![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 197d5205a21aa72c1610d77aa02fe4b0bfa3e089..41c445c59fa4eab10492b16d26a6de48f7df6dda 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
const char *email = "nagiosplug-devel@lists.sourceforge.net";
enum {
+ UNDEFINED = 0,
DEFAULT_PORT = 53
};
char *query_address = NULL;
+char *record_type = "A";
+char *expected_address = NULL;
char *dns_server = NULL;
int verbose = FALSE;
int server_port = DEFAULT_PORT;
-int warning_interval = -1;
-int critical_interval = -1;
+double warning_interval = UNDEFINED;
+double critical_interval = UNDEFINED;
struct timeval tv;
int
usage (_("Could not parse arguments\n"));
/* get the command to run */
- asprintf (&command_line, "%s @%s -p %d %s",
- PATH_TO_DIG, dns_server, server_port, query_address);
+ asprintf (&command_line, "%s @%s -p %d %s -t %s",
+ PATH_TO_DIG, dns_server, server_port, query_address, record_type);
alarm (timeout_interval);
gettimeofday (&tv, NULL);
- if (verbose)
+ if (verbose) {
printf ("%s\n", command_line);
+ if(expected_address != NULL) {
+ printf ("Looking for: '%s'\n", expected_address);
+ } else {
+ printf ("Looking for: '%s'\n", query_address);
+ }
+ }
/* run the command */
child_process = spopen (command_line);
/* the server is responding, we just got the host name... */
if (strstr (input_buffer, ";; ANSWER SECTION:")) {
- /* get the host address */
- if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
- break;
+ /* loop through the whole 'ANSWER SECTION' */
+ do {
+ /* get the host address */
+ if (!fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process))
+ break;
- if (strpbrk (input_buffer, "\r\n"))
- input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
+ if (strpbrk (input_buffer, "\r\n"))
+ input_buffer[strcspn (input_buffer, "\r\n")] = '\0';
- if (strstr (input_buffer, query_address) == input_buffer) {
- output = strdup(input_buffer);
- result = STATE_OK;
- }
- else {
- asprintf (&output, _("Server not found in ANSWER SECTION"));
- result = STATE_WARNING;
- }
+ if (verbose && !strstr (input_buffer, ";; "))
+ printf ("%s\n", input_buffer);
+
+ if (expected_address==NULL && strstr (input_buffer, query_address) != NULL) {
+ output = strdup(input_buffer);
+ result = STATE_OK;
+ }
+ else if (expected_address != NULL && strstr (input_buffer, expected_address) != NULL) {
+ output = strdup(input_buffer);
+ result = STATE_OK;
+ }
+
+ } while (!strstr (input_buffer, ";; "));
+
+ if (result == STATE_UNKNOWN) {
+ asprintf (&output, _("Server not found in ANSWER SECTION"));
+ result = STATE_WARNING;
+ }
- continue;
}
}
- if (result != STATE_OK) {
+ if (result == STATE_UNKNOWN) {
asprintf (&output, _("No ANSWER SECTION found"));
}
if (output == NULL || strlen (output) == 0)
asprintf (&output, _(" Probably a non-existent host/domain"));
- if (elapsed_time > critical_interval)
- die (STATE_CRITICAL,
- _("DNS OK - %d seconds response time (%s)|time=%ldus\n"),
- elapsed_time, output, microsec);
-
- else if (result == STATE_CRITICAL)
- printf (_("DNS CRITICAL - %s|time=%ldus\n"), output);
+ if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
+ result = STATE_CRITICAL;
- else if (elapsed_time > warning_interval)
- die (STATE_WARNING,
- _("DNS OK - %d seconds response time (%s)|time=%ldus\n"),
- elapsed_time, output, microsec);
+ else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
+ result = STATE_WARNING;
- else if (result == STATE_WARNING)
- printf (_("DNS WARNING - %s|time=%ldus\n"), output);
-
- else if (result == STATE_OK)
- printf (_("DNS OK - %d seconds response time (%s)|time=%ldus\n"),
- elapsed_time, output, microsec);
-
- else
- printf (_("DNS problem - %s|time=%ldus\n"), output);
+ asprintf (&output, _("%.3f seconds response time (%s)"), elapsed_time, output);
+ printf ("DNS %s - %s|%s\n",
+ state_text (result), output,
+ fperfdata("time", elapsed_time, "s",
+ (warning_interval>UNDEFINED?TRUE:FALSE),
+ warning_interval,
+ (critical_interval>UNDEFINED?TRUE:FALSE),
+ critical_interval,
+ TRUE, 0, FALSE, 0));
return result;
}
int option = 0;
static struct option longopts[] = {
{"hostname", required_argument, 0, 'H'},
- {"query_address", required_argument, 0, 'e'},
+ {"query_address", required_argument, 0, 'l'},
+ {"warning", required_argument, 0, 'w'},
+ {"critical", required_argument, 0, 'c'},
+ {"timeout", required_argument, 0, 't'},
{"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
+ {"record_type", required_argument, 0, 'T'},
+ {"expected_address", required_argument, 0, 'a'},
{0, 0, 0, 0}
};
return ERROR;
while (1) {
- c = getopt_long (argc, argv, "hVvt:l:H:", longopts, &option);
+ c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:a:", longopts, &option);
if (c == -1 || c == EOF)
break;
usage2 (_("Invalid host name"), optarg);
}
break;
- case 'p':
+ case 'p': /* server port */
if (is_intpos (optarg)) {
server_port = atoi (optarg);
}
else {
- usage2 (_("Server port must be a nonnegative integer\n"), optarg);
+ usage2 (_("Server port must be a nonnegative integer"), optarg);
}
break;
- case 'l': /* username */
+ case 'l': /* address to lookup */
query_address = optarg;
break;
- case 'w': /* timeout */
- if (is_intnonneg (optarg)) {
- warning_interval = atoi (optarg);
+ case 'w': /* warning */
+ if (is_nonnegative (optarg)) {
+ warning_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Warning interval must be a nonnegative integer\n"), optarg);
+ usage2 (_("Warning interval must be a nonnegative integer"), optarg);
}
break;
- case 'c': /* timeout */
- if (is_intnonneg (optarg)) {
- critical_interval = atoi (optarg);
+ case 'c': /* critical */
+ if (is_nonnegative (optarg)) {
+ critical_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Critical interval must be a nonnegative integer\n"), optarg);
+ usage2 (_("Critical interval must be a nonnegative integer"), optarg);
}
break;
case 't': /* timeout */
timeout_interval = atoi (optarg);
}
else {
- usage2 (_("Time interval must be a nonnegative integer\n"), optarg);
+ usage2 (_("Time interval must be a nonnegative integer"), optarg);
}
break;
case 'v': /* verbose */
verbose = TRUE;
break;
+ case 'T':
+ record_type = optarg;
+ break;
+ case 'a':
+ expected_address = optarg;
+ break;
}
}
-l, --lookup=STRING\n\
machine name to lookup\n"));
+ printf (_("\
+ -T, --record_type=STRING\n\
+ record type to lookup (default: A)\n"));
+
+ printf (_("\
+ -a, --expected_address=STRING\n\
+ an address expected to be in the asnwer section.\n\
+ if not set, uses whatever was in -l\n"));
+
printf (_(UT_WARN_CRIT));
printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
print_usage (void)
{
printf (_("\
-Usage: %s -H host -l lookup [-p <server port>] [-w <warning interval>]\n\
- [-c <critical interval>] [-t <timeout>] [-v]\n"),
+Usage: %s -H host -l lookup [-p <server port>] [-T <query type>]\n\
+ [-w <warning interval>] [-c <critical interval>] [-t <timeout>]\n\
+ [-a <expected answer address>] [-v]\n"),
progname);
printf (" %s (-h|--help)\n", progname);
printf (" %s (-V|--version)\n", progname);