Commit Graph

1791 Commits

Author SHA1 Message Date
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
daniel 6eefd38f65 move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:49:58 +01:00
daniel 3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +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
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
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 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 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
felix.suarez ef2950ff56 Fix conflict 2023-10-19 14:02:32 -06:00
felix.suarez 4080f92316 Add alter to MR 2023-10-19 14:02:32 -06:00
Jonathan ac0f89b24f #12256 remove id and check duplicate before insert 2023-10-18 09:15:46 +02:00
Jonathan a3ce979b39 Revert "#12256 remove id and check duplicate before insert"
This reverts commit 75b035261f.
2023-10-18 09:13:00 +02:00
Jonathan 75b035261f #12256 remove id and check duplicate before insert 2023-10-17 12:52:40 +02:00
Daniel Cebrian 2a4f8ce646 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-10-16 16:56:29 +02:00
Daniel Cebrian 4c14a5ee16 #11126 added datatable 2023-10-16 16:45:03 +02:00
Matias Didier f0a3b3af63 Merge branch 'ent-11848-meter-modulos-de-seguridad-hardening-y-auditoria-con-el-grupo-de-modulos-security' into 'develop'
Case insensitive option for get module id

See merge request artica/pandorafms!6551
2023-10-16 10:36:23 +00:00
Daniel Cebrian 533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
Daniel Maya dbc4d35a64 #11914 Added alert_correlation in delete_file 2023-10-13 10:27:43 +02:00
Daniel Maya f5535a1fc8 #11914 Added update 2023-10-11 17:10:14 +02:00
Enrique Martin f8a54d16c1 Update VMware migration hash code 2023-10-11 12:49:54 +02:00
Rafael Ameijeiras f8c99c6ada Merge branch 'ent-11213-plugin-sap-para-discovery-2-0' into 'develop'
Added SAP plugin to MR

See merge request artica/pandorafms!6511
2023-10-11 10:15:20 +00:00
Calvo a333e3bbd8 Add grop security MR 2023-10-11 10:46:36 +02:00
alejandro.campos@artica.es 10d94daf30 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-10 11:09:53 +02:00