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 |
|
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 |
|
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 |
|
alejandro-campos
|
e0a159736c
|
safe output to string with entities
|
2020-02-21 10:50:56 +01:00 |
|
Kevin
|
e6ff0b22ac
|
Added missing information to Solaris policy
|
2020-02-21 10:27:20 +01:00 |
|
artica
|
540fffc6ef
|
Auto-updated build strings.
|
2020-02-21 00:01:14 +01:00 |
|
Daniel Rodriguez
|
433ee4b43b
|
Merge branch 'ent-5408-consola-visual-nueva-bugs' into 'develop'
Module graph paint direct
See merge request artica/pandorafms!3044
|
2020-02-20 17:10:32 +01:00 |
|
marcos
|
bc4c811071
|
update reports with enttites
|
2020-02-20 17:04:18 +01:00 |
|
Daniel Rodriguez
|
5b6279d908
|
Merge branch 'ent-5462-modificar-envio-de-logs-elastic' into 'develop'
Updated sending logs
See merge request artica/pandorafms!3067
|
2020-02-20 16:36:56 +01:00 |
|
Daniel Barbero Martin
|
a55e431b46
|
Fixed error cache build link VC
|
2020-02-20 13:25:56 +01:00 |
|
Daniel Rodriguez
|
6c31f8aec9
|
Merge branch '5055-API-Nuevo-automatismo-para-generacion-graficas' into 'develop'
Deleted stderr for curl testing
See merge request artica/pandorafms!3038
|
2020-02-20 11:39:37 +01:00 |
|
Daniel Maya
|
5e21916049
|
Updated sending logs
|
2020-02-20 11:11:44 +01:00 |
|
Daniel Barbero Martin
|
6ccc606c74
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-20 08:06:59 +01:00 |
|
artica
|
70ee4f4e9b
|
Auto-updated build strings.
|
2020-02-20 00:01:12 +01:00 |
|
Daniel Barbero
|
3288fec039
|
Fixed visual error VC
|
2020-02-19 15:31:30 +01:00 |
|
Daniel Rodriguez
|
ab568bdb52
|
Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop'
fix bug in form action
See merge request artica/pandorafms!3065
|
2020-02-19 11:30:34 +01:00 |
|
Alejandro Fraguas
|
681fcd3c56
|
Merge branch 'ent-4705-encriptado-de-nuevos-tokens' into 'develop'
minnor error
See merge request artica/pandorafms!2972
|
2020-02-19 11:14:39 +01:00 |
|
marcos
|
e265bc2970
|
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
|
2020-02-19 09:31:31 +01:00 |
|
artica
|
a04b92a0bc
|
Auto-updated build strings.
|
2020-02-19 09:12:12 +01:00 |
|
Alejandro Fraguas
|
1acfaa9cdc
|
Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos
See merge request artica/pandorafms!3052
|
2020-02-18 14:03:36 +01:00 |
|
alejandro-campos
|
65b3b1dc36
|
fix bug in form action
|
2020-02-18 13:47:47 +01:00 |
|
Daniel Rodriguez
|
e9bd718eaa
|
Merge branch 'ent-5457-suid-nodos-elastic' into 'develop'
Ent 5457 suid nodos elastic
See merge request artica/pandorafms!3062
|
2020-02-18 13:24:22 +01:00 |
|
Daniel Maya
|
87dc92ffd9
|
Ent 5457 suid nodos elastic
|
2020-02-18 13:24:22 +01:00 |
|
marcos
|
2dffb967cc
|
Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens
|
2020-02-18 12:58:11 +01:00 |
|
Daniel Rodriguez
|
46f282a5e1
|
Merge branch 'ent-5360-revisar-el-comportamiento-de-xml_buffer-y-secondary_mode' into 'develop'
Unify file transfer, secondary mode and XML buffer criteria.
See merge request artica/pandorafms!3034
|
2020-02-18 12:49:06 +01:00 |
|
Ramon Novoa
|
77cc2c6040
|
Fix a typo.
|
2020-02-18 12:03:34 +01:00 |
|
alejandro-campos
|
b9e3c70374
|
fix bug when saving netflow filters
|
2020-02-18 11:25:45 +01:00 |
|
Daniel Barbero Martin
|
1ab92fe798
|
Fixed error event history VC
|
2020-02-18 08:08:56 +01:00 |
|
Daniel Barbero Martin
|
dd437be186
|
Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs
|
2020-02-18 07:55:19 +01:00 |
|
artica
|
92e1492f2b
|
Auto-updated build strings.
|
2020-02-18 00:01:12 +01:00 |
|