summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-02-14 05:04:59 +0100
committerAlexander Sulfrian <alexander@sulfrian.net>2014-02-14 05:04:59 +0100
commit2b3ad8d331de6e06cfdf5116a202f3f4261ebae1 (patch)
treefa6ce05111a69ab33dbac7f80b91d01a0fdf7cb9
parent425550f96f0ddeb8084abe424bc83a2efefeb8ac (diff)
downloadvserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.tar.gz
vserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.tar.bz2
vserver-monitoring-2b3ad8d331de6e06cfdf5116a202f3f4261ebae1.zip
accept all characters for service name
-rwxr-xr-xcheck_load4
-rwxr-xr-xcheck_mem4
2 files changed, 2 insertions, 6 deletions
diff --git a/check_load b/check_load
index 779b979..91063f4 100755
--- a/check_load
+++ b/check_load
@@ -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;
diff --git a/check_mem b/check_mem
index 01288dd..31beef5 100755
--- a/check_mem
+++ b/check_mem
@@ -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;