Module: check_mk Branch: master Commit: 14cf0e3138b866889afe4243bf8fb9dbc4b4e6b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14cf0e3138b866… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Thu Jul 24 17:35:14 2014 +0200 642 FIX fc_port: scan function of check modified ... again --- .werks/642 | 8 ++++++++ ChangeLog | 1 + checks/fc_port | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/642 b/.werks/642 new file mode 100644 index 0000000..ebbf24c --- /dev/null +++ b/.werks/642 @@ -0,0 +1,8 @@ +Title: fc_port: scan function of check modified ... again +Level: 1 +Component: checks +Version: 1.2.5i5 +Date: 1406216089 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index aa916c2..98a191e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,7 @@ * 1049 FIX: ups_capacity: Fix exception when running on battery... * 0639 FIX: jolokia_metrics: fix for problem when catalina uses the standalone engine * 1050 FIX: websphere_mq_queues: make compatible with old agent, fix not-found case + * 0642 FIX: fc_port: scan function of check modified ... again Multisite: * 1013 Sort host names naturally, e.g. foobar11 comes after foobar2... diff --git a/checks/fc_port b/checks/fc_port index 5986b27..634b250 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -317,8 +317,9 @@ 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." \ - and not oid(".1.3.6.1.4.1.1588.2.1.1.1.6.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 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