Changes of Revision 77
| [-] | Changed | nagios-plugins.changes |
|
x 1 2 -------------------------------------------------------------------3 -Sun Apr 26 19:27:31 UTC 2020 - Local OBS User <cs@linux-administrator.com>4 +Wed Apr 12 13:23:40 UTC 2023 - Carsten Schoene <carsten.schoene@internetx.com>5 +6 +- update to release 2.4.3 7 +8 +-------------------------------------------------------------------9 +Sun Apr 26 19:27:31 UTC 2020 - Carsten Schoene <cs@linux-administrator.com>10 11 - update to release 2.3.312 13 -------------------------------------------------------------------14 -Sat Jan 4 20:22:13 UTC 2020 - Local OBS User <cs@linux-administrator.com>15 +Sat Jan 4 20:22:13 UTC 2020 - Carsten Schoene <cs@linux-administrator.com>16 17 - update to release 2.3.118 19 -------------------------------------------------------------------20 -Fri Oct 11 17:59:10 UTC 2019 - Local OBS User <cs@linux-administrator.com>21 +Fri Oct 11 17:59:10 UTC 2019 - Carsten Schoene <cs@linux-administrator.com>22 23 - update to pre-release (git) 2.2.2 ported from EPEL24 25 |
||
| [-] | Changed | nagios-plugins.spec ^ |
|
24 1 2 %global shortcommit %(c=%{commit}; echo ${c:0:7})3 %global commdate 201909264 5 -%global gitbuild 06 +## %global gitbuild 07 8 %define pkgname nagios-plugins9 Name: nagios-plugins10 -Version: 2.3.311 +Version: 2.4.312 %if 0%{?gitbuild:1}13 Release: 35.%{?commdate}git%{?shortcommit}%{?dist}14 %else15 16 Patch11: nagios-plugins-0011-fix-perl-shebang.patch17 Patch12: nagios-plugins-0012-fix-perl-ntp-ipv6.patch18 %else19 -Patch200: revert-check_mailq-autodetect-2.2.1.diff20 +Patch200: revert-check_mailq-autodetect-2.4.0.diff21 %endif22 23 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)24 |
||
| [+] | Added | revert-check_mailq-autodetect-2.4.0.diff ^ |
| @@ -0,0 +1,157 @@ +--- nagios-plugins-2.4.0/plugins-scripts/check_mailq.pl.orig 2020-06-11 22:34:44.000000000 +0200 ++++ nagios-plugins-2.4.0/plugins-scripts/check_mailq.pl 2022-10-08 23:51:22.065399871 +0200 +@@ -221,20 +221,20 @@ + ## now check the queue length(s) + + if ($msg_q == 0) { +- $msg = "OK: $mailq mailq is empty"; ++ $msg = "OK: mailq is empty"; + $state = $ERRORS{'OK'}; + } else { + print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + + # overall queue length + if ($msg_q < $opt_w) { +- $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { +- $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { +- $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + +@@ -371,20 +371,20 @@ + + # check queue length(s) + if ($msg_q == 0){ +- $msg = "OK: $mailq mailq reports queue is empty"; ++ $msg = "OK: mailq reports queue is empty"; + $state = $ERRORS{'OK'}; + } else { + print "msg_q = $msg_q warn=$opt_w crit=$opt_c\n" if $verbose; + + # overall queue length + if ($msg_q < $opt_w) { +- $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { +- $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { +- $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + +@@ -458,13 +458,13 @@ + + # overall queue length + if ($msg_q < $opt_w) { +- $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { +- $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { +- $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + +@@ -516,13 +516,13 @@ + exit $ERRORS{CRITICAL}; + } + if ($msg_q < $opt_w) { +- $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { +- $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { +- $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + } # end of ($mailq eq "exim") +@@ -593,13 +593,13 @@ + } + close(MAILQ) ; + if ($msg_q < $opt_w) { +- $msg = "OK: $mailq mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; ++ $msg = "OK: mailq ($msg_q) is below threshold ($opt_w/$opt_c)"; + $state = $ERRORS{'OK'}; + }elsif ($msg_q >= $opt_w && $msg_q < $opt_c) { +- $msg = "WARNING: $mailq mailq is $msg_q (threshold w = $opt_w)"; ++ $msg = "WARNING: mailq is $msg_q (threshold w = $opt_w)"; + $state = $ERRORS{'WARNING'}; + }else { +- $msg = "CRITICAL: $mailq mailq is $msg_q (threshold c = $opt_c)"; ++ $msg = "CRITICAL: mailq is $msg_q (threshold c = $opt_c)"; + $state = $ERRORS{'CRITICAL'}; + } + } # end of ($mailq eq "nullmailer") +@@ -707,34 +707,7 @@ + exit $ERRORS{'UNKNOWN'}; + } + }else{ +- if (defined $utils::PATH_TO_QMAIL_QSTAT +- && -x $utils::PATH_TO_QMAIL_QSTAT) +- { +- $mailq = 'qmail'; +- } +- elsif (-d '/var/lib/postfix' || -d '/var/local/lib/postfix' +- || -e '/usr/sbin/postfix' || -e '/usr/local/sbin/postfix') +- { +- $mailq = 'postfix'; +- } +- elsif (-d '/usr/lib/exim4' || -d '/usr/local/lib/exim4' +- || -e '/usr/sbin/exim' || -e '/usr/local/sbin/exim') +- { +- $mailq = 'exim'; +- } +- elsif (-d '/usr/lib/nullmailer' || -d '/usr/local/lib/nullmailer' +- || -e '/usr/sbin/nullmailer-send' +- || -e '/usr/local/sbin/nullmailer-send') +- { +- $mailq = 'nullmailer'; +- } +- elsif (defined $utils::PATH_TO_SMTPCTL && -x $utils::PATH_TO_SMTPCTL) +- { +- $mailq = 'opensmtpd'; +- } +- else { +- $mailq = 'sendmail'; +- } ++ $mailq = 'sendmail'; + } + + return $ERRORS{'OK'}; +@@ -757,7 +730,7 @@ + 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 "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; +- print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer | opensmtpd ] (default = autodetect)\n"; ++ print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer | opensmtpd ] (default = sendmail)\n"; + print "-h (--help)\n"; + print "-V (--version)\n"; + print "-v (--verbose) = debugging output\n"; +@@ -765,8 +738,6 @@ + print "Note: -w and -c are required arguments. -W and -C are optional.\n"; + print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n"; + print " -W and -C are applied message not yet preproccessed. (qmail)\n"; +- print " This plugin tries to autodetect which mailserver you are running,\n"; +- print " you can override the autodetection with -M.\n"; + print " This plugin uses the system mailq command (sendmail) or qmail-stat (qmail)\n"; + print " to look at the queues. Mailq can usually only be accessed by root or \n"; + print " a TrustedUser. You will have to set appropriate permissions for the plugin to work.\n"; | ||
| Added | nagios-plugins-2.4.0.tar.bz2 ^ | |
| Added | nagios-plugins-2.4.3.tar.bz2 ^ | |