diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-14 05:04:59 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-02-14 05:04:59 +0100 |
commit | 2b3ad8d331de6e06cfdf5116a202f3f4261ebae1 (patch) | |
tree | fa6ce05111a69ab33dbac7f80b91d01a0fdf7cb9 | |
parent | 425550f96f0ddeb8084abe424bc83a2efefeb8ac (diff) | |
download | vserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.tar.gz vserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.tar.bz2 vserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.zip |
accept all characters for service name
-rwxr-xr-x | check_load | 4 | ||||
-rwxr-xr-x | check_mem | 4 |
2 files changed, 2 insertions, 6 deletions
@@ -146,9 +146,7 @@ for my $load (qw( load1 load5 load15 )) { } } -if ($n->opts->s && $n->opts->s =~ m/(\w[\w\/]*\w)/) { - $ENV{'NAGIOS_PLUGIN'} = $1; -} +$ENV{'NAGIOS_PLUGIN'} = $1 if ($n->opts->s && $n->opts->s =~ m/^(.+)$/); my $domain = ''; $domain = ('.' . $n->opts->d) if $n->opts->d; @@ -151,9 +151,7 @@ my (%warn, %crit); ($warn{'vm'}, $warn{'rss'}, $warn{'anon'}, $warn{'vml'}) = parse_thresholds($n->opts->w); ($crit{'vm'}, $crit{'rss'}, $crit{'anon'}, $crit{'vml'}) = parse_thresholds($n->opts->c); -if ($n->opts->s && $n->opts->s =~ m/(\w[\w\/]*\w)/) { - $ENV{'NAGIOS_PLUGIN'} = $1; -} +$ENV{'NAGIOS_PLUGIN'} = $1 if ($n->opts->s && $n->opts->s =~ m/^(.+)$/); my $domain = ''; $domain = ('.' . $n->opts->d) if $n->opts->d; |