[checkmk-commits] Cleanup of exclusion of if64 and if64adm

Module: check_mk Branch: master Commit: 4281bc80050cecf4f7bb7b990ce05a67ff9e7cd0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4281bc80050cec… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Jun 14 16:33:26 2018 +0200 Cleanup of exclusion of if64 and if64adm Change-Id: I60be4989d7bd63d44eb30594d39042e53d90941d --- checks/fsc_if64 | 3 +-- checks/if64 | 3 +-- checks/if64.include | 6 ++++-- checks/if64adm | 3 +-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/checks/fsc_if64 b/checks/fsc_if64 index e1360e9..11b2dc7 100644 --- a/checks/fsc_if64 +++ b/checks/fsc_if64 @@ -317,8 +317,7 @@ check_info['fsc_if64'] = { 'has_perfdata' : True, 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( '.1.3.6.1.2.1', if64_snmp_end_oids ), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, False), + 'snmp_scan_function' : if64_scan_function, 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels', diff --git a/checks/if64 b/checks/if64 index c069154..4ee3ba1 100644 --- a/checks/if64 +++ b/checks/if64 @@ -40,8 +40,7 @@ check_info["if64"] = { 'has_perfdata' : True, 'includes' : [ 'if.include', 'if64.include' ], 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, False), + 'snmp_scan_function' : if64_scan_function, 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels', diff --git a/checks/if64.include b/checks/if64.include index 2d9ffe2..18e61cf 100644 --- a/checks/if64.include +++ b/checks/if64.include @@ -50,6 +50,9 @@ def need_if64adm(): def if64_scan_function(oid, use_if64adm): + if if64_disabled(host_name()): + return False + ignored_strings = [ "LANCOM", "ELSA", @@ -65,8 +68,7 @@ def if64_scan_function(oid, use_if64adm): string in oid(".1.3.6.1.2.1.1.2.0"): return False - if need_if64adm() != use_if64adm or \ - if64_disabled(host_name()): + if need_if64adm() != use_if64adm: return False if oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None: diff --git a/checks/if64adm b/checks/if64adm index 8fccd41..b93d010 100644 --- a/checks/if64adm +++ b/checks/if64adm @@ -54,8 +54,7 @@ check_info["if64adm"] = { 'snmp_info' : ( ".1.3.6.1.2.1", if64_snmp_end_oids + [ "2.2.1.7", # ifAdminStatus ]), - 'snmp_scan_function' : lambda oid: not if64_disabled(host_name()) \ - and if64_scan_function(oid, True), + 'snmp_scan_function' : lambda oid: if64_scan_function(oid, True), 'group' : 'if', 'node_info' : True, 'default_levels_variable' : 'if_default_levels',