Changes - j0ke.net Open Build Service

Changes of Revision 51

[-] [+]	Changed	nagios-plugins.changes
@@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 24 09:20:00 UTC 2014 - cs@linux-administrator.com + +- fix check_mailq by reverting autodetection patches + (revert-check_mailq-autodetect.diff) + +------------------------------------------------------------------- Mon Jun 23 11:49:00 UTC 2014 - cs@linux-administrator.com - update to release 2.0.2
[-] [+]	Changed	nagios-plugins.spec ^
@@ -1,7 +1,7 @@ #!BuildIgnore: post-build-checks Name: nagios-plugins Version: 2.0.2 -Release: 32 +Release: 35 Summary: Host/service/network monitoring program plugins for Nagios Group: Applications/System @@ -10,6 +10,7 @@ Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Patch100: nagios-plugins_DISABLE-SMARTENABLE.patch +Patch200: revert-check_mailq-autodetect.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Prefix: %{_prefix}/lib/nagios/plugins @@ -57,6 +58,7 @@ %prep %setup -q %patch100 +%patch200 -p1 %build ./configure \ @@ -83,10 +85,6 @@ %find_lang %{name} # fix lib path in perl plugins cd ${RPM_BUILD_ROOT}%{_prefix}/lib/nagios/plugins -# not needed since 1.4.14 -#for PLUGIN in check_breeze check_disk_smb check_file_age check_flexlm check_ifoperstatus check_ifstatus check_ircd check_mailq check_rpc check_wave ; do -# sed -i s@"nagios/plugins"@"%{_prefix}/lib/nagios/plugins"@g ${PLUGIN} -#done # set qmail-qstat if not found sed -i s@'$PATH_TO_QMAIL_QSTAT = "";'@'$PATH_TO_QMAIL_QSTAT = "/var/qmail/bin/qmail-qstat";'@ %{buildroot}%{_prefix}/lib/nagios/plugins/utils.pm sed -i s@"{'PATH'}='';"@"{'PATH'}='/usr/bin:/usr/sbin';"@ %{buildroot}%{_prefix}/lib/nagios/plugins/check_mailq
[-] [+]	Added	revert-check_mailq-autodetect.diff ^
@@ -0,0 +1,155 @@ +diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl +index 028a1b4..9e7da4e 100755 +--- a/plugins-scripts/check_mailq.pl ++++ b/plugins-scripts/check_mailq.pl +@@ -199,20 +199,20 @@ if ($mailq eq "sendmail") { + ## 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'}; + } + +@@ -344,20 +344,20 @@ elsif ( $mailq eq "postfix" ) { + + # 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'}; + } + +@@ -431,13 +431,13 @@ elsif ( $mailq eq "qmail" ) { + + # 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'}; + } + +@@ -489,13 +489,13 @@ elsif ( $mailq eq "exim" ) { + 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") +@@ -526,13 +526,13 @@ elsif ( $mailq eq "nullmailer" ) { + } + 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") +@@ -605,30 +605,7 @@ sub process_arguments(){ + 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'}; +@@ -651,7 +628,7 @@ sub print_help () { + 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"; +@@ -659,8 +636,6 @@ sub print_help () { + 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";