upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-11 01:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

check_ping's timeout interval is only +1 if ping command has a timeout value.

Browse source 
Tests updated to check for 100% packet loss (always if ping has timeout), otherwise
will check for "timed out" string


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1639 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Ton Voon 2007-03-12 10:51:06 +00:00
parent 3f93ecd171
commit 76cc1b75dd
3 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
NEWS
View file

@ -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/
Fixed broken HELO in check_smtp
Root plugins installed with world executable
./configure now detects if possible to compile check_mysql
check_sybase from contrib now maintained in NagiosExchange
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
check_sybase from contrib now maintained in NagiosExchange
1.4.6 5th February 2007
Reduced number of DNS lookups in check_ping and netutils.c for IPv6 configurations

7
plugins/check_ping.c
View file

@ -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++) {

30
plugins/t/check_ping.t
View file

@ -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"
);