tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,451 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1111 Commits

Author SHA1 Message Date
daniel 613d1eb9cb fix error sql edit agents to conected metaconsole pandora_enterprise#12449 2023-11-14 09:16:47 +01:00
Daniel Cebrian ba64bfb882 #11126 refactored 2023-11-06 15:49:19 +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 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 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
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
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
Daniel Maya d4e2fb4fea resolved conflict 2023-09-21 18:04:15 +02:00
alejandro.campos@artica.es ae74caf7b1 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:52:56 +02:00
felix.suarez 976a32617f Add logic to complex alerts 2023-09-20 08:18:39 -05:00
Félix Suárez 2de84982cf Updates to save new Complex templates 2023-09-20 08:16:22 -05:00
Daniel Maya 05320f7ad4 #11990 Fixed enable_horizontal_tree 2023-09-20 12:42:01 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es 318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
alejandro.campos@artica.es f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
Daniel Cebrian a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
Alejandro Campos fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-04 11:50:03 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
 2023-09-04 08:16:48 +02:00
Calvo 788b6f9c26 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-01 13:30:28 +02:00
Calvo 2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Alejandro Campos ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-08-22 08:43:10 +00:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Daniel Cebrian 4c3432cf40 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-11 11:09:49 +02:00