From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 21 Feb 2010 09:35:58 +0000 (+0100)
Subject: Query DNS information only when we need it.  It takes time and puts unnecessary load... 
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=22cd01e2e9763098fce67076ea9ce2250f7cf926;p=mirror%2Fdsa-nagios.git

Query DNS information only when we need it.  It takes time and puts unnecessary load on the tubes
---

diff --git a/dsa-nagios-checks/checks/dsa-check-dnssec-delegation b/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
index 82ffcd5..5ca33b4 100755
--- a/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
+++ b/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
@@ -186,15 +186,16 @@ if (scalar @ARGV) {
 
 $DLV = $params->{'dlv'} if $params->{'dlv'};
 
-my %data;
-for my $zone (@zones) {
-	$data{$zone} = { 'dnskey' => join(', ', get_dnskeytags($zone)),
-	                 'ds'     => join(', ', get_dstags($zone)),
-	                 'dlv'    => join(', ', get_dlvtags($zone)),
-	                 'parent_dnssec' => get_parent_dnssec_status($zone) };
-}
 
 if ($mode eq 'overview') {
+	my %data;
+	for my $zone (@zones) {
+		$data{$zone} = { 'dnskey' => join(', ', get_dnskeytags($zone)),
+				 'ds'     => join(', ', get_dstags($zone)),
+				 'dlv'    => join(', ', get_dlvtags($zone)),
+				 'parent_dnssec' => get_parent_dnssec_status($zone) };
+	}
+
 	my $format = "%60s %-10s %-10s %-10s %-10s\n";
 	printf $format, "zone", "DNSKEY", "DS\@parent", "DLV", "dnssec\@parent";
 	printf $format, "-"x 60,  "-"x 10,  "-"x 10,  "-"x 10, "-"x 10;
@@ -215,12 +216,12 @@ if ($mode eq 'overview') {
 
 	my @warn;
 	my @ok;
-	for my $zone (sort {$a cmp $b} keys %data) {
+	for my $zone (sort {$a cmp $b} @zones) {
 		my @thiskeys = $key eq 'per-zone' ? what_to_check($zone, $params->{'dir'}) : ($key);
 
+		my $dnskey = join(', ', get_dnskeytags($zone)) || '-';
 		for my $thiskey (@thiskeys) {
-			my $dnskey = $data{$zone}->{'dnskey'} || '-';
-			my $target = $data{$zone}->{$thiskey} || '-';
+			my $target = join(', ', $thiskey eq 'ds' ? get_dstags($zone) : get_dlvtags($zone)) || '-';
 
 			if ($dnskey ne $target) {
 				push @warn, "$zone ($dnskey != $target)";