tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-28 13:18:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
39,402 Commits 34 Branches 30 Tags
Commit Graph

2031 Commits

Author SHA1 Message Date
Jonathan
63c74e2aa9 #8365 recovery after vscode revert error 2023-10-30 08:55:21 +01:00
Jonathan
c01af3e9b6 Merge branch 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 08:37:37 +01:00
alejandro.campos@artica.es
1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02: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
Jonathan
90249d4631 #8365 NCM add backup id to ncm queue 2023-10-26 12:49:30 +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
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 75b035261ff0f8fcec9e243742d1104732d70609.
 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
miguel angel rasteu
a456912dd7 #12132 Fix welcome tips 2023-10-16 12:17:42 +02: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
Enrique Martin
62b52b901a Fixed SQL migration scripts 2023-10-09 14:37:31 +02:00
alejandro.campos@artica.es
0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
Daniel Maya
030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Calvo
d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
Daniel Cebrian
2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +02:00
Calvo
db291c77f5 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-10-04 16:21:29 +02:00
Alejandro Campos
0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Calvo
7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Enrique Martin
22769342b8 Merge remote-tracking branch 'origin/develop' into ent-11213-plugin-sap-para-discovery-2-0 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/pandoradb_data.sql
 2023-10-02 10:24:31 +02:00
Enrique Martin
c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop' 
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
 2023-10-02 07:54:54 +00:00
alejandro.campos@artica.es
85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
Jonathan
6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
alejandro
fd6757dbde added discovery cloud plugins in MR 2023-09-28 11:08:38 +02:00
Enrique Martin
59024fa846 Added SAP plugin to MR 2023-09-28 09:18:36 +02:00