Skip to content

Fix #51 and another issue with omitting -w parameter #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbirth wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix #51 and another issue with omitting -w parameter #52

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a3e374
Fixed issue https://github.com/willixix/naglio-plugins/issues/51.
mbirth Dec 3, 2014
2cefa0a
Fix: Omitting -w parameter prevented output of critical limit in
mbirth Dec 3, 2014
f353283
Fixed typos.
mbirth Dec 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions check_files.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ sub check_options {

if (defined($o_age)) {
my @agetemp = split(',',$o_age);
$o_age_warn = parse_threshold($agetemp[0]) if defined($agetemp[0]) && $agetemp[0] ne '';
$o_age_warn = parse_threshold($agetemp[0]) if defined($agetemp[0]) && $agetemp[0] ne '' && $agetemp[0] ne '~';
$o_age_crit = parse_threshold($agetemp[1]) if defined($agetemp[1]) && $agetemp[1] ne '';
}

Expand Down Expand Up @@ -844,7 +844,7 @@ sub open_shell_stream {
$statuscode = "CRITICAL";
$statusinfo .= "," if $statusinfo;
$statusinfo .= $chk;
} elsif ($chk = check_threshold($o_filesLv[$i],$nmatches[$i],$o_warnL[$i])) {
} elsif ($o_warnLv[$i] ne '~' && ($chk = check_threshold($o_filesLv[$i],$nmatches[$i],$o_warnL[$i]))) {
$statuscode="WARNING" if $statuscode eq "OK";
$statusinfo .= "," if $statusinfo;
$statusinfo .= $chk;
Expand All @@ -854,14 +854,14 @@ sub open_shell_stream {
}
$perfdata .= " ". perf_name($o_filesLv[$i]) ."=". $nmatches[$i] if defined($o_perf);

if (defined($o_perf) && defined($o_warnL[$i][5]) && defined($o_critL[$i][5])) {
if (defined($o_perf) && (defined($o_warnL[$i][5]) || defined($o_critL[$i][5]))) {
$perfdata .= ';' if $o_warnL[$i][5] ne '' || $o_critL[$i][5] ne '';
$perfdata .= $o_warnL[$i][5] if $o_warnL[$i][5] ne '';
$perfdata .= ';'.$o_critL[$i][5] if $o_critL[$i][5] ne '';
}
}

# perffata for age
# perfdata for age
if (defined($o_perf) && defined($o_age)) {
$oldest_secold=0 if !defined($oldest_secold);
$newest_secold=0 if !defined($newest_secold);
Expand All @@ -872,7 +872,7 @@ sub open_shell_stream {
$perfdata .= " age_newest=".$newest_secold."s";
}

# perffata for size
# perfdata for size
if (defined($o_perf) && defined($o_size)) {
$largest_filesize=0 if !defined($largest_filesize);
$smallest_filesize=0 if !defined($smallest_filesize);
Expand All @@ -883,7 +883,7 @@ sub open_shell_stream {
$perfdata .= " size_smallest=".$smallest_filesize."o";
}

# perffata for sum of file sizes
# perfdata for sum of file sizes
if (defined($o_perf) && defined($o_sumsize)) {
$perfdata .= " size_sum=".$sum_filesize."o";
$perfdata .= ';' if (defined($o_sumsize_warn) && $$o_sumsize_warn[5] ne '') || (defined($o_sumsize_crit) && $$o_sumsize_crit[5] ne '');
Expand Down