summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Wagner <waja@cyconet.org>2014-10-06 08:25:31 (GMT)
committerJan Wagner <waja@cyconet.org>2014-10-06 08:25:31 (GMT)
commit93071168df90cd71ecb0cd391923cb4cc7de8d3d (patch)
tree577dc81b76783b0b1bb885fe5a94b2af02818a9b
parent4034419bebf1ff0b83596e109218d3682d23d874 (diff)
parent6100950329ff28ba52fa16b67539687efcb1ff08 (diff)
downloadmonitoring-plugins-93071168df90cd71ecb0cd391923cb4cc7de8d3d.tar.gz
Merge branch 'maint'
Conflicts: NEWS THANKS.in
-rw-r--r--NEWS3
-rw-r--r--THANKS.in2
-rwxr-xr-xplugins-scripts/check_log.sh7
-rwxr-xr-xplugins-scripts/check_mailq.pl4
-rwxr-xr-xplugins-scripts/check_oracle.sh5
-rwxr-xr-xplugins-scripts/check_sensors.sh5
-rw-r--r--plugins/check_tcp.c2
7 files changed, 16 insertions, 12 deletions
diff --git a/NEWS b/NEWS
index 6620fdc..73af0c0 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,9 @@ This file documents the major additions and syntax changes between releases.
7 qmail-qstat(8) 7 qmail-qstat(8)
8 New check_ifstatus -n option to ignore interfaces by name 8 New check_ifstatus -n option to ignore interfaces by name
9 9
10 FIXES
11 Fix check_jabber to work with Openfire servers
12
102.0 11th July 2014 132.0 11th July 2014
11 ENHANCEMENTS 14 ENHANCEMENTS
12 check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with 15 check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with
diff --git a/THANKS.in b/THANKS.in
index 433698c..75ecd56 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -329,3 +329,5 @@ Patrick McAndrew
329Alexander Wittig 329Alexander Wittig
330Jason Benguerel 330Jason Benguerel
331Matthew Kent 331Matthew Kent
332Frederic Krueger
333Simon Meggle
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index 8653a5e..d28c8d0 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -58,12 +58,11 @@
58# Paths to commands used in this script. These 58# Paths to commands used in this script. These
59# may have to be modified to match your system setup. 59# may have to be modified to match your system setup.
60 60
61PROGNAME=`/bin/basename $0`
62PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
63REVISION="@NP_VERSION@"
64PATH="@TRUSTED_PATH@" 61PATH="@TRUSTED_PATH@"
65
66export PATH 62export PATH
63PROGNAME=`basename $0`
64PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
65REVISION="@NP_VERSION@"
67 66
68. $PROGPATH/utils.sh 67. $PROGPATH/utils.sh
69 68
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index bd78981..0e8100d 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -332,7 +332,7 @@ elsif ( $mailq eq "postfix" ) {
332 }elsif ($lines[0]=~/Mail queue is empty/) { 332 }elsif ($lines[0]=~/Mail queue is empty/) {
333 $msg_q = 0; 333 $msg_q = 0;
334 }else{ 334 }else{
335 print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; 335 print "Couldn't match $utils::PATH_TO_MAILQ output\n";
336 exit $ERRORS{'UNKNOWN'}; 336 exit $ERRORS{'UNKNOWN'};
337 } 337 }
338 338
@@ -340,7 +340,7 @@ elsif ( $mailq eq "postfix" ) {
340 #if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) { 340 #if ($lines[1]=~/^messages in queue but not yet preprocessed: (\d+)/) {
341 # my $msg_p = $1; 341 # my $msg_p = $1;
342 #}else{ 342 #}else{
343 # print "Couldn't match $utils::PATH_TO_QMAIL_QSTAT output\n"; 343 # print "Couldn't match $utils::PATH_TO_MAILQ output\n";
344 # exit $ERRORS{'UNKNOWN'}; 344 # exit $ERRORS{'UNKNOWN'};
345 #} 345 #}
346 346
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index ceac95d..96078ac 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -6,10 +6,11 @@
6# This Monitoring plugin was created to check Oracle status 6# This Monitoring plugin was created to check Oracle status
7# 7#
8 8
9PATH="@TRUSTED_PATH@"
10export PATH
9PROGNAME=`basename $0` 11PROGNAME=`basename $0`
10PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 12PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
11REVISION="@NP_VERSION@" 13REVISION="@NP_VERSION@"
12PATH="@TRUSTED_PATH@"
13 14
14. $PROGPATH/utils.sh 15. $PROGPATH/utils.sh
15 16
@@ -137,7 +138,7 @@ case "$cmd" in
137 tnschk=` tnsping $2` 138 tnschk=` tnsping $2`
138 tnschk2=` echo $tnschk | grep -c OK` 139 tnschk2=` echo $tnschk | grep -c OK`
139 if [ ${tnschk2} -eq 1 ] ; then 140 if [ ${tnschk2} -eq 1 ] ; then
140 tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'` 141 tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*}
141 echo "OK - reply time ${tnschk3} from $2" 142 echo "OK - reply time ${tnschk3} from $2"
142 exit $STATE_OK 143 exit $STATE_OK
143 else 144 else
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 05c64c4..f742830 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -1,11 +1,10 @@
1#!/bin/sh 1#!/bin/sh
2 2
3PATH="@TRUSTED_PATH@"
4export PATH
3PROGNAME=`basename $0` 5PROGNAME=`basename $0`
4PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` 6PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
5REVISION="@NP_VERSION@" 7REVISION="@NP_VERSION@"
6PATH="@TRUSTED_PATH@"
7
8export PATH
9 8
10. $PROGPATH/utils.sh 9. $PROGPATH/utils.sh
11 10
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index bd7736b..fc0adba 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -172,7 +172,7 @@ main (int argc, char **argv)
172 } 172 }
173 else if (!strncmp(SERVICE, "JABBER", 6)) { 173 else if (!strncmp(SERVICE, "JABBER", 6)) {
174 SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n"; 174 SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
175 EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'"; 175 EXPECT = "<?xml version=\'1.0\'";
176 QUIT = "</stream:stream>\n"; 176 QUIT = "</stream:stream>\n";
177 flags |= FLAG_HIDE_OUTPUT; 177 flags |= FLAG_HIDE_OUTPUT;
178 PORT = 5222; 178 PORT = 5222;