Module: check_mk
Branch: master
Commit: e90c87e47110cfdc6da2e3d2aff3036de15a096a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e90c87e47110cf…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Dec 17 14:23:59 2013 +0100
FIX cisco_fantray: Prevent inventory for not available fans
---
.werks/109 | 10 ++++++++++
ChangeLog | 1 +
checks/cisco_fantray | 4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/.werks/109 b/.werks/109
new file mode 100644
index 0000000..c322562
--- /dev/null
+++ b/.werks/109
@@ -0,0 +1,10 @@
+Title: cisco_fantray: Prevent inventory for not available fans
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387286606
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index c05775e..45fb10d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@
* 0380 FIX: jolokia_metrics.mem: PNP-Template now handles non existant max values...
* 0381 FIX: win_printers: Fixed creation of duplicate services...
* 0347 FIX: smart.stats: Remove duplicate disks...
+ * 0109 FIX: cisco_fantray: Prevent inventory for not available fans
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/cisco_fantray b/checks/cisco_fantray
index 65a1e36..3ea17e1 100644
--- a/checks/cisco_fantray
+++ b/checks/cisco_fantray
@@ -28,7 +28,9 @@ cisco_fan_states = ('', 'unknown', 'up',
'down', 'warning')
def inventory_cisco_fantray(info):
if info and info[0]:
- return [ (line[0], None) for line in info ]
+ #Some Cisco switches reporting not available fans as down,
+ #so we cant invenorize fans reported as down
+ return [ (line[0], None) for line in info if line[1] != '3'
def check_cisco_fantray(item, params, info):
for line in info: