4968 Commits

Author	SHA1	Message	Date
Daniel Cebrian	2b9f7f9b09	#10267 limit entries in events list	2023-02-01 10:47:36 +01:00
alejandro.campos@artica.es	e4f5a9a61a	Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores	2023-02-01 09:36:42 +01:00
Matias Didier	6d2f4d7eac	Merge branch 'ent-10208-sound-events-antiguo-aun-se-puede-usar-en-nodo' into 'develop' ... remove old format events sounds pandora_enterprise#10208 See merge request artica/pandorafms!5468	2023-02-01 07:18:29 +00:00
Matias Didier	08ca68a663	Merge branch 'ent-10274-Overview-de-alertas-no-muestra-correctamente-las-alertas' into 'develop' ... fixed filter See merge request artica/pandorafms!5480	2023-02-01 07:05:49 +00:00
Jose Gonzalez	0363a90e1f	Resolve merge issues	2023-01-31 17:35:44 +01:00
Diego Muñoz-Reja	ea8b5d68d7	Merge branch 'ent-9270-dos-mejoras-en-el-interface-view' into 'develop' ... Ent 9270 dos mejoras en el interface view See merge request artica/pandorafms!5428	2023-01-31 11:10:19 +00:00
alejandro.campos@artica.es	7d7ee65c7b	fixed filter	2023-01-31 11:51:00 +01:00
Jonathan	45b67b1f7a	#9270 Icon for InOctets and OutOctets graph	2023-01-31 09:32:06 +01:00
Jonathan	bb95dadb4f	Merge branch 'develop' into ent-9270-dos-mejoras-en-el-interface-view	2023-01-31 09:26:27 +01:00
Jonathan	b88f26500b	#9819 Change labels Accoustic console	2023-01-31 08:35:47 +01:00
Jonathan	7923a5919c	Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos	2023-01-31 08:18:17 +01:00
Jonathan	89442c3ef9	#10153 regenerate build:watch	2023-01-30 17:06:24 +01:00
Jonathan	c75a49c6ec	#9270 InOctets and outOctets must be enabbled for graph	2023-01-30 17:01:06 +01:00
Jose Gonzalez	6496c08f28	Polish TreeView	2023-01-30 13:39:27 +01:00
Diego Muñoz-Reja	5a3a86dd02	Merge branch 'ent-7172-11510-anadir-agent-name-a-eventos-rss' into 'develop' ... Ent 7172 11510 anadir agent name a eventos rss See merge request artica/pandorafms!5422	2023-01-30 08:17:39 +00:00
Jonathan	624463d573	#9819 change setcion menu configuration sound	2023-01-30 08:27:03 +01:00
Calvo	7111fd66e2	Fix empty module data list view	2023-01-27 13:43:23 +01:00
Jonathan	34fede2ce1	#9819 New section configuration sound event	2023-01-27 12:42:23 +01:00
daniel	95575b4e90	remove old format events sounds pandora_enterprise#10208	2023-01-27 12:37:25 +01:00
Jose Gonzalez	17c0e78d06	Improve TreeView	2023-01-26 13:25:24 +01:00
Pablo Aragon	64fabf28c5	9987 New inventory view - Pending Meta design	2023-01-26 10:06:27 +01:00
alejandro.campos@artica.es	902a843765	implemented agents view filter management	2023-01-25 17:22:54 +01:00
Pablo Aragon	3ebd958298	9987 New inventory view	2023-01-25 14:29:18 +01:00
Jonathan	a5852f3060	Merge branch 'develop' into ent-10153-el-modo-mantenimiento-en-url-anonima-compartida-no-funciona	2023-01-24 16:44:00 +01:00
Pablo Aragon	0ec58067ab	9220 Cast config['license_nms']	2023-01-24 14:45:42 +01:00
Rafael Ameijeiras	1ed1b19cd0	Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop' ... Fix list all private dashboards on user edition See merge request artica/pandorafms!5320	2023-01-24 11:59:23 +00:00
Calvo	63806556de	Fix user dashboard homescreen permissions	2023-01-24 10:12:37 +01:00
Pablo Aragon	d2c286fc4c	9220 Conflict resolved	2023-01-24 09:50:34 +01:00
Pablo Aragon	a50f50d99e	9987 Commit provisional	2023-01-24 09:33:47 +01:00
Calvo	e1fd9577b6	Added tooltip monitors view	2023-01-20 08:02:58 +01:00
alejandro.campos@artica.es	67b7234e58	implement filter save and load feature in monitor view	2023-01-19 10:49:48 +01:00
Jose Gonzalez	8510629781	Treeview improvement	2023-01-19 00:31:11 +01:00
Jonathan	532a90252c	#9270 upgrades interface view + show interface on agent view	2023-01-18 13:44:40 +01:00
Daniel Maya	04e039c515	resolved conflict	2023-01-18 11:31:26 +01:00
Daniel Maya	0f42a5fa88	#9783 Fixed networkmap 4	2023-01-18 11:29:06 +01:00
Jonathan	1513736c90	#7172 RSS add agent_name	2023-01-17 10:14:22 +01:00
Jonathan	6d465add5c	#7172 RSS add agent_name	2023-01-17 10:10:59 +01:00
Daniel Rodriguez	a165eec2a1	Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop' ... Move inventory to open See merge request artica/pandorafms!5105	2023-01-16 13:43:19 +00:00
Jonathan	27c2aa7c94	10153 Maintenance for visual console public link	2023-01-16 14:18:21 +01:00
Jose Gonzalez	8c852fb3df	Agent improvements	2023-01-16 01:28:53 +01:00
Diego Muñoz-Reja	0435dc09bb	Merge branch 'ent-7386-Ocultar-credenciales-de-acceso-a-la-API' into 'develop' ... Ent 7386 ocultar credenciales de acceso a la api See merge request artica/pandorafms!4991	2023-01-13 12:44:32 +00:00
Daniel Rodriguez	9569e77766	Merge branch 'ent-10052-nodo-ficticio-influye-en-el-estado-del-mapa-de-red' into 'develop' ... Ent 10052 nodo ficticio influye en el estado del mapa de red See merge request artica/pandorafms!5394	2023-01-13 09:48:49 +00:00
Calvo	d8428a46a7	Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API	2023-01-13 10:12:21 +01:00
Calvo	ce224d67ba	Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open	2023-01-13 09:08:17 +01:00
Pablo Aragon	c503836634	Restrict access to collections with nms license	2023-01-12 12:28:40 +01:00
Jose Gonzalez	a9c4dd625c	Merge develop branch	2023-01-11 13:46:15 +01:00
Daniel Maya	0832d9613a	#10052 Fixed fictional color	2023-01-10 16:40:53 +01:00
Jose Gonzalez	33c9b50ddc	Polishing agent detail view	2023-01-10 14:57:40 +01:00
Jose Gonzalez	313240378e	Fix filter view for module table	2023-01-10 12:03:16 +01:00
Jose Gonzalez	60685cdccc	Table fixes	2023-01-10 10:18:37 +01:00
Daniel Cebrian	7b1ce9d517	#10082 changed label in monitoring view	2023-01-09 16:25:49 +01:00
Daniel Maya	b4d54fb729	#10119 Fixed alerts table	2023-01-05 13:31:40 +01:00
Jose Gonzalez	8421fb49ca	Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones	2023-01-04 15:54:16 +01:00
Jose Gonzalez	8728551c08	Agent details modules table upgraded	2023-01-04 15:46:32 +01:00
Jose Gonzalez	5f300a160e	Agent view improvement	2023-01-03 10:13:58 +01:00
Jose Gonzalez	03226b1f23	Polishing agent main view	2023-01-02 16:50:13 +01:00
Calvo	88aed19d30	Api auth bearer token working	2022-12-30 16:11:49 +01:00
Calvo	6d9149e11b	Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API	2022-12-29 17:39:12 +01:00
Calvo	c14842a4f9	WIP:Api auth with bearer token	2022-12-29 17:20:34 +01:00
Calvo	fc7187ed0c	Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open	2022-12-28 18:32:49 +01:00
Rafael Ameijeiras	03cad0b117	Merge branch 'ent-9991-opcion-de-edicion-de-usuario-skin-theme' into 'develop' ... Ent 9991 opcion de edicion de usuario skin theme See merge request artica/pandorafms!5352	2022-12-28 11:30:52 +00:00
Calvo	566344ef0e	Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open	2022-12-28 11:00:44 +01:00
Rafael Ameijeiras	19b74922a8	Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop' ... Ent 9587 busqueda doble en vista de agentes See merge request artica/pandorafms!5360	2022-12-28 09:56:34 +00:00
Rafael Ameijeiras	fa034e4ae2	Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' ... Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas See merge request artica/pandorafms!5359	2022-12-28 09:42:23 +00:00
Jonathan	3caaf3a2a5	#9587 agent view - filter alerts when filter on list of modules	2022-12-28 10:03:31 +01:00
Pablo Aragon	bbdc5b3e93	9664 Exclude pendingdelete modules from scheduled downtime	2022-12-27 15:22:39 +01:00
daniel	69e3203317	Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3	2022-12-27 09:06:20 +01:00
Jose Gonzalez	735cec1441	WIP: Agent status	2022-12-23 10:21:53 +01:00
Rafael Ameijeiras	c25ad3d4ea	Merge branch 'ent-9932-errores-en-consola-del-navegador-de-filtro-del-snmp-browser' into 'develop' ... Fi browser console reporting errors See merge request artica/pandorafms!5330	2022-12-23 07:43:21 +00:00
daniel	5907d55ec1	phpchartjs pandora_enterprise#9554	2022-12-22 23:03:52 +01:00
Calvo	617c044a92	Fix js snmp browser errors	2022-12-22 20:10:02 +01:00
Calvo	2ad8fac652	Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open	2022-12-22 11:35:25 +01:00
Pablo Aragon	b4dfc5993f	9991 Change Skin label to Theme	2022-12-22 11:01:21 +01:00
daniel	47c503bdab	Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3	2022-12-21 12:51:18 +01:00
Daniel Rodriguez	cc2da2d4a4	Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop' ... implement cluster in open project See merge request artica/pandorafms!5204	2022-12-21 09:05:01 +00:00
Jose Gonzalez	ffa4ec756c	Agent Group icons adding	2022-12-20 17:22:35 +01:00
alejandro.campos@artica.es	73e8495f96	removed enterprise limitation	2022-12-20 15:43:05 +01:00
alejandro.campos@artica.es	47cb138d9b	path fix	2022-12-20 14:15:33 +01:00
Rafael Ameijeiras	434fd17277	Merge branch 'ent-9908-Fallo-en-filtro-de-eventos-metaconsola-al-modificar-el-autorrefresco' into 'develop' ... fix bug when loading filters from base64 string See merge request artica/pandorafms!5332	2022-12-20 12:54:56 +00:00
Calvo	f84f9733e3	Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API	2022-12-20 12:15:10 +01:00
Daniel Rodriguez	0f4e3d4056	Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop' ... Ent 9292 13830 vista traps snmp peta con muchos elementos See merge request artica/pandorafms!5255	2022-12-20 10:20:26 +00:00
Daniel Maya	23407892b9	#9292 fixed issues 3	2022-12-20 10:03:45 +01:00
Jose Gonzalez	b0997850f4	Fix server type icon definition	2022-12-19 16:38:47 +01:00
Calvo	63840b1d55	Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open	2022-12-19 11:31:02 +01:00
Daniel Barbero	b4d306b9b1	Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3	2022-12-19 09:38:21 +01:00
Daniel Barbero	1d01b8257d	WIP pandora_enterprise#9554	2022-12-16 14:28:04 +01:00
alejandro.campos@artica.es	8f3f8679d5	Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open	2022-12-16 11:29:00 +01:00
Daniel Barbero	62aea35d7b	fixed js render	2022-12-16 10:38:37 +01:00
alejandro.campos@artica.es	4ca220a3a7	Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe	2022-12-15 15:28:58 +01:00
Alejandro Campos	960d8be258	Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt	2022-12-15 14:05:27 +00:00
jose.gonzalez@pandorafms.com	4fd0115d80	Adapt views	2022-12-15 12:42:35 +01:00
alejandro.campos@artica.es	6a21efc42c	fix bug when loading filters from base64 string	2022-12-14 11:08:24 +01:00
Luis	ad39ca397e	Fi browser console reporting errors	2022-12-13 20:08:04 +01:00
Diego Muñoz-Reja	eb212e3c8a	Merge branch 'ent-9833-no-funciona-busqueda-general-de-usuarios-en-open' into 'develop' ... Ent 9833 no funciona busqueda general de usuarios en open See merge request artica/pandorafms!5277	2022-12-13 16:16:04 +00:00
Alejandro Campos	867e1cc2b3	Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' ... # Conflicts: # pandora_console/extras/mr/60.sql	2022-12-13 11:42:41 +00:00
Daniel Barbero	cbc598eb03	fixed minor error pandora_enterprise#9135	2022-12-13 09:30:56 +01:00
Daniel Barbero	a0ddad63b8	Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos ... Conflicts: pandora_console/extras/mr/59.sql	2022-12-13 09:17:39 +01:00
Daniel Barbero	01d14ae3b8	new chart chartjs pandora_enterprise#9554	2022-12-13 09:10:13 +01:00
Rafael Ameijeiras	8a6e3e5e06	Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop' ... add sound events to metaconsole pandora_enterprise#8854 See merge request artica/pandorafms!5246	2022-12-12 14:02:36 +00:00
Diego Muñoz-Reja	31919d4d2c	Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop' ... Prepare download control See merge request artica/pandorafms!5276	2022-12-12 08:29:51 +00:00
Rafael Ameijeiras	f9bb893aae	Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop' ... implemented custom field See merge request artica/pandorafms!5271	2022-12-12 08:20:08 +00:00
alejandro.campos@artica.es	39920692ef	Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional	2022-12-09 12:49:04 +01:00
jose.gonzalez@pandorafms.com	445a8161cf	Merge	2022-12-05 09:44:35 +01:00
Calvo	718be360d5	Download wait message	2022-12-02 15:40:47 +01:00
Calvo	d525cb594c	WIP: Download wait message	2022-12-02 09:42:24 +01:00
jose.gonzalez@pandorafms.com	dccd950e9e	Changes	2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es	d170771905	fixed filter	2022-11-24 16:18:58 +01:00
jose.gonzalez@pandorafms.com	251fddacd0	From merge	2022-11-23 13:26:54 +01:00
alejandro.campos@artica.es	cdddc07b86	changed mr	2022-11-23 12:22:19 +01:00
Daniel Rodriguez	8e860d153b	Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop' ... Ent 9874 editar usuario propio admin en meta da un error 500 See merge request artica/pandorafms!5286	2022-11-23 11:12:16 +00:00
Daniel Rodriguez	0fb90e3383	Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop' ... Fix events view XSS vulnerabilities See merge request artica/pandorafms!5284	2022-11-23 09:46:52 +00:00
José González	001892ed5a	Fix issue with empty autorefresh list	2022-11-23 09:42:12 +00:00
jose.gonzalez@pandorafms.com	a688182062	Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones	2022-11-22 17:47:02 +01:00
Calvo	5aa51f28de	Fix events view XSS vulnerabilities	2022-11-22 15:54:19 +01:00
alejandro.campos@artica.es	767624b0c3	implemented link type custom field	2022-11-22 11:50:07 +01:00
Daniel Barbero	d1beb5cb2d	fixed filters pandora_enterprise#9864	2022-11-22 11:35:38 +01:00
Daniel Rodriguez	34c3f7a326	Merge branch 'ent-9487-GISS-Conteo-incorrecto-sobre-número-de-agentes-en-búsqueda-general' into 'develop' ... fix count See merge request artica/pandorafms!5194	2022-11-22 09:18:42 +00:00
Jimmy Olano	eaae19ab41	Merge branch 'ent-9683-bug-en-leyenda-de-graficas-snmp' into 'develop' ... fix interfaces charts pandora_enterprise#9683 pandora_enterprise#9683 See merge request artica/pandorafms!5278	2022-11-22 00:32:10 +00:00
jose.gonzalez@pandorafms.com	7dce208df9	Update breadcrumbs for Agents and other minor fixes	2022-11-21 23:45:07 +01:00
sergio	5910002e9d	#9833 Fixed general user search in open	2022-11-21 18:01:53 +01:00
jose.gonzalez@pandorafms.com	8e0e249b81	Fixed views and styles	2022-11-21 14:49:07 +01:00
Daniel Barbero	4118a46b9f	add new filter search events pandora_enterprise#9135	2022-11-18 14:04:54 +01:00
Daniel Barbero	a31733ffef	Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos	2022-11-18 07:51:26 +01:00
jose.gonzalez@pandorafms.com	03157caefe	Redo agent edition-creation view	2022-11-15 16:02:40 +01:00
Daniel Maya	564cd837ae	#9292 code refactoring	2022-11-14 17:43:35 +01:00
alejandro.campos@artica.es	6a173664d4	Removed transactional server	2022-11-11 12:09:03 +01:00
jose.gonzalez@pandorafms.com	f99a7dc511	Adaptations	2022-11-07 14:04:07 +01:00
jose.gonzalez@pandorafms.com	92dd21701f	View changes	2022-11-04 13:00:00 +01:00
edu.corral	341fe37def	ent 7914 status scaling based on time	2022-11-04 12:13:38 +01:00
Daniel Rodriguez	8097001b19	Merge branch 'ent-9233-Historico-de-traps-2' into 'develop' ... show historical traps in snmp console See merge request artica/pandorafms!5235	2022-11-03 14:14:26 +00:00
Daniel Barbero	ccc2e830f4	add sound events to metaconsole pandora_enterprise#8854	2022-11-03 15:12:50 +01:00
Daniel Barbero	33b1c0ab8f	add new filter pandora_enterprise#9135	2022-11-03 12:00:58 +01:00
Jimmy Olano	6a36fd305b	Merge branch 'ent-9731-vista-de-alertas-en-agente-aplica-filtro-de-grupo-por-defecto' into 'develop' ... Ent 9731 vista de alertas en agente aplica filtro de grupo por defecto https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9731 See merge request artica/pandorafms!5238	2022-11-02 14:58:39 +00:00
alejandro.campos@artica.es	d7808f6dc3	re-sort traps if history enabled	2022-11-02 14:27:08 +01:00
alejandro.campos@artica.es	930da6c58f	re-sort traps if history enabled	2022-11-02 14:25:48 +01:00
Jimmy Olano	271551c3e6	Merge branch 'ent-9717-vulnerabilidad-xss' into 'develop' ... Fix XSS vulnerability ref:pandora_enterprise#9717 See merge request artica/pandorafms!5230	2022-11-02 13:04:28 +00:00
Daniel Maya	d44760fd08	#9731 Fixed idAgent	2022-11-02 09:41:07 +01:00
alejandro.campos@artica.es	8ad0bbf892	show historical traps in snmp console	2022-10-31 15:59:24 +01:00
Daniel Rodriguez	41946bfda7	Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop' ... add mode maintenance VC pandora_enterprise#4822 See merge request artica/pandorafms!5191	2022-10-31 10:02:44 +00:00
jose.gonzalez@pandorafms.com	195611a3c1	Adapt views and refactor	2022-10-28 15:01:00 +02:00
Calvo	ccc27883f6	Fix XSS vulnerability	2022-10-28 10:52:52 +02:00
Daniel Barbero	6d19391c72	fix interfaces charts pandora_enterprise#9683	2022-10-27 16:12:17 +02:00
Alejandro Campos	a58bc3bf08	Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' ... # Conflicts: # pandora_console/general/register.php	2022-10-27 09:47:49 +00:00
alejandro.campos@artica.es	8d611a8e7f	implemented float formatting and option in reports to change visualization format	2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com	2cb72f532c	Adapted views	2022-10-26 17:00:54 +02:00
jose.gonzalez@pandorafms.com	5e4bf4863c	Adapted views	2022-10-26 12:02:56 +02:00
Daniel Barbero	3273fc23ed	Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento ... Conflicts: pandora_console/extras/mr/58.sql	2022-10-26 09:42:02 +02:00
jose.gonzalez@pandorafms.com	5aaa415ed9	Several fixes	2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com	13b0c7d0c8	Fixed views	2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com	70d0e38382	Adapt views	2022-10-25 11:46:28 +02:00
Daniel Rodriguez	8aa6ea8bc8	Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop' ... Added exclude words for passwords control See merge request artica/pandorafms!5174	2022-10-25 09:07:08 +00:00
Daniel Rodriguez	b6a38e1b7a	Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop' ... event multiple operations pandora_enterprise#9671 See merge request artica/pandorafms!5203	2022-10-25 09:05:43 +00:00
jose.gonzalez@pandorafms.com	00de0faac3	Adapted views	2022-10-24 19:55:22 +02:00
Diego Muñoz-Reja	aff8fdb005	Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' ... new group by events for extraid pandora_enterprise#9425 See merge request artica/pandorafms!5147	2022-10-24 15:19:21 +00:00
jose.gonzalez@pandorafms.com	4cf92cc995	Adapted views	2022-10-24 13:13:56 +02:00
jose.gonzalez@pandorafms.com	83de025bc9	Several adaptations	2022-10-21 13:47:41 +02:00
Diego Muñoz-Reja	423d4b8763	Merge branch 'ent-9641-mejorar-heatmaps' into 'develop' ... Ent 9641 mejorar heatmaps See merge request artica/pandorafms!5196	2022-10-21 09:29:40 +00:00
José González	984fd10897	Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords' ... # Conflicts: # pandora_console/include/auth/mysql.php	2022-10-21 06:44:47 +00:00
alejandro.campos@artica.es	17d7261173	implement cluster in open project	2022-10-20 13:17:26 +02:00
jose.gonzalez@pandorafms.com	f2ebd96cc8	WIP: Created new way to do the menus	2022-10-20 09:43:02 +02:00
Daniel Barbero	6ef3505eab	event multiple operations pandora_enterprise#9671	2022-10-19 16:20:49 +02:00
Diego Muñoz-Reja	c8e8ea61f3	Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop' ... filter recursive groups in events pandora_enterprise#2133 See merge request artica/pandorafms!5155	2022-10-19 11:46:38 +00:00
Jimmy Olano	aaedb39849	Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' ... Fix planned downtime issues Ref: pandora_enterprise#9392 See merge request artica/pandorafms!5166	2022-10-19 11:00:04 +00:00
Daniel Barbero	1acb67ecad	fixed multi selector pandora_enterprise#8620	2022-10-18 13:40:09 +02:00
Daniel Barbero	47a2e01a33	Merge remote-tracking branch 'origin/develop' into ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya ... Conflicts: pandora_console/extras/mr/58.sql	2022-10-18 07:59:26 +02:00
Diego Muñoz-Reja	4c74f1bee7	Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop' ... fixed response events pandora_enterprise#9423 See merge request artica/pandorafms!5141	2022-10-17 10:49:01 +00:00
Daniel Maya	357f9cc817	#9641 heatmap changes 3	2022-10-17 10:44:35 +02:00
Daniel Barbero	004f5c4763	Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento ... Conflicts: pandora_console/include/visual-console-client/vc.main.min.js pandora_console/include/visual-console-client/vc.main.min.js.map	2022-10-14 11:03:11 +02:00
Jimmy Olano	9c413b355d	Merge branch 'ent-9579-derivado-del-trabajo-q-a-765-desactivar-opcion-activate-events-history-en-metaconsola' into 'develop' ... remove tmetaconsole_history token pandora_enterprise#9579 pandora_enterprise#9579 See merge request artica/pandorafms!5161	2022-10-14 08:33:26 +00:00
Daniel Barbero	ace6bcc854	Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento	2022-10-14 09:36:02 +02:00
Daniel Barbero	4dd311063e	fixed errors view events sort and save filters pandora_enterprise#9425	2022-10-14 09:31:45 +02:00
Daniel Barbero	a21048c4c5	Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra	2022-10-14 08:11:51 +02:00
Daniel Barbero	19cfc84a39	add mode maintenance VC pandora_enterprise#4822	2022-10-13 17:45:44 +02:00
Jimmy Olano	1a28c91992	Merge branch 'ent-9519-un-widget-tipo-agent-module-view-en-un-dashboard-falla-al-agregar-mas-modulos-del-mismo-agente' into 'develop' ... fixed agent/module widget pandora_enterprise#9519 pandora_enterprise#9519 See merge request artica/pandorafms!5118	2022-10-13 15:26:14 +00:00
Daniel Barbero	3099ffa7cb	add mode maintenance VC pandora_enterprise#4822	2022-10-13 13:44:39 +02:00
alejandro.campos@artica.es	657e7fe7d5	fix count	2022-10-13 12:27:31 +02:00
Daniel Barbero	9c93a99fb2	add mode maintenance VC pandora_enterprise#4822	2022-10-13 11:03:49 +02:00
Diego Muñoz-Reja	6d076adb9f	Merge branch 'ent-8597-13156-anadir-opciones-en-busqueda-de-eventos' into 'develop' ... filter events multiselector nodes pandora_enterprise#8597 See merge request artica/pandorafms!5152	2022-10-11 15:15:07 +00:00
Jimmy Olano	c14074d4ae	Merge branch 'ent-9578-14208-evento-no-validado-ack-sale-como-1970' into 'develop' ... ack_utimestamp integer pandora_enterprise#9578 pandora_enterprise#9578 See merge request artica/pandorafms!5165	2022-10-11 12:03:29 +00:00
Jimmy Olano	132c720901	Merge branch 'ent-9297-derivado-del-trabajo-q-a-764-falso-positivo-de-violacion-de-acl-png' into 'develop' ... Ent 9297 derivado del trabajo q a 764 falso positivo de violacion de acl png ref: pandora_enterprise#9297 See merge request artica/pandorafms!5142	2022-10-11 10:25:58 +00:00
Daniel Barbero	58221a7c12	fixed minor error array servers pandora_enterprise#8597	2022-10-10 17:08:20 +02:00
Daniel Barbero	d90005d0f5	Merge remote-tracking branch 'origin/develop' into ent-8597-13156-anadir-opciones-en-busqueda-de-eventos	2022-10-10 16:37:45 +02:00
Daniel Barbero	38dea9e01b	Merge remote-tracking branch 'origin/develop' into ent-9425-agrupar-eventos-por-id_extra	2022-10-10 11:27:28 +02:00
José González	381dea9b54	Added excluded password utility	2022-10-04 16:54:34 +02:00
Daniel Maya	a674bdceb0	#9595 Fixed order	2022-10-03 10:16:00 +02:00
Calvo	b29f7eb160	Fix planned downtime issues	2022-09-30 14:54:16 +02:00
Daniel Barbero	ead788cfd5	ack_utimestamp integer pandora_enterprise#9578	2022-09-30 12:30:01 +02:00
Daniel Barbero	4609e141ee	remove tmetaconsole_history token pandora_enterprise#9579	2022-09-30 08:56:19 +02:00
Daniel Rodriguez	637fae3e8d	Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop' ... Ent 8898 anida mapas de red no actualizan bien See merge request artica/pandorafms!5143	2022-09-29 12:36:37 +00:00
Daniel Rodriguez	c784e03883	Merge branch 'ent-9119-Metaconsola-Error-paginacion-vista-monitores' into 'develop' ... Ready See merge request artica/pandorafms!5084	2022-09-29 11:25:40 +00:00
Daniel Barbero	8438045cf6	filter recursive groups in events pandora_enterprise#2133	2022-09-29 12:54:46 +02:00
Daniel Barbero	3dea1f3146	filter events multiselector nodes pandora_enterprise#8597	2022-09-29 09:17:37 +02:00
José González	a4be805ba4	Fix	2022-09-29 00:24:31 +02:00
José González	f8efbc5fce	Fixed issue with module name	2022-09-28 16:29:18 +02:00
Daniel Barbero	755432b381	Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo	2022-09-28 08:52:43 +02:00
Jimmy Olano	09e934395f	Merge branch 'ent-9456-giss-errores-en-la-paginacion-vista-alertas-metaconsola' into 'develop' ... Fix alerts list pagination on meta Ref: pandora_enterprise#9456 See merge request artica/pandorafms!5095	2022-09-27 14:10:47 +00:00
Daniel Barbero	9e2c6edfeb	new group by events for extraid pandora_enterprise#9425	2022-09-27 15:08:09 +02:00
Daniel Rodriguez	5047f8afb9	Merge branch 'ent-8659-mostrar-nombre-completo-del-usuario-para-el-owner-de-un-evento' into 'develop' ... Ent 8659 mostrar nombre completo del usuario para el owner de un evento See merge request artica/pandorafms!5114	2022-09-27 10:50:17 +00:00
José González	1ae6267acc	Fix issue with agent_alias	2022-09-27 11:14:18 +02:00
Daniel Barbero	7bedb8ecf7	Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo	2022-09-27 09:52:24 +02:00
Daniel Barbero	fbce8b7533	fixed response events pandora_enterprise#9423	2022-09-27 09:51:37 +02:00
Calvo	8174925a91	Delete favourite vc from menu when vc is deleted	2022-09-26 11:32:07 +02:00
Calvo	2a4176085f	Fix alerts meta datatables	2022-09-26 09:22:19 +02:00
José González	09c6c5a0f9	Fix	2022-09-23 12:54:51 +02:00
alejandro.campos@artica.es	76f7761373	fixes in double auth	2022-09-22 08:59:39 +02:00
Daniel Barbero	229436b972	fixed agent/module widget pandora_enterprise#9519	2022-09-19 14:40:31 +02:00
Calvo	bc5f1d0dce	Fix meta alert datatable order	2022-09-19 14:02:50 +02:00
edu.corral	af7ad37b50	ent 8659 fullname event owner	2022-09-16 11:04:01 +02:00
Calvo	56c5f324b0	Fix alerts metaconsole datatable order	2022-09-15 18:01:16 +02:00
Calvo	da0dad0148	WIP:Move inventory to open	2022-09-14 18:12:39 +02:00
José González	68654804b4	Fixed minor issue	2022-09-14 17:18:39 +02:00
José González	9164f1e681	IP Allow control	2022-09-12 12:41:09 +02:00
José González	0daeb906f1	WIP	2022-09-06 14:58:38 +02:00
Daniel Maya	d3612439fb	#8898 conflict resolved	2022-08-29 14:06:15 +02:00
Daniel Maya	53cbb4d3da	#9107 conflict resolved	2022-08-29 10:13:39 +02:00
Daniel Maya	16554cfc7a	#8898 networkmap	2022-08-29 09:39:47 +02:00
Daniel Maya	b4a061a190	#9442 Fixed enterprise acl	2022-08-23 13:22:10 +02:00
Daniel Maya	182bb2d2c4	8898 Refresh time	2022-08-23 11:17:48 +02:00
Daniel Maya	b58b0d6c51	#9348 fixed update relations	2022-08-17 12:52:02 +02:00
Daniel Barbero	9b3d7ba763	fixed 500 php7.2 pandora_enterprise#9387	2022-08-11 14:05:01 +02:00
Daniel Barbero	de922dd0b2	fixed 500 php7.2 pandora_enterprise#9387	2022-08-11 13:52:34 +02:00
Daniel Maya	08da6de1da	#8898 Added options icon	2022-08-11 09:36:08 +02:00
Daniel Barbero	2a51a448ac	Merge remote-tracking branch 'origin/develop' into ent-6367-report-server-gestion-de-informes-extensos-varios-cientos-de-agentes-val ... Conflicts: pandora_console/godmode/menu.php	2022-08-02 10:34:21 +02:00
Daniel Barbero Martin	bbf9174903	fix error custom data events list pandora_enterprise#9304	2022-07-22 10:11:14 +02:00
Jimmy Olano	33f6ae1875	Merge branch 'ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola' into 'develop' ... Alerts list datatable Ref: pandora_enterprise#8797 See merge request artica/pandorafms!5018	2022-07-22 02:39:35 +00:00
Daniel Rodriguez	5d674b76b6	Merge branch 'ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos' into 'develop' ... new filter search eventspandora_enterprise#8942 See merge request artica/pandorafms!5007	2022-07-21 10:15:49 +00:00
Daniel Barbero Martin	027f61daff	Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos ... Conflicts: pandora_console/extras/mr/56.sql	2022-07-19 10:18:04 +02:00
Calvo	642c60428c	Merge remote-tracking branch 'origin/develop' into ent-8797-giss-13405-acciones-vista-de-alertas-metaconsola	2022-07-19 09:40:56 +02:00
Daniel Barbero Martin	84fbf0e3dd	double refresh page events pandora_enterprise#9279	2022-07-18 16:44:31 +02:00
Calvo	34333f9f88	Alerts list datatable	2022-07-15 12:15:37 +02:00
Daniel Maya	987678b339	#9107 Fixed filter event	2022-07-15 11:38:46 +02:00
Diego Muñoz-Reja	74d19b3dbd	Merge branch 'ent-9029-Mejora-estética-en-header-vista-agente' into 'develop' ... Ent 9029 mejora estética en header vista agente See merge request artica/pandorafms!5003	2022-07-13 12:54:54 +00:00
Daniel Maya	9d259a4097	#9029 Added starmap 3	2022-07-12 16:18:17 +02:00
Daniel Barbero Martin	01ba149280	new console report pandora_enterprise#6367	2022-07-08 13:40:20 +02:00
Diego Muñoz-Reja	c756f804a7	Merge branch 'ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos' into 'develop' ... modal sound events pandora_enterprise#9095 See merge request artica/pandorafms!4998	2022-07-06 14:57:44 +00:00
Daniel Maya	a71c26b4a7	#9029 Added starmap	2022-07-05 17:44:52 +02:00
Diego Muñoz-Reja	a257f43d49	Merge branch 'ent-8939-Cambiar-comportamiento-de-los-comentarios-en-eventos-rendimiento' into 'develop' ... Ent 8939 cambiar comportamiento de los comentarios en eventos rendimiento See merge request artica/pandorafms!4889	2022-07-05 15:44:24 +00:00
Diego Muñoz-Reja	3ebcf710ee	Merge branch 'ent-9245-13886-auth-token-en-respuesta-de-vista-de-eventos' into 'develop' ... fix error events pandora_enterprise#9245 See merge request artica/pandorafms!5002	2022-07-05 15:14:18 +00:00
Daniel Barbero Martin	12f73d86fd	new filter search eventspandora_enterprise#8942	2022-07-05 17:02:40 +02:00
Daniel Barbero Martin	033027f360	modal sound events pandora_enterprise#9095	2022-07-04 17:09:30 +02:00
Diego Muñoz-Reja	08a9761046	Merge branch 'ent-9239-bug-eventos-nodo' into 'develop' ... bugs events pandora_enterprise#9239 See merge request artica/pandorafms!4995	2022-07-04 11:04:04 +00:00
Daniel Barbero Martin	15363b1ac5	Merge remote-tracking branch 'origin/develop' into ent-9095-cambios-visuales-en-la-interfaz-consola-sonora-de-eventos	2022-07-04 09:12:10 +02:00
Daniel Barbero Martin	de926b5677	fix error events pandora_enterprise#9245	2022-07-01 13:54:33 +02:00
Daniel Barbero Martin	2dc16a2a19	modal sound events pandora_enterprise#9095	2022-07-01 13:08:39 +02:00
Jimmy Olano	c074cd81bf	Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' ... Ent 8302 añadir opción de mostrar solo grupos con datos en group view https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302 See merge request artica/pandorafms!4949	2022-07-01 10:47:27 +00:00
Daniel Barbero Martin	e28bfe9f3f	modal sound events pandora_enterprise#9095	2022-06-30 17:17:05 +02:00
Diego Muñoz-Reja	ef48206e7f	Merge branch 'ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica' into 'develop' ... Ent 8763 g sanchez anadir filtro de grupos al widget de vista tactica See merge request artica/pandorafms!4937	2022-06-30 12:54:40 +00:00
Daniel Barbero Martin	e009257d2f	bugs events pandora_enterprise#9239	2022-06-30 11:56:25 +02:00
Jimmy Olano	f07ed9e4e9	Merge branch 'ent-9125-Bug-a-la-hora-de-crear-gráficas-personalizadas-desde-el-agente' into 'develop' ... Ent 9125 bug a la hora de crear gráficas personalizadas desde el agente https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9125 See merge request artica/pandorafms!4946	2022-06-29 22:25:00 +00:00
Daniel Maya	547962c83a	Merge branch 'develop' into ent-8763-g-sanchez-anadir-filtro-de-grupos-al-widget-de-vista-tactica	2022-06-29 17:27:25 +02:00