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.