[pkg-nagios-changes] [Git][nagios-team/pkg-monitoring-plugins][master] 2 commits: debian/monitoring-plugins-common.docs: Fixing NEWS filename

[Jan Wagner]

Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / pkg-monitoring-plugins


Commits:
45b13cf0 by Jan Wagner at 2020-12-08T19:28:36+01:00
debian/monitoring-plugins-common.docs: Fixing NEWS filename

- - - - -
6ffbf14f by Jan Wagner at 2020-12-08T19:28:47+01:00
Adding d/p/16_check_mailq_options from upstream (Closes: #954961)

- - - - -


3 changed files:

- debian/monitoring-plugins-common.docs
- + debian/patches/16_check_mailq_options
- debian/patches/series


Changes:

=====================================
debian/monitoring-plugins-common.docs
=====================================
@@ -3,5 +3,5 @@ NEWS
 README
 REQUIREMENTS
 SUPPORT
-debian/NEWS.Debian
+debian/NEWS
 debian/README.Debian


=====================================
debian/patches/16_check_mailq_options
=====================================
@@ -0,0 +1,39 @@
+From aa79ab278ffc9bf3d41207d97bdfb04be35b5c74 Mon Sep 17 00:00:00 2001
+From: Sven Nierlein <sven at nierlein.de>
+Date: Tue, 8 Dec 2020 16:24:10 +0100
+Subject: [PATCH] check_mailq: restore accidentially removed options
+
+with https://github.com/monitoring-plugins/monitoring-plugins/issues/381 -W and -C have been removed. It
+would have been sufficient to only remove the long options. Restoring short options..
+
+ - fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954961
+---
+ plugins-scripts/check_mailq.pl | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
+index 32f498d3..aac1310e 100755
+--- a/plugins-scripts/check_mailq.pl
++++ b/plugins-scripts/check_mailq.pl
+@@ -568,7 +568,9 @@ ()
+ 		 "w=i" => \$opt_w, "warning=i"  => \$opt_w,   # warning if above this number
+ 		 "c=i" => \$opt_c, "critical=i" => \$opt_c,	  # critical if above this number
+ 		 "t=i" => \$opt_t, "timeout=i"  => \$opt_t,
+-		 "s"   => \$opt_s, "sudo"       => \$opt_s
++		 "s"   => \$opt_s, "sudo"       => \$opt_s,
++		 "W=i" => \$opt_W,                            # warning if above this number
++		 "C=i" => \$opt_C,                            # critical if above this number
+ 		 );
+ 
+ 	if ($opt_V) {
+@@ -662,8 +664,8 @@ ()
+ 	print "   Feedback/patches to support non-sendmail mailqueue welcome\n\n";
+ 	print "-w (--warning)   = Min. number of messages in queue to generate warning\n";
+ 	print "-c (--critical)  = Min. number of messages in queue to generate critical alert ( w < c )\n";
+-	print "-W (--Warning)   = Min. number of messages for same domain in queue to generate warning\n";
+-	print "-C (--Critical)  = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
++	print "-W               = Min. number of messages for same domain in queue to generate warning\n";
++	print "-C               = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+ 	print "-t (--timeout)   = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
+ 	print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n";
+ 	print "-s (--sudo)      = Use sudo to call the mailq command\n";


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@
 13_check_apt_list_packages
 14_mariadb
 15_check_smtp_initialize
+16_check_mailq_options



View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/compare/52473e9091a9ce96102f6cc61143aff3ef025210...6ffbf14f2233e9e814c1350af0bb274f47ab8a57

-- 
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-monitoring-plugins/-/compare/52473e9091a9ce96102f6cc61143aff3ef025210...6ffbf14f2233e9e814c1350af0bb274f47ab8a57
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/20201208/d7c847c0/attachment-0001.html>