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