summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Eble <psychotrahe@users.sourceforge.net>2008-06-09 19:47:36 (GMT)
committerMatthias Eble <psychotrahe@users.sourceforge.net>2008-06-09 19:47:36 (GMT)
commitd8577e19942b4885ac642513540fc1791a0fa38b (patch)
treee31b28007cee8baf4c76ed5a3eb2312d0a6fdac8
parent5c3d4aea27de408cb7b04f5aab83558efbf841f4 (diff)
downloadmonitoring-plugins-d8577e19942b4885ac642513540fc1791a0fa38b.tar.gz
Added testcases for check_dig
check_dig's -l option is mandatory now (#1986306) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2011 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--NEWS2
-rw-r--r--plugins/check_dig.c11
-rw-r--r--plugins/t/check_dig.t85
3 files changed, 95 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 439a850..8185b55 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ This file documents the major additions and syntax changes between releases.
4 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen) 4 Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
5 Optimised pst3 for systems with large number of processes (Duncan Ferguson) 5 Optimised pst3 for systems with large number of processes (Duncan Ferguson)
6 Updated Nagios::Plugin to 0.27 6 Updated Nagios::Plugin to 0.27
7 Fix Debian bug #479013: check_dig's -l is mandatory now (sf.net #1986306)
8 check_dig now returns CRITICAL instead of WARNING when no answer section is found
7 9
81.4.12 27th May 2008 101.4.12 27th May 2008
9 Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren) 11 Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren)
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index e3f7adb..34197ec 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -143,8 +143,10 @@ main (int argc, char **argv)
143 } 143 }
144 } 144 }
145 145
146 if (result == STATE_UNKNOWN) 146 if (result == STATE_UNKNOWN) {
147 msg = (char *)_("No ANSWER SECTION found"); 147 msg = (char *)_("No ANSWER SECTION found");
148 result = STATE_CRITICAL;
149 }
148 150
149 /* If we get anything on STDERR, at least set warning */ 151 /* If we get anything on STDERR, at least set warning */
150 if(chld_err.buflen > 0) { 152 if(chld_err.buflen > 0) {
@@ -295,7 +297,10 @@ process_arguments (int argc, char **argv)
295int 297int
296validate_arguments (void) 298validate_arguments (void)
297{ 299{
298 return OK; 300 if (query_address != NULL)
301 return OK;
302 else
303 return ERROR;
299} 304}
300 305
301 306
@@ -357,7 +362,7 @@ void
357print_usage (void) 362print_usage (void)
358{ 363{
359 printf (_("Usage:")); 364 printf (_("Usage:"));
360 printf ("%s -H <host> -l <query_address> [-p <server port>]\n", progname); 365 printf ("%s -l <query_address> [-H <host>] [-p <server port>]\n", progname);
361 printf (" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n"); 366 printf (" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n");
362 printf (" [-t <timeout>] [-a <expected answer address>] [-v]\n"); 367 printf (" [-t <timeout>] [-a <expected answer address>] [-v]\n");
363} 368}
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
new file mode 100644
index 0000000..937eec3
--- /dev/null
+++ b/plugins/t/check_dig.t
@@ -0,0 +1,85 @@
1#! /usr/bin/perl -w -I ..
2#
3# Domain Name Server (DNS) Tests via check_dig
4#
5# $Id$
6#
7
8use strict;
9use Test::More;
10use NPTest;
11
12plan skip_all => "check_dig not compiled" unless (-x "check_dig");
13
14plan tests => 12;
15
16my $successOutput = '/DNS OK - [\.0-9]+ seconds? response time/';
17
18my $hostname_valid = getTestParameter(
19 "NP_HOSTNAME_VALID",
20 "A valid (known to DNS) hostname",
21 "nagios.com"
22 );
23
24my $hostname_valid_ip = getTestParameter(
25 "NP_HOSTNAME_VALID_IP",
26 "The IP address of the valid hostname $hostname_valid",
27 "66.118.156.50",
28 );
29
30my $hostname_valid_reverse = getTestParameter(
31 "NP_HOSTNAME_VALID_REVERSE",
32 "The hostname of $hostname_valid_ip",
33 "66-118-156-50.static.sagonet.net.",
34 );
35
36my $hostname_invalid = getTestParameter(
37 "NP_HOSTNAME_INVALID",
38 "An invalid (not known to DNS) hostname",
39 "nosuchhost.altinity.com",
40 );
41
42my $dns_server = getTestParameter(
43 "NP_DNS_SERVER",
44 "A non default (remote) DNS server",
45 );
46
47my $res;
48
49SKIP: {
50 skip "check_dig.t: not enough parameters given",
51 12 unless ($hostname_valid && $hostname_valid_ip && $hostname_valid_reverse && $hostname_invalid && $dns_server);
52
53 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5");
54 cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid");
55 like ( $res->output, $successOutput, "Output OK" );
56
57 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5 -w 0.000001 -c 0.00001");
58 cmp_ok( $res->return_code, '==', 2, "Critical threshold passed");
59
60 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5 -w 0.000001 -c 5");
61 cmp_ok( $res->return_code, '==', 1, "Warning threshold passed");
62
63 $res = NPTest->testCmd("./check_dig -H $dns_server -t 1");
64 cmp_ok( $res->return_code, '==', 3, "Invalid command line -l missing");
65
66 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_invalid -t 1");
67 cmp_ok( $res->return_code, '==', 2, "Invalid $hostname_invalid");
68
69 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -t 5");
70 cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
71 like ( $res->output, $successOutput, "Output OK" );
72
73 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -a $hostname_valid_ip -t 5");
74 cmp_ok( $res->return_code, '==', 0, "Got expected address");
75
76 $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -a 10.10.10.10 -t 5");
77 cmp_ok( $res->return_code, '==', 1, "Got wrong address");
78
79 my $ip_reverse = $hostname_valid_ip;
80 $ip_reverse =~ s/(\d+)\.(\d+)\.(\d+)\.(\d+)/$4.$3.$2.$1.in-addr.arpa/;
81 $res = NPTest->testCmd("./check_dig -H $dns_server -l $ip_reverse -a $hostname_valid_reverse -T PTR -t 5");
82 cmp_ok( $res->return_code, '==', 0, "Got expected fqdn");
83 like ( $res->output, $successOutput, "Output OK");
84
85}