[checkmk-commits] Check_MK Git: check_mk: Fixed <<<cpu>>> output on SPARC machines with openSUSE

Module: check_mk Branch: master Commit: 79210c0cccd50f91698bb4b606508958b0616ba3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79210c0cccd50f… Author: Lars Michelsen &lt;lm(a)mathias-kettner.de&gt; Date: Wed Dec 8 14:02:35 2010 +0100 Fixed <<<cpu>>> output on SPARC machines with openSUSE Thanks to Michael Kromer --- ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1f3fcb7..92f23df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ * check_mk.only_from: new check for monitoring the IP address access restriction of the agent. The current Linux and Windows agents provide this information. * snmp_info check: Recoded not to use snmp_info_single anymore + * Linux Agent: Fixed <<<cpu>>> output on SPARC machines with openSUSE Multisite: * The custom open/close states of custom links are now stored for each diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 1837e7d..4b1ae52 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -117,7 +117,7 @@ egrep -v '^Swap:|^Mem:|total:' < /proc/meminfo # Load und Anzahl Prozesse echo '<<<cpu>>>' -echo "$(cat /proc/loadavg) $(grep ^processor < /proc/cpuinfo | wc -l)" +echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor' < /proc/cpuinfo | wc -l)" # Uptime echo '<<<uptime>>>'