Commit Graph

23979 Commits

Author SHA1 Message Date
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
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
alejandro-campos b29e0c7966 added ui_get_full_url to paths 2020-02-28 11:38:41 +01:00
vgilc 79fd8b415a Merge branch 'ent-5313-subir-nuevas-mibs-a-la-instalacion-por-defecto' into 'develop'
Added new mibs

See merge request artica/pandorafms!3081
2020-02-28 11:35:35 +01:00
Kike 4cdabc1c91 Added new mibs 2020-02-28 11:32:33 +01:00
Daniel Rodriguez 4645ee6ea9 Merge branch 'ent-5350-Modulos-cron-de-agente-cambian-intervalo' into 'develop'
Changed logic of inverted interval management

See merge request artica/pandorafms!3074
2020-02-28 11:02:13 +01:00
Daniel Rodriguez 5dff4e572e Merge branch 'ent-5349-Modulos-con-cron-no-ejecutan-cuando-deben' into 'develop'
Changed cron functions to allow inverse intervals

See merge request artica/pandorafms!3075
2020-02-28 09:39:14 +01:00
Daniel Rodriguez a6542e32b1 Merge branch 'ent-5273-FIXED-Failed-to-read-configuration-file' into 'develop'
Fixed conflict in tpolicies

See merge request artica/pandorafms!3080
2020-02-28 08:56:39 +01:00
Daniel Maya 30e1021877 Fixed conflict in tpolicies 2020-02-28 08:51:00 +01:00
artica 6e594f5503 Auto-updated build strings. 2020-02-28 01:00:10 +01:00
Daniel Rodriguez 72e09fdebf Merge branch 'ent-5312-SNMP-browser-enchancements' into 'develop'
Ent 5312 snmp browser enchancements

See merge request artica/pandorafms!3049
2020-02-27 16:31:09 +01:00
Luis 82fe47cfd9 Ent 5312 snmp browser enchancements 2020-02-27 16:31:09 +01:00
Alejandro Fraguas 8c77637d19 Merge branch 'ent-5273-9370-5708-failed-to-read-configuration-file' into 'develop'
Ent 5273 9370 5708 failed to read configuration file

See merge request artica/pandorafms!3047
2020-02-27 14:04:02 +01:00
Daniel Rodriguez f6fc951eab Merge branch 'ent-5432-Libreria-de-modulos-de-Pandora-integrada-en-consola' into 'develop'
Ent 5432 libreria de modulos de pandora integrada en consola

See merge request artica/pandorafms!3066
2020-02-27 11:20:24 +01:00
Tatiana Llorente ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Rodriguez fd0db4b6bc Merge branch 'ent-5204-Resolucion-imagenes-fechas-graficas-en-PDF' into 'develop'
Fixed resulution charts

See merge request artica/pandorafms!3077
2020-02-27 10:52:01 +01:00
daniel ac6ca52c45 Fixed resulution charts 2020-02-27 10:52:01 +01:00
artica a9590892bf Auto-updated build strings. 2020-02-27 01:00:09 +01:00
Alejandro Fraguas 5340f37723 Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'
remove entities from reports

See merge request artica/pandorafms!3079
2020-02-26 17:19:01 +01:00
marcos e28415250c remove entities from reports 2020-02-26 15:18:42 +01:00
vgilc ffaeaa5d84 Merge branch 'revert-568b8696' into 'develop'
Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"

See merge request artica/pandorafms!3078
2020-02-26 14:35:19 +01:00
vgilc a0ea52983b Revert "Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'"
This reverts merge request !2519
2020-02-26 14:27:19 +01:00
artica 3b9e100f9f Auto-updated build strings. 2020-02-26 01:00:08 +01:00
Jose Gonzalez b5c5d631c6 Changed cron functions to allow inverse intervals 2020-02-25 17:50:27 +01:00
Jose Gonzalez 816123f6ef Changed logic of inverted interval management 2020-02-25 17:45:07 +01:00
Daniel Rodriguez 93fd7bcf06 Merge branch 'ent-5460-borrado-de-logs-antiguos-pandora_db-elasticsearch' into 'develop'
Fixed deleting logs

See merge request artica/pandorafms!3072
2020-02-25 17:06:04 +01:00