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

2031 Commits

Author SHA1 Message Date
Jonathan 837f1ff73c Merge branch 'develop' into ent-8365-ncm-fase-3 2023-11-28 13:04:13 +01:00
Enrique Martin 8849e80406 Added demodata PRD files 2023-11-28 12:59:11 +01:00
daniel 5bd689500c move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 11:06:39 +01:00
alejandro bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
daniel 6eefd38f65 move extension translate_string and file_repo pandora_enterprise#12333 2023-11-28 08:49:58 +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 0ca7f0eb36 Merge branch 'develop' into ent-12459-16599-vista-de-monitoring-vmware-view-no-muestra-informacion-del-datacenter-ni-el-data 2023-11-27 14:55:33 +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 082a641742 #12138 Add MR 2023-11-27 08:19:33 +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
vgilc bdd4628d24 Revert "Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-2' into 'develop'" 
This reverts merge request !6674
 2023-11-21 16:00:27 +00:00
Enrique Martin d84937e6c9 Added snippet script to MR and pandoradb_data.sql 2023-11-17 12:24:07 +01:00
Enrique Martin 58aeb59b2c Updated MR 2023-11-17 10:22:52 +01:00
alejandro 42e278bd7c update version and tasks with the new macros 2023-11-16 15:55:07 +01:00
daniel 0f9facb999 fix chart_generator pdf pandora_enterprise#12382 2023-11-16 13:17:25 +01:00
alejandro 1a931c71b4 update vmwre md5 code 2023-11-16 10:10:54 +01:00
alejandro f75baa72e9 update vmwre md5 code 2023-11-16 10:07:28 +01:00
alejandro 4b0e134fba update md5 hash 2023-11-15 15:13:08 +01:00
alejandro 4579fe21d9 update version in mr 2023-11-15 14:24:42 +01:00
Jorge Rincon db91fe3127 #12451 fixed default alert action for Telegram and Vonage. 2023-11-14 15:34:14 +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
Daniel Cebrian 2923de8872 #11126-2 fixed mr 2023-11-13 14:57:11 +01:00
daniel ca66efb4f4 change service modules async to generic pandora_enterprise#11681 2023-11-13 13:20:55 +01:00
Daniel Cebrian c24cc4eea1 Merge branch 'develop' into ent-11126-vulnerability-scanner-interface 2023-11-10 10:45:51 +01:00
Ramon Novoa 8ec1432414 Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner 2023-11-10 09:53:17 +01:00
miguel angel rasteu 4f60c62626 #12132 Fix conflict 2023-11-08 16:31:01 +01:00
Jorge Rincon 98bc73a83a #8365 Fix ncm report for multiple agents 2023-11-08 14:40:47 +01:00
daniel 14fff84876 queries remove field transactional_agent pandora_enterprise#12334 2023-11-08 11:56:32 +01:00
Daniel Cebrian aafdf32793 #11126 refactored 2023-11-08 09:55:33 +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
Enrique Martin 3506ba1b5a Added default NCM templates 2023-11-06 15:06:16 +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 ee231c1ee4 #11126 fixed pipeline 2023-10-31 12:56:23 +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 e6ca7ce476 #11126 added binary 2023-10-31 10:04:39 +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
Jonathan 307fd7b8cb #8365 remove fk tncm_queue 2023-10-30 10:52:13 +01:00
Daniel Cebrian 200f63b516 #11126 added .disco by default 2023-10-30 10:02:11 +01:00
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 75b035261f.
 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
Daniel Maya d096fa263d #11914 Added log_alerts 2023-09-27 11:05:06 +02:00
alejandro.campos@artica.es 19a9f82fe1 gotty changes 2023-09-25 19:08:24 +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 cba3e39f6c Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-19 17:32:06 +02:00
Enrique Martin 7a725d0c16 Merge branch 'develop' into 'ent-11729-plugin-proxmox-discovery-disco' 
Conflicts:
   pandora_console/extras/mr/66.sql
 2023-09-19 08:42:38 +00:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Rafael Ameijeiras ce38970c38 Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop' 
Changed version for VMware discovery plugin

See merge request artica/pandorafms!6439
 2023-09-18 13:19:33 +00:00
alejandro.campos@artica.es f410f09745 change mr 2023-09-14 10:43:35 +02:00
Enrique Martin 64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Enrique Martin 6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +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 76b3e1da4a #10065 Fixed query that adds private_filter_user field in the database 2023-08-21 13:29:58 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
 2023-08-21 08:08:34 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Jorge Rincon baa63eac77 Merge branch develop into ent-11595-tip-de-bienvenida-planned-stops 2023-08-18 09:02:14 +02:00
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
Daniel Cebrian 9327d50306 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-17 08:26:58 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
Jorge Rincon ec738436eb #11881 the lts_name token is set empty 2023-08-14 13:54:09 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
Jorge Rincon 1669859f03 #11881 lts_name token has been cleaned. 2023-08-14 13:18:31 +02:00
Jorge Rincon 3f0f6f8c44 Merge branch develop into ent-11843-advertencia-de-deprecado-de-discovery-y-marcar-las-tarea-antiguas-como-legacy. conflict is resolved 2023-08-14 11:25:11 +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 f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2023-08-11 14:32:54 +02:00
daniel 554570fda0 ITSM pandora_enterprise#11471 2023-08-11 14:31:20 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +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 24b346ddd6 #11326 fixed tentacle_client and changed security module name 2023-08-11 10:14:35 +02:00
Jonathan 8aff02beb9 #11864 remove foreign key id_user tevent_comment 2023-08-11 08:11:35 +02:00
Daniel Cebrian 8a312ed2cf Merge branch 'ent-11326-security-hardening-console' into ent-11807-security-hardening-console-informes 2023-08-10 14:28:22 +02:00
Daniel Cebrian 843dbef258 #11326 added security module in inventary windows 2023-08-10 14:18:01 +02:00
Jorge Rincon 236ad09ad6 #11843 Added MR and pandorabd_data 2023-08-10 14:08:31 +02:00
Daniel Cebrian 8da33cd0ca #11326 codify tsca data 2023-08-10 13:25:55 +02:00
Daniel Cebrian c21b16bd45 #11326 added security module in inventary 2023-08-10 12:26:24 +02: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
Daniel Cebrian 2e983b3ef0 #11326 added tsca table in mr and scheme database 2023-08-09 15:01:14 +02:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan 5964cdecc0 #10598 fix error sql on create web and check web 2023-08-09 11:55:37 +02:00
Daniel Cebrian 2035286f3a #11326 fixed mr session_max_time_expire conclict 2023-08-09 10:15:48 +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
rafael 9d08261a2c 11850 adding files to delete to delete_file.txt 2023-08-08 15:17:13 +02:00
alejandro.campos@artica.es 68525f0a12 preserve previous disabled or quiet condition when downtime is over 2023-08-07 17:03:25 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
alejandro.campos@artica.es 9f76e7cc83 update mr 2023-08-03 09:09:13 +02:00
alejandro.campos@artica.es 27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
Daniel Cebrian 022ccc6ace https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/11807 2023-07-28 13:54:51 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +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 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +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
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +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
Daniel Rodriguez 5a52abab74 Merge branch 'ent-11539-eliminar-wizard-de-metaconsola' into 'develop' 
Ent 11539 Eliminar wizard de metaconsola

See merge request artica/pandorafms!6083
 2023-07-17 07:43:51 +00:00
Alejandro Sánchez c66c0484cb Merge branch 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' into 'develop' 
9735 adding inventory_solaris.pl to plugin path on unix agent and adding...

See merge request artica/pandorafms!5595
 2023-07-11 08:09:47 +00:00
Daniel Cebrian aae86cd7ee Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-10 16:04:04 +02:00
Alejandro Sánchez 73ee9807d0 Merge branch 'develop' into 'ent-9735-integrar-plugin-de-inventario-de-solaris-en-agente-unix' 
# Conflicts:
#   pandora_console/extras/mr/65.sql
 2023-07-10 09:43:28 +00:00
daniel f97cf3a824 change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 13:02:00 +02:00
Jonathan 82cac02da9 Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2 2023-07-06 12:37:16 +02:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Daniel Cebrian 24358b5e95 Merge branch 'develop' into ent-10012-item-grafico-coincidencias-informe-logs 2023-07-06 12:07:49 +02:00
Jonathan d7a682d48c Merge branch 'develop' into ent-11093-reticula-en-consola-visual 2023-07-03 09:50:59 +02:00
alejandro e3e270233e added inventory solarix modules in 65.sql 2023-06-29 16:25:14 +02:00
Daniel Cebrian eac3cf409b #9771 new input for select mode of interval and changes in database 2023-06-27 17:37:41 +02:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02:00
Daniel Cebrian 7e2e81efb4 #11539 added delete files in .txt 2023-06-26 12:56:20 +02:00
Daniel Maya 686cd0be4d #11493 Delete refr 2023-06-21 10:54:07 +02:00
Jonathan 9fd08c928a #11573 network filters 2023-06-19 16:14:21 +02:00
Jorge Rincon 89355f07a4 #11595 The title and the url of the Tip are updated in the English language. 2023-06-16 12:03:44 +02:00
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
Jonathan 0463d3bea3 #11093 grid position recolocation after drag 2023-06-08 13:54:05 +02:00
daniel aa5658ac0f mr and translates pandora_enterprise#11457 2023-06-07 15:23:42 +02:00
Jonathan dd375dc73e #11093 grid background VC 2023-06-07 12:46:39 +02:00
daniel 674c49fc91 mr and translates pandora_enterprise#11457 2023-06-07 08:12:14 +02:00
miguel angel rasteu c1dd5d39c5 #11446 Add column in tlayout_template_data 2023-06-02 13:03:20 +02:00
Jonathan 01ec39bde0 Merge branch 'develop' into ent-11001-15457-tips-solo-en-espanol 2023-05-30 13:19:23 +02:00
Daniel Cebrian e44fee7d3a Merge branch 'ent-10011-nuevo-item-tabla-de-coincidencias-informe-logs' into ent-10012-item-grafico-coincidencias-informe-logs 2023-05-30 12:04:11 +02:00
Alejandro Campos 988db793da Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-24 09:20:14 +00:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
Miguel Angel Rasteu 5470e4d749 Merge branch 'develop' into 'ent-11117-edicion-usuario-entorno-meta-nodo' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
#   pandora_console/godmode/users/user_management.php
 2023-05-19 10:25:31 +00:00
miguel angel rasteu efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +02:00
Alejandro Campos 097dc8ef12 Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' 
# Conflicts:
#   pandora_console/extras/mr/64.sql
 2023-05-17 07:41:02 +00:00
Jonathan 7b414c6b69 #10362 change MR 64 correction ticket #11109 2023-05-17 09:39:35 +02:00
Jonathan e87da5e1e5 #10362 change MR after change Milestone 2023-05-17 08:09:26 +02:00
Jonathan 0ee3692d5b Merge branch 'develop' into ent-10362-15039-fallo-en-groups-items-de-consolas-visuales 2023-05-17 08:06:03 +02:00
Daniel Rodriguez 018f024815 Merge branch 'ent-11109-cambiar-estado-de-seleccion-por-defecto-de-power-supply-en-snmp-wizard' into 'develop' 
Draft: Ent 11109 cambiar estado de seleccion por defecto de power supply en snmp wizard

See merge request artica/pandorafms!5846
 2023-05-16 10:32:20 +00:00
Daniel Cebrian 37f24d3b5f #10011 fixed mr 2023-05-11 14:54:34 +02:00
Daniel Cebrian 24848df3ba #1001 new item report for group elastic log 2023-05-10 17:47:20 +02:00
Jonathan 13f0e3db23 #10362 recursive group visual console 2023-05-09 16:45:44 +02:00
Jorge Rincon b8611573f2 #11109 Default value of the module_enabled field to 1 from the tnetwork_component table 2023-05-08 10:55:13 +02:00
Jonathan 410a5efcd5 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-05-05 11:32:23 +02:00
Jonathan 51630d32ef #10185 filters log select group 2023-05-05 11:28:58 +02:00
Calvo 56a587791c Change correct MR 2023-05-05 09:10:49 +02:00
Calvo 8c73a0176d Alert recuperation only executes one time if in threshold interval 2023-05-04 20:18:36 +02:00
Alejandro Campos 9e1caceb11 Merge branch 'develop' into 'ent-10908-Fallo-en-el-editor-de-tips' 
# Conflicts:
#   pandora_console/extras/mr/63.sql
 2023-05-03 07:11:28 +00:00
Jonathan 305a853281 Merge branch 'develop' into ent-10185-filtros-personalizados-para-el-visor-de-datos-de-logs 2023-04-28 10:18:31 +02:00
Jonathan d0281443a4 #10185 MR 63.sql 2023-04-28 10:07:55 +02:00
Jonathan afa26e45db #10185 change MR 63 to 64.sql 2023-04-28 09:16:29 +02:00
alejandro.campos@artica.es 9f9aed4d77 add target ip field to remote components 2023-04-27 09:40:32 +02:00
Daniel Cebrian 966dc63a92 #9771 changes in summary and new fields for trecon_task 2023-04-26 17:16:34 +02:00
Daniel Cebrian cc2ab53db4 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-04-26 13:02:13 +02:00
Jonathan 442daf0282 #11001 change MR 63 to 64 2023-04-25 14:28:51 +02:00
Jonathan dfffed1912 #11001 fix sql error MR 2023-04-25 10:07:27 +02:00
Jonathan cde914fb69 #11001 welcome tips english version 2023-04-25 09:10:34 +02:00
Jonathan 6a2d5165f8 #10960 remove alter table MR 63.sql 2023-04-24 07:48:32 +02:00
alejandro.campos@artica.es a453ed7cea changes regarding encoding of tables 2023-04-21 15:16:51 +02:00
Jonathan e7186b99ba #10185 log viewer filter save/update/load 2023-04-20 16:21:29 +02:00
Daniel Cebrian 7514195572 #9771 added mr 63 2023-04-18 15:56:50 +02:00
Jonathan f026c76f69 #10960 fix mr63.sql add tsesion_filter 2023-04-18 11:27:07 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-03-28 14:09:33 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Calvo 834be58631 Fix erorrs 2023-03-21 12:28:46 +01:00
Calvo cd2f8021f5 Updated MR netflow server 2023-03-21 12:12:54 +01:00