1190 Commits

Author SHA1 Message Date
Jonathan
f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +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
3f3e8e42bc move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:13:00 +01:00
Jonathan
def169abb8 Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 07:58:50 +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
262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +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
Jonathan
a277e56672 #8365 NCM v3 rename snipet to snippet 2023-11-22 16:47:13 +01:00
Jonathan
0a9e127576 #8365 NCM v3 snipets 2023-11-22 16:12:37 +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
Jorge Rincon
98bc73a83a #8365 Fix ncm report for multiple agents 2023-11-08 14:40:47 +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
Jonathan
98332d728e #8365 change name ncm agent data 2023-10-31 16:55:35 +01:00
Jonathan
b327c824da #8365 NCM new special templates 2023-10-31 13:45:26 +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
Jonathan
307fd7b8cb #8365 remove fk tncm_queue 2023-10-30 10:52:13 +01:00
Jonathan
63c74e2aa9 #8365 recovery after vscode revert error 2023-10-30 08:55:21 +01:00
Jonathan
e062db2439 #8365 NCM add backup id to ncm queue 2023-10-30 08:39:20 +01:00
alejandro.campos@artica.es
1fd45fb95f implement demo data feature 2023-10-26 19:05: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
a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +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
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
Félix Suárez
66b614d631 Changes on compact db 2023-10-19 14:02:32 -06:00
Daniel Cebrian
4c14a5ee16 #11126 added datatable 2023-10-16 16:45:03 +02:00
Daniel Cebrian
533201197a #11126 new view vulnerabilities scanner 2023-10-13 12:25:25 +02:00
Daniel Maya
030ffc55f9 resolved conflict 2023-10-06 09:15:38 +02:00
Daniel Cebrian
2228011812 #11126 new view vulnerability scanner 2023-10-04 17:37:42 +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
miguel angel rasteu
3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
Jonathan
6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Daniel Maya
d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
daniel
91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Luis
086835765d Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-25 14:08:43 +00:00
Jonathan
e5c5f91576 #11705 change name event_custom_id 2023-09-25 10:32:23 +02:00
Jonathan
79fe89c3c5 #11705 new custom_field tevento 2023-09-22 12:24:15 +02:00
Daniel Maya
d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00