[checkmk-commits] Check_MK Git: check_mk: Solaris Agent: Disable statgrab. net if run in a non-global Solaris Zone

Module: check_mk Branch: master Commit: 6e73f83246a6065437be76789edad69372820423 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e73f83246a606… Author: Florian Heigl &lt;fh(a)mathias-kettner.de&gt; Date: Wed May 16 14:32:13 2012 +0200 Solaris Agent: Disable statgrab.net if run in a non-global Solaris Zone --- agents/check_mk_agent.solaris | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 78c0ba2..1c6234a 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -27,8 +27,8 @@ export LC_ALL=C unset LANG -MK_LIBDIR="/to/be/changed" -MK_CONFDIR="/to/be/changed" +MK_LIBDIR="/usr/lib/check_mk_agent" +MK_CONFDIR="/etc/check_mk" export MK_LIBDIR MK_CONFDIR # All executables in PLUGINSDIR will simply be executed and their @@ -62,9 +62,23 @@ ps -A -o user,vsz,rss,pcpu,args | sed -e 1d -e 's/ *\([^ ]*\) *\([^ ]*\) *\([^ ] # You need statgrab to be installed. You'll find it # here: http://www.i-scream.org/libstatgrab/ -if statgrab const. cpu. disk. general. load. mem. net. page. proc. swap. user. > /tmp/statgrab.$$ 2>/dev/null + +# Only collect net stats if we are in a global zone +statgrab_vars="const. cpu. disk. general. load. mem. page. proc. swap. user." +statgrab_sections="proc cpu load disk page" +if which zonename > /dev/null; then + if [ "`zonename`" = "global" ]; then + statgrab_vars="$statgrab_vars .net" + statgrab_sections"$statgrab_sections net" + fi +else + statgrab_vars="$statgrab_vars .net" + statgrab_sections"$statgrab_sections net" +fi + +if statgrab $stagrab_vars > /tmp/statgrab.$$ 2>/dev/null then - for s in proc cpu net load disk page + for s in $statgrab_sections do echo "<<<statgrab_$s>>>" cat /tmp/statgrab.$$ | grep "^$s\." | cut -d. -f2-99 | sed 's/ *= */ /' @@ -90,6 +104,11 @@ if [ -x /sbin/zpool ]; then /sbin/zpool status -x fi + +# TCP Connection stats +echo '<<<tcp_conn_stats>>>' +netstat -nafinet -P tcp | tail +5 | awk '{ c[$7]++; } END { for (x in c) { print x, c[x];}}' + if cd $PLUGINSDIR 2>/dev/null then for skript in `ls`