Module: check_mk
Branch: master
Commit: cb54f2631a889199ee4940b513ee91be6b550298
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb54f2631a8891…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Jun 15 10:14:52 2018 +0200
Minor cleanup
Change-Id: I07363d3b3772eac36c7102cfe266f53573c55eaa
---
checks/if64.include | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/checks/if64.include b/checks/if64.include
index 983a9c7..572ab2f 100644
--- a/checks/if64.include
+++ b/checks/if64.include
@@ -53,19 +53,22 @@ def if64_scan_function(oid, use_if64adm=False):
if if64_disabled(host_name()):
return False
- ignored_strings = [
+ ignored_sys_descr = [
"LANCOM",
"ELSA",
"T-Systems",
"Brocade VDX Switch",
+ ]
+ for sys_descr in ignored_sys_descr:
+ if sys_descr in oid(".1.3.6.1.2.1.1.1.0"):
+ return False
+ ignored_sys_obj_ids = [
".4.1.11863.",
- ".1.3.6.1.4.1.12356"
+ ".1.3.6.1.4.1.12356",
]
-
- for string in ignored_strings:
- if string in oid(".1.3.6.1.2.1.1.1.0") or \
- string in oid(".1.3.6.1.2.1.1.2.0"):
+ for obj_id in ignored_sys_obj_ids:
+ if obj_id in oid(".1.3.6.1.2.1.1.2.0"):
return False
if need_if64adm() != use_if64adm: