[checkmk-commits] Check_MK Git: check_mk: FIX postfix_mailq: fix Linux agent in case of ssmtp being installed

Module: check_mk Branch: master Commit: c3319dcaf21aa36a517ef209a23a7a4a943bf5d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3319dcaf21aa3… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Feb 20 10:34:23 2014 +0100 FIX postfix_mailq: fix Linux agent in case of ssmtp being installed --- .werks/719 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 1 + 3 files changed, 11 insertions(+) diff --git a/.werks/719 b/.werks/719 new file mode 100644 index 0000000..7ebb3a4 --- /dev/null +++ b/.werks/719 @@ -0,0 +1,9 @@ +Title: postfix_mailq: fix Linux agent in case of ssmtp being installed +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1392888833 + + diff --git a/ChangeLog b/ChangeLog index 493a437..b6a9640 100644 --- a/ChangeLog +++ b/ChangeLog @@ -180,6 +180,7 @@ * 0136 FIX: cisco_fru_power: Prevent inventory of not exsisting devices * 0557 FIX: check_mk_agent.solaris: removed section statgrab mem... * 0673 FIX: zfsget: Fixed broken check - was not compatible to current agent output of "df" + * 0719 FIX: postfix_mailq: fix Linux agent in case of ssmtp being installed Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cf22b2e..d8105a7 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -424,6 +424,7 @@ if type mailq >/dev/null 2>&1 && [ -x /usr/sbin/postfix ] && getent passwd postf echo '<<<postfix_mailq>>>' mailq | tail -n 6 elif [ -x /usr/sbin/ssmtp ] ; then + echo '<<<postfix_mailq>>>' mailq 2>&1 | sed 's/^[^:]*: \(.*\)/\1/' | tail -n 6 fi