[checkmk-commits] Check_MK Git: check_mk: #1768 FIX brocade_fcport/brocade_info:

Only try to discover these services when device provides correct info Message-ID: <54919cba.XNumGQR3LpepZARG%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 1cf74ec5775ce269e43d5dd5e0da26079a8bf5cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cf74ec5775ce2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 17 16:09:31 2014 +0100 #1768 FIX brocade_fcport/brocade_info: Only try to discover these services when device provides correct info The brocade_fcport and brocade_info checks were discovered on some devices which do not provide the needed information. Improved the scan function to prevent this issue. --- .werks/1768 | 11 +++++++++++ ChangeLog | 1 + checks/brocade_fcport | 3 ++- checks/brocade_info | 5 +++-- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/1768 b/.werks/1768 new file mode 100644 index 0000000..b705cad --- /dev/null +++ b/.werks/1768 @@ -0,0 +1,11 @@ +Title: brocade_fcport/brocade_info: Only try to discover these services when device provides correct info +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1418828693 + +The brocade_fcport and brocade_info checks were discovered on some devices which do not +provide the needed information. Improved the scan function to prevent this issue. diff --git a/ChangeLog b/ChangeLog index f7f685f..3a4744a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 1204 FIX: veeam_client: Not longer throwing an error in case of currenlty running backup * 1666 FIX: inventory check esx_vsphere_hostsystem: no longer crashes if information is missing... * 1767 FIX: fc_port: Re-enabled check discovery of this check + * 1768 FIX: brocade_fcport/brocade_info: Only try to discover these services when device provides correct info... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/brocade_fcport b/checks/brocade_fcport index ee1c2f3..84e4fba 100644 --- a/checks/brocade_fcport +++ b/checks/brocade_fcport @@ -352,7 +352,8 @@ check_info["brocade_fcport"] = { "31.1.1.1.15", # IF-MIB::ifHighSpeed ]), ], - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588.2.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.2.1.1") \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.*") != None, 'group' : 'brocade_fcport', 'default_levels_variable' : 'brocade_fcport_default_levels', } diff --git a/checks/brocade_info b/checks/brocade_info index bad098c..d668690 100644 --- a/checks/brocade_info +++ b/checks/brocade_info @@ -90,6 +90,7 @@ check_info["brocade_info"] = { ], ), ], - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.1588") or \ - oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.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") \ + or oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.24.1.1588.2.1.1")) \ + and oid(".1.3.6.1.4.1.1588.2.1.1.1.1.6") != None, }