[checkmk-commits] Check_MK Git: check_mk: Check no longer memorizes port states in inventory

Module: check_mk Branch: master Commit: 6993a84222908f29038e1ed09266248cbec1a4ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6993a84222908f… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Sep 29 09:33:41 2014 +0200 Check no longer memorizes port states in inventory The scan function has been enabled again. The check does not inventorize when a brocade mib is also present --- checks/fc_port | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/checks/fc_port b/checks/fc_port index 8c84158..93b02c6 100644 --- a/checks/fc_port +++ b/checks/fc_port @@ -119,9 +119,8 @@ def inventory_fc_port(info): opstate not in fc_port_no_inventory_opstates and \ phystate not in fc_port_no_inventory_phystates: - inventory.append( (fc_port_getitem(len(info), index, portname), - '{ "admstate": [%d], "opstate": [%d], "phystate": [%d] }' - % (admstate, opstate, phystate) )) + inventory.append( (fc_port_getitem(len(info), index, portname), \ + 'fc_port_default_levels') ) return inventory @@ -317,9 +316,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.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_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, 'snmp_scan_function' : lambda oid: False, 'snmp_info' : ( ".1.3.6.1.3.94", [ "1.10.1.2", # connUnitPortIndex # 0