linux_mirrors/check_lsi_raid
0
0
Fork 0
mirror of https://github.com/thomas-krenn/check_lsi_raid.git synced 2026-03-04 16:32:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix rebuild progress for physical devices

Browse Source 
- Fix regex for floating point number and percentage sign
This commit is contained in:
Georg Schönberger
2013-07-02 10:08:31 +02:00
parent e045d48d92
commit 03dc26dc45
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
check_lsi_raid
View File

@@ -83,7 +83,7 @@ sub displayUsage {
# TODO: ADD URL and Mailing List
sub displayHelp {
print $NAME . " Version: " . $VERSION ."\n";
print "Copyright (C) 2009-2013 Thomas-Krenn.AG\n";
print "Copyright (C) 2013 Thomas-Krenn.AG\n";
print "Current updates available at http://git.thomas-krenn.com/check_lsi_raid.git\n";
print "This Nagios/Icinga Plugin checks LSI RAID-Controllers for Controller, \nPhysical-Device and Logical Device warnings and errors.\n";
print "In order for this plugin to work properly you need to add the \nnagios-user to your sudoers file (or create a new one in /etc/sudoers.d/)\n";
@@ -596,12 +596,15 @@ sub getPhysDeviceStatus {
$output_dev = $2;
}
if(($output_enc ne -1) && ($output_dev ne -1)) {
if($line =~ /^\/c$controller$output_enc$output_dev\s*([\-]{1}|[0-9\%]*)\s*([\w\s]*)$/) { # gets status and percentage
if($2 ne "Not in progress") {
#grep for status and floating point number
if($line =~ /^\/c$controller\/e$output_enc\/s$output_dev\s*([\-]{1}|[0-9]*\.?[0-9]*)\s*([\w\s]*)$/){
my $inProgress = $1;
my $state = $2;
if($state =~ m/^In progress/) {
$status = getExitState($status, STATE_WARNING);
if ($VERBOSITY == 0) {$statusMessage .= "Phys. drive: $action in progress, "; }
if ($VERBOSITY == 1) {$statusMessage .= "Physical drive $output_dev: $action in progress, "; }
if ($VERBOSITY >= 2) {$statusMessage .= "Physical drive $output_dev in enclosure $output_enc: $action in progress (percentage: $1), "; }
if ($VERBOSITY >= 2) {$statusMessage .= "Physical drive $output_dev in enclosure $output_enc: $action in progress (percentage: $inProgress), "; }
}
}
}