[checkmk-commits] Check_MK Git: check_mk: #1695 FIX brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check

Module: check_mk Branch: master Commit: 28aaa9de8426490f3e8add2b591354113db23a34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28aaa9de842649… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 9 09:15:58 2014 +0100 #1695 FIX brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check --- .werks/1695 | 9 +++++++++ ChangeLog | 1 + checks/brocade_vdx_status | 8 ++++++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/1695 b/.werks/1695 new file mode 100644 index 0000000..f5e2b42 --- /dev/null +++ b/.werks/1695 @@ -0,0 +1,9 @@ +Title: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418112916 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 5cf17a7..de3b50c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,6 +133,7 @@ * 1713 FIX: check_fstab_mounts: now correctly ignores swap space... * 1716 FIX: windows_tasks: consider state SCHED_S_TASK_QUEUED (0x00041325) as OK now * 1721 FIX: dell_om_mem: Handle formerly unhandled situations with multiple errors... + * 1695 FIX: brocade_vdx_status: Is now not bein inventorized anymore for devices not supporting the check Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index b6eecda..1f9d6a4 100644 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -53,8 +53,12 @@ check_info["brocade_vdx_status"] = { "check_function" : check_brocade_vdx_status, "inventory_function" : inventory_brocade_vdx_status, "service_description" : "Status", - "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588") and - not oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.1.1.1"), + # It does not seem to work to exclude several OIDs here, there seem + # to be too many devices which do not have the needed OIDs. We try + # another approach: check for existance of the first needed OID + #not oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588.2.1.1.1"), + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0').startswith( ".1.3.6.1.4.1.1588") \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.1.6") != None, "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status