X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-msa-eventlog;h=5743b6bdd35792b0799252b1fd8685801a0d2411;hb=f79acba81afea4a50183dd6754d7aeb064e0e4e1;hp=dff96486373ce61c12648b689a0cf6905169bdb0;hpb=5d2fa9076c1d3eb0049dea5eb623f2d177be4f55;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-msa-eventlog b/dsa-nagios-checks/checks/dsa-check-msa-eventlog
index dff9648..5743b6b 100755
--- a/dsa-nagios-checks/checks/dsa-check-msa-eventlog
+++ b/dsa-nagios-checks/checks/dsa-check-msa-eventlog
@@ -119,7 +119,7 @@ for my $key (keys %$r) {
 
 my $exit = 0;
 my $res = '';
-my %num = ('warn' => 0, 'error' => 0);
+my %num = ('warn' => 0, 'error' => 0, 'info' => 0, 'error-ignored' => 0, 'warn-ignored' => 0);
 
 for my $idx (sort {$a <=> $b} keys %{$data{'severity'}}) {
 	my $sev = $snmp_severity{$data{'severity'}->{$idx}};
@@ -127,7 +127,10 @@ for my $idx (sort {$a <=> $b} keys %{$data{'severity'}}) {
 	my $sevint = $severity_int{$sev};
 	if ($sevint > 0) {
 		my $msg = $data{'message'}->{$idx};
-		next if grep {$_ eq $msg} @ignores;
+		if (grep {$_ eq $msg} @ignores) {
+			$num{$sev.'-ignored'}++;
+			next;
+		};
 
 		$exit = $sevint > $exit ? $sevint : $exit;
 
@@ -137,11 +140,18 @@ for my $idx (sort {$a <=> $b} keys %{$data{'severity'}}) {
 			$data{'timestamp'}->{$idx},
 			$msg;
 
+		$num{$sev}++;
+	} else {
 		$num{$sev}++;
 	};
 };
 
-printf "Event Log: %d warnings, %d errors\n", $num{'warn'}, $num{'error'};
+printf "Event Log: %d info, %d warnings%s, %d errors%s\n",
+	$num{'info'},
+	$num{'warn'},
+	($num{'warn-ignored'} ? " (+$num{'warn-ignored'} ignored)" : ""),
+	$num{'error'},
+	($num{'error-ignored'} ? " (+$num{'error-ignored'} ignored)" : "");
 print $res;
 exit $exit;