Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-07-25 18:38:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pr/375'

Browse source
This commit is contained in:
Steve Schnepp 2013-11-05 10:43:35 +01:00
commit f64c2e5d55
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/disk/raid
View file

@ -38,9 +38,9 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
# Should look like "active raid1 sda1[0] sdc1[2] sdb1[1]" # Should look like "active raid1 sda1[0] sdc1[2] sdb1[1]"
# Interestingly, swap is presented as "active (auto-read-only)" # Interestingly, swap is presented as "active (auto-read-only)"
while ($text =~ /(md\d+)\s+:\s+active\s+(\(auto-read-only\)\s+|)(\w+)\s+(.*)\n.*\[(\d+)\/(\d+)]\s+\[(\w+)]/ ) { while ($text =~ /(md\d+)\s+:\s+active\s+(\(auto-read-only\)\s+|)(\w+)\s+(.*)\n.*\[(\d+)\/(\d+)]\s+\[(\w+)]\n(.*(check|resync)\s=\s+(\d+\.\d+)%|.*\n)/ ) {
my($dev,$dummy,$type,$members,$nmem,$nact,$status) = ($1,$2,$3,$4,$5,$6,$7); my($dev,$dummy,$type,$members,$nmem,$nact,$status,$dummy2,$dummy3,$proc) = ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10);
# print "$text\nitem: $dev $type ($members) status=$status \n"; # print "$text\nitem: $dev $type ($members) status=$status $proc\n";
if ( $ARGV[0] and $ARGV[0] eq "config" ) { if ( $ARGV[0] and $ARGV[0] eq "config" ) {
print "$dev.label $dev\n"; print "$dev.label $dev\n";
print "$dev.info $type $members\n"; print "$dev.info $type $members\n";
@ -51,19 +51,25 @@ if ( $ARGV[0] and $ARGV[0] eq "config" ) {
print $dev, "_rebuild.info $type\n"; print $dev, "_rebuild.info $type\n";
# Because of an unfound bug, sometimes reported as 99.XX even when OS reports 100. # Because of an unfound bug, sometimes reported as 99.XX even when OS reports 100.
print $dev, "_rebuild.critical 98:\n"; print $dev, "_rebuild.critical 98:\n";
print $dev, "_check.label $dev check/resync \n";
print $dev, "_check.info $type\n";
} else { } else {
my $pct = 100 * $nact / $nmem; my $pct = 100 * $nact / $nmem;
my $rpct = 100; my $rpct = 100;
if ( $pct < 100 ) { if ( $pct < 100 ) {
my @output = `/sbin/mdadm -D /dev/$dev | grep Rebuild`; my @output = `/sbin/mdadm -D /dev/$dev | grep Rebuild`;
if( $output[0] =~ /([0-9]+)% complete/ ) { if( $output[0] and $output[0] =~ /([0-9]+)% complete/ ) {
$rpct = $1; $rpct = $1;
} else { } else {
$rpct = 0; $rpct = 0;
} }
} }
if ( $proc ) {
$cpct = $proc;
}
print "$dev.value $pct\n"; print "$dev.value $pct\n";
print $dev, "_rebuild.value $rpct\n"; print $dev, "_rebuild.value $rpct\n";
print $dev, "_check.value $cpct\n";
} }
$text = $'; $text = $';
} }