Module: check_mk
Branch: master
Commit: f51b52c116eb6a5a034e88d4e7acc9d3556a8ed8
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f51b52c116eb6a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 22 17:08:21 2013 +0100
FIX: megaraid_bbu: deal with broken output ("Adpater")
Conflicts:
ChangeLog
---
ChangeLog | 2 ++
checks/megaraid_bbu | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 26c77f0..ff061e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
Core:
* FIX: Fix output of cmk -D: datasource programs were missing
* FIX: allow unicode encoded extra_service_conf
+ * FIX: no default PING service if custom checks are defined
* FIX: check_mk_base: fixed rounding error in get_bytes_human_readable
* New configuration variable contactgroup_members
@@ -45,6 +46,7 @@
* FIX: diskstat: fix local variable 'ios_per_sec' referenced before
assignment
* FIX: multipath: ignore warning messages in agent due to invalid multipath.conf
* FIX: jolokia_metrics.mem: renamed parameter totalheap to total
+ * FIX: megaraid_bbu: deal with broken output ("Adpater")
* Linux agent: limit netstat to 10 seconds
* ps: Allow %1, %2, .. instead of %s in process_inventory. That allows
reordering of matched groups
diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu
index b6a734c..d000efd 100644
--- a/checks/megaraid_bbu
+++ b/checks/megaraid_bbu
@@ -56,7 +56,7 @@ def megaraid_bbu_parse(info):
data = data.strip()
# Scan each controller into its own dictionary
- if name == "BBU status for Adapter":
+ if name in [ "BBU status for Adapter", "BBU status for
Adpater" ]:
current_hba = {}
controllers[data] = current_hba
else:
@@ -80,7 +80,7 @@ def check_megaraid_bbu(item, _no_params, info):
state = 0
# get current charge level
if 'Relative State of Charge' not in controller:
- charge = ", No charge information were reported for this controller"
+ charge = ", No charge information reported for this controller"
else:
charge = ", Charge is %s" % controller['Relative State of
Charge']
@@ -96,7 +96,7 @@ def check_megaraid_bbu(item, _no_params, info):
except:
pass
- if controller["Learn Cycle Active"] == "Yes":
+ if controller.get("Learn Cycle Active") == "Yes":
return (0, "OK - no states to check (controller is in learn cycle)" +
charge)
# return assembled info
elif broken: