Module: check_mk
Branch: master
Commit: 06dbc8263216e37305ecc10edc7a32739a372f96
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06dbc8263216e3…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Nov 13 11:22:56 2015 +0100
#2766 FIX juniper_fru: Don't discover devices reported as "empty"
The check was discovering empty device slots as checks and always
reporting them as being critical. The discovery has been disabled
for these units.
---
.werks/2766 | 12 ++++++++++++
ChangeLog | 1 +
checks/juniper_fru | 3 ++-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/2766 b/.werks/2766
new file mode 100644
index 0000000..88c5337
--- /dev/null
+++ b/.werks/2766
@@ -0,0 +1,12 @@
+Title: juniper_fru: Don't discover devices reported as "empty"
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1447410115
+
+The check was discovering empty device slots as checks and always
+reporting them as being critical. The discovery has been disabled
+for these units.
diff --git a/ChangeLog b/ChangeLog
index 0bd89d1..73c43a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,7 @@
* 2835 FIX: netextreme_psu_in: fixed wrong voltage usage handling...
* 2776 FIX: apache_status: fix crash for Apache versions with yet unhandled status
fields
* 2836 FIX: pandacom_psu: fixed handling of not available power supplies
+ * 2766 FIX: juniper_fru: Don't discover devices reported as "empty"...
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/checks/juniper_fru b/checks/juniper_fru
index 1087862..daf802d 100644
--- a/checks/juniper_fru
+++ b/checks/juniper_fru
@@ -103,7 +103,8 @@ def parse_juniper_fru(info):
def inventory_juniper_fru(parsed, fru_type):
return [ (fru_name, None) for fru_name, fru_data in parsed.items() \
- if fru_data["fru_type"] == fru_type ]
+ if fru_data["fru_type"] == fru_type
+ and fru_data["fru_state"] != "2" ] # ignore
"empty" states
def check_juniper_fru(item, _no_params, parsed):