X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-dnssec-delegation;h=5e25363735cd96c86eddf8757b8baf0aa24dbe2c;hb=94c1c3cd379c5761c1171b542446ff6a1b98a2e6;hp=82ffcd5e95e392ab1c220a889b7427490d85a99b;hpb=99b3f8cd5e377af0bb167a3b5bb2e56bdac0b68b;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-dnssec-delegation b/dsa-nagios-checks/checks/dsa-check-dnssec-delegation
index 82ffcd5..5e25363 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,15 +216,15 @@ 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)";
+				push @warn, "$zone ([$dnskey] != [$target])";
 			} else  {
 				push @ok, "$zone ($dnskey)";
 			};