diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | plugins/check_ping.c | 7 | ||||
| -rw-r--r-- | plugins/t/check_ping.t | 30 |
3 files changed, 37 insertions, 5 deletions
@@ -3,11 +3,12 @@ This file documents the major additions and syntax changes between releases. 1.4.7 ?? check_procs uses /usr/ucb/ps if available - fixes pst3 problems on Solaris Fixed MKINSTALLDIRS problem in po/ + ./configure now detects if possible to compile check_mysql Fixed broken HELO in check_smtp + check_icmp now allows to set a minimum number of hosts required for successs (-m) + check_ping times out 1 second quicker if host is unreachable Root plugins installed with world executable - ./configure now detects if possible to compile check_mysql check_sybase from contrib now maintained in NagiosExchange - check_icmp now allows to set a minimum number of hosts required for successs (-m) 1.4.6 5th February 2007 Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 9ddc2529..211f74ef 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -103,8 +103,13 @@ main (int argc, char **argv) usage4 (_("Cannot catch SIGALRM")); } - /* handle timeouts gracefully */ + /* If ./configure finds ping has timeout values, set plugin alarm slightly + * higher so that we can use response from command line ping */ +#ifdef PING_PACKETS_FIRST && PING_HAS_TIMEOUT alarm (timeout_interval + 1); +#else + alarm (timeout_interval); +#endif for (i = 0 ; i < n_addresses ; i++) { diff --git a/plugins/t/check_ping.t b/plugins/t/check_ping.t index b8323a0e..c9a09041 100644 --- a/plugins/t/check_ping.t +++ b/plugins/t/check_ping.t @@ -9,7 +9,7 @@ use strict; use Test::More; use NPTest; -plan tests => 18; +plan tests => 20; my $successOutput = '/PING (ok|OK) - Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/'; my $failureOutput = '/Packet loss = +[0-9]{1,2}\%, +RTA = [\.0-9]+ ms/'; @@ -58,12 +58,38 @@ $res = NPTest->testCmd( is( $res->return_code, 2, "Old syntax, with forced critical" ); like( $res->output, $failureOutput, "Output OK" ); + +# check_ping results will depend on whether the ping command discovered by +# ./configure has a timeout option. If it does, then the timeout will +# be set, so check_ping will always get a response. If it doesn't +# then check_ping will timeout. We do 2 tests for check_ping's timeout +# - 1 second +# - 15 seconds +# The latter should be higher than normal ping timeouts, so should always give a packet loss result +open(F, "../config.h") or die "Cannot open ../config.h"; +@_ = grep /define PING_HAS_TIMEOUT 1|define PING_PACKETS_FIRST 1/, <F>; +my $has_timeout; +$has_timeout = 1 if (scalar @_ == 2); # Need both defined +close F; $res = NPTest->testCmd( "./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 1" ); -is( $res->return_code, 2, "Timeout - host nonresponsive" ); +is( $res->return_code, 2, "Timeout 1 second - host nonresponsive" ); +if ($has_timeout) { + like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" ); +} else { + like( $res->output, '/timed out/', "Error contains 'timed out' string" ); +} + +$res = NPTest->testCmd( + "./check_ping -H $host_nonresponsive -w 10,100% -c 10,100% -p 1 -t 15" + ); +is( $res->return_code, 2, "Timeout 15 seconds - host nonresponsive" ); like( $res->output, '/100%/', "Error contains '100%' string (for 100% packet loss)" ); + + + $res = NPTest->testCmd( "./check_ping $host_nonresponsive -p 1 -t 1 100 100 1000 10000" ); |