37130 Commits

Author SHA1 Message Date
Jorge Rincon
7db3e3bb2b #8365 Added html report for ncm backups 2023-10-30 17:20:58 +01:00
Rafael Ameijeiras
6e3e2534b2 Merge branch 'ent-12349-porblema-con-csv-de-logs' into 'develop'
Ent 12349 porblema con csv de logs

See merge request artica/pandorafms!6608
2023-10-30 16:02:03 +00:00
Daniel Cebrian
d5a6411e02 #12252 added datatable vulnerabilities 2023-10-30 16:26:14 +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
Enrique Martin
f8c56c5c5c Fixed misstype in pandoradb_data.sql 2023-10-30 13:40:11 +01:00
Daniel Rodriguez
4826e9090a Merge branch 'ent-11506-modulo-de-extraccion-de-logs' into 'develop'
Ent-11506-modulo-de-extraccion-de-logs

Closes pandora_enterprise#11506

See merge request artica/pandorafms!6517
2023-10-30 11:32:01 +00:00
Jonathan
307fd7b8cb #8365 remove fk tncm_queue 2023-10-30 10:52:13 +01:00
miguel angel rasteu
899b1359da #12082 Fix conflict 2023-10-30 10:22:35 +01:00
Jorge Rincon
ad81b26556 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-30 10:20:31 +01:00
Jorge Rincon
84b9ac14fb #8365Added viewer report for ncm backups 2023-10-30 10:18:29 +01:00
miguel angel rasteu
0cff0b22d0 Merge branch 'develop' into ent-12219-error-al-eliminar-perfiles-en-edicion-de-usuario 2023-10-30 10:14:05 +01:00
Daniel Cebrian
200f63b516 #11126 added .disco by default 2023-10-30 10:02:11 +01:00
miguel angel rasteu
84bc687d5d #12177 Fix conflict 2023-10-30 09:53:00 +01:00
Rafael Ameijeiras
2fbc72a49a Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop'
Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2

See merge request artica/pandorafms!6603
2023-10-30 08:31:09 +00: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
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
miguel angel rasteu
0f32550f21 #11650 Fix conflict 2023-10-30 08:35:34 +01:00
miguel angel rasteu
98da82aadf #11652 Fix conflict 2023-10-30 08:30:29 +01:00
artica
9cc5937c96 Auto-updated build strings. 2023-10-30 01:00:18 +01:00
artica
d43b7d14fa Auto-updated build strings. 2023-10-29 01:00:20 +02:00
artica
2f07f59a7b Auto-updated build strings. 2023-10-28 01:00:20 +02:00
Jorge Rincon
f78f9d3504 Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-27 14:34:00 +02:00
Jorge Rincon
407a505a3e #8365 Added reports for ncm backups. 2023-10-27 14:32:48 +02:00
Matias Didier
37a25c4873 Merge branch 'ent-12307-automonitorizacion-mysql-reads' into 'develop'
Ent 12307 automonitorizacion mysql reads

See merge request artica/pandorafms!6604
2023-10-27 10:18:25 +00:00
Daniel Maya
c8bab9032d #12349 Fixed csv 2023-10-27 12:09:56 +02:00
Calvo
ecdb2cfd15 Merge remote-tracking branch 'origin/develop' into ent-12307-automonitorizacion-mysql-reads 2023-10-27 11:06:40 +02:00
daniel
fa39a97518 Module histogram only events pandora_enterprise#12209 2023-10-27 10:18:10 +02:00
Daniel Cebrian
654029c8f6 Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into ent-11126-vulnerability-scanner-interface 2023-10-27 08:08:49 +02:00
artica
c97d62ff0e Auto-updated build strings. 2023-10-27 01:00:24 +02:00
Ramon Novoa
eade0aedbe Patch the Discovery Server to support vulnerability scans. 2023-10-26 18:51:01 +02:00
Ramon Novoa
1fbba70eb1 Add configuration options for vulnerability scans. 2023-10-26 18:50:27 +02:00
Daniel Rodriguez
ba3d12eb0e Merge branch 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' into 'develop'
Added enable MADE option to modules and bulk op

See merge request artica/pandorafms!6385
2023-10-26 16:39:16 +00:00
Calvo
936508174f Fix merge errors 2023-10-26 16:24:49 +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
Daniel Cebrian
f30a6425d1 #11126 deleted vulnerabilities from conf agent 2023-10-26 13:16:06 +02:00
Jonathan
90249d4631 #8365 NCM add backup id to ncm queue 2023-10-26 12:49:30 +02:00
Jorge Rincon
f521f3e9bb Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3 2023-10-26 12:37:50 +02:00
Jorge Rincon
f00ac9ea89 #8365 added donut icon in svg 2023-10-26 12:19:42 +02:00
Daniel Cebrian
7d485c7c26 #11126 update pandora_cve 2023-10-26 11:55:19 +02:00
Calvo
82d8af0fb5 Merge remote-tracking branch 'origin/develop' into ent-12307-automonitorizacion-mysql-reads 2023-10-26 11:48:18 +02:00
Calvo
235701edb9 Fix mysql questions reads/writes module undef value 2023-10-26 10:21:49 +02:00
artica
3a00e47c82 Auto-updated build strings. 2023-10-26 01:00:22 +02:00
Daniel Cebrian
23a55a9f66 #11126 fixed styles datatable 2023-10-25 17:48:25 +02:00
Daniel Rodriguez
b841dbcee8 Merge branch 'ent-12328-syslogserver-logserver-y-eventserver-por-defecto-activados' into 'develop'
Ent 12328 syslogserver logserver y eventserver por defecto activados

See merge request artica/pandorafms!6602
2023-10-25 13:59:46 +00:00
Matias Didier
88deb7bd83 Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop'
Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6591
2023-10-25 13:42:53 +00:00
Jonathan
4b8b296722 #9814 dashboard size fix 2023-10-25 15:33:18 +02:00