Module: check_mk
Branch: master
Commit: 96096778b80e1fab4de474ba90f2dca351bb43d9
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96096778b80e1f…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Tue Dec 17 14:29:19 2013 +0100
FIX cisco_fru_power: Prevent inventory for not available FRUs
---
.werks/110 | 10 ++++++++++
ChangeLog | 1 +
checks/cisco_fru_power | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/110 b/.werks/110
new file mode 100644
index 0000000..7e24a8a
--- /dev/null
+++ b/.werks/110
@@ -0,0 +1,10 @@
+Title: cisco_fru_power: Prevent inventory for not available FRUs
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387286933
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index 45fb10d..cfd71a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@
* 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
+ * 0110 FIX: cisco_fru_power: Prevent inventory for not available FRUs
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/cisco_fru_power b/checks/cisco_fru_power
index 2f57a24..37cdc3d 100644
--- a/checks/cisco_fru_power
+++ b/checks/cisco_fru_power
@@ -65,7 +65,7 @@ power_oper_type = ('', 'offEnvOther', 'on',
'offAdmin', 'offDenied',
power_admin_type = ( '', 'on', 'off', 'inlineAuto',
'inlineOn', 'powercycle')
def inventory_cisco_fru_power(info):
- return [ (line[0], None ) for line in info if saveint(line[2]) != 1 ]
+ return [ (line[0], None ) for line in info if saveint(line[2]) not in [ 1, 5 ] ]
def check_cisco_fru_power(item, params, info):
for line in info: