Module: check_mk
Branch: master
Commit: e8b54a3c27875be6fc7146b719e209dc68f0bbef
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e8b54a3c27875b…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Jun 6 15:12:45 2012 +0200
avoid duplicate checks cisco_temp_perf and cisco_sensor_temp
---
ChangeLog | 1 +
checks/cisco_temp_perf | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c0404b2..bd259bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
* tcp_conn_stats: handle state BOUND (found on Solaris)
* diskstat: support for checking latency, LVM and VxVM on Linux (needs
updated agent)
+ * avoid duplicate checks cisco_temp_perf and cisco_sensor_temp
1.2.0b6:
Multisite:
diff --git a/checks/cisco_temp_perf b/checks/cisco_temp_perf
index 3be163a..28ea012 100644
--- a/checks/cisco_temp_perf
+++ b/checks/cisco_temp_perf
@@ -91,5 +91,6 @@ check_info['cisco_temp_perf'] = (check_cisco_temp_perf,
"Temperature %s", 1, in
snmp_info['cisco_temp_perf'] = ( ".1.3.6.1.4.1.9.9.13.1.3.1", [ 2, 3,
4, 6, OID_END ] ) # CISCO-SMI
snmp_scan_functions['cisco_temp_perf'] = \
lambda oid: "cisco" in oid(".1.3.6.1.2.1.1.1.0").lower() and \
- oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None
+ oid(".1.3.6.1.4.1.9.9.13.1.3.1.3.*") != None and \
+ oid(".1.3.6.1.4.1.9.9.91.1.1.1.1.*") == None # the using
cisco_sensor_temp
checkgroup_of["cisco_temp_perf"] = "temperature_auto"