tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2011-06-21 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/NetworkServer.pm: Added blank space in a couple of
	queries to avoid errors when the enterprise is not installed



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4476 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2011-06-21 14:28:08 +00:00
parent 8b39e98fc3
commit 96e9431f0f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2011-06-21 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/NetworkServer.pm: Added blank space in a couple of
queries to avoid errors when the enterprise is not installed
2011-06-20 Ramon Novoa <rnovoa@artica.es> 2011-06-20 Ramon Novoa <rnovoa@artica.es>
* lib/PandoraFMS/Config.pm,, * lib/PandoraFMS/Config.pm,,

4
pandora_server/lib/PandoraFMS/NetworkServer.pm
View File

@ -95,7 +95,7 @@ sub data_producer ($) {
AND tagente_modulo.id_agente = tagente.id_agente AND tagente_modulo.id_agente = tagente.id_agente
AND tagente.disabled = 0 AND tagente.disabled = 0
AND tagente_modulo.id_tipo_modulo > 4 AND tagente_modulo.id_tipo_modulo > 4
AND tagente_modulo.id_tipo_modulo < 19' AND tagente_modulo.id_tipo_modulo < 19 '
. enterprise_hook ('get_network_filter', []) . . enterprise_hook ('get_network_filter', []) .
'AND tagente_modulo.disabled = 0 'AND tagente_modulo.disabled = 0
AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
@ -109,7 +109,7 @@ sub data_producer ($) {
AND tagente.disabled = 0 AND tagente.disabled = 0
AND tagente_modulo.disabled = 0 AND tagente_modulo.disabled = 0
AND tagente_modulo.id_tipo_modulo > 4 AND tagente_modulo.id_tipo_modulo > 4
AND tagente_modulo.id_tipo_modulo < 19' AND tagente_modulo.id_tipo_modulo < 19 '
. enterprise_hook ('get_network_filter', []) . . enterprise_hook ('get_network_filter', []) .
'AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo 'AND tagente_estado.id_agente_modulo = tagente_modulo.id_agente_modulo
AND (tagente_modulo.flag = 1 OR ((tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP())) AND (tagente_modulo.flag = 1 OR ((tagente_estado.last_execution_try + tagente_estado.current_interval) < UNIX_TIMESTAMP()))