packages: nagios-plugin-check_raid/check_raid - megacli: join status of disks

[glen]

Author: glen                         Date: Wed Apr 11 17:43:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- megacli: join status of disks

---- Files affected:
packages/nagios-plugin-check_raid:
   check_raid (1.118 -> 1.119) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.118 packages/nagios-plugin-check_raid/check_raid:1.119
--- packages/nagios-plugin-check_raid/check_raid:1.118	Wed Apr 11 15:56:32 2012
+++ packages/nagios-plugin-check_raid/check_raid	Wed Apr 11 19:42:59 2012
@@ -357,18 +357,18 @@
 		}
 	}
 
-	my @dstatus;
+	my %dstatus;
 	foreach my $dev (@devs) {
 		if ($dev->{state} eq 'Online' || $dev->{state} eq 'Hotspare') {
-			push(@dstatus, sprintf "%02d:%s", $dev->{dev}, $dev->{state});
+			push(@{$dstatus{$dev->{state}}}, sprintf "%02d", $dev->{dev});
 		} else {
 			$status = $ERRORS{CRITICAL};
 			# TODO: process other statuses
-			push(@dstatus, sprintf "%02d (%s): %s", $dev->{dev}, $dev->{name}, $dev->{state});
+			push(@{$dstatus{$dev->{state}}}, sprintf "%02d (%s)", $dev->{dev}, $dev->{name});
 		}
 	}
 
-	push(@status, ($#vols + 1) . ' Vols: ' . join(',', @vstatus) . ', '. ($#devs + 1) . ' Devs: ' . join(',', @dstatus));
+	push(@status, ($#vols + 1) . ' Vols: ' . join(',', @vstatus) . ', '. ($#devs + 1) . ' Devs: ' . join_status(\%dstatus));
 
 	return unless @status;
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/nagios-plugin-check_raid/check_raid?r1=1.118&r2=1.119