Module: check_mk Branch: master Commit: 973de7598ba67bf98f4c6452793c365a00907ef1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=973de7598ba67b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 22 14:24:20 2016 +0200 3422 FIX printer_pages, canon_pages: Detect pages on Canon 8350 with generic check This printer (and maybe others) do not implement the Canon-specific OIDs so we now fall back to the generic MIB. --- .werks/3422 | 11 +++++++++++ ChangeLog | 1 + checks/printer_pages.include | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/3422 b/.werks/3422 new file mode 100644 index 0000000..1d6d432 --- /dev/null +++ b/.werks/3422 @@ -0,0 +1,11 @@ +Title: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1461327795 + +This printer (and maybe others) do not implement the Canon-specific OIDs so we +now fall back to the generic MIB. diff --git a/ChangeLog b/ChangeLog index 1cf78a1..c904cc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 3419 FIX: solaris_mem: avoid crash in case of empty agent section, treat section as missing... * 3420 FIX: check_ftp, check_tcp, check_smtp: add missing CRIT levels for certificate live time... * 3421 FIX: cisco_asa_failover: Do not discover interfaces where failover is not enabled... + * 3422 FIX: printer_pages, canon_pages: Detect pages on Canon 8350 with generic check... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/printer_pages.include b/checks/printer_pages.include index d8b9ed6..b5b2446 100644 --- a/checks/printer_pages.include +++ b/checks/printer_pages.include @@ -36,7 +36,8 @@ def scan_ricoh_printer(oid): def scan_canon_printer(oid): return "canon" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None + and oid(".1.3.6.1.4.1.1602.1.1.1.1.0") != None \ + and oid(".1.3.6.1.4.1.1602.1.11.1.3.1.4") != None def scan_generic_printer(oid): return oid(".1.3.6.1.2.1.43.10.2.1.4.1.1") != None \