[checkmk-commits] Check_MK Git: check_mk: FIX blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod : fix scan function

Module: check_mk Branch: master Commit: a04498e12aec8ce729b1b0ef9ef9451ab087978e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a04498e12aec8c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Dec 16 16:03:54 2013 +0100 FIX blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function Due to a previous precision in the scan function API the scan functions of the blade_* checks where never successful anymore. That way those checks were not detected on new devices. This has been fixed. Existing checks were not affected. --- .werks/339 | 13 +++++++++++++ ChangeLog | 1 + checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- 9 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.werks/339 b/.werks/339 new file mode 100644 index 0000000..baf2c49 --- /dev/null +++ b/.werks/339 @@ -0,0 +1,13 @@ +Title: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function +Level: 2 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387205955 +Targetversion: future + +Due to a previous precision in the scan function API the scan functions of +the blade_* checks where never successful anymore. That way those checks +were not detected on new devices. This has been fixed. Existing checks +were not affected. diff --git a/ChangeLog b/ChangeLog index ade0b7b..ef74e59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,6 +29,7 @@ * 0357 FIX: megaraid_bbu: Fixed expected state checking... * 0358 FIX: df: now ignores filesystems with a reported size of '-'... * 0360 FIX: multipath: Inventory handles non loaded kernel module now... + * 0339 FIX: blade_bays blade_blades blade_blowers blade_health blade_mediatray blade_powerfan blade_powermod: fix scan function... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/checks/blade_bays b/checks/blade_bays index 3352d5b..d528dc7 100644 --- a/checks/blade_bays +++ b/checks/blade_bays @@ -75,5 +75,5 @@ check_info["blade_bays"] = { "3", # powerDomain2 ], [ "1.1.5", "1.1.6", "1.1.2", "1.1.1" ] ), # BLADE-MIB 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blades b/checks/blade_blades index 1313bb4..f1f0e7c 100644 --- a/checks/blade_blades +++ b/checks/blade_blades @@ -79,5 +79,5 @@ check_info["blade_blades"] = { 6, # bladeName ]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_blowers b/checks/blade_blowers index d3110d2..b9f9b9c 100644 --- a/checks/blade_blowers +++ b/checks/blade_blowers @@ -106,5 +106,5 @@ check_info["blade_blowers"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2', [3]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_health b/checks/blade_health index 81a80b8..e81cae6 100644 --- a/checks/blade_health +++ b/checks/blade_health @@ -63,5 +63,5 @@ check_info["blade_health"] = { 'service_description': 'Summary health state', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.7', ['1.0', '2.1.3.1']), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_mediatray b/checks/blade_mediatray index 30259c7..9b2402e 100644 --- a/checks/blade_mediatray +++ b/checks/blade_mediatray @@ -50,5 +50,5 @@ check_info["blade_mediatray"] = { 'service_description': 'Media tray', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.5.2', [74, 75]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_powerfan b/checks/blade_powerfan index 59b2c25..be50f00 100644 --- a/checks/blade_powerfan +++ b/checks/blade_powerfan @@ -59,5 +59,5 @@ check_info["blade_powerfan"] = { 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.6.1.1', [1, 2, 3, 4, 5, 6, 7]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, } diff --git a/checks/blade_powermod b/checks/blade_powermod index 53e0e87..95c6973 100644 --- a/checks/blade_powermod +++ b/checks/blade_powermod @@ -49,5 +49,5 @@ check_info["blade_powermod"] = { 'service_description': 'Power Module %s', 'snmp_info': ('.1.3.6.1.4.1.2.3.51.2.2.4.1.1', [1, 2, 3, 4]), 'snmp_scan_function': \ - lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")), + lambda oid: re.match('BladeCenter( Advanced)* Management Module', oid(".1.3.6.1.2.1.1.1.0")) != None, }