From 9cd9a501b6d0f5103d31582d2c0d1d7035c76306 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Fri, 5 Aug 2011 08:32:01 +0000 Subject: [PATCH] 2011-08-05 Junichi Satoh * lib/PandoraFMS/PredictionServer.pm: Fixed some network server modules are processed as prediction server modules. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4674 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/PredictionServer.pm | 2 ++ 2 files changed, 7 insertions(+) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index f0c019f362..93ac16e61a 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2011-08-05 Junichi Satoh + + * lib/PandoraFMS/PredictionServer.pm: Fixed some network server + modules are processed as prediction server modules. + 2011-07-29 Koichiro Kikuchi * lib/PandoraFMS/Tools.pm: Send utf8 email properly. diff --git a/pandora_server/lib/PandoraFMS/PredictionServer.pm b/pandora_server/lib/PandoraFMS/PredictionServer.pm index 09dc30fdfb..b8beea0625 100644 --- a/pandora_server/lib/PandoraFMS/PredictionServer.pm +++ b/pandora_server/lib/PandoraFMS/PredictionServer.pm @@ -91,6 +91,7 @@ sub data_producer ($) { AND tagente_modulo.prediction_module != 0 AND tagente_modulo.disabled = 0 AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + AND tagente_modulo.id_modulo = 5 AND (tagente_modulo.flag = 1 OR (tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP()) ORDER BY last_execution_try ASC ', $pa_config->{'servername'}); @@ -103,6 +104,7 @@ sub data_producer ($) { AND tagente_modulo.disabled = 0 AND tagente_modulo.prediction_module != 0 AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo + AND tagente_modulo.id_modulo = 5 AND (tagente_modulo.flag = 1 OR (tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP()) ORDER BY last_execution_try ASC', $pa_config->{'servername'}); }