[checkmk-commits] Check_MK Git: check_mk: Conflicts:

Lars Michelsen lm at mathias-kettner.de
Thu Feb 26 11:40:01 CET 2015


Module: check_mk
Branch: master
Commit: b5fc4c5f71652d67b3bff58b925b7dac8b6d42c8
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5fc4c5f71652d67b3bff58b925b7dac8b6d42c8

Author: Lars Michelsen <lm at mathias-kettner.de>
Date:   Thu Feb 26 11:39:56 2015 +0100

Conflicts:
	ChangeLog
	checks/if64

---

 .werks/2021      |   10 ++++++++++
 ChangeLog        |    1 +
 checks/if64      |    2 ++
 checks/if_lancom |    4 +++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.werks/2021 b/.werks/2021
new file mode 100644
index 0000000..6266c0e
--- /dev/null
+++ b/.werks/2021
@@ -0,0 +1,10 @@
+Title: if_lancom: Also used for checking ELSA/T-Systems branded devices
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424947137
+
+
diff --git a/ChangeLog b/ChangeLog
index 7eee12c..6f9d88e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -199,6 +199,7 @@
     * 2019 FIX: heartbeat_crm: Be compatible to yet unknown crm_mon output format
     * 2048 FIX: netapp_api_fan, netapp_api_psu, netapp_api_temp: fixed typo in service description Shelfes -> Shelves
             NOTE: Please refer to the migration notes!
+    * 2021 FIX: if_lancom: Also used for checking ELSA/T-Systems branded devices
 
     Multisite:
     * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/checks/if64 b/checks/if64
index e8a43cb..fb1a431 100644
--- a/checks/if64
+++ b/checks/if64
@@ -44,6 +44,8 @@ def check_if64(item, params, info):
 def if64_scan_function(oid):
     ignored_strings = [
         "LANCOM",
+        "ELSA",
+        "T-Systems",
         "Brocade VDX Switch",
     ]
     for string in ignored_strings:
diff --git a/checks/if_lancom b/checks/if_lancom
index f29b27b..97dc890 100644
--- a/checks/if_lancom
+++ b/checks/if_lancom
@@ -94,7 +94,9 @@ check_info["if_lancom"] = {
     ],
     # check if number of network interfaces (IF-MIB::ifNumber.0) is at least 2
     'snmp_scan_function':      \
-         lambda oid: "LANCOM" in oid(".1.3.6.1.2.1.1.1.0") and \
+         lambda oid: ("LANCOM"    in oid(".1.3.6.1.2.1.1.1.0") or \
+                      "ELSA"      in oid(".1.3.6.1.2.1.1.1.0") or \
+                      "T-Systems" in oid(".1.3.6.1.2.1.1.1.0")) and \
                      (not if64_disabled(g_hostname)) and \
                      oid(".1.3.6.1.2.1.31.1.1.1.6.*") != None,
     'group':                   'if',



More information about the checkmk-commits mailing list