alejandro.campos@artica.es
|
60137eb300
|
changes in discovery extensions
|
2023-12-05 11:32:19 +01:00 |
Rafael Ameijeiras
|
6a998c79ae
|
Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop'
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente
See merge request artica/pandorafms!6639
|
2023-11-30 09:24:33 +00:00 |
|
Rafael Ameijeiras
|
0957a87dcb
|
Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop'
Ent 11705 15916 campo editable en vista de eventos
See merge request artica/pandorafms!6486
|
2023-11-30 09:18:28 +00:00 |
Jonathan
|
75d57337af
|
#11705 Fix merge conflict
|
2023-11-30 08:10:32 +01:00 |
Daniel Cebrian
|
c0218ad75c
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-29 15:45:07 +01:00 |
Daniel Maya
|
544997d30c
|
Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente
|
2023-11-29 15:44:04 +01:00 |
Jorge Rincon
|
faffada931
|
Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo
|
2023-11-28 15:10:02 +01:00 |
alejandro
|
bb7c618528
|
re merge mr changes
|
2023-11-28 10:59:04 +01:00 |
|
Jonathan
|
9819c3a5ff
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-28 08:30:23 +01:00 |
|
Daniel Cebrian
|
09708255aa
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-27 13:34:33 +01:00 |
|
Daniel Maya
|
d8e1dc4e7c
|
#12095 resolved conflict
|
2023-11-27 12:11:13 +01:00 |
miguel angel rasteu
|
a4cd6d7fe1
|
#12138 Resolve conflict
|
2023-11-27 11:43:24 +01:00 |
|
Jorge Rincon
|
2c0a88f7da
|
Merge branch 'develop' into ent-11691-15801-feature-token-para-ignorar-desconocidos-en-grafica-simple
|
2023-11-27 09:14:04 +01:00 |
|
miguel angel rasteu
|
082a641742
|
#12138 Add MR
|
2023-11-27 08:19:33 +01:00 |
|
Jonathan
|
4f707a5a1b
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-23 09:27:46 +01:00 |
vgilc
|
bdd4628d24
|
Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'"
This reverts merge request !6674
|
2023-11-21 16:00:27 +00:00 |
|
alejandro
|
42e278bd7c
|
update version and tasks with the new macros
|
2023-11-16 15:55:07 +01:00 |
|
alejandro
|
f75baa72e9
|
update vmwre md5 code
|
2023-11-16 10:07:28 +01:00 |
|
Jorge Rincon
|
db91fe3127
|
#12451 fixed default alert action for Telegram and Vonage.
|
2023-11-14 15:34:14 +01:00 |
|
Daniel Cebrian
|
b23e4330a6
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-11-14 10:51:25 +01:00 |
daniel
|
613d1eb9cb
|
fix error sql edit agents to conected metaconsole pandora_enterprise#12449
|
2023-11-14 09:16:47 +01:00 |
|
Daniel Cebrian
|
2923de8872
|
#11126-2 fixed mr
|
2023-11-13 14:57:11 +01:00 |
|
Daniel Cebrian
|
c24cc4eea1
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-11-10 10:45:51 +01:00 |
|
Daniel Cebrian
|
aafdf32793
|
#11126 refactored
|
2023-11-08 09:55:33 +01:00 |
|
Daniel Maya
|
84ee69b435
|
#12095 remove user_comment
|
2023-11-07 15:56:23 +01:00 |
|
Daniel Cebrian
|
ba64bfb882
|
#11126 refactored
|
2023-11-06 15:49:19 +01:00 |
|
Daniel Cebrian
|
ee231c1ee4
|
#11126 fixed pipeline
|
2023-10-31 12:56:23 +01:00 |
|
Daniel Cebrian
|
0699759b60
|
#11126 fixed table cve
|
2023-10-31 11:24:45 +01:00 |
|
Daniel Cebrian
|
5088149d5c
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-31 10:08:58 +01:00 |
|
Daniel Cebrian
|
e6ca7ce476
|
#11126 added binary
|
2023-10-31 10:04:39 +01:00 |
|
Daniel Maya
|
ed1ae83770
|
#12344 Fixed log source
|
2023-10-30 15:15:53 +01:00 |
|
Rafael Ameijeiras
|
c48414ac8a
|
Merge branch 'ent-12278-meter-por-defecto-las-integraciones-de-alertas-en-el-paquete-de-pandora-y-generar-comando-y' into 'develop'
Added messaging alerts to pandoradb_data.sql and 66.sql
See merge request artica/pandorafms!6599
|
2023-10-30 12:45:02 +00:00 |
|
Daniel Cebrian
|
200f63b516
|
#11126 added .disco by default
|
2023-10-30 10:02:11 +01:00 |
Calvo
|
aaea2e59c4
|
Fix MADE minor bugs
|
2023-10-26 16:23:07 +02:00 |
|
Daniel Cebrian
|
48e1782910
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-26 15:18:17 +02:00 |
|
Calvo
|
763f656822
|
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
|
2023-10-26 14:31:22 +02:00 |
|
Daniel Cebrian
|
7d485c7c26
|
#11126 update pandora_cve
|
2023-10-26 11:55:19 +02:00 |
|
Daniel Cebrian
|
a862a8018c
|
#11126 added token in config agent and setup
|
2023-10-24 18:02:14 +02:00 |
Enrique Martin
|
08921ad8db
|
Merge branch 'ent-12174-error-vmware-discovery-2-0' into 'develop'
Update VMware migration hash code
See merge request artica/pandorafms!6554
|
2023-10-24 13:55:07 +00:00 |
|
Enrique Martin
|
0d0ea46f7d
|
Added messaging alerts to pandoradb_data.sql and 66.sql
|
2023-10-24 15:50:37 +02:00 |
|
Calvo
|
715f6abc69
|
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
|
2023-10-24 14:02:36 +02:00 |
|
Daniel Cebrian
|
0baeee66e0
|
Merge branch 'develop' into ent-12288-varios-bugs-en-netflow
|
2023-10-24 13:50:14 +02:00 |
|
Daniel Cebrian
|
490e39c2d8
|
Merge branch 'develop' into ent-11126-vulnerability-scanner-interface
|
2023-10-24 13:43:31 +02:00 |
Daniel Rodriguez
|
3c59c40b4c
|
Merge branch 'ent-10268-pandora_db-refactorizacion-del-sistema-de-compactacion-de-datos' into 'develop'
Changes on compact db
Closes pandora_enterprise#10268
See merge request artica/pandorafms!6343
|
2023-10-24 11:04:33 +00:00 |
|
Daniel Cebrian
|
9babe9df4e
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-10-23 16:35:55 +02:00 |
|
Daniel Cebrian
|
f419f0931d
|
#12288 fixed filters in netflow explorer
|
2023-10-23 16:20:32 +02:00 |
|
Daniel Rodriguez
|
1f8554e8d1
|
Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
Ent 11914 editor de alertas de logs
See merge request artica/pandorafms!6505
|
2023-10-23 12:34:32 +00:00 |
|
Calvo
|
1ef42182a7
|
Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine
|
2023-10-20 10:46:34 +02:00 |
|
Daniel Cebrian
|
4d9679648d
|
Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards
|
2023-10-20 09:59:05 +02:00 |
felix.suarez
|
ef2950ff56
|
Fix conflict
|
2023-10-19 14:02:32 -06:00 |