X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-zone-rrsig-expiration;h=7a92768571d1e60b28b504849cb03becd935dbaf;hb=f8f0a115031d992fc10e5a3ab43c56b61efe94db;hp=45918a4a922facc0f0b38f846804a68adbd42325;hpb=e1e0202ad2a482b348037cdacd0cf058444924a1;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration
index 45918a4..7a92768 100755
--- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration
+++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration
@@ -41,6 +41,10 @@
 # Copyright (c) 2010 Peter Palfrader <peter@palfrader.org>
 # - various fixes and cleanups
 # - do more than one zone
+# Copyright (c) 2012 Peter Palfrader <peter@palfrader.org>
+#  - add -s option to configure udp packet size.  default changed from 4k to 1k
+# Copyright (c) 2013 Peter Palfrader <peter@palfrader.org>
+#  - add -r option to override initial refs.
 
 
 # usage
@@ -89,8 +93,8 @@ sub convert_time {
 	return $ticks;
 }
 
-my %opts = (t=>30);
-getopts('hdt:c:w:', \%opts);
+my %opts = (t=>30, s=>1024);
+getopts('hdt:c:w:s:r:', \%opts);
 usage() unless scalar @ARGV == 1;
 usage() if $opts{h};
 my $zone = $ARGV[0];
@@ -119,6 +123,7 @@ k.root-servers.net
 l.root-servers.net
 m.root-servers.net
 );
+@refs = split(/\s*,\s*/, $opts{r}) if (defined $opts{r});
 
 $start = [gettimeofday()];
 do_recursion();
@@ -136,7 +141,7 @@ sub do_recursion {
 			print STDERR "sending query for $zone RRSIG to $ns\n" if $opts{d};
 			$res->nameserver($ns);
 			$res->udp_timeout($opts{t});
-			$res->udppacketsize(4096);
+			$res->udppacketsize($opts{s});
 			$pkt = $res->send($zone, 'RRSIG');
 			last if $pkt;
 		}
@@ -219,7 +224,7 @@ sub do_analyze {
 		my $ND = sprintf "%3.1f days", ($min_exp-$NOW)/86400;
 		warning("$min_type RRSIG expires in $ND at $min_ns")
 	}
-	success(sprintf("No RRSIGs expiring in the next %3.1f days", $WARN/86400));
+	success(sprintf("No RRSIGs at zone apex expiring in the next %3.1f days", $WARN/86400));
 }
 
 sub sigrr_exp_epoch {
@@ -269,7 +274,7 @@ sub output {
 }
 
 sub usage {
-	print STDERR "usage: $0 [-d] [-t=<timeout>] <zone>\n";
+	print STDERR "usage: $0 [-d] [-w=<warn>] [-c=<crit>] [-t=<timeout>] <zone>\n";
 	exit 3;
 }
 
@@ -281,7 +286,7 @@ sub send_query {
 	$res->nameserver($server) if $server;
 	$res->udp_timeout($opts{t});
 	$res->retry(2);
-	$res->udppacketsize(4096);
+	$res->udppacketsize($opts{s});
 	my $pkt = $res->send($qname, $qtype);
 	unless ($pkt) {
 		$res->usevc(1);