From cf0246a0287b465e938feb2025c8a7690c297b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Georg=20Sch=C3=B6nberger?= Date: Fri, 25 Oct 2013 16:58:27 +0200 Subject: [PATCH] Improve line splitting for CV status Fix regex for state checking --- check_lsi_raid | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/check_lsi_raid b/check_lsi_raid index 814a154..f7466ed 100755 --- a/check_lsi_raid +++ b/check_lsi_raid @@ -770,18 +770,18 @@ sub getCVStatus { if(defined($currBlock)){ $line =~ s/^\s+|\s+$//g;#trim line if($currBlock eq 'Cachevault_Info' && $line =~ /^State/){ - $line =~ /([a-zA-Z0-9]*)$/; - if($1 ne "Optimal") { + my @vals = split('\s{2,}',$line); + if($vals[1] ne "Optimal") { $status = getExitState($status, STATE_WARNING); - if($VERBOSITY == 0){$statusMessage .= "CV state not optimal, ";} - if($VERBOSITY >= 1){$statusMessage .= "CV Cachevault_Info state $1, "; } + if($VERBOSITY == 0){$statusMessage .= "CacheVault state not optimal, ";} + if($VERBOSITY >= 1){$statusMessage .= "Cachevault Info state $1, "; } } } elsif($currBlock eq 'Firmware_Status' && $line =~ /^Replacement required/){ $line =~ /([a-zA-Z0-9]*)$/; if($1 ne "No") { $status = getExitState($status, STATE_WARNING); - $statusMessage .= "CV replacement required, "; + $statusMessage .= "CacheVault replacement required, "; } } }