Commit Graph

23906 Commits

Author SHA1 Message Date
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 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
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
Daniel Maya 0e89fd1413 Fixed deleting logs 2020-02-25 12:10:26 +01:00
Daniel Rodriguez a53966e286 Merge branch 'ent-5513-mover-alertCorrelation-a-la-ubicacion' into 'develop'
Ent 5513 mover alert correlation a la ubicacion

See merge request artica/pandorafms!3070
2020-02-25 11:26:12 +01:00
Daniel Rodriguez 4284c83f18 Merge branch 'fix-alert-action' into 'develop'
Fixed problem of evaluation for last alert execution.

See merge request artica/pandorafms!3061
2020-02-25 11:22:40 +01:00
marcos 0cdd33f69a deleted alert correlations fms 2020-02-25 11:19:45 +01:00
Daniel Rodriguez f61a4403ed Merge branch 'ent-4959-errores-con-chequeos-fallidos-en-discovery-oracle-nokia-telenor' into 'develop'
Control if module is hashref or not

See merge request artica/pandorafms!3069
2020-02-25 10:51:45 +01:00
fbsanchez 7fbd8e73eb Control if module is hashref or not 2020-02-25 09:28:44 +01:00
artica 400809ce61 Auto-updated build strings. 2020-02-25 01:00:10 +01:00
Daniel Rodriguez a519330b42 Merge branch 'ent-5201-correlacion-de-alertas-fase-2' into 'develop'
alert correlation update

See merge request artica/pandorafms!3063
2020-02-24 18:11:09 +01:00
Daniel Rodriguez 43ca1bdc5d Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop'
Fixed when you select 'show all modules' and the module is not from the interface

See merge request artica/pandorafms!3056
2020-02-24 14:30:49 +01:00
Alejandro Fraguas 568b869681 Merge branch 'ent-4239-entities-en-exportacion-de-informes-nodo-meta' into 'develop'
Removed entitites

See merge request artica/pandorafms!2519
2020-02-24 14:15:14 +01:00
Daniel Maya 9f01356b6f conflict resolved 2020-02-24 09:49:25 +01:00
artica 03b97f4fdb Auto-updated build strings. 2020-02-24 01:00:07 +01:00
artica bfab0285e5 Auto-updated build strings. 2020-02-23 01:00:11 +01:00
artica 1667ed4f1c Auto-updated build strings. 2020-02-22 01:00:10 +01:00
marcos dcce09befd fixed error 2020-02-21 14:53:48 +01:00
Daniel Rodriguez b0f0ef3f98 Merge branch 'policies-rework' into 'develop'
Replaced old policies with reworked ones

See merge request artica/pandorafms!3060
2020-02-21 13:51:17 +01:00
Daniel Rodriguez 4e403bca72 Merge branch 'ent-5436-Vulnerabilidad' into 'develop'
fix bug when saving netflow filters

See merge request artica/pandorafms!3064
2020-02-21 13:27:34 +01:00
alejandro-campos 0a1dd6fe24 fix save of filters 2020-02-21 13:01:47 +01:00
marcos f25aacf108 fixed erro2 2020-02-21 10:58:04 +01:00