Module: check_mk Branch: master Commit: 96e44f6bfb036c36e5df2eb15d7741178ed7d4f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96e44f6bfb036c… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jul 16 09:55:52 2014 +0200 FIX fc_port: do not inventorize if brocade fibre channel mib is also supported on the device Some devices on the market have shown to support both the brocade fibre channel mib, and the FCMGMT mib. In these cases two services were created for each fibre channel port, one for the brocade_fcport check and one for the fc_port check. With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported. --- .werks/636 | 11 +++++++++++ ChangeLog | 1 + checks/fc_port | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/636 b/.werks/636 new file mode 100644 index 0000000..a5febf6 --- /dev/null +++ b/.werks/636 @@ -0,0 +1,11 @@ +Title: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1405496969 +Class: fix + +Some devices on the market have shown to support both the brocade fibre channel mib, and +the FCMGMT mib. In these cases two services were created for each fibre channel port, one for +the brocade_fcport check and one for the fc_port check. +With this fix, the fc_port does not inventorize if the brocade fibre channel mib is supported. diff --git a/ChangeLog b/ChangeLog index daaef7e..ec9e7f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 1055 FIX: mysql_slave: Fixed detecting CRIT states when IO/SQL slaves are not running * 0634 FIX: Max Bandwidth for PNP-Graphs of Interface checks corrected... * 0635 FIX: fc_port: the check no longer inventorizes ports with administrative state of 'unknown' or 'offline' + * 0636 FIX: fc_port: do not inventorize if brocade fibre channel mib is also supported on the device... Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index 743c74f..5986b27 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -317,7 +317,8 @@ check_info["fc_port"] = { 'has_perfdata' : True, 'group' : 'fc_port', 'default_levels_variable': 'fc_port_default_levels', - 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch.", + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.1.0") == "Fibre Channel Switch." \ + and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.2.1.1"), 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0 "1.10.1.3", # connUnitPortType # 1