Module: check_mk
Branch: master
Commit: 92b1db5a514ec6ee2290d24a8c1bf66c0201baaa
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92b1db5a514ec6…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Aug 18 18:02:24 2011 +0200
printer_pages: workaround for trailing-zeroes
---
ChangeLog | 1 +
checks/printer_supply | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 26bddc4..cafd9ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
1.1.11i3:
Checks & Agents:
+ * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect
* mk_logwatch: allow to set limits in processing time and number of
new log messages per log file
* Windows Agent: Now supports direct execution of powershell scripts
diff --git a/checks/printer_supply b/checks/printer_supply
index 13d0bfa..ccfa4f7 100644
--- a/checks/printer_supply
+++ b/checks/printer_supply
@@ -74,13 +74,14 @@ def printer_supply_fix_infos(info):
def inventory_printer_supply(checkname, info):
# Ignore devices which show -2 for current value and -2 for max value -> useless
- return [ (line[0], "printer_supply_default_levels")
+ # Also fix trailing zero bytes (seen on HP Jetdirect 143)
+ return [ (line[0].rstrip('\0'), "printer_supply_default_levels")
for line in printer_supply_fix_infos(info)
if not (line[1] == '-2' and line[2] == '-2') ] # ignore
useless devices
def check_printer_supply(item, params, info):
for line in printer_supply_fix_infos(info):
- if line[0] == item:
+ if line[0].rstrip('\0') == item:
maxlevel = int(line[1])
current = saveint(line[2])
warn, crit = params # in percent