Changes - j0ke.net Open Build Service

Changes of Revision 60

[-] [+]	Changed	nagios-plugins.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jun 30 06:06:28 UTC 2017 - cs@linux-administrator.com + +- update to release 2.2.1 + +------------------------------------------------------------------- Thu Dec 22 14:41:47 UTC 2016 - cs@linux-administrator.com - update to release 2.2
[-] [+]	Changed	nagios-plugins.spec ^
@@ -1,24 +1,24 @@ #!BuildIgnore: post-build-checks -%define pkgname monitoring-plugins +%define pkgname nagios-plugins Name: nagios-plugins -Version: 2.2 +Version: 2.2.1 Release: 35 Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System License: GPL -URL: https://www.monitoring-plugins.org/ +URL: https://www.nagios-plugins.org/ Source0: %{pkgname}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc #Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch -Patch200: revert-check_mailq-autodetect-2.2.diff +Patch200: revert-check_mailq-autodetect-2.2.1.diff #Patch201: nagios-plugins-2.0.2_dnsfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prefix: %{_prefix}/lib/nagios/plugins PreReq: sed -Provides: %{pkgname}-%{version}-%{release} +Provides: monitoring-plugins-%{version}-%{release} %{!?custom:%global custom 0} Obsoletes: nagios-plugins-custom nagios-plugins-extras
[-] [+]	Added	revert-check_mailq-autodetect-2.2.1.diff ^
@@ -0,0 +1,153 @@ +--- nagios-plugins-2.2.1/plugins-scripts/check_mailq.pl.orig 2017-04-19 18:03:12.000000000 +0200 ++++ nagios-plugins-2.2.1/plugins-scripts/check_mailq.pl 2017-06-30 08:05:00.054337646 +0200 +@@ -215,20 +215,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'}; + } + +@@ -365,20 +365,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'}; + } + +@@ -452,13 +452,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'}; + } + +@@ -510,13 +510,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") +@@ -547,13 +547,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") +@@ -627,30 +627,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'; +- } +- else { +- $mailq = 'sendmail'; +- } ++ $mailq = 'sendmail' ; + } + + return $ERRORS{'OK'}; +@@ -673,7 +650,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 ] (default = autodetect)\n"; ++ print "-M (--mailserver) = [ sendmail \| qmail \| postfix \| exim \| nullmailer ] (default = sendmail)\n"; + print "-h (--help)\n"; + print "-V (--version)\n"; + print "-v (--verbose) = debugging output\n"; +@@ -681,8 +658,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.2.1.tar.bz2 ^