[checkmk-commits] Check_MK Git: check_mk: #1480 FIX brocade_vdx_status: disable check on some devices that do not support it

Module: check_mk Branch: master Commit: 9d18671cd307987c2c707a7baabbeb9bd7d73026 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9d18671cd30798… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 31 14:11:34 2014 +0100 #1480 FIX brocade_vdx_status: disable check on some devices that do not support it Thanks to Oleg Roitburd. --- .werks/1480 | 10 ++++++++++ ChangeLog | 1 + checks/brocade_vdx_status | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/1480 b/.werks/1480 new file mode 100644 index 0000000..c3cd4bd --- /dev/null +++ b/.werks/1480 @@ -0,0 +1,10 @@ +Title: brocade_vdx_status: disable check on some devices that do not support it +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.5i7 +Date: 1414761045 + +Thanks to Oleg Roitburd. diff --git a/ChangeLog b/ChangeLog index 4ffb065..4bbe7c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1167 citrix_license/esx_license: Can now be configured to always show OK as state * 1198 climaveneta_fan: New check for FAN speed on climaveneta devices * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... + * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... Multisite: * 1164 FIX: Fixed links from servicegroup overviews to single servicegroups diff --git a/checks/brocade_vdx_status b/checks/brocade_vdx_status index 22af8d4..b6eecda 100644 --- a/checks/brocade_vdx_status +++ b/checks/brocade_vdx_status @@ -53,7 +53,8 @@ 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"), + "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"), "snmp_info" : ( ".1.3.6.1.4.1.1588.2.1.1.1.1", [ 6, # Firmware 7 # Status