5630 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	e91230b165	Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop' ... Ent 12440 16596 agregar acl operation events events no hace nada See merge request artica/pandorafms!6713	2023-12-04 08:12:48 +00:00
Jonathan	1fb98d34ae	#12296 fix conflict merge develop	2023-12-01 11:59:03 +01:00
Rafael Ameijeiras	aa9aa40ebd	Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop' ... Ent 12213 cambiar update manager por warp update See merge request artica/pandorafms!6546	2023-12-01 10:07:07 +00:00
miguel angel rasteu	b89f182e19	#12213 Resolve conflicts	2023-12-01 10:31:50 +01:00
miguel angel rasteu	5ee6eb7306	#12052 Resolve conflicts	2023-12-01 10:19:39 +01:00
Daniel Rodriguez	39c6420d2c	Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' ... Ent 11763 15982 regex en busqueda de eventos See merge request artica/pandorafms!6512	2023-12-01 08:44:46 +00:00
Jonathan	c41b360a6e	#8365 merge conflict	2023-11-30 12:04:28 +01:00
Jonathan	b99c9240de	#8365 NCM Merge conflict	2023-11-30 08:32:15 +01:00
Jonathan	75d57337af	#11705 Fix merge conflict	2023-11-30 08:10:32 +01:00
Jonathan	e8272c0006	#11763 Fix merge conflict	2023-11-30 07:57:25 +01:00
Rafael Ameijeiras	60d9fffe22	Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' ... Ent 12137 propuesta de refactoring visual de vista ppal de agente See merge request artica/pandorafms!6520	2023-11-29 14:26:53 +00:00
Jonathan	4c25e4cab1	#12440 add operation/events/events check readonly	2023-11-29 11:55:59 +01:00
Jonathan	f86a3e60e8	#11763 save filter regex on bbdd	2023-11-29 11:14:40 +01:00
Daniel Maya	892048554e	#12468 Fixed instructions	2023-11-29 10:27:55 +01:00
daniel	5bd689500c	move extension translate_string and file_repo pandora_enterprise#12333	2023-11-28 11:06:39 +01:00
Jonathan	49a81b34c4	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-28 09:50:48 +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	f6f0f15731	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/godmode/reporting/reporting_builder.item_editor.php pandora_console/include/graphs/fgraph.php pandora_console/include/lib/Dashboard/Widgets/single_graph.php pandora_console/include/styles/pandora.css	2023-11-28 08:29:10 +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
Rafael Ameijeiras	215c665a9c	Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop' ... Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta See merge request artica/pandorafms!6565	2023-11-27 14:51:48 +00:00
Rafael Ameijeiras	4ac9316391	Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop' ... Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas See merge request artica/pandorafms!6475	2023-11-27 14:51:02 +00:00
Rafael Ameijeiras	8e68198ab5	Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop' ... Ent 11679 15855 nombres de modulos no tienen link a su edicion See merge request artica/pandorafms!6422	2023-11-27 14:39:14 +00:00
Rafael Ameijeiras	707f85ed7f	Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop' ... Ent 11511 cambiar el apartado de tools a seccion management See merge request artica/pandorafms!6403	2023-11-27 14:36:38 +00:00
miguel angel rasteu	e967b5820a	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-27 13:06:51 +01:00
miguel angel rasteu	cac31cc482	#12137 Resolve conflicts	2023-11-27 13:05:43 +01:00
Rafael Ameijeiras	074ea7a9c9	Merge branch 'ent-12159-16357-cuadro-de-busqueda-no-muestra-agentes-cuando-se-busca-con-un-guion-bajo' into 'develop' ... Ent 12159 16357 cuadro de busqueda no muestra agentes cuando se busca con un guion bajo See merge request artica/pandorafms!6519	2023-11-27 11:58:59 +00:00
Matias Didier	c7d28b9a77	Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop' ... Fix pagination interfaces pandora_enterprise#12356 See merge request artica/pandorafms!6626	2023-11-27 11:38:19 +00:00
Rafael Ameijeiras	63f5396d30	Merge branch 'ent-12043-cve-2023-41814-vulnerabilidad-xss-mensajes' into 'develop' ... Ent 12043 cve 2023 41814 vulnerabilidad xss mensajes See merge request artica/pandorafms!6492	2023-11-27 11:20:10 +00:00
miguel angel rasteu	b0125d943e	#12138 Resolve conflict	2023-11-27 11:51:00 +01:00
miguel angel rasteu	a4cd6d7fe1	#12138 Resolve conflict	2023-11-27 11:43:24 +01:00
Rafael Ameijeiras	5d94be5e7f	Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop' ... Ent 12134 contador de agentes modulos en las vistas See merge request artica/pandorafms!6566	2023-11-27 10:42:01 +00:00
Rafael Ameijeiras	e5c708298b	Merge branch 'ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged' into 'develop' ... add new type search status events not in process pandora_enterprise#11760 See merge request artica/pandorafms!6491	2023-11-27 10:41:28 +00:00
Diego Muñoz-Reja	59bed70175	Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' ... Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos See merge request artica/pandorafms!6532	2023-11-27 10:32:34 +00:00
miguel angel rasteu	262affeb74	Merge branch 'develop' into ent-12138-eliminar-agent-access-graph	2023-11-27 08:18:35 +01:00
Jorge Rincon	b4e07c8ce7	#12067 Added easter egg, think green	2023-11-23 17:31:11 +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
Daniel Maya	6fc6bead65	#12483 Fixed custom fields view	2023-11-21 16:17:41 +01:00
miguel angel rasteu	99c5da677d	#12137 Fix entities	2023-11-16 08:37:41 +01:00
miguel angel rasteu	8b9d52646c	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-16 08:06:20 +01:00
Daniel Maya	804970719d	#12385 Fixed group	2023-11-15 16:32:02 +01:00
Daniel Maya	6059f4dea0	#12453 Changed string	2023-11-15 13:10:19 +01:00
Jonathan	4fec6a1ccb	#12296 restyling agent detail filters	2023-11-14 17:04:31 +01:00
Daniel Rodriguez	7fdca7aa12	Merge branch 'ent-11125-pandora-security-monitoring-vulnerability-scanner' into 'develop' ... Add support for inventory vulnerability scans. See merge request artica/pandorafms!6487	2023-11-13 08:24:48 +00:00
Rafael Ameijeiras	8c26dbe973	Merge branch 'ent-12423-error-en-vista-de-alertas-de-un-agente-visor' into 'develop' ... Remove filter group for alert pandora_enterprise#12423 See merge request artica/pandorafms!6640	2023-11-10 13:09:28 +00: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
Jonathan	80d85c1149	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-08 15:29:14 +01:00
Jonathan	82759ae12f	#11763 regex events	2023-11-08 15:24:47 +01:00
Matias Didier	ca8d0ed7f8	Merge branch 'ent-12376-problemas-vistos-en-la-nueva-vista-tactica' into 'develop' ... Ent 12376 Problemas vistos en la nueva vista táctica See merge request artica/pandorafms!6628	2023-11-08 13:36:10 +00:00
Jonathan	1d065c2fbb	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-08 14:16:09 +01:00
daniel	9ccb6a98c6	fix alert details pandora_enterprise#12423	2023-11-08 12:49:45 +01:00
daniel	5bc1cb1862	Merge remote-tracking branch 'origin/develop' into ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged	2023-11-08 09:48:46 +01:00
daniel	c81b42cc95	Remove filter group for alert pandora_enterprise#12423	2023-11-07 16:17:13 +01:00
Daniel Cebrian	8f8e5ecf45	#12376 multiple changes in general tactical view	2023-11-07 13:18:44 +01:00
daniel	aaa590b65f	VC Public links pandora_enterprise#12329	2023-11-07 09:20:48 +01:00
Jonathan	545316e9a8	#11763 regex fix html entities	2023-11-07 08:35:49 +01:00
Jonathan	94d5d58636	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-07 08:31:18 +01:00
miguel angel rasteu	de22886cec	#11679 Fix edit module link in search and fix checkbox switch bug in edit module	2023-11-06 08:55:21 +01:00
Calvo	92ee718f91	Optimiized monitors view	2023-11-03 17:48:15 +01:00
daniel	84d450e35e	Fix pagination interfaces pandora_enterprise#12356	2023-11-03 13:10:09 +01:00
miguel angel rasteu	c2b3eb14bf	Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion	2023-11-03 09:43:04 +01:00
miguel angel rasteu	88f1b964e3	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-02 15:22:57 +01:00
miguel angel rasteu	3822ffc0f0	#12137 Fix agent view	2023-11-02 15:22:49 +01:00
miguel angel rasteu	47aeb3cc39	#12137 Fix Description	2023-11-02 13:22:42 +01:00
Daniel Maya	4c368e5da5	#12344 Fixed filter 3	2023-11-02 12:33:30 +01:00
Daniel Maya	ed1ae83770	#12344 Fixed log source	2023-10-30 15:15:53 +01:00
Jorge Rincon	ad81b26556	Merge branch 'ent-8365-ncm-fase-3' of https://brutus.artica.es:8081/artica/pandorafms into ent-8365-ncm-fase-3	2023-10-30 10:20:31 +01:00
Jorge Rincon	84b9ac14fb	#8365Added viewer report for ncm backups	2023-10-30 10:18:29 +01:00
Rafael Ameijeiras	2fbc72a49a	Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' ... Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2 See merge request artica/pandorafms!6603	2023-10-30 08:31:09 +00: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
Jorge Rincon	407a505a3e	#8365 Added reports for ncm backups.	2023-10-27 14:32:48 +02:00
daniel	04a8717aed	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/lib/Dashboard/Widgets/single_graph.php	2023-10-25 15:58:10 +02:00
daniel	868700f9f1	add sliced mode simple graph reports and CV pandora_enterprise#9640	2023-10-25 15:55:54 +02:00
Rafael Ameijeiras	50d3139dc7	Merge branch 'ent-10602-Inventory-widget-2' into 'develop' ... Ent 10602 inventory widget 2 See merge request artica/pandorafms!6589	2023-10-25 11:07:55 +00:00
Jonathan	08140b87a7	#12286 no enable click user not logged public VC	2023-10-25 12:29:55 +02:00
Daniel Cebrian	a862a8018c	#11126 added token in config agent and setup	2023-10-24 18:02:14 +02:00
Daniel Cebrian	f3fe59bfda	#12288 fixed spinner in button link	2023-10-24 14:53:34 +02:00
Daniel Cebrian	638ba75894	#12288 fixed spinner in empty page	2023-10-24 14:18:48 +02:00
Daniel Cebrian	490e39c2d8	Merge branch 'develop' into ent-11126-vulnerability-scanner-interface	2023-10-24 13:43:31 +02:00
daniel	d8dfaf0fe3	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-23 17:02:51 +02:00
Daniel Cebrian	f419f0931d	#12288 fixed filters in netflow explorer	2023-10-23 16:20:32 +02:00
Daniel Cebrian	8d624fe371	Merge branch 'develop' into ent-12288-varios-bugs-en-netflow	2023-10-23 14:59:20 +02:00
alejandro.campos@artica.es	a747b8fa56	fix	2023-10-23 14:09:38 +02:00
Diego Muñoz-Reja	48c314669a	Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop' ... Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización) See merge request artica/pandorafms!6485	2023-10-23 07:24:20 +00:00
Calvo	fdb800c712	Fix upload file function filter by extension. Fix mib uploader only upload .mib file	2023-10-20 13:43:28 +02:00
Daniel Cebrian	7bee2a9784	#12288 fixed translate	2023-10-20 10:15:48 +02:00
Daniel Cebrian	04e001c010	#12288 fixed string translate	2023-10-20 10:10:27 +02:00
daniel	6ad9b27df8	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-20 10:08:20 +02:00
Matias Didier	dcd891eedb	Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' ... Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2 See merge request artica/pandorafms!6578	2023-10-20 05:51:32 +00:00
Daniel Cebrian	7bba90cd4f	#12288 added spinner in netflow and fixed bug filter	2023-10-19 17:18:13 +02:00
Jonathan	98388bb7d2	#12286 fix dashboard vulnerability login admin	2023-10-19 17:06:01 +02:00
Rafael Ameijeiras	796282086c	Merge branch 'ent-11639-15813-neflow-tener-2-fuentes-de-datos-a-monitorizar' into 'develop' ... Ent 11639 [#15813] Neflow: Tener 2 fuentes de datos a monitorizar See merge request artica/pandorafms!6577	2023-10-19 14:23:23 +00:00
Daniel Cebrian	b1b7a1e57d	#10194 fixed acl in view	2023-10-19 16:18:36 +02:00
Daniel Cebrian	8259f4a503	#11639 fixed router_ip in netflow	2023-10-19 10:58:30 +02:00
Jonathan	42aa751d29	#12286 fix issue logout public link visual console	2023-10-19 10:53:20 +02:00
Daniel Cebrian	8aa1e88317	#12191 optimized command netflow and sflow	2023-10-18 19:02:27 +02:00
daniel	4fb7e1719b	add periodicity graph pandora_enterprise#9640	2023-10-18 12:49:47 +02:00
Rafael Ameijeiras	2451eaff62	Merge branch 'ent-12073-consola-sonora-no-funciona-si-la-pestana-se-minimiza' into 'develop' ... Ent 12073 consola sonora no funciona si la pestana se minimiza See merge request artica/pandorafms!6495	2023-10-17 12:25:58 +00:00
miguel angel rasteu	7b443414ca	#12137 Fix graph events height	2023-10-17 09:52:56 +02:00
miguel angel rasteu	1c609374a8	#12134 Count total modules	2023-10-17 09:27:53 +02:00