[checkmk-commits] Check_MK Git: check_mk: FIX check_mk_agent.solaris: removed section statgrab mem

Module: check_mk Branch: master Commit: ff0b718216cd1f4ad4938cae0a600f219b1a71fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff0b718216cd1f… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue Feb 18 13:32:42 2014 +0100 FIX check_mk_agent.solaris: removed section statgrab mem The data from statgrab_mem section was already provided by the solaris_mem section. <<<statgrab_mem>>> is hereby removed from the check_mk_agent.solaris output. --- .werks/557 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.solaris | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/557 b/.werks/557 new file mode 100644 index 0000000..c831707 --- /dev/null +++ b/.werks/557 @@ -0,0 +1,9 @@ +Title: check_mk_agent.solaris: removed section statgrab mem +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1392726543 +Class: fix + +The data from statgrab_mem section was already provided by the solaris_mem section. +<<<statgrab_mem>>> is hereby removed from the check_mk_agent.solaris output. diff --git a/ChangeLog b/ChangeLog index 1931758..a189a00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -178,6 +178,7 @@ * 0667 FIX: oracle_asm_diskgroup: Now really uses the generic filesystem levels... * 0555 FIX: snmp_uptime: no longer fails if uptime is < 1 seconds * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices + * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index 89dd922..20a2c51 100644 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -158,8 +158,9 @@ then grep "^$s\." /tmp/statgrab.$$ | cut -d. -f2-99 | sed 's/ *= */ /' done - echo '<<<statgrab_mem>>>' - egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' +# this info is already provided by solaris_mem +# echo '<<<statgrab_mem>>>' +# egrep "^(swap|mem)\." /tmp/statgrab.$$ | sed 's/ *= */ /' [ -f /tmp/statgrab.$$ ] && rm -f /tmp/statgrab.$$ fi