[checkmk-commits] 5055 FIX quantum_libsmall_door: Fixed exception in scan function when .1.3.6.1.2.1.1.6.0 is not available

Module: check_mk Branch: master Commit: 4f6e214ccd354cb2036661587e639a4c983c0be9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f6e214ccd354c… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Tue Aug 29 13:40:26 2017 +0200 5055 FIX quantum_libsmall_door: Fixed exception in scan function when .1.3.6.1.2.1.1.6.0 is not available Fixes exceptions like this: File "/omd/sites/heute/bin/cmk", line 96, in <module> exit_status = modes.call(o, a, opts, args) File "/omd/sites/heute/lib/python/cmk_base/modes/__init__.py", line 80, in call return mode.handler_function(*handler_args) File "/omd/sites/heute/lib/python/cmk_base/modes/check_mk.py", line 1380, in mode_discover options["discover"] == 1) File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 110, in do_discovery _do_discovery_for(hostname, check_types, only_new, use_caches, on_error) File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 131, in _do_discovery_for new_items = _discover_services(hostname, check_types, use_caches, do_snmp_scan, on_error) File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 750, in _discover_services check_types = _gather_check_types_native(hostname, ipaddress, on_error, do_snmp_scan) File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 681, in _gather_check_types_native check_types = snmp_scan(hostname, ipaddress, on_error) File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 846, in snmp_scan result = scan_function(oid_function) File "/omd/sites/heute/share/check_mk/checks/quantum_libsmall_door", line 49, in <lambda> and "library" in oid(".1.3.6.1.2.1.1.6.0").lower(), AttributeError: 'NoneType' object has no attribute 'lower' Change-Id: Icc57e299ae2cdb4f7cb7ea47dfe000a696c5ce16 --- .werks/5055 | 31 +++++++++++++++++++++++++++++++ checks/quantum_libsmall_door | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/.werks/5055 b/.werks/5055 new file mode 100644 index 0000000..8e20066 --- /dev/null +++ b/.werks/5055 @@ -0,0 +1,31 @@ +Title: quantum_libsmall_door: Fixed exception in scan function when .1.3.6.1.2.1.1.6.0 is not available +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1504006790 + +Fixes exceptions like this: + + File "/omd/sites/heute/bin/cmk", line 96, in <module> + exit_status = modes.call(o, a, opts, args) + File "/omd/sites/heute/lib/python/cmk_base/modes/__init__.py", line 80, in call + return mode.handler_function(*handler_args) + File "/omd/sites/heute/lib/python/cmk_base/modes/check_mk.py", line 1380, in mode_discover + options["discover"] == 1) + File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 110, in do_discovery + _do_discovery_for(hostname, check_types, only_new, use_caches, on_error) + File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 131, in _do_discovery_for + new_items = _discover_services(hostname, check_types, use_caches, do_snmp_scan, on_error) + File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 750, in _discover_services + check_types = _gather_check_types_native(hostname, ipaddress, on_error, do_snmp_scan) + File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 681, in _gather_check_types_native + check_types = snmp_scan(hostname, ipaddress, on_error) + File "/omd/sites/heute/lib/python/cmk_base/discovery.py", line 846, in snmp_scan + result = scan_function(oid_function) + File "/omd/sites/heute/share/check_mk/checks/quantum_libsmall_door", line 49, in <lambda> + and "library" in oid(".1.3.6.1.2.1.1.6.0").lower(), +AttributeError: 'NoneType' object has no attribute 'lower' diff --git a/checks/quantum_libsmall_door b/checks/quantum_libsmall_door index 31eebac..21548b0 100644 --- a/checks/quantum_libsmall_door +++ b/checks/quantum_libsmall_door @@ -45,6 +45,6 @@ check_info['quantum_libsmall_door'] = { "inventory_function" : inventory_quantum_libsmall_door, "service_description" : "Tape library door", "snmp_info" : (".1.3.6.1.4.1.3697.1.10.10.1.15.2", [ "0" ]), - "snmp_scan_function" : lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0").lower() \ - and "library" in oid(".1.3.6.1.2.1.1.6.0").lower(), + "snmp_scan_function" : lambda oid: "linux" in oid(".1.3.6.1.2.1.1.1.0", "").lower() \ + and "library" in oid(".1.3.6.1.2.1.1.6.0", "").lower(), }