Commit Graph

24154 Commits

Author SHA1 Message Date
alejandro-campos db3709164a Merge branch 'develop' into ent-5214-Bug-rutas 2020-03-12 13:15:19 +01:00
Daniel Rodriguez 2977766cc7 Merge branch 'ent-4515-Filtro-de-alertas-en-vista-de-agente' into 'develop'
Ent 4515 filtro de alertas en vista de agente

See merge request artica/pandorafms!3094
2020-03-12 10:47:59 +01:00
Tatiana Llorente 04f2ebeaf1 Ent 4515 filtro de alertas en vista de agente 2020-03-12 10:47:59 +01:00
Daniel Rodriguez e1ff103826 Merge branch 'ent-5366-monitor-report-not-showing-correct-sla' into 'develop'
Ent 5366 monitor report not showing correct sla

See merge request artica/pandorafms!3095
2020-03-12 10:41:43 +01:00
Luis d9dd1992ff Ent 5366 monitor report not showing correct sla 2020-03-12 10:41:43 +01:00
Alejandro Fraguas 1a8539fe81 Merge branch 'ent-2929-Check-servicios-favoritos' into 'develop'
Added control for favourites filter in TreeService class

See merge request artica/pandorafms!3098
2020-03-12 09:50:54 +01:00
artica 48f014ee7d Auto-updated build strings. 2020-03-12 01:00:17 +01:00
Alejandro Fraguas 14e9d5402c Merge branch 'ent-5540-valores-por-defecto-server-autocreate-y-update-parent' into 'develop'
Modified default parameters

Closes pandora_enterprise#5540

See merge request artica/pandorafms!3089
2020-03-11 17:32:32 +01:00
Daniel Maya a7fdd4cc20 change in metaconsole advanced setup 2020-03-11 16:21:25 +01:00
Jose Gonzalez c5888b1d1a Added control for favourites filter in TreeService class 2020-03-11 15:00:35 +01:00
fbsanchez f0a71e01de minor fixes 2020-03-11 13:35:31 +01:00
ismael.moreno 1cb3fb54d7 Merge remote-tracking branch 'origin/develop' into ent-5375-9442-Plugin-log-praser-no-funciona-multifichero
Conflicts:
	pandora_plugins/Advanced Log Parser/pandora_logparser.pl
2020-03-11 11:54:03 +01:00
Daniel Rodriguez fe5af27f8d Merge branch 'ent-5446-bug-creating-netflow-filter' into 'develop'
Ent 5446 bug creating netflow filter

See merge request artica/pandorafms!3090
2020-03-11 11:32:21 +01:00
Luis 6721e4f5ab Ent 5446 bug creating netflow filter 2020-03-11 11:32:21 +01:00
Daniel Rodriguez 9aea31f5c4 Merge branch 'ent-5420-bug-agent-modules-view' into 'develop'
Added cont for module status alert triggered

See merge request artica/pandorafms!3092
2020-03-11 11:17:06 +01:00
Alejandro Fraguas 1cb6b8fa69 Merge branch 'ent-5492-Respuestas-eventos-no-disponibles-usuarios-con-tags' into 'develop'
Added tags_user for events responses

Closes pandora_enterprise#5492

See merge request artica/pandorafms!3091
2020-03-11 09:59:57 +01:00
artica c8ee27ed2b Auto-updated build strings. 2020-03-11 01:00:17 +01:00
alejandro-campos ef704895b1 truncate long texts 2020-03-10 17:23:19 +01:00
Alejandro Fraguas 52ef358642 Merge branch 'ent-5461-9442-plugin-advanced-log-parser-descripción-incorrecta' into 'develop'
Fixed description

See merge request artica/pandorafms!3059
2020-03-10 16:36:34 +01:00
Daniel Rodriguez 97f3902cf4 Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop'
fix bad parameter in function call

See merge request artica/pandorafms!3068
2020-03-10 12:11:29 +01:00
Jose Gonzalez 6488a88636 Solved issue with WHERE clause 2020-03-10 12:00:25 +01:00
Daniel Rodriguez 326e784e4d Merge branch 'ent-5404-Boton-de-creacion-desplazado-en-consolas-visuales' into 'develop'
Ent 5404 boton de creacion desplazado en consolas visuales

See merge request artica/pandorafms!3086
2020-03-10 10:17:59 +01:00
artica 8b3dafc48f Auto-updated build strings. 2020-03-10 01:00:15 +01:00
Alejandro Fraguas 533ea33f5e Merge branch 'ent-4890-8989-pandora_df_used-filtro-por-regexp' into 'develop'
Added regexp

See merge request artica/pandorafms!2897
2020-03-09 11:27:08 +01:00
artica b7408b5e99 Auto-updated build strings. 2020-03-09 01:00:14 +01:00
artica 1ff7219e06 Auto-updated build strings. 2020-03-08 01:00:13 +01:00
artica d995210494 Auto-updated build strings. 2020-03-07 01:00:14 +01:00
Daniel Rodriguez 05dbe9c922 Merge branch 'ent-5558-9625-no-funciona-proteccion-tormenta-de-traps-snmpv2' into 'develop'
Fix storm protection for SNMPv2 traps.

See merge request artica/pandorafms!3096
2020-03-06 14:19:52 +01:00
Ramon Novoa 9743f1a2d4 Fix storm protection for SNMPv2 traps. 2020-03-06 12:59:31 +01:00
artica bdd6cde6c2 Auto-updated build strings. 2020-03-06 01:00:16 +01:00
artica 4a5af5da40 Auto-updated build strings. 2020-03-05 01:00:08 +01:00
Luis Calvo c2e608f120 Added cont for module status alert triggered 2020-03-04 12:09:54 +01:00
Jose Gonzalez 3501efb0ad Added tags_user for events responses 2020-03-04 10:42:52 +01:00
artica 9d3db50cf4 Auto-updated build strings. 2020-03-04 01:00:07 +01:00
Jose Gonzalez db2fc26c41 Modified default parameters 2020-03-03 12:52:58 +01:00
daniel b77f6d4453 Merge branch 'ent-update-version' into 'develop'
update version

See merge request artica/pandorafms!3088
2020-03-03 10:19:48 +01:00
Daniel Barbero 19b571fc78 update version 2020-03-03 10:17:18 +01:00
artica 3e6cc7b2e7 Auto-updated build strings. 2020-03-03 01:00:09 +01:00
Tatiana Llorente d799ac0739 Added pagination and filter box in alert actions - #5365 2020-03-02 16:17:45 +01:00
Tatiana Llorente c8e492b194 Moved creation button to right side in visual maps - #5404 2020-03-02 11:41:54 +01:00
Tatiana Llorente 13466536bd Show correct counter of deleted alerts - #5509 2020-03-02 11:23:20 +01:00
artica 015b1b55b2 Updated version and build strings. 2020-03-02 11:01:26 +01:00
Alejandro Fraguas 3c542b4d06 Merge branch 'ent-5371-tags-perfil-usuario-monitor-view' into 'develop'
Fixed monitor view groups without tags

See merge request artica/pandorafms!3083
2020-03-02 10:24:07 +01:00
artica 97037d1266 Auto-updated build strings. 2020-03-02 01:00:08 +01:00
artica 501d76b975 Auto-updated build strings. 2020-03-01 01:00:08 +01:00
artica b106981613 Auto-updated build strings. 2020-02-29 01:00:10 +01:00
alejandro-campos 814b68c284 avoid trying to connect to server if server name is empty or zero 2020-02-28 14:54:20 +01:00
Alejandro Fraguas 0a42ad6e17 Merge branch 'ent-4492-Consola-visual-por-paises' into 'develop'
Ent 4492 consola visual por paises

See merge request artica/pandorafms!3016
2020-02-28 14:37:44 +01:00
Tatiana Llorente c820a32b53 Ent 4492 consola visual por paises 2020-02-28 14:37:44 +01:00
Luis Calvo 1196524581 Fixed monitor view groups without tags 2020-02-28 12:33:36 +01:00