Module: check_mk
Branch: master
Commit: 04fcfb6ff7cf1dfa8515dc95e06e9bd2cdc02a70
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04fcfb6ff7cf1d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Feb 21 08:46:55 2012 +0100
FIX: Linux Agent: Fixed ipmi-sensors handling of Power_Unit data
---
ChangeLog | 1 +
agents/check_mk_agent.linux | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index af32aea..7a2a5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,7 @@
* FIX: fix inventory of f5_bigip_temp
* mk_oracle (lnx+win): Fixed TEMP tablespace size calculations
* ps: output node process is running on (only for clusters)
+ * FIX: Linux Agent: Fixed ipmi-sensors handling of Power_Unit data
Multisite:
* Added several missing localization stringsw
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index a78eb77..68e3329 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -253,7 +253,8 @@ then
# in case of parallel or overlapping calls of the agent.
(
flock -n 200 --wait 60
- for class in Temperature 'Power Unit' Fan
+ # At least with ipmi-sensoirs 0.7.16 this group is Power_Unit instead of "Power Unit"
+ for class in Temperature Power_Unit Fan
do
$WAITMAX ipmi-sensors $IPMI_FORMAT --sdr-cache-directory /var/cache -g "$class" | sed -e 's/ /_/g' -e 's/:_\?/ /g' -e 's@ \([^(]*\)_(\([^)]*\))@ \2_\1@'
# In case of a timeout immediately leave loop.
Module: check_mk
Branch: master
Commit: 736df5840b36de96d78f229d50955fbfefc11c8e
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=736df5840b36de…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 23 13:15:00 2012 +0100
FIX: megaraid_bbu: fix problem with alternative agent output
---
ChangeLog | 2 ++
checks/megaraid_bbu | 13 ++++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 353c5a0..dd84683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,8 @@
* FIX: check_mk-hp_blade_psu.php: allow more than 4 power supplies
* FIX: smart plugin: handle cases with missing vendor (thanks
to Stefan Kärst)
+ * FIX: megaraid_bbu: fix problem with alternative agent output
+ (thanks to Daniel Tuecks)
Multisite:
* Added several missing localization strings
diff --git a/checks/megaraid_bbu b/checks/megaraid_bbu
index 183352b..1e0066b 100644
--- a/checks/megaraid_bbu
+++ b/checks/megaraid_bbu
@@ -82,11 +82,14 @@ def check_megaraid_bbu(item, _no_params, info):
# verify defined important parameters to current level
for varname, (refvalue, refstate) in megaraid_bbu_refvalues.items():
- value = controller[varname]
- # build a list of all errors
- if controller[varname] != refvalue:
- broken.append("%s is %s, but should be %s(%s)" % (varname, value, refvalue, "!" * refstate))
- state = max(state, refstate)
+ try:
+ value = controller[varname]
+ # build a list of all errors
+ if controller[varname] != refvalue:
+ broken.append("%s is %s, but should be %s(%s)" % (varname, value, refvalue, "!" * refstate))
+ state = max(state, refstate)
+ except:
+ pass
# return assembled info
if broken:
Module: check_mk
Branch: master
Commit: 7b0bbf0e09ec459f052930ac885183789aaf4de1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b0bbf0e09ec45…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 23 11:51:07 2012 +0100
Updated bug entries #0667
---
.bugs/667 | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/.bugs/667 b/.bugs/667
new file mode 100644
index 0000000..91389dc
--- /dev/null
+++ b/.bugs/667
@@ -0,0 +1,10 @@
+Title: extra_service_conf["use"] should work
+Component: core
+State: open
+Date: 2012-02-23 11:50:15
+Targetversion: future
+Class: feature
+
+Somehow this does not seem to work. We should handle this
+specially and omit the standard use in case we see a
+custom extra_conf "use".
Module: check_mk
Branch: master
Commit: 1cc55e81e851a35a700cc44ba7f38539043733cb
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1cc55e81e851a3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Feb 23 11:05:01 2012 +0100
FIX: create auth.php if it is empty
---
web/htdocs/login.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/web/htdocs/login.py b/web/htdocs/login.py
index f36aa5c..6c87621 100644
--- a/web/htdocs/login.py
+++ b/web/htdocs/login.py
@@ -211,7 +211,8 @@ def normal_login_page():
# We assume: Each user must visit this login page before using the multisite based
# authorization. So we can easily create the file here if it is missing.
# This is a good place to replace old api based files in the future.
- if not os.path.exists(defaults.var_dir + '/wato/auth/auth.php'):
+ auth_php = defaults.var_dir + '/wato/auth/auth.php'
+ if not os.path.exists(auth_php) or os.path.getsize(auth_php) == 0:
import wato
wato.load_plugins()
wato.create_auth_file(wato.load_users())