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

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
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
Jorge Rincon fece93d38b #11691 Added the Show unknowns in graph token in the item editor view when creating the report item. 2023-09-20 08:49:56 +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 Cebrian d8e0df1912 #10983 new function for get date parameter and added parent date in dashboard 2023-09-06 08:52:46 +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
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian f871f4e4d0 Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 08:19:03 +02:00
Jorge Rincon 74f2fa7a74 #10065 added private_filter_user field for new installations. 2023-08-09 15:35:03 +02:00
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
Jonathan 5964cdecc0 #10598 fix error sql on create web and check web 2023-08-09 11:55:37 +02:00
Daniel Cebrian 0a23448259 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-09 09:29:19 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/65.sql
 2023-08-09 08:59:01 +02:00
Matias Didier 16513cf52d Merge branch 'ent-10071-14719-Comprobacion-estado-previo-del-agente-ante-paradas-planificadas' into 'develop' 
Ent 10071 14719 comprobacion estado previo del agente ante paradas planificadas

See merge request artica/pandorafms!6319
 2023-08-08 10:29:36 +00:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
Matias Didier e4aea936e0 Merge branch 'ent-10231-limpieza-de-codigo-del-server-transaccional' into 'develop' 
Ent-10231 limpieza-de-codigo-del-server-transaccional

See merge request artica/pandorafms!6073
 2023-08-07 08:18:07 +00:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian c92899573f #11326 new field in treport_content for reports 2023-07-28 12:12:29 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop' 
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
 2023-07-27 10:27:55 +00:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
alejandro.campos@artica.es c8393ae210 fixed snmp traps time 2023-07-18 10:40:33 +02:00
Daniel Cebrian 092e1dfd62 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:46:19 +02:00
Diego Muñoz-Reja 92623a5837 Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' 
Ent 11573 mejora de los informes en vivo de netflow 2

See merge request artica/pandorafms!6142
 2023-07-18 07:30:00 +00:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00