add parameter for service name

2 files changed, 28 insertions, 2 deletions

diff --git a/check_load b/check_load
index 59a8554..ac2db4d 100755
--- a/check_load
+++ b/check_load
@@ -12,7 +12,8 @@ our $VERSION = '1.6';
 sub init_nagios_plugin() {
     my $plugin = Nagios::Plugin->new(
         usage => "Usage: %s [-h|--help] [-w|--warnings=...] " .
-                 "[-c|--critical=...] [-d|--domain=...] [vserver-name]",
+                 "[-c|--critical=...] [-d|--domain=...] " .
+                 "[-s|--service=...] [vserver-name]",
         version => $VERSION,
         blurb => "This plugin could monitor the load of vserver guests."
     );
@@ -36,6 +37,14 @@ sub init_nagios_plugin() {
         label => "DOMAIN",
     );
 
+    $plugin->add_arg(
+        spec => 's|service=s',
+        help => 'Name of the service, as defined in the config of ' .
+                'the monitoring server. (default: ' .
+                Nagios::Plugin::Functions::get_shortname() . ')',
+        label => 'SERVICE',
+    );
+
     return $plugin;
 }
 
@@ -138,6 +147,10 @@ for my $load (qw( load1 load5 load15 )) {
     }
 }
 
+if ($n->opts->s && $n->opts->s =~ m/(\w[\w\/]*\w)/) {
+    $ENV{'NAGIOS_PLUGIN'} = $1;
+}
+
 my $domain = '';
 $domain = ('.' . $n->opts->d) if $n->opts->d;
 
diff --git a/check_mem b/check_mem
index 702273b..9909134 100755
--- a/check_mem
+++ b/check_mem
@@ -19,7 +19,8 @@ our %desc = (
 sub init_nagios_plugin() {
     my $plugin = Nagios::Plugin->new(
         usage => "Usage: %s [-h|--help] [-w|--warnings=...] " .
-                 "[-c|--critical=...] [-d|--domain=...] [vserver-name]",
+                 "[-c|--critical=...] [-d|--domain=...] " .
+                 "[-s|--service=...] [vserver-name]",
         version => $VERSION,
         blurb => "This plugin could monitor the memory of vserver guests."
     );
@@ -43,6 +44,14 @@ sub init_nagios_plugin() {
         label => "DOMAIN",
     );
 
+    $plugin->add_arg(
+        spec => 's|service=s',
+        help => 'Name of the service, as defined in the config of ' .
+                'the monitoring server. (default: ' .
+                Nagios::Plugin::Functions::get_shortname() . ')',
+        label => 'SERVICE',
+    );
+
     return $plugin;
 }
 
@@ -143,6 +152,10 @@ 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;
+}
+
 my $domain = '';
 $domain = ('.' . $n->opts->d) if $n->opts->d;