upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-05-28 04:35:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

check_icmp now reports min and max round trip time perfdata (Steve Rader)

Browse source 
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2073 f882894a-f735-0410-b71e-b25c423dba1c
This commit is contained in:
Thomas Guyot-Sionnest 2008-11-07 01:41:17 +00:00
parent dac9d73736
commit 526c3ad7a7
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -11,6 +11,7 @@ This file documents the major additions and syntax changes between releases.
Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
Fixed segfault in extra-opts under some circumstance when reading multiple sections
Fix long options parsing in check_tcp
check_icmp now reports min and max round trip time perfdata (Steve Rader)
1.4.13 25th Sept 2008
Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)

1
THANKS.in
View file

@ -240,3 +240,4 @@ Sven Nierlein
Erik Wasser
Tilman Koschnick
Olivier 'Babar' Raginel
Steve Rader

22
plugins-root/check_icmp.c
View file

@ -106,6 +106,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
# define ICMP_UNREACH_PRECEDENCE_CUTOFF 15
#endif
#ifndef DBL_MAX
# define DBL_MAX 9.9999999999e999
#endif
typedef unsigned short range_t; /* type for get_range() -- unimplemented */
@ -120,6 +123,8 @@ typedef struct rta_host {
unsigned char icmp_type, icmp_code; /* type and code from errors */
unsigned short flags; /* control/status flags */
double rta; /* measured RTA */
double rtmax; /* max rtt */
double rtmin; /* min rtt */
unsigned char pl; /* measured packet loss */
struct rta_host *next; /* linked list */
} rta_host;
@ -782,11 +787,15 @@ wait_for_reply(int sock, u_int t)
host->time_waited += tdiff;
host->icmp_recv++;
icmp_recv++;
if (tdiff > host->rtmax)
host->rtmax = tdiff;
if (tdiff < host->rtmin)
host->rtmin = tdiff;
if(debug) {
printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u\n",
printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n",
(float)tdiff / 1000, inet_ntoa(resp_addr.sin_addr),
ttl, ip->ip_ttl);
ttl, ip->ip_ttl, (float)host->rtmax / 1000, (float)host->rtmin / 1000);
}
/* if we're in hostcheck mode, exit with limited printouts */
@ -993,11 +1002,12 @@ finish(int sig)
host = list;
while(host) {
if(debug) puts("");
printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; ",
printf("%srta=%0.3fms;%0.3f;%0.3f;0; %spl=%u%%;%u;%u;; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ",
(targets > 1) ? host->name : "",
host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000,
(targets > 1) ? host->name : "",
host->pl, warn.pl, crit.pl);
(targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl,
(targets > 1) ? host->name : "", (float)host->rtmax / 1000,
(targets > 1) ? host->name : "", (host->rtmin < DBL_MAX) ? (float)host->rtmin / 1000 : (float)0);
host = host->next;
}
@ -1074,6 +1084,8 @@ add_target_ip(char *arg, struct in_addr *in)
host->saddr_in.sin_family = AF_INET;
host->saddr_in.sin_addr.s_addr = in->s_addr;
host->rtmin = DBL_MAX;
if(!list) list = cursor = host;
else cursor->next = host;