[checkmk-commits] Check_MK Git: check_mk: Conflicts:

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


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

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

Conflicts:
	ChangeLog
	checks/hitachi_hnas_volume

---

 .werks/2111                |   10 ++++++++++
 ChangeLog                  |    1 +
 checks/hitachi_hnas_volume |   12 ++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/.werks/2111 b/.werks/2111
new file mode 100644
index 0000000..e4bbb63
--- /dev/null
+++ b/.werks/2111
@@ -0,0 +1,10 @@
+Title: hitachi_hnas_volume: fix for cases when size information of volumes is not available
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1428438547
+
+
diff --git a/ChangeLog b/ChangeLog
index c1c697b..c42d26f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -308,6 +308,7 @@
     * 1899 FIX: mk_oracle: backport of werk 1564 from agent...
     * 2110 FIX: netapp_api_aggr: check did not take configured levels when using Nagios
     * 1954 FIX: fileinfo / fileinfo.groups: Fixed discovery function for fileinfo groups and equalize agent output of fileinfo agents...
+    * 2111 FIX: hitachi_hnas_volume: fix for cases when size information of volumes is not available
 
     Multisite:
     * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/checks/hitachi_hnas_volume b/checks/hitachi_hnas_volume
index fac705b..b6cc896 100644
--- a/checks/hitachi_hnas_volume
+++ b/checks/hitachi_hnas_volume
@@ -39,11 +39,23 @@ 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))
+                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