projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5'
[collectd.git]
/
contrib
/
exec-nagios.px
diff --git
a/contrib/exec-nagios.px
b/contrib/exec-nagios.px
index
02bd0a3
..
ec13b0a
100755
(executable)
--- a/
contrib/exec-nagios.px
+++ b/
contrib/exec-nagios.px
@@
-25,7
+25,8
@@
our $ConfigFile = '/etc/exec-nagios.conf';
our $TypeMap = {};
our $NRPEMap = {};
our $Scripts = [];
our $TypeMap = {};
our $NRPEMap = {};
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);
main ();
exit (0);
@@
-351,6
+352,7
@@
sub handle_performance_data
my $type = shift;
my $time = shift;
my $line = shift;
my $type = shift;
my $time = shift;
my $line = shift;
+ my $ident = "$host/$plugin-$pinst/$type-$tinst";
my $tinst;
my $value;
my $tinst;
my $value;
@@
-366,7
+368,9
@@
sub handle_performance_data
return;
}
return;
}
- print "PUTVAL $host/$plugin-$pinst/$type-$tinst interval=$Interval ${time}:$value\n";
+ $ident =~ s/"/\\"/g;
+
+ print qq(PUTVAL "$ident" interval=$Interval ${time}:$value\n);
}
sub execute_script
}
sub execute_script
@@
-376,7
+380,7
@@
sub execute_script
my $time = time ();
my $script = shift;
my @args = ();
my $time = time ();
my $script = shift;
my @args = ();
- my $host = hostname () || 'localhost';
+ my $host =
$Hostname ||
hostname () || 'localhost';
my $state = 0;
my $serviceoutput;
my $state = 0;
my $serviceoutput;
@@
-438,7
+442,7
@@
sub execute_script
close ($fh);
# Save the exit status of the check in $state
close ($fh);
# Save the exit status of the check in $state
- $state = $?;
+ $state = $?
>> 8
;
if ($state == 0)
{
if ($state == 0)
{