Monitoring/nagios-plugins
1
0
Fork 0
mirror of https://github.com/opinkerfi/nagios-plugins.git synced 2024-11-21 18:03:45 +01:00
Code Issues Releases Wiki Activity

Regex filtering broke disk checks

Browse Source
This commit is contained in:
Tomas Edwardsson 2014-08-28 11:33:30 +00:00
parent 9060a171f0
commit bf0edd899b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
check_disks.pl/check_disks.pl
View File

@ -251,10 +251,10 @@ if ($ret > 1) {
# #
foreach my $l (@output) { foreach my $l (@output) {
next if ($l =~ m/$opt_R/);
next if ($l !~ m/$opt_r/);
next if ($l =~ m/$exclude_re/);
if($l =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+([\/\w\d\.-]+)$/) { if($l =~ /(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+([\/\w\d\.-]+)$/) {
next if ($l =~ m/$opt_R/);
next if ($l !~ m/$opt_r/);
next if ($l =~ m/$exclude_re/);
my ($s,$u,$f,$pu,$d) = ($1,$2,$3,$4,$5); my ($s,$u,$f,$pu,$d) = ($1,$2,$3,$4,$5);
$alldisks{$d}->{pused} = $pu; $alldisks{$d}->{pused} = $pu;
$alldisks{$d}->{pfree} = 100-$pu; $alldisks{$d}->{pfree} = 100-$pu;
@ -268,10 +268,10 @@ foreach my $l (@output) {
# This is the output of df.exe on Windows # This is the output of df.exe on Windows
#C:\ 9097126 6094081 3003045 67% argon-c (ntfs) #C:\ 9097126 6094081 3003045 67% argon-c (ntfs)
else { else {
if ($l =~ /(\w)\:\\\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(.*)$/) {
next if ($l =~ m/$opt_R/); next if ($l =~ m/$opt_R/);
next if ($l !~ m/$opt_r/); next if ($l !~ m/$opt_r/);
next if ($l =~ m/$exclude_re/); next if ($l =~ m/$exclude_re/);
if ($l =~ /(\w)\:\\\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\%\s+(.*)$/) {
my ($d,$s,$u,$f,$pu) = ("/$1",$2,$3,$4,$5); my ($d,$s,$u,$f,$pu) = ("/$1",$2,$3,$4,$5);
$alldisks{$d}->{pused} = $pu; $alldisks{$d}->{pused} = $pu;
$alldisks{$d}->{pfree} = 100-$pu; $alldisks{$d}->{pfree} = 100-$pu;