Commit Graph

2335 Commits

Author SHA1 Message Date
fermin831 50569f187f Fixed server cron problems when there is set only time from 2017-11-20 14:06:40 +01:00
artica 04c271ae61 Auto-updated build strings. 2017-11-20 00:01:08 +01:00
artica 92b71b17f4 Auto-updated build strings. 2017-11-19 00:01:09 +01:00
artica 1fb39ee151 Auto-updated build strings. 2017-11-18 00:01:11 +01:00
artica c624c213ea Auto-updated build strings. 2017-11-17 00:01:11 +01:00
artica 104db9a875 Auto-updated build strings. 2017-11-16 00:01:12 +01:00
vgilc fbbd029812 Merge branch 'ent-1493-problemas-con-las-entidades-html-al-crear-eventos-con-el-pandora_server' into 'develop'
Added safe_output to server events

See merge request artica/pandorafms!970
2017-11-15 09:40:10 +01:00
artica e793e3fd4e Auto-updated build strings. 2017-11-15 00:01:16 +01:00
artica 69aff8a420 Auto-updated build strings. 2017-11-14 00:01:10 +01:00
artica 301795af83 Auto-updated build strings. 2017-11-13 00:01:08 +01:00
artica 2e6e46c10c Auto-updated build strings. 2017-11-12 00:01:08 +01:00
artica b8e6d7927e Auto-updated build strings. 2017-11-11 00:01:10 +01:00
artica 680d23038e Auto-updated build strings. 2017-11-10 00:01:09 +01:00
artica f512bea610 Auto-updated build strings. 2017-11-09 00:01:13 +01:00
artica ef8b69841c Updated version and build strings. 2017-11-08 15:30:28 +01:00
danielmaya 1d7df38b61 Fixed entities in networkserver.pm 2017-11-08 11:55:23 +01:00
artica b461121361 Auto-updated build strings. 2017-11-08 00:01:10 +01:00
daniel 29c69b1dbc add send mail plain/text 2017-11-07 11:43:46 +01:00
artica 3763a1a93c Auto-updated build strings. 2017-11-07 00:01:10 +01:00
danielmaya 6cd13dbc6d Fixed call snmp in server 2017-11-06 15:53:33 +01:00
artica 2bca9c92fa Auto-updated build strings. 2017-11-06 00:01:08 +01:00
artica 3a220564ec Auto-updated build strings. 2017-11-05 00:01:09 +01:00
artica cc4e337f70 Auto-updated build strings. 2017-11-04 00:01:12 +01:00
artica 3d6d1044ea Auto-updated build strings. 2017-11-03 00:01:11 +01:00
artica f8211e2c63 Auto-updated build strings. 2017-11-02 00:01:07 +01:00
artica 9b530c414f Auto-updated build strings. 2017-11-01 00:01:10 +01:00
artica 0653c17a9d Auto-updated build strings. 2017-10-31 00:01:11 +01:00
artica 90b671de74 Auto-updated build strings. 2017-10-30 00:01:08 +01:00
artica 8f6d4a5d42 Auto-updated build strings. 2017-10-29 00:01:08 +02:00
artica 9bc804073a Auto-updated build strings. 2017-10-28 00:01:11 +02:00
artica 42a43b0c4e Auto-updated build strings. 2017-10-27 00:01:09 +02:00
vgilc e4e5734ff5 Merge branch 'ent-1178-solicitud-de-macro-que-devuelve-el-server-al-que-esta-asignado-el-agente' into 'develop'
Ent 1178 solicitud de macro que devuelve el server al que esta asignado el agente

See merge request artica/pandorafms!902
2017-10-26 13:54:39 +02:00
vgilc 99e2b07e23 Merge branch 'ent-1415-falta-espacio-en-nombre-de-evento-al-reiniciar-server' into 'develop'
Added space on restart server event

See merge request artica/pandorafms!876
2017-10-26 11:14:45 +02:00
vgilc 9767f9bb9e Merge branch 'ent-1436-opciones-avanzadas-cron-modulos-sinteticos-no-funciona-correctamente' into 'develop'
Fixed cron on server modules

See merge request artica/pandorafms!914
2017-10-26 09:54:29 +02:00
vgilc 64117e2744 Merge branch 'tardanza-en-vista-de-arbol-carrefour' into 'develop'
Tardanza en vista de arbol carrefour

See merge request artica/pandorafms!924
2017-10-26 09:51:34 +02:00
artica 0a74291730 Auto-updated build strings. 2017-10-26 00:01:09 +02:00
fermin831 f1cbaec98b Added safe_output to server events 2017-10-25 12:11:56 +02:00
artica fc81469b7c Auto-updated build strings. 2017-10-25 00:01:09 +02:00
artica 326b1a0828 Auto-updated build strings. 2017-10-24 00:01:10 +02:00
artica 906201a34c Updated version and build strings. 2017-10-23 17:45:29 +02:00
Alejandro Gallardo Escobar edcff5e1f1 [Pandora Server] Added a decode to the alert description before the event creation, to avoid a double encode with HTML entities 2017-10-23 16:23:30 +02:00
artica f59c4f591c Auto-updated build strings. 2017-10-23 00:01:07 +02:00
artica 50c0447d85 Auto-updated build strings. 2017-10-22 00:01:08 +02:00
artica 83b0e393e1 Auto-updated build strings. 2017-10-21 00:01:07 +02:00
artica 30f4162d91 Auto-updated build strings. 2017-10-20 00:01:08 +02:00
artica 038fce3346 Auto-updated build strings. 2017-10-19 00:01:08 +02:00
vgilc 7121d4a343 Merge branch 'deadlocks-base-de-datos-en-cluster-de-percona-4137' into 'develop'
Retry queries when a deadlock is found.

See merge request !936
2017-10-18 11:15:54 +02:00
Ramon Novoa 702bed8c13 Retry queries when a deadlock is found.
Ref pandora_enterprise#1126.
2017-10-18 10:45:55 +02:00
artica 157670c21c Auto-updated build strings. 2017-10-18 00:01:15 +02:00
artica fc762719c9 Auto-updated build strings. 2017-10-17 00:01:21 +02:00