upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-21 22:29:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

check_mailq.pl: separate submission queue

Browse source 
check_mailq.pl ignores the separate submission queue used in (modern?) sendmail
implementations.

For the queue output below with one message in the submission queue and no
messages in the transport queue, check_mailq.pl reports zero messages in the
queue because the request count from the last queue always overwrites previous
queues. If the sendmail MTA isn't running or has become wedged, messages will
sit in the submission queue forever.

The attached patch fixes this in a backwards compatible way (i.e., it shouldn't
break any of the currently supported formats).
--
Just turning attached patch of github issue #972 into a push request.
(Closes #972)
This commit is contained in:
Jan Wagner 2013-10-01 15:06:51 +02:00
parent fc8a233854
commit 12ae1fb662
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
THANKS.in
View file

@ -405,3 +405,4 @@ Robert Bohne
Wolfgang Nieder
andrew bezella
Lorenz Gruenwald
John Morrissey

36
plugins-scripts/check_mailq.pl
View file

@ -149,7 +149,26 @@ if ($mailq eq "sendmail") {
##/var/spool/mqueue/qF/df is empty
## Total Requests: 1
# separate submission/transport queues, empty
## MSP Queue status...
## /var/spool/mqueue-client is empty
## Total requests: 0
## MTA Queue status...
## /var/spool/mqueue is empty
## Total requests: 0
# separate submission/transport queues: 1
## MSP Queue status...
## /var/spool/mqueue-client (1 request)
## -----Q-ID----- --Size-- -----Q-Time----- ------------Sender/Recipient-----------
## oAJEfhdW014123 5 Fri Nov 19 14:41 jwm
## (Deferred: Connection refused by [127.0.0.1])
## root
## Total requests: 1
## MTA Queue status...
## /var/spool/mqueue is empty
## Total requests: 0
my $this_msg_q = 0;
while (<MAILQ>) {
# match email addr on queue listing
@ -189,13 +208,18 @@ if ($mailq eq "sendmail") {
#
# single queue: first line
# multi queue: one for each queue. overwrite on multi queue below
$msg_q = $1 ;
$this_msg_q = $1 ;
$msg_q += $1 ;
}
} elsif (/^\s+Total\sRequests:\s(\d+)$/i) {
print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
#
# multi queue: last line
$msg_q = $1 ;
if ($this_msg_q) {
$this_msg_q = 0 ;
} else {
print "$utils::PATH_TO_MAILQ = $_ \n" if $verbose ;
#
# multi queue: last line
$msg_q += $1 ;
}
}
}