Module: check_mk
Branch: master
Commit: f7ee98e44637538fe3741118e70c1b52db4ec477
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7ee98e4463753…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 12:13:58 2014 +0100
megaraid_bbu: fix exception if Full Charge Capacity is unknown
---
checks/megaraid_bbu | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu
index baa07cc..ca7d8ac 100644
--- a/checks/megaraid_bbu
+++ b/checks/megaraid_bbu
@@ -86,8 +86,9 @@ def check_megaraid_bbu(item, _no_params, info):
if 'Relative State of Charge' not in controller:
charge = ", No charge information reported for this controller"
else:
- charge = ", Charge is %s, Capacity is %s" % \
- (controller['Relative State of Charge'], controller['Full Charge Capacity'])
+ charge = ", Charge is %s" % controller['Relative State of Charge']
+ if 'Full Charge Capacity' in controller:
+ charge += ", Charge is %s, Capacity is %s" % controller['Full Charge Capacity']
# verify defined important parameters to current level
for varname, (refvalue, refstate) in megaraid_bbu_refvalues.items():
Module: check_mk
Branch: master
Commit: db16accb234bbe349a4b3134d4b2428246df15ae
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db16accb234bbe…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 11:23:12 2014 +0100
#1626 Renamed service descriptions of filesystem, process and logwatch checks
The service descriptions of several check types have been renamed in order to
be more consistent the the rest of the services. For example <tt>fs_</tt> has
been renamed into <tt>Filesystem</tt>.
In order not to run in problems this renaming is just enabled for <i>new
sites</i> per default. You can switch existing sites to the new naming
scheme with a new global WATO option <i>Use new service descriptions</i>
in the section <i>Operation mode of Check_MK</i>. Please be aware that
renaming services in operative systems have many implications, such as:
<ul>
<li>Notifications being sent about non-OK new services</li>
<li>Performance data will start new and not continue the old one</li>
<li>History and availability will break</li>
</ul>
---
.werks/1626 | 23 +++++++++++++++++++++
ChangeLog | 1 +
checks/df | 2 +-
checks/df_netapp | 2 +-
checks/df_netapp32 | 2 +-
checks/esx_vsphere_datastores | 2 +-
checks/hr_fs | 2 +-
checks/logwatch | 2 +-
checks/ps | 4 ++--
checks/vms_diskstat | 2 +-
checks/wmic_process | 2 +-
checks/zfsget | 2 +-
doc/README.renaming_services | 25 ++++++++++++++++++++++
modules/check_mk.py | 26 ++++++++++++++++++++++-
web/htdocs/wato.py | 24 ++++++++++++++++++++-
web/plugins/wato/check_mk_configuration.py | 31 ++++++++++++++++++++++++++++
16 files changed, 139 insertions(+), 13 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=db16accb23…