diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | THANKS.in | 2 | ||||
| -rwxr-xr-x | plugins-scripts/check_log.sh | 7 | ||||
| -rwxr-xr-x | plugins-scripts/check_mailq.pl | 4 | ||||
| -rwxr-xr-x | plugins-scripts/check_oracle.sh | 5 | ||||
| -rwxr-xr-x | plugins-scripts/check_sensors.sh | 5 | ||||
| -rw-r--r-- | plugins/check_tcp.c | 2 |
7 files changed, 16 insertions, 12 deletions
@@ -7,6 +7,9 @@ This file documents the major additions and syntax changes between releases. qmail-qstat(8) New check_ifstatus -n option to ignore interfaces by name + FIXES + Fix check_jabber to work with Openfire servers + 2.0 11th July 2014 ENHANCEMENTS check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with @@ -329,3 +329,5 @@ Patrick McAndrew Alexander Wittig Jason Benguerel Matthew Kent +Frederic Krueger +Simon Meggle diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index 8653a5e1..d28c8d0a 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh @@ -58,12 +58,11 @@ # Paths to commands used in this script. These # may have to be modified to match your system setup. -PROGNAME=`/bin/basename $0` -PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` -REVISION="@NP_VERSION@" PATH="@TRUSTED_PATH@" - export PATH +PROGNAME=`basename $0` +PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` +REVISION="@NP_VERSION@" . $PROGPATH/utils.sh diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index bd78981e..0e8100d0 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -332,7 +332,7 @@ elsif ( $mailq eq "postfix" ) { }elsif ($lines[0]=~/Mail queue is empty/) { $msg_q = 0; }else{ - print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; + print "Couldn't match $utils::PATH_TO_MAILQ output\n"; exit $ERRORS{'UNKNOWN'}; } @@ -340,7 +340,7 @@ elsif ( $mailq eq "postfix" ) { #if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) { # my $msg_p = $1; #}else{ - # print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; + # print "Couldn't match $utils::PATH_TO_MAILQ output\n"; # exit $ERRORS{'UNKNOWN'}; #} diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index ceac95dc..96078aca 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh @@ -6,10 +6,11 @@ # This Monitoring plugin was created to check Oracle status # +PATH="@TRUSTED_PATH@" +export PATH PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` REVISION="@NP_VERSION@" -PATH="@TRUSTED_PATH@" . $PROGPATH/utils.sh @@ -137,7 +138,7 @@ case "$cmd" in tnschk=` tnsping $2` tnschk2=` echo $tnschk | grep -c OK` if [ ${tnschk2} -eq 1 ] ; then - tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'` + tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*} echo "OK - reply time ${tnschk3} from $2" exit $STATE_OK else diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh index 05c64c48..f7428301 100755 --- a/plugins-scripts/check_sensors.sh +++ b/plugins-scripts/check_sensors.sh @@ -1,11 +1,10 @@ #!/bin/sh +PATH="@TRUSTED_PATH@" +export PATH PROGNAME=`basename $0` PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` REVISION="@NP_VERSION@" -PATH="@TRUSTED_PATH@" - -export PATH . $PROGPATH/utils.sh diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index bd7736b5..fc0adba0 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -172,7 +172,7 @@ main (int argc, char **argv) } else if (!strncmp(SERVICE, "JABBER", 6)) { SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n"; - EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'"; + EXPECT = "<?xml version=\'1.0\'"; QUIT = "</stream:stream>\n"; flags |= FLAG_HIDE_OUTPUT; PORT = 5222; |