From 745e1a3662fe2b73b288d669fe4b7e5c6af0becd Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 10 Aug 2012 09:05:34 +0000 Subject: [PATCH] 2012-08-10 Miguel de Dios * lib/PandoraFMS/PredictionServer.pm: changed for the SLA service calculate alone instead before it was calculate for the module service. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6857 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/PredictionServer.pm | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 7e7d015b01..7e6a50621d 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2012-08-10 Miguel de Dios + + * lib/PandoraFMS/PredictionServer.pm: changed for the SLA service + calculate alone instead before it was calculate for the module + service. + 2012-07-29 Junichi Satoh * lib/PandoraFMS/DB.pm: Added missing '%'. diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm index 5d3db75aa9..d1807a9060 100644 --- a/pandora_server/lib/PandoraFMS/PredictionServer.pm +++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm @@ -157,11 +157,16 @@ sub exec_prediction_module ($$$$) { # Service modules if ($agent_module->{'prediction_module'} == 2) { if ($agent_module->{'custom_string_1'} eq 'SLA') { - # Do none because the modules for SLA service - # are filled in the service with same id. + logger ($pa_config, "Executing service module SLA " . + $agent_module->{'id_agente_modulo'} . " " . + $agent_module->{'nombre'}, 5); + enterprise_hook ('exec_service_module_sla', [$pa_config, $agent_module, $server_id, $dbh]); + logger ($pa_config, "End execution", 5); } else { - logger ($pa_config, "Executing service module " . $agent_module->{'nombre'}, 5); + logger ($pa_config, "Executing service module " . + $agent_module->{'id_agente_modulo'} . " " . + $agent_module->{'nombre'}, 5); enterprise_hook ('exec_service_module', [$pa_config, $agent_module, $server_id, $dbh]); logger ($pa_config, "End execution", 5); }