[checkmk-commits] Check_MK Git: check_mk: hitachi_hnas_volume: fix from last merge

Goetz Golla gg at mathias-kettner.de
Tue Apr 7 22:54:03 CEST 2015


Module: check_mk
Branch: master
Commit: bab3c776e01e3788f40f8c2ecf502366c244c511
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bab3c776e01e3788f40f8c2ecf502366c244c511

Author: Goetz Golla <gg at mathias-kettner.de>
Date:   Tue Apr  7 22:53:24 2015 +0200

hitachi_hnas_volume: fix from last merge

---

 checks/hitachi_hnas_volume |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume
index b6cc896..9c822b8 100644
--- a/checks/hitachi_hnas_volume
+++ b/checks/hitachi_hnas_volume
@@ -39,23 +39,15 @@ def check_hitachi_hnas_volume(item, params, info):
         if volid == '':
             continue
         if volid + " " + label == item:
-<<<<<<< HEAD
-            size_mb = int(total) / 1048576.0
-            avail_mb = int(free) / 1048576.0
-            fslist.append((item, size_mb, avail_mb, 0))
-
-            status, message, perfdata = df_check_filesystem_list(item, params, fslist)
-=======
             if total and free:
                 size_mb = int(total) / 1048576.0
                 avail_mb = int(free) / 1048576.0
-                fslist.append((item, size_mb, avail_mb))
+                fslist.append((item, size_mb, avail_mb, 0))
                 status, message, perfdata = df_check_filesystem_list(item, params, fslist)
             else:
                 status = 1
                 message = "no filesystem size information (!)"
                 perfdata = []
->>>>>>> c301dde... #2111 FIX hitachi_hnas_volume: fix for cases when size information of volumes is not available
 
             # evaluate volumeStatus
             statusmap = (("", 3),



More information about the checkmk-commits mailing list