[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 4 commits: Adding d/p/24_check_disk_fix_SI_units from upstream
Jan Wagner (@waja)
gitlab at salsa.debian.org
Mon Jun 12 21:33:08 BST 2023
Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins
Commits:
85a271e8 by Jan Wagner at 2023-06-12T21:29:53+02:00
Adding d/p/24_check_disk_fix_SI_units from upstream
- - - - -
02c716f5 by Jan Wagner at 2023-06-12T21:40:22+02:00
d/p/31_check_mailq_separate_submission_queue: Fix filename
- - - - -
2f967041 by Jan Wagner at 2023-06-12T21:48:19+02:00
Prepare release
- - - - -
aebd2cce by Jan Wagner at 2023-06-12T21:55:17+02:00
New changelog
- - - - -
4 changed files:
- debian/changelog
- + debian/patches/24_check_disk_fix_SI_units
- + debian/patches/31_check_mailq_separate_submission_queue
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,32 @@
-monitoring-plugins (2.3.3-6) UNRELEASED; urgency=medium
-
- *
-
- -- Jan Wagner <waja at cyconet.org> Thu, 30 Mar 2023 09:33:25 +0000
+monitoring-plugins (2.3.3-7) UNRELEASED; urgency=medium
+
+ *
+
+ -- Jan Wagner <waja at cyconet.org> Mon, 12 Jun 2023 21:55:02 +0200
+
+monitoring-plugins (2.3.3-6) unstable; urgency=medium
+
+ * [e1f9786] Adding d/p/14_check_curl_fix_SSL_with_multiple_IPs from upstream
+ * [534d0c8] Adding d/p/30_check_radius_radcli_1.3.1_support from upstream
+ * [bd72df2] Adding d/p/31_checl_mailq_separate_submission_queue from upstream
+ * [567890c] Adding d/p/32_check_disk_add_ignore_missing from upstream
+ (Closes: #516097)
+ * [47b7589] Adding d/p/15_check_swap_remove_includes from upstream
+ * [6f89be8] Adding d/p/33_check_procs_exclude-process from upstream
+ * [983507a] Adding d/p/34_check_curl_fix_compare_warning from upstream
+ * [9225592] Adding d/p/17_fix_exit_codes from upstream
+ * [3a0d875] Adding d/p/18_check_mysql_fix_typo from upstream
+ * [17688c7] Adding d/p/19_check_nwstat_fix_typo from upstream
+ * [e0cfe77] Adding d/p/20_chech_nt_fix_encoding from upstream
+ * [3da2163] Adding d/p/21_check_pgsql_extra_output from upstream
+ * [7cbe4b6] Adding d/p/22_check_disk_avoid_mount from upstream
+ * [01be8ce] d/p/series: Fix typo
+ * [85d9e03] Adding d/p/23_check_mysql_fix_error_handling from upstream
+ * [555d643] CI: Disable BLHC job
+ * [85a271e] Adding d/p/24_check_disk_fix_SI_units from upstream
+ * [02c716f] d/p/31_check_mailq_separate_submission_queue: Fix filename
+
+ -- Jan Wagner <waja at cyconet.org> Mon, 12 Jun 2023 21:46:29 +0200
monitoring-plugins (2.3.3-5) unstable; urgency=medium
=====================================
debian/patches/24_check_disk_fix_SI_units
=====================================
@@ -0,0 +1,56 @@
+From bf8eb6dcc7f9d1318ddeac16fe62a5b5f818524b Mon Sep 17 00:00:00 2001
+From: RincewindsHat <12514511+RincewindsHat at users.noreply.github.com>
+Date: Fri, 26 May 2023 08:43:24 +0200
+Subject: [PATCH] check_disk: Display SI units correctly
+
+---
+ plugins/check_disk.c | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/check_disk.c b/plugins/check_disk.c
+index a99f35e33..39dc6cd21 100644
+--- a/plugins/check_disk.c
++++ b/plugins/check_disk.c
+@@ -626,21 +626,36 @@ process_arguments (int argc, char **argv)
+ if (! strcasecmp (optarg, "bytes")) {
+ mult = (uintmax_t)1;
+ units = strdup ("B");
+- } else if ( (! strcmp (optarg, "kB")) || (!strcmp(optarg, "KiB")) ) {
++ } else if (!strcmp(optarg, "KiB")) {
+ mult = (uintmax_t)1024;
+- units = strdup ("kiB");
+- } else if ( (! strcmp (optarg, "MB")) || (!strcmp(optarg, "MiB")) ) {
++ units = strdup ("KiB");
++ } else if (! strcmp (optarg, "kB")) {
++ mult = (uintmax_t)1000;
++ units = strdup ("kB");
++ } else if (!strcmp(optarg, "MiB")) {
+ mult = (uintmax_t)1024 * 1024;
+ units = strdup ("MiB");
+- } else if ( (! strcmp (optarg, "GB")) || (!strcmp(optarg, "GiB")) ) {
++ } else if (! strcmp (optarg, "MB")) {
++ mult = (uintmax_t)1000 * 1000;
++ units = strdup ("MB");
++ } else if (!strcmp(optarg, "GiB")) {
+ mult = (uintmax_t)1024 * 1024 * 1024;
+ units = strdup ("GiB");
+- } else if ( (! strcmp (optarg, "TB")) || (!strcmp(optarg, "TiB")) ) {
++ } else if (! strcmp (optarg, "GB")){
++ mult = (uintmax_t)1000 * 1000 * 1000;
++ units = strdup ("GB");
++ } else if (!strcmp(optarg, "TiB")) {
+ mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
+ units = strdup ("TiB");
+- } else if ( (! strcmp (optarg, "PB")) || (!strcmp(optarg, "PiB")) ) {
++ } else if (! strcmp (optarg, "TB")) {
++ mult = (uintmax_t)1000 * 1000 * 1000 * 1000;
++ units = strdup ("TB");
++ } else if (!strcmp(optarg, "PiB")) {
+ mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024;
+ units = strdup ("PiB");
++ } else if (! strcmp (optarg, "PB")){
++ mult = (uintmax_t)1000 * 1000 * 1000 * 1000 * 1000;
++ units = strdup ("PB");
+ } else {
+ die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+ }
=====================================
debian/patches/31_check_mailq_separate_submission_queue
=====================================
@@ -0,0 +1,77 @@
+From 12ae1fb6627bfef419fb4571a7189909107f5e6e Mon Sep 17 00:00:00 2001
+From: Jan Wagner <waja at 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 ;
++ }
+ }
+
+ }
=====================================
debian/patches/series
=====================================
@@ -15,9 +15,10 @@
21_check_pgsql_extra_output
22_check_disk_avoid_mount
23_check_mysql_fix_error_handling
+24_check_disk_fix_SI_units
# feature patches
30_check_radius_radcli_1.3.1_support
-31_checl_mailq_separate_submission_queue
+31_check_mailq_separate_submission_queue
32_check_disk_add_ignore_missing
33_check_procs_exclude-process
34_check_curl_fix_compare_warning
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/555d643b551c2a7bef66f95e231da68d80218663...aebd2cce940445038979575bcc0dd6e737bf3372
--
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/555d643b551c2a7bef66f95e231da68d80218663...aebd2cce940445038979575bcc0dd6e737bf3372
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20230612/bd9d8e80/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list