Module: check_mk
Branch: master
Commit: 3ed9a2cc250b42c1bba84deb3fcb3f8ba29f4465
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ed9a2cc250b42…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Wed Feb 10 10:35:30 2016 +0100
#3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem
datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model
---
.werks/3173 | 9 +++++++++
ChangeLog | 1 +
checks/datapower_cpu | 2 +-
checks/datapower_fan | 2 +-
checks/datapower_fs | 2 +-
checks/datapower_ldrive | 4 +---
checks/datapower_mem | 2 +-
checks/datapower_pdrive | 3 +--
checks/datapower_raid_bat | 4 +---
checks/datapower_tcp | 2 +-
checks/datapower_temp | 2 +-
11 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/.werks/3173 b/.werks/3173
new file mode 100644
index 0000000..30b55aa
--- /dev/null
+++ b/.werks/3173
@@ -0,0 +1,9 @@
+Title: datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem
datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i4
+Date: 1455096912
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index f50d391..3be380c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -113,6 +113,7 @@
* 2976 eltek_battery, eltek_battery.temp, eltek_battery.supply, eltek_fans,
eltek_outdoor_temp, eltek_systemstatus: new checks for a Eltek Valere USV
* 2989 netapp_api_snapshots: increased performance while querying data. levels
configurable...
* 2977 aruba_wlc_clients: new check which monitors the WLC clients of a Aruba
Networks WLAN Controller
+ * 3173 datapower_cpu datapower_fan datapower_fs datapower_ldrive datapower_mem
datapower_pdrive datapower_raid_bat datapower_tcp datapower_temp: Detect XI52 Model
* 2660 FIX: fixed windows agent using the wrong working directory...
* 2664 FIX: ps: Speedup in situation with many matching processes...
* 2661 FIX: windows agent: fixed incomplete process list...
diff --git a/checks/datapower_cpu b/checks/datapower_cpu
index 6c30130..bb76da0 100644
--- a/checks/datapower_cpu
+++ b/checks/datapower_cpu
@@ -44,7 +44,7 @@ check_info['datapower_cpu'] = {
"snmp_info" : ( ".1.3.6.1.4.1.14685.3.1.14", [
"2", # dpStatusCPUUsageoneMinute
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
"includes" : [ "cpu_util.include" ],
"group" : "cpu_utilization",
"default_levels_variable" : "datapower_cpu_default_levels",
diff --git a/checks/datapower_fan b/checks/datapower_fan
index 20c0a36..def1090 100644
--- a/checks/datapower_fan
+++ b/checks/datapower_fan
@@ -85,5 +85,5 @@ check_info["datapower_fan"] = {
2, # dpStatusEnvironmentalFanSensorsFanSpeed
4, # dpStatusEnvironmentalFanSensorsReadingStatus
]),
- "snmp_scan_function" : lambda oid:
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14685.1.7"),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
}
diff --git a/checks/datapower_fs b/checks/datapower_fs
index 38b19c9..8306047 100644
--- a/checks/datapower_fs
+++ b/checks/datapower_fs
@@ -70,6 +70,6 @@ check_info["datapower_fs"] = {
"7", # dpStatusFilesystemStatusFreeInternal
"8", #
dpStatusFilesystemStatusTotalInternal
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
}
diff --git a/checks/datapower_ldrive b/checks/datapower_ldrive
index faa50f0..7517ccb 100644
--- a/checks/datapower_ldrive
+++ b/checks/datapower_ldrive
@@ -67,7 +67,5 @@ check_info['datapower_ldrive'] = {
"5", #
dpStatusRaidLogicaldrivetatusNumPhysicalDrives
"6", # dpStatusRaidLogicaldrivetatusState
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
-
-
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
}
diff --git a/checks/datapower_mem b/checks/datapower_mem
index c4a46ad..dd6a2a8 100644
--- a/checks/datapower_mem
+++ b/checks/datapower_mem
@@ -48,7 +48,7 @@ check_info['datapower_mem'] = {
"2", # dpStatusMemoryStatusTotalMemory
"3", # dpStatusMemoryStatusUsedMemory
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
"includes" : [ "memory.include" ],
"group" : "memory_simple",
"default_levels_variable" : "datapower_mem_default_levels",
diff --git a/checks/datapower_pdrive b/checks/datapower_pdrive
index cc6ab23..ab5c273 100644
--- a/checks/datapower_pdrive
+++ b/checks/datapower_pdrive
@@ -87,7 +87,6 @@ check_info['datapower_pdrive'] = {
"15", #
dpStatusRaidPhysicaldrivetatusProductID
"18", #
dpStatusRaidPhysicaldrivetatusFailure
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
-
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
}
diff --git a/checks/datapower_raid_bat b/checks/datapower_raid_bat
index e8221f6..eafe966 100644
--- a/checks/datapower_raid_bat
+++ b/checks/datapower_raid_bat
@@ -74,7 +74,5 @@ check_info['datapower_raid_bat'] = {
"4", # dpStatusRaidBatteryBackUpStatusName
"5", #
dpStatusRaidBatteryBackUpStatusStatus
]),
- "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
-
-
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
}
diff --git a/checks/datapower_tcp b/checks/datapower_tcp
index 6169b4d..f46d383 100644
--- a/checks/datapower_tcp
+++ b/checks/datapower_tcp
@@ -52,7 +52,7 @@ check_info['datapower_tcp'] = {
OID_END, # state of tcp connection
"", # number of tcp connections
of this state
]),
- 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
== ".1.3.6.1.4.1.14685.1.7",
+ "snmp_scan_function" : lambda oid:
oid(".1.3.6.1.2.1.1.2.0") in [ ".1.3.6.1.4.1.14685.1.7",
".1.3.6.1.4.1.14685.1.3" ],
'has_perfdata' : True,
'group' : 'tcp_conn_stats',
'includes' : [ "tcp_connections.include" ],
diff --git a/checks/datapower_temp b/checks/datapower_temp
index 720c3df..fe76e6f 100644
--- a/checks/datapower_temp
+++ b/checks/datapower_temp
@@ -68,7 +68,7 @@ check_info["datapower_temp"] = {
5, # dpStatusEnvironmentalSensorsReadingStatus
6, #
dpStatusEnvironmentalSensorsUpperCriticalThreshold
]),
- "snmp_scan_function" : lambda oid:
oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14685.1.7"),
+ "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0")
in [ ".1.3.6.1.4.1.14685.1.7", ".1.3.6.1.4.1.14685.1.3" ],
"includes" : [ "temperature.include" ],
"default_levels_variable" : "datapower_temp_default_levels",
}