[checkmk-commits] Check_MK Git: check_mk: FIX zfsget: Fixed broken check - was not compatible to current agent output of "df"

Module: check_mk Branch: master Commit: c2f9c61ea50818fa17261be16ae1441355052c7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c2f9c61ea50818… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Feb 19 14:28:51 2014 +0100 FIX zfsget: Fixed broken check - was not compatible to current agent output of "df" --- .werks/673 | 9 +++++++++ ChangeLog | 1 + checks/zfsget | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/673 b/.werks/673 new file mode 100644 index 0000000..aef544d --- /dev/null +++ b/.werks/673 @@ -0,0 +1,9 @@ +Title: zfsget: Fixed broken check - was not compatible to current agent output of "df" +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392816428 + + diff --git a/ChangeLog b/ChangeLog index ef5f673..493a437 100644 --- a/ChangeLog +++ b/ChangeLog @@ -179,6 +179,7 @@ * 0555 FIX: snmp_uptime: no longer fails if uptime is < 1 seconds * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... + * 0673 FIX: zfsget: Fixed broken check - was not compatible to current agent output of "df" Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/zfsget b/checks/zfsget index b152291..b798c3b 100644 --- a/checks/zfsget +++ b/checks/zfsget @@ -106,7 +106,7 @@ def parse_zfsget(info): def zfsget_parse_df_info(entries, info): new_entries = {} - for device, kbytes, used, avail, percent, mountpoint in info: + for device, fs_type, kbytes, used, avail, percent, mountpoint in info: # ignore entries already contained in zfsget and also # entries for virtual filesystems (like swap) if mountpoint.startswith("/") and mountpoint not in entries: