[checkmk-commits] updated werk 8753

Module: check_mk Branch: master Commit: 52d582a4d65ed082f2a1effe97593c69e5965ae4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52d582a4d65ed0… Author: Simon Betz &lt;si(a)mathias-kettner.de&gt; Date: Thu Feb 23 14:50:13 2017 +0100 updated werk 8753 Change-Id: I16b6d537f59189b01e8558e34c60a213ee29eced --- agents/check_mk_agent.solaris | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index ba871b4..0f4f3eb 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -197,20 +197,14 @@ fi # ZFS arc cache # newer Solaris (>=11.3) do not provide hits and misses via mdb -k -function get_zfs_arc_cache_data () { - out=$(echo "::arc" | mdb -k | grep "hits") - if [ ! -z "$out" ] - then - echo "::arc" | mdb -k - else - kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | awk '{printf "%s = %s\n", $1, $2;}' - fi -} +echo '<<<zfs_arc_cache>>>' +if type kstat &>/dev/null +then + kstat -p zfs:0:arcstats | sed -e 's/.*arcstats://g' | awk '{printf "%s = %s\n", $1, $2;}' -if type mdb >/dev/null 2>&1 - then - echo '<<<zfs_arc_cache>>>' - get_zfs_arc_cache_data +elif type mdb &>/dev/null +then + echo '::arc' | mdb -k fi # Processes