Module: check_mk
Branch: master
Commit: 6eba0b96f6403ed1cf4764f3ca7f99f00a646b8d
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6eba0b96f6403e…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Apr 2 13:28:23 2014 +0200
zfsget: fixed problem with agent output of check_mk_agent.solaris
The reported columns from the check_mk_agent.solaris did not match
the columns expected in the check. This has been fixed.
Might have fixed problem with other agents than check_mk_agent.linux, too.
---
.werks/746 | 11 +++++++++++
ChangeLog | 1 +
checks/zfsget | 6 +++++-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/.werks/746 b/.werks/746
new file mode 100644
index 0000000..6ae8b02
--- /dev/null
+++ b/.werks/746
@@ -0,0 +1,11 @@
+Title: zfsget: fixed problem with agent output of check_mk_agent.solaris
+Level: 1
+Component: checks
+Class: feature
+State: unknown
+Version: 1.2.5i2
+Date: 1396438010
+
+The reported columns from the check_mk_agent.solaris did not match
+the columns expected in the check. This has been fixed.
+Might have fixed problem with other agents than check_mk_agent.linux, too.
diff --git a/ChangeLog b/ChangeLog
index ae82fc1..d86bf63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* 0600 nfsexports.solaris: new agent plugin for monitoring nfs exports on solaris
systems...
* 0743 mem, fortigate_memory, solaris_mem: display total SWAP info in check output
* 0745 drbd: Roles and diskstates are now configurable via WATO...
+ * 0746 zfsget: fixed problem with agent output of check_mk_agent.solaris...
* 0740 FIX: winperf_if: now able to handle bandwidth > 4GBit...
Multisite:
diff --git a/checks/zfsget b/checks/zfsget
index b798c3b..c57609b 100644
--- a/checks/zfsget
+++ b/checks/zfsget
@@ -106,7 +106,11 @@ def parse_zfsget(info):
def zfsget_parse_df_info(entries, info):
new_entries = {}
- for device, fs_type, kbytes, used, avail, percent, mountpoint in info:
+ for entry in info:
+ if len(entry) == 6:
+ device, kbytes, used, avail, percent, mountpoint = entry
+ else:
+ device, fs_type, kbytes, used, avail, percent, mountpoint = entry
# ignore entries already contained in zfsget and also
# entries for virtual filesystems (like swap)
if mountpoint.startswith("/") and mountpoint not in entries: