Module: check_mk
Branch: master
Commit: 05b03b7b4effb4ad4f0ff4516a451ae833976752
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05b03b7b4effb4…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Apr 7 15:56:53 2014 +0200
agent_ibmsvc: a version additionally calling lsdrive
---
agents/special/agent_ibmsvc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc
index 4a61a04..6a3e64f 100755
--- a/agents/special/agent_ibmsvc
+++ b/agents/special/agent_ibmsvc
@@ -163,6 +163,14 @@ for module in command_options.keys():
else:
cmd += "%s -nohdr -delim :;" % module
+ # in these 2 sections we need to run the lsdrive command additionaly
+ # to find out if there are drives. Only if there are some, the drives
+ # checks need to be created by inventory
+ if module in [ "lsnodestats", "lssystemstats" ]:
+ cmd += "echo \[lsdrive start\];"
+ cmd += "lsdrive -delim : -nohdr;"
+ cmd += "echo \[lsdrive end\];"
+
cmd += "'"
if opt_debug:
Module: check_mk
Branch: master
Commit: e88c5e85db7196131c37cef26fa21acfb38c1310
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e88c5e85db7196…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Apr 7 15:58:45 2014 +0200
agent_ibmsvc: removing call of lsdrive again, because it is only useful at inventory, but always called at every check
---
agents/special/agent_ibmsvc | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/agents/special/agent_ibmsvc b/agents/special/agent_ibmsvc
index 6a3e64f..d409a97 100755
--- a/agents/special/agent_ibmsvc
+++ b/agents/special/agent_ibmsvc
@@ -162,15 +162,6 @@ for module in command_options.keys():
cmd += "lseventlog -expired no -fixed no -monitoring no -order severity -message no -delim : -nohdr;"
else:
cmd += "%s -nohdr -delim :;" % module
-
- # in these 2 sections we need to run the lsdrive command additionaly
- # to find out if there are drives. Only if there are some, the drives
- # checks need to be created by inventory
- if module in [ "lsnodestats", "lssystemstats" ]:
- cmd += "echo \[lsdrive start\];"
- cmd += "lsdrive -delim : -nohdr;"
- cmd += "echo \[lsdrive end\];"
-
cmd += "'"
if opt_debug:
Module: check_mk
Branch: master
Commit: d2905739dfa133ef85d8661bee660ed19cac7b8f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d2905739dfa133…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Apr 7 14:47:25 2014 +0200
FIX df: fixed problems on some filesystem checks when legacy check parameters where used
Any checks using the df.include library function had problems when their
check parameters where configured in a legacy syntax - in detail tuple(int, int)
This caused invalid output from Agent messages. However, a reinventory
of the check in question fixed the problems.
---
.werks/787 | 11 +++++++++++
ChangeLog | 1 +
checks/df.include | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/787 b/.werks/787
new file mode 100644
index 0000000..23285a7
--- /dev/null
+++ b/.werks/787
@@ -0,0 +1,11 @@
+Title: df: fixed problems on some filesystem checks when legacy check parameters where used
+Level: 1
+Component: checks
+Version: 1.2.5i3
+Date: 1396874528
+Class: fix
+
+Any checks using the df.include library function had problems when their
+check parameters where configured in a legacy syntax - in detail tuple(int, int)
+This caused invalid output from Agent messages. However, a reinventory
+of the check in question fixed the problems.
diff --git a/ChangeLog b/ChangeLog
index a2f5784..8f140be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18,6 +18,7 @@
* 0777 FIX: special agent emcvnx: did not work with security file authentication...
* 0786 FIX: zfsget: fixed compatibility with older Solaris agents...
* 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection
+ * 0787 FIX: df: fixed problems on some filesystem checks when legacy check parameters where used...
Multisite:
* 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled by filter)
diff --git a/checks/df.include b/checks/df.include
index 987bf59..6f8a7a7 100644
--- a/checks/df.include
+++ b/checks/df.include
@@ -215,7 +215,7 @@ def get_filesystem_levels(host, mountpoint, size_gb, params):
crit_hr = get_bytes_human_readable(crit * mega)
levels["levels_text"] = "(%s %s/%s)" % (label, warn_hr, crit_hr)
- if params.get("inodes_levels"):
+ if "inodes_levels" in params:
if type(levels["inodes_levels"]) == tuple:
warn, crit = levels["inodes_levels"]
else: