diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-14 03:26:32 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-14 04:36:57 +0100 |
commit | 6ccc388658b58bca0e89149c69bcc7bfa1cfed2f (patch) | |
tree | 35ed16eaf9a33b422dbdf3b167aeb4cc3cad17b1 | |
parent | 45d24754154efca6caba08b206ccad195558a610 (diff) | |
download | vserver-monitoring-6ccc388658b58bca0e89149c69bcc7bfa1cfed2f.tar.gz vserver-monitoring-6ccc388658b58bca0e89149c69bcc7bfa1cfed2f.tar.bz2 vserver-monitoring-6ccc388658b58bca0e89149c69bcc7bfa1cfed2f.zip |
optional limits
-rwxr-xr-x | check_load | 14 | ||||
-rwxr-xr-x | check_mem | 10 |
2 files changed, 12 insertions, 12 deletions
@@ -42,20 +42,20 @@ sub parse_thresholds($) { my $arg = shift; if ($arg) { - if ($arg =~ m/([0-9]+),([0-9]+),([0-9]+)/) { + if ($arg =~ m/^([0-9]*),([0-9]*),([0-9]*)$/) { return ($1, $2, $3); } - if ($arg =~ m/([0-9]+),([0-9]+)/) { + if ($arg =~ m/^([0-9]*),([0-9]*)$/) { return ($1, $2, $2); } - if ($arg =~ m/([0-9]+)/) { + if ($arg =~ m/^([0-9]*)$/) { return ($1, $1, $1); } } - return (0, 0, 0); + return undef; } sub get_load($$) { @@ -98,9 +98,9 @@ my (%warn, %crit); ($crit{'load1'}, $crit{'load5'}, $crit{'load15'}) = parse_thresholds($n->opts->c); for my $load (qw( load1 load5 load15 )) { - if ($crit{$load} < $warn{$load}) { - $n->nagios_exit(UNKNOWN, "Parameter inconsistency: warning load" . - "is greater than critical load for '$load'"); + if (defined $crit{$load} && defined $warn{$load} && $crit{$load} < $warn{$load}) { + die("Parameter inconsistency: warning load is greater " . + "than critical load for '$load'"); } } @@ -43,24 +43,24 @@ sub parse_thresholds($) { my $arg = shift; if ($arg) { - if ($arg =~ m/([-:@~0-9]+),([-:@~0-9]+),([-:@~0-9]+),([-:@~0-9]+)/) { + if ($arg =~ m/^([-:@~0-9]*),([-:@~0-9]*),([-:@~0-9]*),([-:@~0-9]*)$/) { return ($1, $2, $3, $4); } - if ($arg =~ m/([-:@~0-9]+),([-:@~0-9]+),([-:@~0-9]+)/) { + if ($arg =~ m/^([-:@~0-9]*),([-:@~0-9]*),([-:@~0-9]*)$/) { return ($1, $2, $3, $3); } - if ($arg =~ m/([-:@~0-9]+),([-:@~0-9]+)/) { + if ($arg =~ m/^([-:@~0-9]*),([-:@~0-9]*)$/) { return ($1, $2, $2, $2); } - if ($arg =~ m/([-:@~0-9]+)/) { + if ($arg =~ m/^([-:@~0-9]*)$/) { return ($1, $1, $1, $1); } } - return (); + return undef; } sub get_mem($$) { |