[checkmk-commits] 4547 FIX check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS

Module: check_mk Branch: master Commit: f46f1d73e0b68ab3bfc466705cf0b6ead88712d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f46f1d73e0b68a… Author: Marcel Arentz &lt;ma(a)mathias-kettner.de&gt; Date: Wed Mar 22 17:24:16 2017 +0100 4547 FIX check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS The section postfix_mailq_status was writing into utmp everytime the agent run. With the new version we are able to avoid this behaviour and still get informations about multiple instances of postfix. Change-Id: I31961f6879cb2f04a7760bc7ccb209342f4e6b96 --- .werks/4547 | 15 +++++++++++++++ agents/check_mk_agent.linux | 26 +++++++++++--------------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.werks/4547 b/.werks/4547 new file mode 100644 index 0000000..094c9bb --- /dev/null +++ b/.werks/4547 @@ -0,0 +1,15 @@ +Title: check_mk_agent.linux: Fixed agent section which spammed in utmp of RHEL/CentOS +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1490199589 +Class: fix + +The section postfix_mailq_status was writing into utmp everytime the agent +run. With the new version we are able to avoid this behaviour and still get +informations about multiple instances of postfix. + +This fix needs an updated agent AND an updated checkplugin but a rediscovery +is not neccessary. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 4e1ec35..80c5413 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -684,28 +684,24 @@ elif [ -x /usr/sbin/ssmtp ] ; then fi -# postfix would write to stderr but only if it's a tty -# Another quirk: output would be strayed if not stored -# in extra variable +# Postfix status monitoring. Can handle multiple instances. if type postfix >/dev/null ; then echo "<<<postfix_mailq_status:sep(58)>>>" - multi_instances_dirs=$(postconf -c /etc/postfix 2>/dev/null | grep ^multi_instance_directories | sed 's/.*=[[:space:]]*//g') - if [ ! -z "$multi_instances_dirs" ]; then - for queue_dir in $multi_instances_dirs + for i in $(ls -d /var/spool/postfix*) do - if [ -n "$queue_dir" ]; then - postfix_out=$(script -qfc "postfix -c $queue_dir status" /dev/null) - echo $postfix_out + if [ -e "$i/pid/master.pid" ]; then + postfix_pid=$(cat $i/pid/master.pid | sed 's/ //g') # handle possible spaces in output + if [[ $(readlink -- /proc/$postfix_pid/exe) == *"postfix/master"* ]]; then + echo "$i:is running:PID:$postfix_pid" | sed 's/\/var\/spool\///g' + else + echo "$i:PID file exists but instance is not running!" | sed 's/\/var\/spool\///g' + fi + else + echo "$i:not running" | sed 's/\/var\/spool\///g' fi done - - else - postfix_out=$(script -qfc 'postfix status' /dev/null) - echo $postfix_out - fi fi - # Check status of qmail mailqueue if type qmail-qstat >/dev/null then