X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=contrib%2Fexec-munin.px;h=5309cc660705a298dc2d5fd669c4ab415e2094c9;hb=965115a9ec6d4beaea5c6c1483176b80445c5f96;hp=b57601a3054aa9c99c8022c384d869f595828882;hpb=dfa9f1043e287606c7c7c8e6444c79ecaad5422d;p=collectd.git

diff --git a/contrib/exec-munin.px b/contrib/exec-munin.px
index b57601a3..5309cc66 100755
--- a/contrib/exec-munin.px
+++ b/contrib/exec-munin.px
@@ -46,7 +46,8 @@ use Regexp::Common ('number');
 our $ConfigFile = '/etc/exec-munin.conf';
 our $TypeMap = {};
 our $Scripts = [];
-our $Interval = 300;
+our $Interval = defined ($ENV{'COLLECTD_INTERVAL'}) ? (0 + $ENV{'COLLECTD_INTERVAL'}) : 300;
+our $Hostname = defined ($ENV{'COLLECTD_HOSTNAME'}) ? $ENV{'COLLECTD_HOSTNAME'} : '';
 
 main ();
 exit (0);
@@ -55,7 +56,7 @@ exit (0);
 
 =head1 CONFIGURATION
 
-This script reads it's configuration from F</etc/exec-munin.conf>. The
+This script reads its configuration from F</etc/exec-munin.conf>. The
 configuration is read using C<Config::General> which understands a Apache-like
 config syntax, so it's very similar to the F<collectd.conf> syntax, too.
 
@@ -189,7 +190,7 @@ sub execute_script
   my $pinst;
   my $time = time ();
   my $script = shift;
-  my $host = hostname () || 'localhost';
+  my $host = $Hostname || hostname () || 'localhost';
   if (!open ($fh, '-|', $script))
   {
     print STDERR "Cannot execute $script: $!";