Commit Graph

3261 Commits

Author SHA1 Message Date
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 0191fd38d4 Merge branch 'ent-300-proteccion-contra-tormenta-de-eventos-solo-funciona-en-el-servidor-master' into 'develop'
Modified events protection checking to protect secundary servers too

See merge request artica/pandorafms!917
2017-10-26 12:32:54 +02:00
vgilc ce5b6109c4 Merge branch 'bug-paquetes-pandora-instalacion-opensuse' into 'develop'
Enable SystemD services and other fixes an Suse rpm

See merge request artica/pandorafms!878
2017-10-26 12:29:30 +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 e1c3e55582 Merge branch 'ent-1411-pandora_manage---get_module_data-con-modulos-incrementales' into 'develop'
Fixed inc modules on pandora manage --get_module_data

See merge request artica/pandorafms!894
2017-10-26 10:39:16 +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
vgilc 4bd7c7fb1f Merge branch 'reinicio-automatico-de-recon-ext-4100' into 'develop'
Do not automatically restart manual recon tasks.

See merge request !928
2017-10-16 17:21:23 +02:00
vgilc 27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'"
This reverts merge request !862
2017-10-16 16:44:44 +02:00
Ramon Novoa e649815624 Do not automatically restart manual recon tasks.
Ref pandora_enterprise#1274.
2017-10-16 15:52:00 +02:00
artica 6c11b68d3d Auto-updated build strings. 2017-10-16 00:01:18 +02:00
artica 606697a405 Auto-updated build strings. 2017-10-15 00:01:19 +02:00
artica 6bfc11be4a Auto-updated build strings. 2017-10-14 00:01:20 +02:00
slerena 551704a0bf Updated description to be more precise in the comments of web server configuration token. 2017-10-13 17:10:48 +02:00
Ramon Novoa 7d3e86296b Add metaconsole support to server-side group stats. 2017-10-13 15:10:46 +02:00
artica 3fb49f294d Auto-updated build strings. 2017-10-13 00:02:12 +02:00
vgilc c1fe2a3447 Merge branch '1425-new-improvements-in-route-analyzer-feature-dev' into 'develop'
1425 new improvements in route analyzer feature dev

See merge request !919
2017-10-11 17:40:55 +02:00
fermin831 4dfd000ba0 Modified events protection checking to protect secundary servers too 2017-10-11 11:05:55 +02:00
artica 6bc0949942 Auto-updated build strings. 2017-10-11 00:01:25 +02:00
fermin831 5171f7a747 Fixed cron on server modules 2017-10-10 16:32:02 +02:00
Arturo Gonzalez 1e6f3a9d9b Borja fix this error 2017-10-10 11:44:15 +02:00
fbsanchez 4fc33ec58b Fix pandora_db string data purge 2017-10-10 11:26:04 +02:00
artica ec95400043 Auto-updated build strings. 2017-10-10 00:01:23 +02:00
Arturo Gonzalez 391655f6fe Added images and Borsha fix 2017-10-09 17:11:08 +02:00
fermin831 739c507d77 Added _server_ip_ and _server_name_ macros to alerts 2017-10-09 12:28:17 +02:00
vgilc f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'
add send mail plain/text

See merge request !862
2017-10-09 10:11:27 +02:00
artica 2553494696 Auto-updated build strings. 2017-10-09 00:01:22 +02:00
artica 406ceaf8d3 Auto-updated build strings. 2017-10-08 00:01:32 +02:00
fermin831 5b933977af Fixed inc modules on pandora manage --get_module_data 2017-10-06 10:55:18 +02:00
artica c1ff200f3c Auto-updated build strings. 2017-10-06 00:01:24 +02:00
Daniel Maya b5fcf50257 Fixed snmp version in plugin snmp_remote 2017-10-05 12:12:59 +02:00
artica 9e475f5710 Auto-updated build strings. 2017-10-05 00:01:23 +02:00
artica de8285dc27 Auto-updated build strings. 2017-10-04 00:01:23 +02:00
fermin831 485d132baa Enable SystemD services and other fixes an Suse rpm 2017-10-03 17:56:13 +02:00
fermin831 fbc264f6b7 Added space on restart server event 2017-10-03 16:16:52 +02:00
artica 7b3a0d49f1 Auto-updated build strings. 2017-10-03 00:01:22 +02:00
artica 3188bf1b0b Updated version and build strings. 2017-10-02 11:57:37 +02:00
artica e9b8f01931 Auto-updated build strings. 2017-10-02 00:01:20 +02:00
artica bc48ddc747 Auto-updated build strings. 2017-10-01 00:01:20 +02:00
artica befb1fb196 Auto-updated build strings. 2017-09-30 00:01:23 +02:00
artica 6d7a9fd648 Auto-updated build strings. 2017-09-29 00:01:25 +02:00
Ramon Novoa 96a3dfab43 Set @Parser::Expat::Encoding_Path instead of calling load_encoding.
Parser::Expat::load_encoding doesn't seem to be thread safe. Set
@Parser::Expat::Encoding_Path instead to avoid problems.

Ref pandora_enterprise#1340.
2017-09-28 15:18:21 +02:00
Arturo Gonzalez 0b3f252436 Fixed elements per row to 8 2017-09-28 09:56:15 +02:00
artica 165087d670 Auto-updated build strings. 2017-09-28 00:01:20 +02:00
daniel 9a66aa52f2 add send mail plain/text 2017-09-27 13:42:02 +02:00
Arturo Gonzalez 23aa244051 Fixed bad positions when mode is auto and have less than 4 elements and added new parameter to export elements with id 2017-09-27 13:15:51 +02:00
Arturo Gonzalez ed7d8efaea Added 0 to all parents id 2017-09-27 12:26:13 +02:00
Arturo Gonzalez 28ecf5c51b Added simple quotes 2017-09-27 12:21:33 +02:00
artica 5ab5e04630 Auto-updated build strings. 2017-09-26 00:01:25 +02:00
vgilc 07b8e178d3 Merge branch '152-handle-incomplete-SNMPtraps' into 'develop'
Improved SNMP trap handling against incomplete traps or partially delayed ones.

Closes #152

See merge request !593
2017-09-25 13:14:35 +02:00
artica 444101dbdf Auto-updated build strings. 2017-09-25 00:01:22 +02:00
artica 3e3268971f Auto-updated build strings. 2017-09-24 00:01:21 +02:00
artica d1c4ce1008 Auto-updated build strings. 2017-09-23 00:01:17 +02:00
Arturo Gonzalez 9e01eda73d Added change to scape double quotes 2017-09-22 14:42:26 +02:00
Arturo Gonzalez 49d3c2574b Added minor changes to duplicate and export functions 2017-09-22 10:18:18 +02:00
artica c50c7b70da Auto-updated build strings. 2017-09-22 00:01:16 +02:00
artica 581b6cbae2 Auto-updated build strings. 2017-09-21 00:01:28 +02:00
artica 2e802e1b70 Auto-updated build strings. 2017-09-19 00:01:21 +02:00
fermin831 4d27093679 Fixed down server time calculation 2017-09-18 11:50:40 +02:00
vgilc d0f8b9d2a5 Merge branch '118-pandora_db-pl-use-uninisialized-config-value' into 'develop'
Resolve "pandora_db.pl use uninisialized config value"

Closes #118

See merge request !361
2017-09-18 10:53:17 +02:00
artica 9a6a22718e Auto-updated build strings. 2017-09-18 00:01:20 +02:00
artica 14cea700ad Auto-updated build strings. 2017-09-17 00:01:19 +02:00
artica d35a88e439 Auto-updated build strings. 2017-09-16 00:01:20 +02:00
artica 802a782c9a Auto-updated build strings. 2017-09-15 00:01:21 +02:00
vgilc e8a3484646 Merge branch '1306-visual-console-management-with-cli-dev' into 'develop'
1306 visual console management with cli dev

See merge request !819
2017-09-14 15:48:08 +02:00
Arturo Gonzalez 4fd4783bc5 Added edit function with auto position 2017-09-14 13:14:31 +02:00
Arturo Gonzalez bb0e15261a Added editor function when static option is enabled 2017-09-14 12:07:52 +02:00
Arturo Gonzalez aa8ee4278d Added export to JSON function to cli 2017-09-14 09:37:45 +02:00
artica 41956caa5c Auto-updated build strings. 2017-09-14 00:01:20 +02:00
Arturo Gonzalez f03514c771 Added first version to export console elements to json 2017-09-13 18:07:45 +02:00
Arturo Gonzalez 351f9e27b1 Added duplicate function 2017-09-13 17:39:17 +02:00
Arturo Gonzalez 26522ecaaa Added remove console items function to cli 2017-09-13 15:19:41 +02:00
Arturo Gonzalez e7cdf9b049 Added creation when elements position is auto 2017-09-13 13:27:37 +02:00
vgilc 754697f51c Merge branch 'ent-966-os_version-en-ficheros-xml-ext-4098-v7-0' into 'develop'
Ent 966 os version en ficheros xml ext 4098 v7 0

See merge request !813
2017-09-13 12:53:43 +02:00
artica 4cc2a5da0a Auto-updated build strings. 2017-09-13 00:01:21 +02:00
artica 870a59ba57 Auto-updated build strings. 2017-09-12 00:01:21 +02:00
Arturo Gonzalez 4dec318607 Added function to create visual console with elements in cli 2017-09-11 17:56:42 +02:00
fermin831 787fb00d16 Avoid to overwrite the os_version when is empty 2017-09-11 17:46:56 +02:00
Arturo Gonzalez ac36c701f7 Added a first contact with the new functions 2017-09-11 16:09:13 +02:00
vgilc 49f7168e1b Merge branch '1089-Incluir-borrado-de-entradas-en-tgraph_source-al-pandora_db-dev' into 'develop'
Delete old tgraph_source data

See merge request !806
2017-09-11 09:58:09 +02:00
artica 291871fae0 Auto-updated build strings. 2017-09-11 00:01:20 +02:00
artica e651f64c85 Auto-updated build strings. 2017-09-10 00:01:18 +02:00
artica cc36e2756f Auto-updated build strings. 2017-09-09 00:01:22 +02:00