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

check_dig: patch to make dig honor -t option

Browse source 
When a timeout value is specified with the -t option, dig will sometimes
timeout before the timer is actually reached.

The problem occurs because the check_dig plugin does not pass the specified
timeout value to dig, leaving dig to timeout with it's default value which
seems to be around 10-15seconds.

To reproduce:
time ./check_dig -H 127.0.0.2 -l www.google.com -t 30

It will not run for 30secs, which is the expected behaviour.

The following will work, because the timeout is less than the default dig
timeout, so the plugin cancels the dig command:
time ./check_dig -H 127.0.0.2 -l www.google.com -t 2

This fix passes the timeout value to dig, and sets the number of retries which tends to vary from system to system by default.

Closes #1168
This commit is contained in:
Jan Wagner 2014-01-30 09:35:41 +01:00
parent 7310030ae7
commit df53473d03
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
THANKS.in
View file

@ -305,3 +305,4 @@ Geoff Oakham
Tim Laszlo
Stéphane Bortzmeyer
Luca Corti
Jethro Carr

11
plugins/check_dig.c
View file

@ -48,6 +48,8 @@ void print_usage (void);
#define UNDEFINED 0
#define DEFAULT_PORT 53
#define DEFAULT_TRIES 3
#define DEFAULT_TIMEOUT 10
char *query_address = NULL;
char *record_type = "A";
@ -57,6 +59,7 @@ char *dig_args = "";
char *query_transport = "";
int verbose = FALSE;
int server_port = DEFAULT_PORT;
int number_tries = DEFAULT_TRIES;
double warning_interval = UNDEFINED;
double critical_interval = UNDEFINED;
struct timeval tv;
@ -72,6 +75,7 @@ main (int argc, char **argv)
long microsec;
double elapsed_time;
int result = STATE_UNKNOWN;
timeout_interval = DEFAULT_TIMEOUT;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
@ -87,9 +91,12 @@ main (int argc, char **argv)
if (process_arguments (argc, argv) == ERROR)
usage_va(_("Could not parse arguments"));
/* dig applies the timeout to each try, so we need to work around this */
int timeout_interval_dig = ceil((double) timeout_interval / (double) number_tries);
/* get the command to run */
xasprintf (&command_line, "%s %s @%s -p %d %s -t %s %s",
PATH_TO_DIG, query_transport, dns_server, server_port, query_address, record_type, dig_args);
xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d",
PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig);
alarm (timeout_interval);
gettimeofday (&tv, NULL);