Module: check_mk
Branch: master
Commit: 078b459f188bcb917b7d16b8898646e5d4acffd2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=078b459f188bcb…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Apr 23 17:07:10 2014 +0200
fixed merge conflict
---
.werks/154 | 9 +++++++++
ChangeLog | 1 +
checks/zfsget | 6 +++---
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.werks/154 b/.werks/154
new file mode 100644
index 0000000..cae564b
--- /dev/null
+++ b/.werks/154
@@ -0,0 +1,9 @@
+Title: zfsget: Fixed inventory of filesystems
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i3
+Date: 1398265418
+
+
diff --git a/ChangeLog b/ChangeLog
index f58de74..96b0db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@
* 0606 FIX: apache_status: now also sends an accept header to make it work with
mod_security enables servers
* 0832 FIX: solaris_mem: fixed invalid calculation of total swap...
* 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces
anymore
+ * 0154 FIX: zfsget: Fixed inventory of filesystems
Multisite:
* 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled
by filter)
diff --git a/checks/zfsget b/checks/zfsget
index 5ec0d93..386e08f 100644
--- a/checks/zfsget
+++ b/checks/zfsget
@@ -95,7 +95,8 @@ def parse_zfsget(info):
for entry in entries:
if entry["mountpoint"].startswith("/"):
entry["is_pool"] = '/' not in entry["name"]
- parsed[entry["mountpoint"]] = entry
+ if entry['available'] != 0:
+ parsed[entry["mountpoint"]] = entry
if start_of_df != None:
zfsget_parse_df_info(parsed, info[start_of_df:])
@@ -146,8 +147,7 @@ def inventory_zfsget(info):
parsed = parse_zfsget(info)
for mountpoint, properties in parsed.items():
if mountpoint not in inventory_df_exclude_mountpoints:
- if properties["available"] != 0:
- mplist.append(mountpoint)
+ mplist.append(mountpoint)
return df_inventory(mplist)