[checkmk-commits] Check_MK Git: check_mk: #1253 FIX printer_io, printer_supply:

prevent discovery on not supported devices Message-ID: <55758f03./Kovj+c19LpPY3Oc%bk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2047b7039a441756e5a7bb7e05f3b8023c97af10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2047b7039a4417… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Jun 8 14:47:19 2015 +0200 #1253 FIX printer_io,printer_supply: prevent discovery on not supported devices --- .werks/1253 | 10 ++++++++++ ChangeLog | 1 + checks/printer_io.include | 2 ++ checks/printer_supply | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/1253 b/.werks/1253 new file mode 100644 index 0000000..566abb7 --- /dev/null +++ b/.werks/1253 @@ -0,0 +1,10 @@ +Title: printer_io,printer_supply: prevent discovery on not supported devices +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i2 +Date: 1433767600 + + diff --git a/ChangeLog b/ChangeLog index fa36cee..0c21634 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ * 2323 FIX: df: Fix new graphs for all filesystem checks in case of existing inode information * 2305 FIX: agent_vsphere, esx_vsphere_sensors: now able to handle sensor names with semicolon... * 2118 FIX: aix_sap_processlist: agent plugin now is more general to deal with various AIX versions... + * 1253 FIX: printer_io,printer_supply: prevent discovery on not supported devices Multisite: * 2260 Improved load time of Check_MK GUI... diff --git a/checks/printer_io.include b/checks/printer_io.include index af349a6..dce786b 100644 --- a/checks/printer_io.include +++ b/checks/printer_io.include @@ -70,6 +70,8 @@ factory_settings['printer_output_default_levels'] = { def inventory_printer_io(info): for line in info: index, name, descr, status = line[:4] + if descr == '': + continue ignore = False snmp_status = saveint(status) for state_val in sorted(printer_io_states,reverse=True): diff --git a/checks/printer_supply b/checks/printer_supply index ed206a5..88f8d6d 100644 --- a/checks/printer_supply +++ b/checks/printer_supply @@ -91,7 +91,7 @@ def inventory_printer_supply(info): # Also fix trailing zero bytes (seen on HP Jetdirect 143) return [ (line[0].rstrip('\0'), {}) for line in printer_supply_fix_infos(info) - if not (line[1] == '-2' and line[2] == '-2') and len(line[1]) > 0 ] # ignore useless devices + if not (line[1] == '-2' and line[2] == '-2') and line[2] and len(line[1]) > 0 ] # ignore useless devices def check_printer_supply(item, params, info): for line in printer_supply_fix_infos(info):