30866 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	b154abc7fa	Merge branch 'ent-12525-validacion-email-en-registro-consola' into 'develop' ... Ent 12525 Validacion email en registro consola See merge request artica/pandorafms!6922	2024-02-15 08:26:24 +00:00
Rafael Ameijeiras	28c71386e8	Merge branch 'ent-12870-Problemas-de-llenado-de-logs-con-pandora-gotty' into 'develop' ... prevent warnings See merge request artica/pandorafms!6937	2024-02-15 08:25:17 +00:00
Rafael Ameijeiras	6aab32bb42	Merge branch 'ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola' into 'develop' ... not show servers in metaconsole pandora_enterprise#12178 See merge request artica/pandorafms!6793	2024-02-15 08:22:11 +00:00
Jonathan	e6e98aeb39	Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-15 09:08:25 +01:00
artica	e2d3fafda9	Auto-updated build strings.	2024-02-15 01:00:05 +01:00
alejandro.campos@artica.es	02ab6f289b	fixed not registered widget	2024-02-14 18:27:05 +01:00
Jonathan	42975c7967	#12695 wip removing warnings	2024-02-14 17:43:20 +01:00
alejandro.campos@artica.es	5dbf868460	fix entities	2024-02-14 17:37:10 +01:00
Daniel Cebrian	bb93542257	#10419 changed name column in list agent	2024-02-14 17:14:09 +01:00
Daniel Cebrian	30893762a3	#12884 fixed histogram-graph	2024-02-14 16:58:52 +01:00
Matias Didier	8d3a7e6a7f	Merge branch 'ent-12871-16045-16060-Busquedas-eventos-con-2-espacios-no-muestra-resultados' into 'develop' ... search collapsing whitespaces See merge request artica/pandorafms!6936	2024-02-14 14:52:27 +00:00
alejandro.campos@artica.es	f9ffde3253	Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD	2024-02-14 14:21:53 +01:00
alejandro.campos@artica.es	b00bb507b6	fix entities	2024-02-14 14:02:31 +01:00
Enrique Martin	cb63c27d2a	Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' ... Ent 12687 sistema import export prd See merge request artica/pandorafms!6874	2024-02-14 12:11:16 +00:00
Rafael Ameijeiras	c6170ee6f6	Merge branch 'ent-12866-agente-creado-por-tarea-mssql-disco-muestra-main-view-totalmente-vacia-error-500' into 'develop' ... Ent 12866 agente creado por tarea mssql disco muestra main view totalmente vacia error 500 See merge request artica/pandorafms!6925	2024-02-14 12:00:17 +00:00
Matias Didier	5ff738eec4	Merge branch 'ent-12879-problema-con-validacion-acl' into 'develop' ... Ent 12879 Problema con validación ACL See merge request artica/pandorafms!6935	2024-02-14 10:55:28 +00:00
alejandro.campos@artica.es	3bb61d22f9	prevent warnings	2024-02-14 11:25:31 +01:00
alejandro.campos@artica.es	a5759524a1	prevent warnings	2024-02-14 11:22:22 +01:00
Daniel Cebrian	e0b751b57f	#12879 fixed message and button with acl in group list	2024-02-14 11:04:14 +01:00
Enrique Martin	4ab6b29bef	Added references to netwflow filters reports	2024-02-14 10:41:29 +01:00
alejandro.campos@artica.es	e293bd6ca3	changed prd	2024-02-14 10:10:39 +01:00
artica	a1a515c9a6	Auto-updated build strings.	2024-02-14 01:00:04 +01:00
Enrique Martin	73c33c15fd	FIxed demo data PRDs import	2024-02-14 00:48:10 +01:00
Enrique Martin	e80c88214f	Improved base64 check for fields	2024-02-13 21:24:50 +01:00
Enrique Martin	a41eae8b5c	Fixed several items import and export	2024-02-13 20:13:58 +01:00
Enrique Martin	3159c4a50a	Fixed several report items import	2024-02-13 19:45:29 +01:00
alejandro.campos@artica.es	c7de5a1eba	search collapsing whitespaces	2024-02-13 18:28:20 +01:00
Daniel Cebrian	d10133e116	#12864 fixed deprecated	2024-02-13 17:21:02 +01:00
Jonathan	da2bef45f2	#12695 wip removing warnings	2024-02-13 17:06:48 +01:00
Daniel Cebrian	66f8e31824	#12783 enabled correct modules when safe mode module is active in agent	2024-02-13 16:55:46 +01:00
Matias Didier	1eea5095aa	Merge branch 'ent-12862-scroll-indeseado-en-vista-resumen-discovery' into 'develop' ... Ent 12862 scroll indeseado en vista resumen discovery See merge request artica/pandorafms!6933	2024-02-13 15:44:00 +00:00
Daniel Cebrian	d471845178	Merge branch 'ent-12195-15835-Safe-operation-mode-habilita-modulos-deshabilitados-en-los-modulos-al-recuperarse' into ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode	2024-02-13 16:12:59 +01:00
Daniel Cebrian	a432ae4d2d	#12879 fixed problem with validation acl in delete group	2024-02-13 15:58:54 +01:00
Enrique Martin	5d174013e5	Fixed recon task snmp v3 credentials update	2024-02-13 15:44:09 +01:00
Enrique Martin	4b4a94e7fb	Fixed recon task snmp v3 credentials update	2024-02-13 15:40:31 +01:00
Enrique Martin	85315fab60	Fixed JSON values import and export for dashboards and autocreate eval	2024-02-13 15:22:37 +01:00
Enrique Martin	23bd170ff0	Fixed JSON values import and export for dashboards	2024-02-13 15:15:10 +01:00
Enrique Martin	c7d61902fb	Fixed JSON values import and export for dashboards	2024-02-13 15:00:46 +01:00
Daniel Cebrian	c18ecd0f01	#12864 added halfpastfouram in phpchartjs	2024-02-13 13:05:29 +01:00
Daniel Maya	fdb8d68336	#12862 Fixed css table	2024-02-13 12:58:47 +01:00
Enrique Martin	9733ac8717	Set consecutive keys for dashboard items array. Fix JS error when printing imported dashboard	2024-02-13 11:53:35 +01:00
Enrique Martin	57b50e4c85	Fixed skip items creations	2024-02-13 10:43:44 +01:00
Daniel Maya	5a73d708e0	#12872 Fixed gis	2024-02-13 10:37:17 +01:00
Enrique Martin	59020ea572	Fixed skip items creations	2024-02-13 10:36:55 +01:00
Jonathan	7f580cc388	Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-13 09:42:00 +01:00
alejandro.campos@artica.es	8ff87ec93a	Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD	2024-02-13 09:36:36 +01:00
Rafael Ameijeiras	8422aba9d7	Merge branch 'ent-12851-Se-ha-roto-el-token-Enable-log-collection-de-agente-software-linux-desde-la-consola' into 'develop' ... fix toggling log in linux agent See merge request artica/pandorafms!6923	2024-02-13 08:19:48 +00:00
Rafael Ameijeiras	76a4df9a07	Merge branch 'ent-12859-17048-alc-enterprise-no-filtra-correctamente-en-dashboards' into 'develop' ... Ent 12859 17048 alc enterprise no filtra correctamente en dashboards See merge request artica/pandorafms!6926	2024-02-13 08:19:15 +00:00
artica	58aabef5ce	Auto-updated build strings.	2024-02-13 01:00:05 +01:00
Jonathan	0dcced8b53	#12695 wip removing warnings	2024-02-12 17:59:27 +01:00
alejandro.campos@artica.es	731cc195ec	fix safe mode recovery	2024-02-12 17:47:46 +01:00
Daniel Cebrian	e5139436ab	#12877 fixed reload comments	2024-02-12 17:19:50 +01:00
Daniel Maya	a43b2b1c59	#12687 Initialize result	2024-02-12 15:27:56 +01:00
daniel	c6a662a070	fix reload server update to license pandora_enterprise#12178	2024-02-12 14:58:00 +01:00
alejandro.campos@artica.es	405f15f9f0	minor fixes	2024-02-12 13:52:45 +01:00
Daniel Maya	e8bd4b9e6b	#12859 Fixed groups	2024-02-12 13:02:11 +01:00
daniel	d5b780ee99	fix visual errors servers notification pandora_enterprise#12178	2024-02-12 12:42:54 +01:00
Daniel Maya	15382049b8	#12687 Fixed delete file	2024-02-12 10:35:01 +01:00
daniel	45ffdb1cc5	fix visual errors not working servers pandora_enterprise#12178	2024-02-12 10:34:43 +01:00
daniel	639fbcc807	Merge remote-tracking branch 'origin/develop' into ent-12178-metaconsola-los-servidores-de-nodo-no-desaparecen-de-la-vista-al-convertilo-en-metaconsola	2024-02-12 09:51:56 +01:00
daniel	0f6fab06fb	new api 2.0	2024-02-12 09:49:44 +01:00
miguel angel rasteu	301ca0f710	#12866 Fix Other OS name and version in Agent view	2024-02-12 09:42:20 +01:00
Daniel Maya	35713c358b	#12687 Added info message	2024-02-12 09:37:18 +01:00
Enrique Martin	d382ca4066	Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida ... Conflicts: pandora_console/extras/mr/68.sql	2024-02-12 09:29:28 +01:00
daniel	851b046add	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-02-12 08:05:36 +01:00
artica	b4c8e81e86	Auto-updated build strings.	2024-02-12 01:00:03 +01:00
artica	4b850ff733	Auto-updated build strings.	2024-02-11 01:00:04 +01:00
artica	f5ccba67dc	Auto-updated build strings.	2024-02-10 01:00:05 +01:00
alejandro.campos@artica.es	ecfef0da29	several changes	2024-02-09 18:48:32 +01:00
Enrique Martin	2f24344025	Removed temporal comment	2024-02-09 15:16:48 +01:00
Enrique Martin	07ec59290b	Added info messages to import output	2024-02-09 15:11:47 +01:00
Enrique Martin	b2df1b3529	Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd	2024-02-09 13:56:21 +01:00
Enrique Martin	63b2541e61	Fixed get values from references and viceversa	2024-02-09 13:55:53 +01:00
Jonathan	d590961e69	#12695 wip removing warnings	2024-02-09 13:51:56 +01:00
daniel	6a7dd0de9b	new api 2.0	2024-02-09 10:53:32 +01:00
alejandro.campos@artica.es	df8c14864c	improvements	2024-02-09 10:37:04 +01:00
Rafael Ameijeiras	140ed1c304	Merge branch 'ent-12321-widget-mapa-gis' into 'develop' ... Ent 12321 widget mapa gis See merge request artica/pandorafms!6835	2024-02-09 09:23:42 +00:00
Rafael Ameijeiras	4cdea9d8ef	Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop' ... Ent 12460 Cientos de errores en el log de apache See merge request artica/pandorafms!6748	2024-02-09 09:22:48 +00:00
Rafael Ameijeiras	5a1b5b53cc	Merge branch 'ent-12843-error-deshabilitar-agentes-por-masivas-en-meta-16996' into 'develop' ... Ent 12843 error deshabilitar agentes por masivas en meta 16996 See merge request artica/pandorafms!6915	2024-02-09 09:21:44 +00:00
Rafael Ameijeiras	de47bcf7b1	Merge branch 'ent-12617-columna-name-y-botones-en-la-vista-de-servidores' into 'develop' ... Ent 12617 columna name y botones en la vista de servidores See merge request artica/pandorafms!6869	2024-02-09 09:21:22 +00:00
Daniel Maya	5b0f330491	#12687 changes in css 3	2024-02-09 10:08:54 +01:00
daniel	181f3ae7b3	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-02-09 08:19:48 +01:00
artica	a8409c33a6	Auto-updated build strings.	2024-02-09 01:00:04 +01:00
Enrique Martin	a41d420245	Fixed inverse import key	2024-02-08 17:47:28 +01:00
Enrique Martin	ac016c4c9d	Fixed policies export order	2024-02-08 17:36:05 +01:00
Enrique Martin	4e48142205	Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd	2024-02-08 17:33:55 +01:00
Enrique Martin	53964da048	Fixed inverse join key select	2024-02-08 17:33:30 +01:00
Jonathan	6e1fb2f061	#12695 wip removing warnings	2024-02-08 17:17:17 +01:00
Daniel Maya	b68663b966	#12687 changes in sla_service	2024-02-08 17:01:49 +01:00
Enrique Martin	4ffba029c2	Fixed css issue with selctors	2024-02-08 16:21:07 +01:00
Rafael Ameijeiras	06a3fa3f27	Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop' ... Ent 12636 error con los iconos y cabecera de sistemas operativos See merge request artica/pandorafms!6872	2024-02-08 14:50:49 +00:00
Daniel Maya	7a3bf1a13f	#12687 changes in css 2	2024-02-08 15:50:49 +01:00
Daniel Maya	cf3b8e7359	#12687 changes in css	2024-02-08 15:42:00 +01:00
daniel	d7172a5308	new api 2.0	2024-02-08 15:32:58 +01:00
Jonathan	56e26ab3d5	#12695 wip removing warnings	2024-02-08 13:42:02 +01:00
Jonathan	9084a34514	#12695 wip removing warnings	2024-02-08 12:31:55 +01:00
daniel	019f5d9bbb	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-02-08 12:24:18 +01:00
daniel	5ff79dc550	new api 2.0	2024-02-08 12:23:56 +01:00
Enrique Martin	86c33119c8	Updated welcome windows styles	2024-02-08 11:32:45 +01:00
alejandro.campos@artica.es	14ae2c5206	Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD	2024-02-08 11:06:58 +01:00
alejandro.campos@artica.es	bf4786e8fb	fix toggling log in linux agent	2024-02-08 10:22:20 +01:00
Daniel Maya	8524e7ba31	Merge branch 'develop' into ent-12321-widget-mapa-gis	2024-02-08 09:34:32 +01:00
Daniel Maya	9844f95f16	#12350 resolved conflict	2024-02-08 09:19:13 +01:00
Daniel Maya	b9d871cbd9	#12687 Changes in import dialog	2024-02-08 09:07:33 +01:00
artica	5acffa86d3	Auto-updated build strings.	2024-02-08 01:00:04 +01:00
Enrique Martin	9901dea9a0	Fixed services import when agent not found	2024-02-07 21:24:41 +01:00
Enrique Martin	afb6892ef0	Remove only not ref keys in items creation	2024-02-07 19:32:08 +01:00
Enrique Martin	47c6b9c335	Merge branch 'ent-12687-sistema-import-export-prd' of https://brutus.artica.es:8081/artica/pandorafms into ent-12687-sistema-import-export-prd	2024-02-07 18:26:51 +01:00
Enrique Martin	5d000a03d1	Improved import and export. Supported Array and CSV fields.	2024-02-07 18:26:22 +01:00
Daniel Maya	b858527a31	#12687 Changes in export dialog	2024-02-07 16:45:11 +01:00
Jonathan	2246fd8049	#12695 WIP warnings	2024-02-07 16:39:33 +01:00
Daniel Cebrian	cf12d9dfd0	#12525 added control for verify default emails in update manager	2024-02-07 16:29:39 +01:00
Daniel Maya	8675e60c9b	#12687 Changes to the export name	2024-02-07 15:49:20 +01:00
daniel	510e8452cf	new api 2.0	2024-02-07 15:44:53 +01:00
Daniel Cebrian	f2a15061f0	#12783 check if module is use by agent for safe mode before delete	2024-02-07 15:39:23 +01:00
Daniel Maya	5bc20f9768	#12687 Added message prd	2024-02-07 15:01:53 +01:00
Daniel Cebrian	0d235f3b6d	#12460 fixed deprecated	2024-02-07 13:17:39 +01:00
Daniel Maya	af334e21be	#12687 Added import prd 2	2024-02-07 12:13:50 +01:00
Jonathan	834635a487	Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log	2024-02-07 10:39:47 +01:00
Jonathan	499ea9b805	#12633 fix visuals errors	2024-02-07 09:21:42 +01:00
daniel	c0a2a4fdeb	Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0	2024-02-07 08:55:52 +01:00
daniel	8cfb04d243	new api 2.0	2024-02-07 08:53:54 +01:00
Enrique Martin	2421f07291	Included parse error message	2024-02-07 04:16:51 +01:00
Enrique Martin	59e53cc4cc	Fixed PRD export process	2024-02-07 04:13:43 +01:00
Enrique Martin	3ce2c6ae3e	Encoded SQL fields for queries	2024-02-07 03:13:52 +01:00
Enrique Martin	ad0984d312	Removed values safe_output and safe_input	2024-02-07 02:53:31 +01:00
Enrique Martin	f69b1af3bd	Fixed export and import json formats	2024-02-07 02:18:39 +01:00
Enrique Martin	064393ed14	Fixed inverseRecursiveJoin	2024-02-07 01:37:31 +01:00
Enrique Martin	4139910167	Fixed tables crossed references and tables import order	2024-02-07 01:29:43 +01:00
artica	4912a4051f	Auto-updated build strings.	2024-02-07 01:00:50 +01:00
Enrique Martin	e0d1352201	Get result, errors, items. Fix create items function.	2024-02-06 20:28:43 +01:00
Rafael Ameijeiras	f072936f21	Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop' ... Ent 12845 errores visuales en nuevas modales See merge request artica/pandorafms!6913	2024-02-06 16:55:38 +00:00
Daniel Maya	d308aa6822	#12687 Added import	2024-02-06 16:02:37 +01:00
Enrique Martin	bff917bdaf	Remove console.log() entries	2024-02-06 15:30:39 +01:00
Rafael Ameijeiras	e7f74210dc	Merge branch 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola' into 'develop' ... get data in file count from module See merge request artica/pandorafms!6746	2024-02-06 13:49:02 +00:00
Jonathan	644308db4f	#12845 fix style hover	2024-02-06 14:34:34 +01:00
Rafael Ameijeiras	adb67e9ff0	Merge branch 'ent-12847-nombres-de-consolas-visuales-favoritas-muestran-entities' into 'develop' ... Ent 12847 nombres de consolas visuales favoritas muestran entities See merge request artica/pandorafms!6912	2024-02-06 11:14:20 +00:00
Rafael Ameijeiras	00b7781ec6	Merge branch 'ent-12848-vista-credential-store-no-autorefresca' into 'develop' ... Ent 12848 vista credential store no autorefresca See merge request artica/pandorafms!6911	2024-02-06 11:14:01 +00:00
Jonathan	e402f713c7	#12845 fix play image	2024-02-06 11:35:28 +01:00
Jonathan	f869c18b69	#12843 fix node db update massive	2024-02-06 10:57:26 +01:00
Alejandro Campos	64f13f1ae3	Merge branch 'develop' into 'ent-10247-Verificar-como-hace-la-comprobacion-del-spool-la-consola' ... # Conflicts: # pandora_console/include/class/ConsoleSupervisor.php	2024-02-06 09:02:36 +00:00
Rafael Ameijeiras	542d1c2b51	Merge branch 'ent-12751-path-traversal-and-untrusted-upload-file' into 'develop' ... Ent 12751 Path Traversal and Untrusted Upload File See merge request artica/pandorafms!6905	2024-02-06 07:59:50 +00:00
Rafael Ameijeiras	1ae069ce12	Merge branch 'ent-12833-17008-bulk-operations-cuadros-min-critical-y-max-critical-referencian-incorrectamente' into 'develop' ... Ent 12833 [#17008] Bulk Operations: Cuadros Min Critical y Max Critical referencian incorrectamente See merge request artica/pandorafms!6895	2024-02-06 07:59:09 +00:00
Rafael Ameijeiras	39ed351034	Merge branch 'ent-12488-cambiar-funcionamiento-de-reescalado-de-tamano-tips-de-inicio' into 'develop' ... Ent 12488 cambiar funcionamiento de reescalado de tamano tips de inicio See merge request artica/pandorafms!6910	2024-02-06 07:58:05 +00:00
artica	7dc0acf6da	Auto-updated build strings.	2024-02-06 01:00:25 +01:00
Enrique Martin	269a9134bb	Added net scan options to welcome wizard	2024-02-06 00:09:03 +01:00
Enrique Martin	f00e491738	Fix merge issues	2024-02-05 23:30:35 +01:00
Enrique Martin	d1c6c9843b	Added net scan options to welcome wizard	2024-02-05 23:26:55 +01:00
Jonathan	59fd298215	#12845 fix styles events	2024-02-05 17:24:52 +01:00
Jonathan	5f00166b74	#12847 remove entities title and name	2024-02-05 16:52:12 +01:00