Commit Graph

5431 Commits

Author SHA1 Message Date
Pablo Aragon dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
daniel 0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +02:00
Pablo Aragon 5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Daniel Maya 712da9070f #10699 Fixed maps 2023-03-28 10:45:41 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 48a254c4b2 fixed styles 2023-03-27 14:34:05 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop'
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
2023-03-27 10:43:48 +00:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Matias Didier 2daea0e5c4 Merge branch 'ent-10764-favoritos-y-nuevos-menus' into 'develop'
Ent 10764 favoritos y nuevos menus

See merge request artica/pandorafms!5618
2023-03-27 09:01:48 +00:00
Jonathan 0ae7630714 Gis map fix view 2023-03-27 08:44:45 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
daniel abf9fcf200 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-24 14:05:30 +01:00
daniel 25ea15fe0f fixed styles 2023-03-24 14:04:38 +01:00
Matias Didier f931a86f22 Merge branch 'ent-10792-en-version-open-la-vista-tactica-de-grupo-devuelve-error-500-al-solicitar-grupo-all' into 'develop'
Ent 10792 en version open la vista tactica de grupo devuelve error 500 al solicitar grupo all

See merge request artica/pandorafms!5624
2023-03-24 12:15:01 +00:00
Pablo Aragon 95edb47d01 10408 2023-03-24 12:29:03 +01:00
Daniel Cebrian 075d0a1c4f #10441 added version file in css 2023-03-24 12:06:40 +01:00
Jimmy Olano eb833f2ad8 Merge branch 'ent-10747-version-open-error-500-en-vista-principal-de-un-agente' into 'develop', JJOS.
Ent 10747 version open error 500 en vista principal de un agente

See merge request artica/pandorafms!5616
2023-03-24 10:14:01 +00:00
Calvo c4ef22164b Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-24 10:38:44 +01:00
Matias Didier 5529c33f0c Merge branch 'ent-10650-bugs-funcionales-en-consolas-visuales' into 'develop'
Ent 10650 bugs funcionales en consolas visuales

See merge request artica/pandorafms!5601
2023-03-24 09:11:26 +00:00
Daniel Cebrian da742bc15e #10441 added version file in js 2023-03-24 09:13:22 +01:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
2023-03-24 07:25:52 +00:00
daniel bac1a7bf65 fixed styles 2023-03-23 17:44:06 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Daniel Cebrian 2683f9e6dc #10792 fixed error 500 in agent status list 2023-03-23 12:39:55 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Daniel Maya 94c843dac2 #9662 Fixed gis map menu 2023-03-23 10:41:08 +01:00
daniel 72c95a6274 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-22 19:12:16 +01:00
Calvo 96017090ce Netflow monitoring filters forms 2023-03-22 14:22:17 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Calvo 784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
Rafael Ameijeiras 3fcf4dfbc5 Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop'
Ent 10737 15246 error 500 en mapa servicios metaconsola

See merge request artica/pandorafms!5617
2023-03-22 10:34:42 +00:00
daniel 5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
#   pandora_console/install.php
2023-03-22 08:23:07 +00:00
Pablo Aragon 99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Daniel Cebrian a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Jonathan d2d8b43c87 Custom fields agent view change size svg 2023-03-21 13:09:32 +01:00
Daniel Cebrian aec5e6b483 #10737 fixed error 500 in service map 2023-03-21 12:52:24 +01:00
Jonathan 9654ba4fa2 Snmp browser select multiple post 2023-03-21 12:35:25 +01:00
Daniel Cebrian 8e88e0a603 #10747 fixed error 500 in agent 2023-03-21 11:45:38 +01:00
Calvo a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian ed7b46eb22 #9662 fixed url tactic in list groups 2023-03-21 09:56:36 +01:00
Jonathan 82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jonathan b56cb0e78e log sources view hide on empty 2023-03-16 12:23:58 +01:00
Jose Gonzalez 9ac04fba28 Netflow fix 2023-03-16 09:42:59 +01:00
Pablo Aragon 4d6029ba3f 10408-Manage agents, Agent view 2023-03-15 17:02:25 +01:00
Pablo Aragon 797f43ff3c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 15:58:34 +01:00
Pablo Aragon bed1e34fd2 Dashboards widgets 2023-03-15 15:58:28 +01:00
Jonathan 19b295060b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 13:53:34 +01:00
Jonathan 17ba51d2bf cluster view 2023-03-15 13:53:23 +01:00
Daniel Cebrian c346aefeaa #10685 changed in system fav, tips and Tactical group view 2023-03-15 12:46:09 +01:00
Jonathan d323ab7fe5 Timezonevisual correction and fix conflict 2023-03-15 09:06:07 +01:00
Jose Gonzalez bab3248d57 Monitor view with not normal at start 2023-03-15 08:56:15 +01:00
Calvo 4adaf31a5a Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-14 19:45:48 +01:00
Calvo 6950624cc9 Added new netflow server filters form 2023-03-14 18:55:43 +01:00
daniel cec81f1cc2 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/extras/mr/62.sql
2023-03-14 18:17:54 +01:00
Jose Gonzalez 4f5d3ed924 Netflow meta 2023-03-14 18:15:31 +01:00
Daniel Cebrian 26c08ebe0f #10650 fixed bug when user access in view maintenance and show modules select 2023-03-14 17:13:19 +01:00
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Pablo Aragon 2215097100 Manage agent, modules 2023-03-13 17:39:58 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Jose Gonzalez c2ba5cfdd3 Agent status 2023-03-13 16:21:14 +01:00
Jose Gonzalez a7cfa310a3 Agents alias in header 2023-03-13 15:52:28 +01:00
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +01:00
Jonathan a0bffb79bd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 14:21:17 +01:00
Jose Gonzalez 1b4136d91e Minor fix 2023-03-13 14:10:20 +01:00
Jose Gonzalez 45ba4cdd15 Netflow 2023-03-13 14:03:00 +01:00
Jose Gonzalez 7bedd86e25 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 13:26:03 +01:00
Jose Gonzalez 5466cb5995 Netflow live view 2023-03-13 13:25:42 +01:00
Daniel Cebrian bdeb2240f3 10324 refactor duplicity code 2023-03-13 13:01:48 +01:00
Daniel Cebrian 339d7e8bfe #10324 fixed error 500 2023-03-13 12:57:09 +01:00
daniel 0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Jose Gonzalez 590e7a3978 Netflow improvements 2023-03-13 11:25:43 +01:00
Jonathan 80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
Jose Gonzalez d449179765 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-11 02:10:23 +01:00
Jose Gonzalez 39ace10629 Fix image issue with Networkmap 2023-03-11 02:08:37 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
Calvo e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
Pablo Aragon 427ecf96e4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 13:03:35 +01:00
Pablo Aragon ceed3c5d51 Alert details validation 2023-03-10 13:02:23 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Maya 030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida'
# Conflicts:
#   pandora_console/pandoradb.sql
2023-03-10 10:41:08 +00:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jose Gonzalez d8cdb13b59 Fix minor issue 2023-03-09 11:43:36 +01:00
daniel 63d83b3f97 fixed styles 2023-03-09 11:25:43 +01:00
Jose Gonzalez c855061d43 Netflow view 2023-03-09 00:45:41 +01:00
Jonathan 63ecb7eb0b Tree view metaconsole view like nodo 2023-03-08 15:45:18 +01:00
Jonathan 91a708dfb8 SNMP Browser and agent module SNMP walk 2023-03-08 13:41:00 +01:00
Daniel Cebrian 11250bd59b Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-08 13:00:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Jose Gonzalez 5017878701 Messages view 2023-03-07 22:05:06 +01:00
Jose Gonzalez 4af67db415 Export data view 2023-03-07 18:10:07 +01:00
Daniel Cebrian 27005158ba #9073 resolve conflics and bugs 2023-03-07 17:57:09 +01:00
Jose Gonzalez 14246ea570 User edit notifications 2023-03-07 17:50:03 +01:00
Jose Gonzalez 2dbc2e801f Minor icon fixes 2023-03-07 17:24:36 +01:00
Jose Gonzalez f7aab35082 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-07 15:59:51 +01:00
Jose Gonzalez 226b80b7c7 Icon revision 2023-03-07 15:59:10 +01:00
Daniel Maya 6b9175ea0d Merge branch 'develop' into ent-9662-second-round 2023-03-07 15:05:28 +01:00
Jonathan 8dbcffaa8b Buttons and view report 2023-03-07 14:15:02 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
daniel 1db803b8f6 fixed styles 2023-03-07 12:59:34 +01:00
Jose Gonzalez 44fb762fdf Minor fixes with graphs 2023-03-06 15:44:32 +01:00
Jonathan 2a11873638 #9529 fix events last contact value 2023-03-06 12:12:36 +01:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +01:00
daniel f6e063b981 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/class/SnmpConsole.class.php
2023-03-06 08:09:29 +01:00
Jimmy Olano 6b55c65330 Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view

See merge request artica/pandorafms!5532
2023-03-05 22:56:35 +00:00
daniel 08dca1a83c fixed styles 2023-03-05 13:46:27 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Jose Gonzalez 9ad97ee267 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 14:51:07 +01:00
Jose Gonzalez 6846961ff0 Icon updates 2023-03-03 14:50:47 +01:00
daniel 95df525cb2 fixed styles 2023-03-03 14:16:06 +01:00
Jose Gonzalez df6dddb586 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 13:52:49 +01:00
Jose Gonzalez 128dc9c42c Visual console changes 2023-03-03 13:52:28 +01:00
Daniel Cebrian 00b5d3f237 #1347 added links tactical view group 2023-03-03 13:24:33 +01:00
Pablo Aragon f3b9d73855 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 12:43:35 +01:00
Pablo Aragon b18a689225 About meta and observer input password 2023-03-03 12:40:58 +01:00
Jonathan e5cbe07a86 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-03 10:12:28 +01:00
Jonathan 8d31603e44 Custom Graphs visual changes 2023-03-03 10:12:24 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Alejandro Campos f297f6fff9 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
2023-03-02 16:53:42 +00:00
Jonathan cef5c478e9 Graph viewer and graph template item editor visual 2023-03-02 17:17:10 +01:00
Diego Muñoz-Reja 5d756ee393 Merge branch 'ent-9819-crear-tip-en-consola-sonora-de-eventos' into 'develop'
Ent 9819 crear tip en consola sonora de eventos

See merge request artica/pandorafms!5466
2023-03-02 15:25:31 +00:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
2023-03-02 14:52:45 +00:00
Jose Gonzalez 9a295cf974 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 12:59:47 +01:00
Jose Gonzalez d65852e9aa Visual console 2023-03-02 12:59:40 +01:00
daniel 6c87ec3c99 fixed styles 2023-03-02 11:29:47 +01:00
daniel ad33accfda fixed styles 2023-03-02 11:10:09 +01:00
Matias Didier c4e8ff49d5 Merge branch 'ent-10569-Error-500-a-la-hora-de-abrir-vista-de-algun-agente-en-fenix' into 'develop'
error fix

See merge request artica/pandorafms!5574
2023-03-02 09:15:37 +00:00
Jonathan fdab2cff8e Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos 2023-03-02 08:26:53 +01:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
Jonathan 93479ed1f0 reporting viewer 2023-03-01 16:30:57 +01:00
alejandro.campos@artica.es fd13b376a5 Merge branch 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' of brutus.artica.es:artica/pandorafms into ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas 2023-03-01 16:10:30 +01:00
alejandro.campos@artica.es 296ec44ef4 minor fix 2023-03-01 16:10:18 +01:00
alejandro.campos@artica.es 36cfcc3c2f error fix 2023-03-01 14:19:35 +01:00
daniel 774b32d7a0 fixed styles 2023-03-01 13:54:22 +01:00
daniel 69d1bdd908 fixed styles 2023-03-01 13:44:01 +01:00
Daniel Rodriguez 424c4db9de Merge branch 'ent-10302-errores-de-fecha-con-eventos-y-tz' into 'develop'
Ent 10302 errores de fecha con eventos y tz

See merge request artica/pandorafms!5524
2023-03-01 12:31:27 +00:00
Jonathan 472b655ee6 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 08:18:50 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
2023-03-01 07:56:32 +01:00
daniel 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jimmy Olano a8d0f79540 Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS)
Fix empty module data list view

See merge request artica/pandorafms!5472
2023-02-28 17:35:56 +00:00
Pablo Aragon c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan 1dca587455 SNMP Browser modals change visual styles 2023-02-28 17:22:17 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-02-28 16:11:46 +00:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Jose Gonzalez 825b937958 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 10:39:42 +01:00
Pablo Aragon 1d28762d22 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:50:50 +01:00
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel f3d7aa9e30 fixed styles 2023-02-27 18:39:10 +01:00
daniel 76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
2023-02-27 18:25:45 +01:00
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Pablo Aragon 936c9bcafb 10454-Events 2023-02-27 10:12:42 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
daniel 35241e0d38 restyling 2023-02-27 09:55:29 +01:00
Daniel Cebrian e76d8606dc #10324 added star in menu 2023-02-27 09:45:15 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
daniel 5477fdbb6c Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:45:14 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
Daniel Cebrian 032fcdeae4 #10324 added fav menu in reporting viewer 2023-02-24 10:23:14 +01:00
Pablo Aragon a28eb59ce0 10454-Fix filters 2023-02-24 10:06:32 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
daniel b34515d03c restyling 2023-02-23 17:57:48 +01:00
daniel 1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
daniel 929680eb17 restyling 2023-02-23 16:00:13 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
Daniel Cebrian d6645ee283 #10324 added fav menu in network map and visual console 2023-02-23 11:37:23 +01:00
Daniel Cebrian c0dcc03388 #10324 added system fav in visual console and modules 2023-02-23 11:00:46 +01:00
daniel e672ba141b restyling 2023-02-23 11:00:38 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Daniel Cebrian 0990fe672e #10324 added system fav menu in agent and events 2023-02-23 09:48:13 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop'
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
2023-02-22 15:09:19 +00:00
Pablo Aragon 1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
Pablo Aragon 2081459556 10454-Fix event view 2023-02-22 13:08:15 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
2023-02-22 12:35:34 +01:00
Daniel Cebrian 3d5458ae46 #10302 fixed ack date 2023-02-22 11:36:09 +01:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop'
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
2023-02-22 10:36:00 +00:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Daniel Maya 6efaa2bbc6 #8642 Added heatmap widget 2023-02-21 15:06:15 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop'
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
2023-02-20 23:00:29 +00:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Jonathan 934851ae4e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 15:58:52 +01:00
Jonathan fc68e6ead1 Monitor view meta fix status 2023-02-20 15:58:41 +01:00
Jose Gonzalez 6808fb0655 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 14:50:33 +01:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Jonathan 4bbf750944 Monitor view meta fix 2023-02-20 14:35:32 +01:00
Daniel Cebrian f67bf4d084 #10416 added name agent in filter event 2023-02-20 13:10:00 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez b0ee4a203a Ticket 10470 Agent improvements bis 2023-02-17 14:26:41 +01:00
Jose Gonzalez c1f8510563 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 14:21:49 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Jose Gonzalez 8a5a25cd65 Ticket 10452 Status monitor view improve 2023-02-17 13:35:42 +01:00
Jonathan e6eed5e471 fix visual module graph and monitor details more details 2023-02-17 11:54:48 +01:00
Daniel Rodriguez 10d275c2a5 Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop'
Fix showing all modules on monitors view on firt load

See merge request artica/pandorafms!5541
2023-02-15 15:04:30 +00:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop'
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
2023-02-15 14:34:17 +00:00
Calvo 70291758c8 Fix showing all modules on monitors view on firt load 2023-02-15 14:25:43 +01:00
Daniel Maya 845a2d08c3 #10118 Changed id_group 2 2023-02-15 13:42:19 +01:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Daniel Maya 856fade86c #10118 Added spinner 2023-02-14 14:45:46 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Daniel Maya ccb0cda305 #10118 changed CIDR input 2023-02-14 12:16:38 +01:00
Daniel Cebrian dfb93d2cf5 #9073 added token for tips in user profile configuration 2023-02-14 10:34:08 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Daniel Maya b010965caa #9662 Fixed tactical view 2023-02-13 14:44:32 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Daniel Maya 4cd0820f11 #10118 Changed radio button 2023-02-13 11:44:01 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Daniel Cebrian 50e8b457f8 #10302 fixed tz in event list 2023-02-09 11:42:42 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Pablo Aragon 5b538920f0 Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms 2023-02-07 11:22:20 +01:00
Matias Didier 1d9c3a5f29 Merge branch 'ent-10249-guardia-problemas-en-grupos-anidados-para-visualizar-modulos-criticos' into 'develop'
Ent 10249 guardia problemas en grupos anidados para visualizar modulos criticos

See merge request artica/pandorafms!5486
2023-02-07 09:57:37 +00:00
Jonathan a2d7573d30 #9479 Create module and edit/delete on metaconsole 2023-02-06 16:44:14 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Daniel Maya 5d3b21b36d #10249 Fixed groups 2023-02-03 11:07:52 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Pablo Aragon 36fc9b2917 9987-New inventory view 2023-02-03 09:55:46 +01:00
Jonathan 181b172ba8 #9529 timezone visual for new users 2023-02-01 16:57:48 +01:00
Jose Gonzalez 2c8c1d4593 Minor fixes and improvements 2023-02-01 15:14:32 +01:00
alejandro.campos@artica.es 4d24f281fe fixed minor bug 2023-02-01 14:56:30 +01:00
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