Module: check_mk
Branch: master
Commit: 9f3612340408bddb8ea3a5967355331bee09f0e7
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f3612340408bd…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Aug 27 14:54:49 2015 +0200
Conflicts:
ChangeLog
checks/akcp_daisy_temp
---
.werks/2545 | 10 ++++++++++
ChangeLog | 1 +
checks/akcp_daisy_temp | 4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/2545 b/.werks/2545
new file mode 100644
index 0000000..c72162a
--- /dev/null
+++ b/.werks/2545
@@ -0,0 +1,10 @@
+Title: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on these
devices
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i3
+Date: 1440679593
+
+
diff --git a/ChangeLog b/ChangeLog
index 047f0f3..496d6a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,6 +143,7 @@
* 1285 FIX: blade_bx_powerfan: Fixed exception in case of fan failure
* 2522 FIX: check_mk_agent.aix: now handles different output formats of the uptime
function
* 1287 FIX: akcp_temperature: Fixed interpretation of device levels...
+ * 2545 FIX: akcp_daisy_temp: sensorProbe8-X20 not trying to discover services on
these devices
Multisite:
* 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce
unhandled exceptions...
diff --git a/checks/akcp_daisy_temp b/checks/akcp_daisy_temp
index bdcbf44..d3adb50 100644
--- a/checks/akcp_daisy_temp
+++ b/checks/akcp_daisy_temp
@@ -62,7 +62,9 @@ check_info["akcp_daisy_temp"] = {
]
),
'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0") in \
- [ ".1.3.6.1.4.1.3854.1.2.2.1.1",
".1.3.6.1.4.1.3854.1" ] and not oid('.1.3.6.1.4.1.3854.2.*'),
+ [ ".1.3.6.1.4.1.3854.1.2.2.1.1",
".1.3.6.1.4.1.3854.1" ] \
+ and not oid('.1.3.6.1.4.1.3854.2.*') \
+ and oid('.1.3.6.1.4.1.3854.1.2.2.1.19.*'),
'group' : 'room_temperature',
'includes' : [ 'temperature.include' ],
}