debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Adding d/p/31_checl_mailq_separate_submission_queue from upstream

Browse source
This commit is contained in:
Jan Wagner 2023-03-13 08:38:20 +00:00
parent 534d0c8842
commit bd72df2522
2 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
debian/patches/31_checl_mailq_separate_submission_queue vendored Normal file
View file

@ -0,0 +1,77 @@
From 12ae1fb6627bfef419fb4571a7189909107f5e6e Mon Sep 17 00:00:00 2001
From: Jan Wagner <waja@cyconet.org>
Date: Tue, 1 Oct 2013 15:06:51 +0200
Subject: [PATCH] check_mailq.pl: separate submission queue
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)
---
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index 27073d3cc..f02c90fbc 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -149,7 +149,26 @@
##/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 @@
#
# 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 ;
+ }
}
}

1
debian/patches/series vendored
View file

@ -8,3 +8,4 @@
14_check_curl_fix_SSL_with_multiple_IPs
# feature patches
30_check_radius_radcli_1.3.1_support
31_checl_mailq_separate_submission_queue