Author: glen Date: Tue Apr 13 09:10:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- print out also raid personality in linux md
---- Files affected:
packages/nagios-plugin-check_raid:
check_raid (1.74 -> 1.75)
---- Diffs:
================================================================
Index: packages/nagios-plugin-check_raid/check_raid
diff -u packages/nagios-plugin-check_raid/check_raid:1.74
packages/nagios-plugin-check_raid/check_raid:1.75
--- packages/nagios-plugin-check_raid/check_raid:1.74 Tue Apr 13 11:06:06 2010
+++ packages/nagios-plugin-check_raid/check_raid Tue Apr 13 11:10:48 2010
@@ -140,14 +140,15 @@
sub check_mdstat {
open my $fh, '<', '/proc/mdstat' or return;
- my ($md, $md_status, $resync_status);
+ my ($md, $md_pers, $md_status, $resync_status);
my (@status, @failed_disks);
while (<$fh>) {
chomp;
- if (my($s) = /^(\S+)\s+:/) {
+ if (my($s, $p) = /^(\S+)\s+:\s*(?:\S+)\s+(\S+)/) {
$md = $s;
+ $md_pers = $p;
@failed_disks = $_ =~ m/(\S+)\[\d+\]\(F\)/g;
undef $resync_status;
next;
@@ -183,19 +184,19 @@
if ($md_status =~ /_/) {
$status = $ERRORS{CRITICAL};
- push(@status, "$md:@failed_disks:$md_status");
+ push(@status, "$md($md_pers):@failed_disks:$md_status");
} elsif (scalar @failed_disks > 0) {
$status = $ERRORS{WARNING} unless $status;
- push(@status, "$md:hot-spare failure:
@failed_disks:$md_status");
+ push(@status, "$md($md_pers):hot-spare failure:
@failed_disks:$md_status");
} elsif ($resync_status) {
$status = $ERRORS{WARNING} unless $status;
- push(@status, "$md:$md_status ($resync_status)");
+ push(@status, "$md($md_pers):$md_status
($resync_status)");
undef $resync_status;
} else {
- push(@status, "$md:$md_status");
+ push(@status, "$md($md_pers):$md_status");
}
}
close $fh;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_raid/check_raid?r1=1.74&r2=1.75&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
