X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-nrpe-config%2Fdsa-check-raid-sw;h=0297036a0e3f5a035f02aa595b6d3c50a37c873b;hb=ecb76b28a06c9a1e6b324bb026ffb8032c54f9e4;hp=f971d664c98ea289913ef212221c25f409d62a92;hpb=2195ac025bb6e53ed8f8076a65c5905be1de9383;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-nrpe-config/dsa-check-raid-sw b/dsa-nagios-nrpe-config/dsa-check-raid-sw
index f971d66..0297036 100755
--- a/dsa-nagios-nrpe-config/dsa-check-raid-sw
+++ b/dsa-nagios-nrpe-config/dsa-check-raid-sw
@@ -84,9 +84,8 @@ alarm($timeout);
 
 # Start checking the file...
 open (FH, $stat) or print("UNKNOWN: Cannot open $stat: $!\n"), exit $ERRORS{'UNKNOWN'};
-$state = $ERRORS{'OK'};
-$msg ="";
 
+my @failed = ();
 my @resyncing = ();
 my $device = '';
 
@@ -96,8 +95,7 @@ while (<FH>) {
 	if ($line =~ /^(md\S*) /) {
 		$device = $1;
 	} elsif( $line =~ / \[_|_\]|U_|_U /) {
-		$state = $ERRORS{'CRITICAL'};
-		$msg = $msg . $device . ": - ";
+		push @failed, $device;
 	}
 	elsif ( $line =~ / resync /) {
 		#       [==>..................]  resync = 10.3% (15216320/146994624) finish=2153.2min speed=1018K/sec
@@ -109,14 +107,20 @@ while (<FH>) {
 }
 close (FH);
 
-if ( $state == $ERRORS{'CRITICAL'} ) { 
-	print "CRITICAL - Device(s) $msg have failed\n"; 
-} elsif ( scalar @resyncing > 0 ) {
+if (scalar @failed > 0) {
+	if (scalar @failed == 1) {
+		print "CRITICAL - Device $failed[0] has failed.\n";
+	} else {
+		print "CRITICAL - Devices ".join(", ", @failed)." have failed.\n"
+	};
+	exit $ERRORS{'CRITICAL'};
+} elsif (scalar @resyncing > 0 ) {
 	print "WARNING: Resyncing: ".(join "; ", @resyncing)."\n";
-	$state = $ERRORS{'WARNING'};
-} elsif ( $state == $ERRORS{'OK'} )
-	 { print "OK - All devices are online\n"; }
-exit $state;
+	exit $ERRORS{'WARNING'};
+} else {
+	print "OK - All devices are online\n";
+	exit $ERRORS{'OK'};
+};
 
 
 sub print_usage () {