diff --git a/centreon-plugins/src/traps/fill_trapDB b/centreon-plugins/src/traps/fill_trapDB index c61006f95..702a7641d 100644 --- a/centreon-plugins/src/traps/fill_trapDB +++ b/centreon-plugins/src/traps/fill_trapDB @@ -29,7 +29,7 @@ use Getopt::Long; use DBI; use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd); -require "@OREON_PATH@/ODS/etc/conf.pm"; +require "/srv/oreon/ODS/etc/conf.pm"; ######################################### ## TEST IF OID ALREADY EXISTS IN DATABASE diff --git a/centreon-plugins/src/traps/genSnmpttConfFile b/centreon-plugins/src/traps/genSnmpttConfFile index 797ed3f58..76db45bf8 100644 --- a/centreon-plugins/src/traps/genSnmpttConfFile +++ b/centreon-plugins/src/traps/genSnmpttConfFile @@ -29,7 +29,7 @@ use Getopt::Long; use DBI; use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd); -require "@OREON_PATH@/ODS/etc/conf.pm"; +require "/srv/oreon/ODS/etc/conf.pm"; ###################################### ## Get snmptt configuration files path @@ -77,7 +77,7 @@ sub main() { if (defined($values[3])) { print FILE "FORMAT ".$values[3]."\n"; } - print FILE "EXEC ".$NAGIOS_TRAPS."/trapHandler \$aA \$o \"\$*\|\"\n"; + print FILE "EXEC ".$NAGIOS_TRAPS."/trapHandler \$aA \$o \"\$*\"\n"; if (defined($values[4])) { print FILE "SDESC\n".$values[4]; if ($values[4] =~ /\n$/) { diff --git a/centreon-plugins/src/traps/trapHandler b/centreon-plugins/src/traps/trapHandler index 5232906f9..23983c96c 100644 --- a/centreon-plugins/src/traps/trapHandler +++ b/centreon-plugins/src/traps/trapHandler @@ -28,7 +28,7 @@ use strict; use DBI; use vars qw($mysql_database_oreon $mysql_database_ods $mysql_host $mysql_user $mysql_passwd); -require "@OREON_PATH@/ODS/etc/conf.pm"; +require "/srv/oreon/ODS/etc/conf.pm"; ############################### ## GET HOSTNAME FROM IP ADDRESS @@ -112,7 +112,7 @@ sub getTrapsInfos($$$){ $sth->execute(); my @conf = $sth->fetchrow_array(); $sth->finish(); - my $submit = `/bin/echo "[$datetime] PROCESS_SERVICE_CHECK_RESULT;$this_host;$this_service;$status;$arguments_line" >> $conf[0]`; + my $submit = `/bin/echo "[$datetime] PROCESS_SERVICE_CHECK_RESULT;$this_host;$this_service;$status;$argument" >> $conf[0]`; } } $dbh->disconnect();