Module: check_mk
Branch: master
Commit: 7e1f5e7cbef2104d9982b74b1b368458579d4069
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e1f5e7cbef210…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Wed Aug 26 15:36:30 2015 +0200
#1286 blade_bx_powerfan: Discovery ignores not present fans now
---
.werks/1286 | 9 +++++++++
ChangeLog | 1 +
checks/blade_bx_powerfan | 7 ++++++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/1286 b/.werks/1286
new file mode 100644
index 0000000..115629c
--- /dev/null
+++ b/.werks/1286
@@ -0,0 +1,9 @@
+Title: blade_bx_powerfan: Discovery ignores not present fans now
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i3
+Date: 1440596160
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index e22bebb..17c9711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@
* 2421 winperf_phydisk: now able to monitor the average read/write duration for each
disk...
* 2422 winperf_mem: new check to monitor memory pages per second...
* 2423 interface checks: now able to configure absolute levels for error packets...
+ * 1286 blade_bx_powerfan: Discovery ignores not present fans now
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
* 2316 FIX: windows agent: fix garbled output of cached agent plugins...
* 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space...
diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan
index 40b1657..39ee9db 100644
--- a/checks/blade_bx_powerfan
+++ b/checks/blade_bx_powerfan
@@ -37,6 +37,11 @@ blade_bx_status = { "1" : "unknow",
"8" : "not-present",
"9" : "not-available" }
+def inventory_blade_bx_powerfan(info):
+ for line in info:
+ if line[1] != "8":
+ yield line[2], "blade_bx_fan_default_error_levels"
+
def check_blade_bx_powerfan(item, params, info):
warn_perc, crit_perc = params
for index, status, descr, rpm, max_speed, speed, ctrlstate in info:
@@ -64,7 +69,7 @@ def check_blade_bx_powerfan(item, params, info):
check_info['blade_bx_powerfan'] = {
"check_function" : check_blade_bx_powerfan,
- "inventory_function" : lambda info: [ (line[2],
"blade_bx_fan_default_error_levels" ) for line in info ] ,
+ "inventory_function" : inventory_blade_bx_powerfan,
"service_description" : "Blade Cooling %s",
"has_perfdata" : True,
"snmp_info" : (".1.3.6.1.4.1.7244.1.1.1.3.3.1.1", [