2322 Commits

Author	SHA1	Message	Date
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
José González	1ae6267acc	Fix issue with agent_alias	2022-09-27 11:14:18 +02:00
Daniel Barbero	fbce8b7533	fixed response events pandora_enterprise#9423	2022-09-27 09:51:37 +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
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
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	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	16554cfc7a	#8898 networkmap	2022-08-29 09:39:47 +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
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
Calvo	34333f9f88	Alerts list datatable	2022-07-15 12:15:37 +02:00
Daniel Maya	9d259a4097	#9029 Added starmap 3	2022-07-12 16:18:17 +02:00
Daniel Maya	a71c26b4a7	#9029 Added starmap	2022-07-05 17:44:52 +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
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
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
Daniel Barbero Martin	58f5f4e9f1	refactor events meta pandora_enterprise#9086	2022-06-23 12:47:49 +02:00
Calvo	5ce0ebb72a	Fix agent view satellite name visual	2022-06-17 10:09:37 +02:00
Ramon Novoa	48b20b255b	Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente	2022-06-09 12:05:24 +02:00
Daniel Maya	3e15ed2726	#8302 Added show_empty_groups	2022-06-08 15:17:03 +02:00
Calvo	5297123d17	Console changes for 8950	2022-06-08 13:10:01 +02:00
Daniel Rodriguez	a40efcfee5	Merge branch 'ent-9037-controles-pegados-en-agente-detail-view' into 'develop' ... Ent 9037 controles pegados en agente detail view See merge request artica/pandorafms!4936	2022-06-08 09:11:54 +00:00
Daniel Rodriguez	a2c1b38a3f	Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop' ... fixed permissions in selectors See merge request artica/pandorafms!4931	2022-06-08 09:10:51 +00:00
Daniel Maya	6a8140b36c	#9125 Fixed chart type	2022-06-08 10:59:46 +02:00
Daniel Rodriguez	fc18c1a168	Merge branch 'ent-9035-Si-no-hay-inventario,-no-deberia-mostrar-la-solapa-de-inventario' into 'develop' ... Hide inventory view if agent dont have inventory modules See merge request artica/pandorafms!4916	2022-06-07 11:52:37 +00:00
Daniel Maya	d6fc15f0bf	#8763 Added filter groups	2022-06-06 11:14:09 +02:00
edu.corral	9d7b047e72	9037 fixed agent view controls	2022-06-03 14:15:51 +02:00
Daniel Maya	6c48717627	#9038 filter remake	2022-06-01 15:07:51 +02:00
alejandro.campos@artica.es	8b57e1dfb4	fixed permissions in selectors	2022-06-01 14:00:33 +02:00
José González	353e8773f8	Hide inventory view if agent dont have inventory modules	2022-05-26 08:13:30 +02:00
Daniel Barbero Martin	a77699b251	fixed update legend hover chart pandora_enterprise#8895	2022-05-12 09:10:39 +02:00
Daniel Rodriguez	7168f1d848	Merge branch 'ent-8735-vista-de-interfaces-referencia-mal-los-agentes' into 'develop' ... Ent 8735 vista de interfaces referencia mal los agentes See merge request artica/pandorafms!4800	2022-05-11 06:20:02 +00:00
Daniel Maya	3dd96d6e91	#8903 Fixed padding	2022-04-28 14:58:33 +02:00
Daniel Maya	165f3ff598	#8735 Fixed interface view	2022-04-05 13:00:15 +02:00
alejandro.campos@artica.es	84ca3c040c	fix query	2022-03-25 11:04:14 +01:00
Calvo	6067f356e9	Command snapshot monospaced font	2022-03-15 09:21:34 +01:00
Daniel Rodriguez	a67b6647f7	Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' ... bulk operation edit agents add secundary groups pandora_enterprise#2152 See merge request artica/pandorafms!4677	2022-03-11 08:51:33 +00:00
Daniel Barbero Martin	0d6570ea24	fixed error massive operation agents #2152	2022-03-09 15:12:26 +01:00
José González	604633dd35	Fixed issues with interfaces view and limited to show only agents with ifaces	2022-02-22 12:37:01 +01:00
fbsanchez	4d912fbd34	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-11 09:55:34 +01:00
José González	fc4b702db0	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' ... # Conflicts: # pandora_console/godmode/alerts/configure_alert_template.php	2022-02-08 11:35:01 +00:00
fbsanchez	48ca83aa76	errata fix	2022-02-04 13:33:46 +01:00
fbsanchez	e1776d7994	removed collation from filtering	2022-02-04 13:26:03 +01:00
fbsanchez	a298b25a38	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-03 17:55:34 +01:00
Daniel Barbero Martin	f342a218ba	fix link pandora_enterprise#8518	2022-02-02 13:51:04 +01:00
fbsanchez	17be6f3ca5	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-02 11:36:14 +01:00
Daniel Rodriguez	110052a21f	Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' ... Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos See merge request artica/pandorafms!4666	2022-02-02 09:37:15 +00:00
fbsanchez	5b06942caf	DANGER COMMIT, uses schema collation instead forced one	2022-02-01 15:18:45 +01:00
Jose Gonzalez	40efaa157d	Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs	2022-02-01 13:42:30 +01:00
Jose Gonzalez	d81e6571ec	New audit logs	2022-02-01 13:39:18 +01:00
alejandro.campos@artica.es	2b6a9f0277	show agent and module name tip	2022-01-31 15:43:56 +01:00
alejandro.campos@artica.es	d210390a3d	truncate texts in module massive operations	2022-01-27 17:30:20 +01:00
fbsanchez	1207463f16	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 ... Conflicts: pandora_console/include/class/HTML.class.php	2022-01-25 14:16:47 +01:00
vgilc	4b85e93490	Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' ... Ent 8222 nueva grafica desde la vista de modulos histograma See merge request artica/pandorafms!4637	2022-01-25 10:28:18 +00:00
vgilc	b547278930	Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' ... Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados See merge request artica/pandorafms!4633	2022-01-25 10:27:25 +00:00
vgilc	fa0e3c4abb	Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop' ... Fix monitoring alert detail filter for defautl actions See merge request artica/pandorafms!4558	2022-01-25 10:24:42 +00:00
fbsanchez	35184c4eb6	ws php8	2022-01-21 17:39:11 +01:00
Jose Gonzalez	3252832cc7	WIP: Check audit logs	2022-01-20 10:55:23 +01:00
Daniel Barbero Martin	6be6b1a95d	add new macros #3763	2022-01-19 12:18:23 +01:00
Calvo	891c88f458	Fix meta alert action filter counter	2022-01-18 15:34:56 +01:00
Daniel Barbero Martin	a0a74cf7bb	add new chart histogram	2022-01-18 13:01:49 +01:00
Daniel Maya	b2fe6780ac	Fixed links in networkmaps	2022-01-18 11:39:37 +01:00
Daniel Barbero Martin	4f46da6633	Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma ... Conflicts: pandora_console/include/styles/pandora.css	2022-01-18 10:17:19 +01:00
Daniel Maya	e8d3d93f7f	Fixed pandora_black in metaconsole	2022-01-17 10:22:30 +01:00
Calvo	8c86dbbc50	Fix meta alerts list action filter	2022-01-17 09:17:39 +01:00
fbsanchez	fee3f4ab96	php8 review + mdpf update	2022-01-12 14:22:16 +01:00
Calvo	f9dceb9e10	Fix not init color	2021-12-28 12:38:22 +01:00
Calvo	daf0b4e6e9	Fix alert view with default actions node and meta	2021-12-27 19:01:53 +01:00
Daniel Rodriguez	0ed9406796	Merge branch 'ent-8171-Filtro-Server-type-limitado-en-vista-Monitores-metaconsola' into 'develop' ... Ent 8171 filtro server type limitado en vista monitores metaconsola See merge request artica/pandorafms!4574	2021-12-27 17:09:29 +00:00
Daniel Rodriguez	eb3d36489c	Merge branch 'ent-8270-Fallos-al-borrar-relaciones-en-mapas-de-red' into 'develop' ... Ent 8270 fallos al borrar relaciones en mapas de red See merge request artica/pandorafms!4566	2021-12-27 16:17:09 +00:00
Daniel Barbero Martin	f705cc0fba	wip chart histogram list modules #8222	2021-12-14 13:21:34 +01:00
fbsanchez	f852df2f1c	Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 ... Conflicts: pandora_console/extras/mr/51.sql	2021-12-14 11:03:04 +01:00
Daniel Maya	57cd3d7309	#8171 Fixed server type in metaconsole	2021-12-07 16:21:20 +01:00
Daniel Maya	fb80350f99	#8270 Fixed delete links	2021-12-02 13:46:29 +01:00
fbsanchez	cad0c6cea6	Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 ... Conflicts: pandora_console/extras/mr/51.sql	2021-12-02 10:43:30 +01:00
Daniel Barbero Martin	a02c8a7988	wip reports alert actions	2021-12-01 15:15:45 +01:00
Daniel Barbero Martin	40d801a947	Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta	2021-11-30 14:16:19 +01:00
Daniel Rodriguez	198959f6cb	Merge branch 'ent-7995-unificar-criterios-de-busqueda-que-no-sean-case-sensitive' into 'develop' ... Unify search criteria case insensitive See merge request artica/pandorafms!4496	2021-11-29 11:08:00 +00:00
fbsanchez	5197d08aa3	Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 ... Conflicts: pandora_console/install.php	2021-11-29 09:54:55 +01:00
Daniel Barbero Martin	960c2de6c3	wip reports alert actions	2021-11-26 14:06:10 +01:00
Daniel Barbero Martin	cb0039d7a7	wip reports alert actions	2021-11-26 13:52:15 +01:00
Jose Gonzalez	98f519958c	Fix merge	2021-11-23 12:25:58 +01:00
Daniel Rodriguez	3e5b34325b	Merge branch 'ent-8169-No-funciona-recursión-de-grupos-en-vista-de-Monitores-de-Metaconsola' into 'develop' ... Ent 8169 no funciona recursión de grupos en vista de monitores de metaconsola See merge request artica/pandorafms!4513	2021-11-16 09:12:40 +00:00
Daniel Rodriguez	d094987eda	Merge branch 'ent-8063-recursion-y-filtro-en-operaciones-masivas-de-modulos' into 'develop' ... Fix recursion and filter on modules massive operations See merge request artica/pandorafms!4477	2021-11-15 11:29:33 +00:00
Daniel Rodriguez	e16a398c1a	Merge branch 'ent-7900-trazas-en-estado-agente-y-pandora-alert' into 'develop' ... Deleted js traces See merge request artica/pandorafms!4354	2021-11-15 11:13:50 +00:00
Daniel Rodriguez	650607067e	Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' ... Include modules not init in total monitors count on tactical view See merge request artica/pandorafms!4309	2021-11-15 11:00:07 +00:00
Daniel Rodriguez	ddb156564d	Merge branch 'ent-7962-bug-visual-monitor-detail' into 'develop' ... Fixed tip position and code style Closes pandora_enterprise#7962 See merge request artica/pandorafms!4488	2021-11-15 10:10:53 +00:00
José González	bdc4d0a8b1	Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" ... This reverts merge request !4302	2021-11-04 16:28:15 +01:00
Jose Gonzalez	c0abe5edb9	Fix merge	2021-11-04 16:00:05 +01:00
Daniel Maya	031e0a2cd7	#8169 Fixed group recursion with standar user	2021-11-02 11:08:15 +01:00
Calvo	f1f984614f	Unify search criteria case insensitive	2021-10-22 12:02:31 +02:00
Jose Gonzalez	070c920e0e	Fixed tip position and code style	2021-10-20 13:01:13 +02:00
Calvo	7daf138ef5	Fix recursion and filter on modules massive operations	2021-10-18 15:47:22 +02:00
Jose Gonzalez	4331438765	Removed some cheerful words in the project	2021-10-08 11:13:28 +02:00
fbsanchez	dae8a9ba14	Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red	2021-10-06 14:50:13 +02:00
Daniel Rodriguez	3ab921acbb	Merge branch 'ent-7950-errores-en-log-viewer' into 'develop' ... Ent 7950 errores en log viewer See merge request artica/pandorafms!4383	2021-10-05 09:29:24 +00:00
Jose Gonzalez	5eb66e5c6e	Fixed issue with node actions	2021-10-01 14:05:41 +02:00
fbsanchez	d322d23203	WIP NCM	2021-09-30 19:10:45 +02:00
Jose Gonzalez	8696d21a42	Fixed any minor bugs	2021-09-29 17:03:13 +02:00
Luis	849ce30da5	Update pandora_networkmap.view.php	2021-09-28 08:50:00 +00:00
Calvo	90ac62c0cc	Fix recursion on networkmap nodes	2021-09-27 16:14:07 +02:00
Jose Gonzalez	de1bf03976	Clean logs	2021-09-23 17:19:47 +02:00
Jose Gonzalez	5b40a4f700	Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open	2021-09-23 08:50:50 +02:00
Daniel Maya	61fb2e102b	#7950 Fixed last_contact 3	2021-09-22 16:39:34 +02:00
Daniel Rodriguez	126030261b	Merge branch 'ent-7969-Etiquetas-HTML-en-módulos-de-wizard-Consolas-Visuales' into 'develop' ... Ent 7969 etiquetas html en módulos de wizard consolas visuales See merge request artica/pandorafms!4394	2021-09-22 09:01:17 +00:00
Jose Gonzalez	3af47c0e5f	Open network maps	2021-09-17 10:45:01 +02:00
Daniel Maya	240caa3ad1	#7969 Fixed span with truncate	2021-09-08 12:14:03 +02:00
Daniel Maya	24670da399	#7950 Fixed last_contact 2	2021-09-07 14:47:54 +02:00
Jose Gonzalez	bb743cb87f	Fixed forget metaconsole alerts	2021-09-06 14:08:24 +02:00
Daniel Maya	5bf70f876c	#7950 Fixed last_contact	2021-09-02 16:12:46 +02:00
Daniel Rodriguez	8397f778b3	Merge branch 'ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail' into 'develop' ... add not option in monitor detail filter See merge request artica/pandorafms!4112	2021-09-01 08:54:49 +00:00
marcos	80f4e25b92	change first option value when not_condition its enabled	2021-08-30 11:19:53 +02:00
Daniel Rodriguez	a89faed47c	Merge branch 'ent-7823-interfaces-view-no-calcula-bien-last-data' into 'develop' ... Fixed issue with last_data obtain Closes pandora_enterprise#7823 See merge request artica/pandorafms!4338	2021-08-27 10:46:39 +00:00
marcos	2ed657c166	updates	2021-08-26 12:42:16 +02:00
marcos	24a66f0173	updates	2021-08-24 13:30:50 +02:00
marcos	4d270a3559	set first option select2 all to none if not condition is enabled	2021-08-23 09:52:42 +02:00
marcos	61409b72b4	Merge remote-tracking branch 'origin/develop' into ent-6885-11172-añadir-opcion-de-nor-en-monitor-detail	2021-08-23 08:52:17 +02:00
Daniel Maya	9488ce873b	#7887 Fixed xss in massive modules	2021-08-19 12:57:16 +02:00
Calvo	fcbd69c603	Deleted js traces	2021-08-12 14:16:25 +02:00
fbsanchez	034e921e35	Upgraded jquery to 3.6.0, without npm	2021-08-12 09:30:43 +02:00
Daniel Rodriguez	2224709814	Merge branch 'ent-7543-11772-command-snapshot-view-fondo-blanco-en-tema-oscuro' into 'develop' ... se command sanpshot black theme See merge request artica/pandorafms!4232	2021-08-06 12:57:05 +00:00
Daniel Rodriguez	2963d67225	Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop' ... Improve code for get secondary groups Closes pandora_enterprise#7767 See merge request artica/pandorafms!4259	2021-08-02 07:18:02 +00:00
José González	b23aafdf03	Fixed issue with last_data obtain	2021-07-30 12:35:08 +02:00
Calvo	a8c0ba8e78	Include modules not init in total monitors count on tactical view	2021-07-19 13:20:00 +02:00
José González	a9075463ac	Missed change	2021-07-02 13:48:59 +02:00
fbsanchez	760522aeff	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-06-28 11:03:09 +02:00
marcos	26acac191f	ad not condition on monitor detail	2021-06-25 09:37:26 +02:00
fbsanchez	36e455e5c5	Fixes for agent_module widget	2021-06-23 18:00:54 +02:00
marcos	fafcef7e85	se command sanpshot black theme	2021-06-23 17:35:16 +02:00
fbsanchez	76fbf75572	Fix for filtering common modules	2021-06-23 14:31:42 +02:00
fbsanchez	be09c1c64d	Some changes, multibox fixes for metaconsole	2021-06-23 14:24:16 +02:00
fbsanchez	9fb7074082	minor fix	2021-06-22 19:44:41 +02:00
fbsanchez	390bf14761	cover for bulk service operations in mc/node	2021-06-22 15:32:15 +02:00
fbsanchez	fc0b605cee	Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios	2021-06-21 12:13:46 +02:00
fbsanchez	1f34cf8596	Massive operation over service elements	2021-06-18 15:36:52 +02:00
marcos	56b6418716	add not condition filter	2021-06-17 15:04:21 +02:00
marcos	dff7220be9	add not condition filter	2021-06-17 14:59:43 +02:00
marcos	0cfb7c994f	fixed merge conflict	2021-06-14 11:02:57 +02:00
marcos	ee4a3dc450	fixed merge conflict	2021-06-14 10:52:50 +02:00
marcos	5162864b28	fixed merge conflict	2021-06-14 09:03:17 +02:00
marcos	0ab343e672	merge conflict	2021-06-14 08:26:33 +02:00
fbsanchez	ae34209f52	Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center	2021-06-10 21:45:50 +02:00
Marcos Alconada	665efa4fb7	Ent 7519 cambio de fuentes en la consola a nivel global	2021-06-10 08:19:11 +00:00
Daniel Barbero Martin	a9864f7d87	Wip command center, clean functions db	2021-06-10 08:45:50 +02:00
Daniel Rodriguez	4b819360ff	Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" ... This reverts merge request !4132	2021-06-09 18:09:43 +02:00
Marcos Alconada	2334eccd01	Ent 7519 cambio de fuentes en la consola a nivel global	2021-06-09 13:59:28 +00:00
fbsanchez	70b8eb77a3	Remove service elements when removing items itselves and multiple fixes	2021-06-01 12:12:07 +02:00
marcos	c4c772032a	add help string on status monitor not condition	2021-05-26 10:35:35 +02:00
José González	e7b59ab472	Added standarized headers	2021-05-26 10:16:23 +02:00
José González	76628117fa	Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' ... # Conflicts: # pandora_console/operation/messages/message_edit.php	2021-05-25 13:50:17 +00:00
Junichi Satoh	362855a24e	Fixed to follow ACL with get_agents_group_json.	2021-05-24 18:56:18 +09:00
Daniel Rodriguez	5b2c340163	Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop' ... Create interface views See merge request artica/pandorafms!4023	2021-05-14 09:37:48 +00:00
alejandro.campos@artica.es	2c065d6f38	visual fix	2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es	86447e2a0b	visual fix	2021-05-14 10:10:42 +02:00
Daniel Rodriguez	ed4e89a4d0	Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' ... fixed visual error on snmp interfaces agent graphs black theme See merge request artica/pandorafms!4119	2021-05-12 12:52:44 +00:00
Marcos Alconada	f8eafa5015	fixed visual error on snmp interfaces agent graphs black theme	2021-05-12 12:52:44 +00:00
Daniel Rodriguez	4e871ed296	Merge branch 'ent-6983-typo-en-traduccion' into 'develop' ... fixed wrong string See merge request artica/pandorafms!4099	2021-05-12 07:55:09 +00:00
Daniel Rodriguez	8a3d977e82	Merge branch 'ent-5401-Búsqueda-de-módulo-por-ID-al-llegar-desde-link-de-consola' into 'develop' ... Ent 5401 búsqueda de módulo por id al llegar desde link de consola See merge request artica/pandorafms!4026	2021-05-11 15:38:01 +00:00
Daniel Rodriguez	a0197dab87	Merge branch 'ent-7453-Busqueda-alertas-en-vista-de-agente-no-funciona' into 'develop' ... Ent 7453 busqueda alertas en vista de agente no funciona See merge request artica/pandorafms!4084	2021-05-10 09:15:40 +00:00
Daniel Rodriguez	6faefa4afa	Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' ... Unified downtime name as scheduled downtime See merge request artica/pandorafms!4001	2021-05-10 09:06:43 +00:00
Luis	f25256a74d	Unified downtime name as scheduled downtime	2021-05-10 09:06:43 +00:00
Daniel Rodriguez	b609bbfdd9	Merge branch 'ent-7240-error-acl-graficas-tree-view' into 'develop' ... Fixed metaconsole ACL on module graphs view See merge request artica/pandorafms!3987	2021-05-10 08:15:50 +00:00
marcos	e526cfbfad	add not option in monitor detail filter	2021-05-07 11:16:28 +02:00
marcos	943232ed7e	add not option in monitor detail filter	2021-05-07 09:32:54 +02:00
marcos	f03364bf96	add not option in monitor detail filter	2021-05-06 17:08:11 +02:00
marcos	1f5e08a9fe	fixed wrong string	2021-05-05 09:23:47 +02:00
José González	3f33a0ec29	Added standard header	2021-04-30 12:35:02 +02:00
José González	9ab027b286	WIP: Upload	2021-04-29 13:28:03 +02:00
Daniel Maya	a193234270	#7453 Fixed id alert_list	2021-04-28 16:46:27 +02:00
Daniel Rodriguez	e9956092d4	Merge branch 'ent-7399-Problemas-integracion-Ehorus-en-Pandora-FMS' into 'develop' ... Fixed errors display tab ehorus See merge request artica/pandorafms!4078	2021-04-28 11:24:45 +00:00
Daniel Barbero Martin	d3f3364830	Fixed errors display tab ehorus	2021-04-27 11:06:17 +02:00
marcos	f818b86827	fixed minnor error black theme 7376	2021-04-23 09:56:06 +02:00
Daniel Maya	bdbfe81f31	Fixed id_agente_modulo in sql condiction	2021-04-13 12:24:35 +02:00
alejandro.campos@artica.es	93f3551326	Create interface views	2021-04-12 18:17:09 +02:00
Daniel Rodriguez	b4e469c463	Merge branch 'ent-7040-forzar-URL-publica-meta' into 'develop' ... Reverted failed change Closes pandora_enterprise#7040 See merge request artica/pandorafms!4007	2021-04-12 14:40:28 +00:00
Daniel Rodriguez	a203a6e80d	Merge branch 'ent-7269-black-theme.vista-ppal-agente-la-caja-de-vista-de-logs-sale-encogida' into 'develop' ... fixed size box log sources status See merge request artica/pandorafms!4006	2021-04-09 09:35:50 +00:00
Jose Gonzalez	34b01fdf51	Merge	2021-04-07 13:10:52 +02:00
marcos	7a5125ea8c	fixed size box log sources status	2021-04-07 11:52:57 +02:00
fbsanchez	55e272c360	MC dashboards agent_module fixes	2021-04-06 12:53:12 +02:00
Calvo	d0bddbe27c	Fixed metaconsole ACL on module graphs view	2021-03-31 10:30:18 +02:00
Daniel Rodriguez	8a62fa67ad	Merge branch 'ent-7171-iconos-poco-visibles-en-monitor-detail-black-theme' into 'develop' ... Ent 7171 iconos poco visibles en monitor detail black theme See merge request artica/pandorafms!3929	2021-03-30 09:51:04 +00:00
Marcos Alconada	9dd17acb57	fixed visual error	2021-03-26 13:40:55 +00:00
Marcos Alconada	3d350ba481	fixed visual error	2021-03-26 09:32:30 +00:00
marcos	b4cc075870	resolved error with modal module detail on agent detail	2021-03-24 14:10:46 +01:00
Daniel Rodriguez	3eb6a8b3c4	Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' ... fixed visual error group view See merge request artica/pandorafms!3897	2021-03-17 15:22:01 +00:00
marcos	0195a80b78	fixed visual error	2021-03-17 14:41:36 +01:00
marcos	137a2c31ad	fixed visual fails	2021-03-15 15:30:56 +01:00
Daniel Rodriguez	5bae2be954	Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' ... Ent 6898 integracion integria en pandora See merge request artica/pandorafms!3898	2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es	3c5bf3eeef	Merge remote-tracking branch 'origin/develop' into temp	2021-03-12 12:34:47 +01:00
marcos	ac3587208b	fixed visual error	2021-03-12 12:10:56 +01:00
marcos	de716ddc4a	fixed visual error group view	2021-03-12 11:55:54 +01:00
Jose Gonzalez	5b1517f767	Merge	2021-03-12 11:07:44 +01:00
Marcos Alconada	d8a628b1c4	Ent 6781 revision de estilos visuales y eliminacion de sistemas skins	2021-03-11 14:40:23 +00:00
Daniel Rodriguez	2422813a29	Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop' ... visual fixes in agent view graphs See merge request artica/pandorafms!3884	2021-03-10 15:56:15 +00:00
José González	b7bd28ba07	Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt	2021-03-10 10:17:27 +00:00
Daniel Rodriguez	1846cb6471	Merge branch 'ent-6888-uniway-deshabilitar-boton-crear-una-vez-pulsado-para-evitar-duplicados' into 'develop' ... avoid double networkmap creation See merge request artica/pandorafms!3762	2021-03-09 16:38:51 +00:00
José González	69e1f1fb33	Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' ... # Conflicts: # pandora_console/extras/delete_files/delete_files.txt # pandora_console/include/styles/pandora.css	2021-03-09 14:39:15 +00:00
alejandro.campos@artica.es	0a8c478c47	visual fixes in agent view graphs	2021-03-08 17:48:59 +01:00
daniel	fbf26fab91	Fix styles file export_data	2021-03-04 10:29:52 +00:00
Alejandro Campos	d4054f15d0	Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' ... # Conflicts: # pandora_console/extras/mr/45.sql # pandora_console/godmode/alerts/configure_alert_action.php # pandora_server/util/pandora_db.pl	2021-03-04 10:27:07 +00:00
Daniel Rodriguez	4fbfc14479	Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' ... Fix loading charts modules and interfaces See merge request artica/pandorafms!3700	2021-03-01 12:16:27 +00:00
Daniel Rodriguez	f6d9997b16	Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop' ... Ent 6547 visual styles cambio de tamaño agente modulo y descripcion See merge request artica/pandorafms!3707	2021-03-01 10:57:08 +00:00
Daniel Rodriguez	5661f9fbdd	Merge branch 'ent-5163-error-texto-pestaña-Network-tools-agente' into 'develop' ... Fixed Closes pandora_enterprise#5163 See merge request artica/pandorafms!3713	2021-03-01 10:32:55 +00:00
alejandro.campos@artica.es	901d12fec0	Integration with Integria	2021-02-25 13:18:04 +01:00
Daniel Rodriguez	f92ba2ce3d	Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop' ... Modified query for show only available alerts Closes pandora_enterprise#6503 See merge request artica/pandorafms!3672	2021-01-25 10:11:25 +01:00
Jose Gonzalez	579b8d4965	Solve issue and added correct headers	2021-01-14 19:08:01 +01:00
alejandro-campos	366d02f203	Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3	2021-01-14 09:22:06 +01:00
Jose Gonzalez	1fc1752b01	Solved merge	2021-01-12 13:26:48 +01:00
fbsanchez	f89397996f	avoid double networkmap creation	2021-01-08 11:59:45 +01:00
Daniel Rodriguez	b0f862b4c7	Merge branch 'ent-1175-copyright-actualizados' into 'develop' ... Updated copyrights Closes pandora_enterprise#1175 See merge request artica/pandorafms!3668	2020-12-23 17:19:46 +01:00
Daniel Rodriguez	41730cbe58	Merge branch 'ent-6339-Monitors-View-Metaconsole' into 'develop' ... Ent 6339 monitors view metaconsole See merge request artica/pandorafms!3676	2020-12-23 11:46:00 +01:00
José González	02475d25b6	Merge branch 'develop' into 'ent-1175-copyright-actualizados' ... # Conflicts: # pandora_console/general/header.php # pandora_console/general/sap_view.php	2020-12-23 06:48:22 +01:00
Jose Gonzalez	5f0d686034	Changed Network Tools for External Tools	2020-12-18 12:31:44 +01:00
Daniel Rodriguez	697b467a77	Merge branch 'ent-5115-Metaconsola-Vista-de-monitores' into 'develop' ... Ent 5115 metaconsola vista de monitores See merge request artica/pandorafms!3659	2020-12-17 16:51:57 +01:00
Daniel Rodriguez	398cc3ac2a	Merge branch 'ent-6689-Selector-de-grupos-muy-estrecho-en-Monitors-View-metaconsola' into 'develop' ... fix name filters See merge request artica/pandorafms!3664	2020-12-17 16:37:31 +01:00
Jose Gonzalez	959fbd4764	WIP: Backup upload	2020-12-17 13:04:21 +01:00
José González	623b729001	Merge branch 'develop' into 'ent-1175-copyright-actualizados' ... # Conflicts: # pandora_agents/pc/Win32/pandora_agent.conf # pandora_agents/win32/bin/pandora_agent.conf # pandora_console/extensions/realtime_graphs.php # pandora_console/godmode/snmpconsole/snmp_alert.php # pandora_console/include/functions_ui.php # pandora_console/install.php # pandora_console/operation/agentes/realtime_win.php	2020-12-14 11:10:35 +01:00
Jose Gonzalez	0e20c3d547	Fixed	2020-12-11 09:38:37 +01:00
Daniel Maya	fcf4b6c239	Fixed Agent and module text size	2020-12-10 12:06:56 +01:00
Daniel Barbero Martin	aa52ab01df	Fix loading charts modules and interfaces	2020-12-09 14:05:40 +01:00
Luis	50b1fa3c56	Changed check connection method to ajax. Check deleted from login	2020-12-03 12:27:55 +01:00
Marcos Alconada	f72d924f1e	ticket 6435	2020-12-02 10:10:34 +01:00
Daniel Maya	2b52b3beef	Show data type	2020-12-01 12:29:53 +01:00
daniel	35bfd765f3	fix SNMP v3 show realtime charts	2020-11-30 14:26:49 +01:00
Jose Gonzalez	649442f794	Updated copyrights	2020-11-27 13:52:35 +01:00
Daniel Barbero Martin	b3437b3432	fix name filters	2020-11-27 08:24:01 +01:00
Daniel Maya	e9f8077c23	Fixed section in metaconsole	2020-11-26 12:28:12 +01:00
Daniel Rodriguez	38c9dafa1b	Merge branch 'ent-6061-vmware-view' into 'develop' ... Discovery task instead Recon task in some places See merge request artica/pandorafms!3507	2020-11-17 16:38:29 +01:00
Luis	2f2556ef79	Ent 6680 ventana de perdida de conexion incorrecta	2020-11-04 16:41:25 +01:00
Daniel Rodriguez	79db1c3236	Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop' ... removed strict-user from monitor detail See merge request artica/pandorafms!3568	2020-10-30 13:28:35 +01:00
Daniel Rodriguez	64df831302	Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop' ... fix charts See merge request artica/pandorafms!3581	2020-10-30 13:23:03 +01:00
Daniel Rodriguez	4f3e09c6c3	Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop' ... Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0 See merge request artica/pandorafms!3541	2020-10-29 13:43:10 +01:00
fbsanchez	98a04bfcf8	omg... what a file	2020-10-29 12:55:44 +01:00
fbsanchez	2748f0ac29	Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail	2020-10-29 12:41:24 +01:00
Daniel Barbero Martin	9b81da193b	fix charts	2020-10-28 12:50:15 +01:00
fbsanchez	29174a87ef	removed strict-user from monitor detail	2020-10-26 10:14:14 +01:00
alejandro-campos	def59508ae	changed behavior of all group acl check and fixed acl vulnerabilities	2020-10-22 12:00:44 +02:00
fbsanchez	6b25ae6004	improved agent_module report (CSV)	2020-10-21 13:23:17 +02:00
fbsanchez	42cca865ac	groups_get_children and propagate update	2020-10-21 11:38:57 +02:00