Commit Graph

778 Commits

Author SHA1 Message Date
Daniel Cebrian 3b0d15b41c Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map 2023-08-11 12:26:24 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/65.sql
2023-08-09 08:59:01 +02:00
Daniel Cebrian 131f78e21e #11682 fixed special days calendar 2023-08-08 18:04:30 +02:00
alejandro.campos@artica.es 30784cc992 implemented inventory widget 2023-08-01 11:47:37 +02:00
Daniel Maya 0d321f5311 #11739 Fixed deprecated functions 3 2023-08-01 11:19:04 +02:00
alejandro.campos@artica.es 8fdc841254 Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget 2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es 78e76e1ad3 implemented inventory widget 2023-08-01 09:57:49 +02:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Rafael Ameijeiras 39edfa48df Merge branch 'ent-11419-pequenos-cambios-en-widget-de-graficas-simples' into 'develop'
Ent 11419 Pequeños cambios en widget de graficas simples

See merge request artica/pandorafms!6155
2023-07-25 08:04:23 +00:00
Rafael Ameijeiras 6b3b98ac04 Merge branch 'ent-11480-widget-de-estado-de-grupos-no-deberia-mostar-grupos-vacios' into 'develop'
Ent 11480 Widget de estado de grupos no deberia mostar grupos vacios

See merge request artica/pandorafms!6152
2023-07-24 10:54:24 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop'
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
2023-07-19 11:54:01 +00:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Daniel Cebrian 018bfe1288 #10696 fixed resize circular mesh 2023-07-19 10:36:30 +02:00
daniel 5707ec9e4b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-18 15:13:29 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop'
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
2023-07-18 05:30:04 +00:00
Daniel Maya 37b1c94b45 #11493 Fixed icon 2023-07-17 11:53:14 +02:00
daniel a29497f659 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-17 10:52:15 +02:00
Daniel Cebrian 42540065cd #11490 new widget group status map 2023-07-17 08:30:47 +02:00
Daniel Maya 89f55fd24e resolved conflict 2023-07-17 08:28:38 +02:00
Rafael Ameijeiras df70aa6ee6 Merge branch 'ent-11680-15857-bug-dashboard-metaconsola-widgets-servicio-con-mapa-sunburts' into 'develop'
Ent 11680 [#15857]Bug Dashboard metaconsola widgets servicio con mapa sunburts

See merge request artica/pandorafms!6190
2023-07-17 06:04:55 +00:00
daniel 0722cfca1a ITSM fixed pandora_enterprise#11471 2023-07-14 15:42:35 +02:00
daniel c2297052c1 ITSM dashboard pandora_enterprise#11471 2023-07-11 15:55:10 +02:00
miguel angel rasteu 8bcd7cae26 #10946 redirect to tree view in metaconsole 2023-07-11 09:56:46 +02:00
daniel 524bb7fdbb Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-11 08:26:20 +02:00
miguel angel rasteu b9b64d062d #10946 redirect to Agent detail and monitor detail 2023-07-10 16:08:26 +02:00
daniel 200750f90b change events user_comment new table tevent_comment pandora_enterprise#11387 2023-07-07 12:53:14 +02:00
miguel angel rasteu 6d848b9fd3 #11216 Duplicate widget 2023-07-07 12:25:49 +02:00
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop'
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
2023-07-06 08:35:35 +00:00
Daniel Cebrian bdcb16e6f8 #9162 fixed configure colums in meta 2023-07-06 09:20:21 +02:00
Gorka Sanchez 029cb77068 Merge branch 'ent-11460-top-n-events-by-agent-y-by-module-en-metaconsola-no-toman-en-cuenta-los-top-n-de-los-nodos' into 'develop'
Ent 11460 top n events by agent y by module en metaconsola no toman en cuenta los top n de los nodos

See merge request artica/pandorafms!6036
2023-07-03 07:37:28 +00:00
Gorka Sanchez 498a6d1ee6 Merge branch 'ent-11465-widget-agent-module-view-se-rompe-si-aloja-modulo-no-inicializado-que-posteriormente-reporta' into 'develop'
Ent 11465 widget agent module view se rompe si aloja modulo no inicializado que posteriormente reporta

See merge request artica/pandorafms!6030
2023-07-03 07:33:54 +00:00
Rafael Ameijeiras b44bd8efca Merge branch 'ent-10691-mejoras-en-widget-top-n-agent-modules' into 'develop'
Ent 10691 mejoras en widget top n agent modules

See merge request artica/pandorafms!5853
2023-06-30 07:06:46 +00:00
daniel 564f714112 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-29 09:46:08 +02:00
daniel 64c8086854 wip integration integriaIMS pandora_enterprise#11471 2023-06-29 09:45:44 +02:00
Daniel Cebrian 40f0deed67 #11680 fixed multi service widget 2023-06-28 15:12:50 +02:00
Matias Didier 8e42ee6c82 Merge branch 'ent-11262-15597-modulos-deshabiitados-aparecen-en-el-widget-del-dashboard-de-reportes' into 'develop'
Ent 11262 15597 modulos deshabiitados aparecen en el widget del dashboard de reportes

See merge request artica/pandorafms!5966
2023-06-28 12:05:03 +00:00
Daniel Cebrian 7c99e788c7 #10691 added image no data in pue graph 2023-06-27 15:53:42 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
Rafael Ameijeiras 4edaf4bc78 Merge branch 'ent-11451-network-map-de-dashboard-siempre-aparece-con-zoom-x1-al-editar' into 'develop'
Ent 11451 Network map de Dashboard siempre aparece con zoom x1 al editar

See merge request artica/pandorafms!6107
2023-06-26 07:43:41 +00:00
Rafael Ameijeiras f1fc7bbbe5 Merge branch 'ent-11496-opcion-de-click-to-view-report-en-widget-de-custom-report-lleva-a' into 'develop'
Ent 11496 opcion de click to view report en widget de custom report lleva a

See merge request artica/pandorafms!6106
2023-06-26 07:41:29 +00:00
Rafael Ameijeiras 7065d8bb4d Merge branch 'ent-11550-widget-tactical-view-muestra-todos-los-datos-en-algunas-partes-aun-filtrando-por-grupo' into 'develop'
Ent 11550 widget tactical view muestra todos los datos en algunas partes aun filtrando por grupo

See merge request artica/pandorafms!6096
2023-06-26 07:35:24 +00:00
Matias Didier fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
2023-06-22 13:24:47 +00:00
Daniel Cebrian eac656dfc0 #11059 fixed setted number 2023-06-22 15:08:52 +02:00
Daniel Cebrian 66ba29581b #11059 added new property in graphjs for add text in center 2023-06-22 15:06:16 +02:00
miguel angel rasteu 5d4f90ca10 #11550 Fix tactical view widget 2023-06-21 16:10:13 +02:00
Matias Didier 91615f5bd6 Merge branch 'ent-11548-widget-module-in-a-table-es-ilegible' into 'develop'
Ent 11548 widget module in a table es ilegible

See merge request artica/pandorafms!6089
2023-06-21 08:17:06 +00:00
Daniel Cebrian bd652e5778 #11419 added new options in basic chart 2023-06-20 17:19:23 +02:00
Daniel Cebrian 5ee902902a #11480 added recursion in condition 2023-06-20 15:20:43 +02:00
Daniel Cebrian 50dca5f8e6 #11480 fixed widget status group 2023-06-20 15:09:50 +02:00
daniel d84299d3ab wip api integration pandora #1355 2023-06-20 08:43:10 +02:00
Daniel Maya c28730a081 #11493 Fixed color 2023-06-19 17:31:26 +02:00
Rafael Ameijeiras 2923fa867e Merge branch 'ent-11482-widget-de-module-histogram-en-metaconsola-no-lista-modulos-del-agente-ya-seleccionado-en' into 'develop'
Ent 11482 widget de module histogram en metaconsola no lista modulos del agente ya seleccionado en

See merge request artica/pandorafms!6048
2023-06-19 08:20:57 +00:00
daniel e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +02:00
Daniel Cebrian dd61cb6cfb #11451 fixed zoom in network map widget 2023-06-14 17:25:51 +02:00
Jonathan 7e8585dabe #11496 fix dashboard custom report redirection 2023-06-14 16:53:06 +02:00
Daniel Maya 1aa295735b #11549 Fixed widgets 2023-06-14 15:24:38 +02:00
miguel angel rasteu 341f5bdb7c #11550 Fix code identation 2023-06-13 16:17:40 +02:00
miguel angel rasteu 5c1a04dbcd #11550 Fix charts pie data 2023-06-13 16:15:54 +02:00
miguel angel rasteu 9e4c1a7574 #11548 Fix separators and select separators 2023-06-13 11:36:54 +02:00
Daniel Maya 6ca91b89ec #11493 Added agent hive 2023-06-12 16:28:57 +02:00
Daniel Cebrian f04b700574 #11542 fixed width module graph 2023-06-12 14:17:12 +02:00
Daniel Cebrian fb297c8891 #10696 delete switches from graphs in netflow widget 2023-06-08 15:56:13 +02:00
Rafael Ameijeiras 45d0de7386 Merge branch 'ent-11382-widget-event-cardboard-no-funciona-en-version-community' into 'develop'
Ent 11382 widget event cardboard no funciona en version community

See merge request artica/pandorafms!5973
2023-06-08 11:57:01 +00:00
Rafael Ameijeiras 37073d9f67 Merge branch 'ent-11479-widget-color-pestana-de-modulos-casca-en-version-open' into 'develop'
Ent 11479 widget color pestana de modulos casca en version open

See merge request artica/pandorafms!6042
2023-06-08 11:55:31 +00:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
Rafael Ameijeiras 5aff890b8d Merge branch 'ent-11481-widget-icon-and-module-value-no-alineado-correctamente-en-horizontal-y-bug-en-la-edición-de-módulo-con-mismo-agente' into 'develop'
Ent 11481 widget icon and module value no alineado correctamente en horizontal y bug en la edición de módulo con mismo agente

See merge request artica/pandorafms!6049
2023-06-08 10:48:20 +00:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Cebrian 75f227ec9f #11481 fixed widgets dashboard styles 2023-06-06 17:12:13 +02:00
Daniel Cebrian 7fa2f77729 #11482 fixed list modules in module histogram, only meta 2023-06-06 15:06:15 +02:00
Daniel Cebrian b6f586a6f4 #11479 fixed color module tabs in open version 2023-06-06 13:10:05 +02:00
Daniel Cebrian 6c00b39550 #11460 fixed widgets Top N events by agent
and Top N events by module
2023-06-05 16:43:27 +02:00
Daniel Cebrian 0b3f23f137 #11465 fixed agent module widget when server is restarted 2023-06-05 12:45:37 +02:00
Daniel Maya 96762749cf #11256 fixed icon 2023-06-01 17:47:43 +02:00
Daniel Cebrian fb8a54c42e #11195 fixed widget groups when select all 2023-05-29 13:41:17 +02:00
Daniel Cebrian f97832f3f2 #11382 fixed event cardboard in version open 2023-05-26 14:36:29 +02:00
Daniel Cebrian 913775c0d3 #11262 added new token in modules by status for filter disabled modules 2023-05-26 08:57:45 +02:00
Matias Didier efd2adac06 Merge branch 'ent-11233-bug-dashboard-no-data' into 'develop'
Ent 11233 bug dashboard no data

See merge request artica/pandorafms!5911
2023-05-22 08:19:54 +00:00
Daniel Maya 9f1002e082 #11276 Fixed group 2023-05-18 17:21:26 +02:00
Matias Didier c62b46282f Merge branch 'ent-11190-dashboard-widget-tree-view-al-filtrar-agentes-con-mas-de-1-palabra-ya-no-encuentra-nada' into 'develop'
Ent 11190 dashboard widget tree view al filtrar agentes con mas de 1 palabra ya no encuentra nada

See merge request artica/pandorafms!5904
2023-05-17 10:08:42 +00:00
Daniel Cebrian 7980d68faf #11190 fixed filter with name module 2023-05-17 11:24:48 +02:00
Daniel Cebrian a1d02e4f4d #11233 fixed bug no data in basic chart 2023-05-17 09:50:08 +02:00
Rafael Ameijeiras 4f5315db98 Merge branch 'ent-11171-15556-edicion-de-historico-sigue-fallando-en-771' into 'develop'
Ent 11171 15556 edicion de historico sigue fallando en 771

See merge request artica/pandorafms!5875
2023-05-16 12:31:16 +00:00
Rafael Ameijeiras 5e4fee412d Merge branch 'ent-11193-dashboard-widget-color-tabs-modules-no-carga-cuando-hay-modulos-string' into 'develop'
Ent 11193 dashboard widget color tabs modules no carga cuando hay modulos string

See merge request artica/pandorafms!5896
2023-05-16 12:29:52 +00:00
Daniel Cebrian 45ecf362d8 #11190 safe output in filter agent tree widget 2023-05-16 13:22:33 +02:00
Daniel Rodriguez e2ef02081a Merge branch 'ent-11179-15577-errores-en-varios-widgets-de-dashboard' into 'develop'
Ent 11179 15577 errores en varios widgets de dashboard

See merge request artica/pandorafms!5884
2023-05-16 09:43:38 +00:00
Daniel Cebrian 5adcdb1cae #10696 fixed select Usage map 2023-05-16 09:34:59 +02:00
Daniel Maya 605181f4e6 #11193 fix string 2023-05-12 14:25:35 +02:00
Daniel Cebrian 05cc72eb0f #10696 new widget for netflow 2023-05-12 14:16:04 +02:00
Matias Didier 2b4a362e06 Merge branch 'ent-10733-alinear-forma-horizontal-del-widget-avg-max-min-sum' into 'develop'
Ent 10733 alinear forma horizontal del widget avg max min sum

See merge request artica/pandorafms!5750
2023-05-12 06:18:18 +00:00
Daniel Maya 45d6f2b5f5 #11179 Fixed heatmap and latest events 2023-05-11 12:05:00 +02:00
Daniel Maya d26ae96670 #11171 Fix historical database with php 8.1 2023-05-10 15:15:03 +02:00
Daniel Cebrian 0e58a9b2fb #added new type bars in widget and change legend 2023-05-08 14:46:46 +02:00
Pablo Aragon 886bde919b 11135-Move js code from ui_print_datatable 2023-05-08 14:25:57 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
Calvo 4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
Calvo fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
Daniel Cebrian 48d7eb2514 #10733 align text widget hotizontally 2023-04-20 11:15:34 +02:00
daniel a89e1aa534 new widget basic chart pandora_enterprise#10692 2023-04-20 10:16:18 +02:00
Rafael Ameijeiras d40091a8f3 Merge branch 'ent-10066-poner-recursividad-para-grupos-en-widget-triggered-alerts-report' into 'develop'
Ent 10066 poner recursividad para grupos en widget triggered alerts report

See merge request artica/pandorafms!5666
2023-04-19 12:40:16 +00:00
Jonathan ad0e922ece #10966 change style widget info groups 2023-04-18 12:56:18 +02:00
Matias Didier e4fd12f6de Merge branch 'ent-10067-anadir-filtro-alerts-triggered-en-tree-view-y-widget-tree-view' into 'develop'
Ent 10067 anadir filtro alerts triggered en tree view y widget tree view

See merge request artica/pandorafms!5662
2023-04-17 11:06:10 +00:00
Rafael Ameijeiras 57ec600bd1 Merge branch 'ent-10912-enlaces-a-agente-en-la-vista-tactica-de-grupo-lleva-a-la-edicion-de-agente-deberia-ir-a-la' into 'develop'
Ent 10912 enlaces a agente en la vista tactica de grupo lleva a la edicion de agente deberia ir a la

See merge request artica/pandorafms!5716
2023-04-13 13:07:05 +00:00
Rafael Ameijeiras b78acc28ca Merge branch 'ent-10310-14620-Widget-General-group-status-no-funciona-correctamente-en-la-Metaconsola' into 'develop'
fixed group link on General group status widget

See merge request artica/pandorafms!5711
2023-04-13 12:45:19 +00:00
Jonathan 7730ca6469 #10912 link to agent view in tactical group view 2023-04-13 12:16:32 +02:00
Matias Didier 250d65d94a Merge branch 'ent-10740-mejoras-en-heatmap' into 'develop'
Ent 10740 mejoras en heatmap

See merge request artica/pandorafms!5660
2023-04-13 08:24:18 +00:00
alejandro.campos@artica.es 153b978778 fixed group link on General group status widget 2023-04-13 09:18:55 +02:00
daniel c0172afc3d update composer 2023-04-10 16:38:37 +02:00
Pablo Aragon 2dc8b25ddc 10066-Recursion group widget alerts triggered 2023-04-05 12:59:52 +02:00
Pablo Aragon 73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +02:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Jimmy Olano 89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS.
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
2023-04-04 11:57:45 +00:00
Jonathan 4aaddf063c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 09:52:06 +02:00
Jonathan 93966788eb Slides require mesage 2023-03-31 09:51:48 +02:00
daniel 24e5fca884 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-30 17:34:06 +02:00
Pablo Aragon 98acf2b864 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-30 16:50:40 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Jonathan 9635b4b721 Dashboard slides fix 2023-03-30 16:45:27 +02:00
Daniel Cebrian f442272177 Merge branch 'develop' into ent-10633-pantalla-de-timeout 2023-03-30 09:30:38 +02:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan 8c3b5d650d tree view dashboard metaconsole 2023-03-29 16:50:17 +02:00
Alejandro Campos e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-03-28 14:09:33 +00: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
daniel 56e4770b93 fixed styles 2023-03-23 14:20:54 +01:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon e2820d1ad7 9680-Fix widget 2023-03-23 09:18:39 +01:00
Daniel Cebrian b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan 30538265e8 Cluster wizzard visual fix 2023-03-15 16:06:42 +01:00
Pablo Aragon 00a5e8e84b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-15 11:30:40 +01:00
Pablo Aragon 938e8cd777 Dashboards widgets 2023-03-15 11:30:22 +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
Pablo Aragon 620bff28af Dashboards widgets 2023-03-14 15:59:20 +01:00
Pablo Aragon 658f2853f7 Dashboards widgets 2023-03-14 14:56:33 +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 d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
daniel c96ac79726 fixed styles 2023-03-13 19:30:51 +01:00
Daniel Cebrian 90f0c3771f #10324 fixed deleted element fav menu 2023-03-13 17:21:28 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
Daniel Maya 0e4d423825 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-13 15:17:18 +01:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
2023-03-13 10:43:38 +01:00
daniel 80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
2023-03-13 09:23:53 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
alejandro.campos@artica.es 39a119d150 Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob 2023-03-10 13:29:20 +01:00
Daniel Maya 030a37a5da Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-10 12:19:00 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +01:00
Daniel Cebrian fdc73be979 Merge branch 'develop' into ent-10347-vista-tactica-de-grupo 2023-03-07 13:19:52 +01:00
Jose Gonzalez 5ecc3470e2 Tree View in dashboard minor fixes 2023-03-06 23:48:06 +01:00
daniel 5ba9e0e9aa fixed styles 2023-03-06 16:21:10 +01:00
Jose Gonzalez e33a9bc3e4 Services TreeView 2023-03-06 13:32:21 +01:00
Pablo Aragon daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +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 ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
Daniel Cebrian 7562a9253a #10347 refactoring and add link to events in graph 2023-03-03 13:13:49 +01:00
Alejandro Campos 3ddb3c1034 Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
#   pandora_console/extras/mr/62.sql
#   pandora_console/pandoradb.sql
2023-03-03 08:12:57 +00:00
daniel 310ad88707 fixed styles 2023-03-02 19:25:31 +01:00
Daniel Cebrian af5a620883 #10347 fixed urls monitors and added name group 2023-03-02 16:22:25 +01:00
Daniel Cebrian dc6256058f #10347 added list agents in tactical view groups 2023-03-02 13:48:14 +01:00
Daniel Cebrian a4a5650a01 #10347 added modal in heatmap agent 2023-03-02 11:10:37 +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
Daniel Cebrian ea51399460 #10347 create view tactic for groups with monitoring and alerts 2023-03-01 17:27:32 +01:00
Daniel Cebrian 08fb4e3396 #10324 fixed delete element in favmenu 2023-02-27 10:07:35 +01:00
Daniel Cebrian 728991ad9a #10324 delete fav menu when delete element 2023-02-24 13:36:13 +01:00
alejandro.campos@artica.es 6c64ccd6d6 implemented consoles management 2023-02-21 15:32:45 +01:00
Daniel Maya d4f6baa9bb #8642 Added heatmap widget 2 2023-02-21 15:06:58 +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
Pablo Aragon 0125ba742b 9680-Create widget ModulesByStatus 2023-02-15 11:42:50 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Pablo Aragon b439ed684e 9859-Widget AvgSumMaxMinModule 2023-02-10 10:31:41 +01:00
Pablo Aragon f35acde8eb 9680-Create widget ModulesByStatus 2023-02-09 10:37:12 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Jose Gonzalez 17c0e78d06 Improve TreeView 2023-01-26 13:25:24 +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
Rafael Ameijeiras b0167af928 Merge branch 'ent-10103-cambio-en-vista-de-threeshold-de-clusters' into 'develop'
Ent 10103 cambio en vista de threeshold de clusters

See merge request artica/pandorafms!5390
2023-01-23 15:28:06 +00:00
Calvo 2fc1abc893 Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio 2023-01-18 11:33:21 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Daniel Cebrian acd36289b0 #10103 added module name in A-A THRESHOLDS 2023-01-09 17:17:04 +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
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
Rafael Ameijeiras 96257faf31 Merge branch 'ent-9556-14267-Conteo-y-paginacion-incorrecto-en-vista-de-Dashboards' into 'develop'
fixed count query for admin user

See merge request artica/pandorafms!5348
2022-12-28 11:35:18 +00:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
alejandro.campos@artica.es 4ee89b5b3e fixed count query for admin user 2022-12-21 13:39:03 +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
Diego Muñoz-Reja de0efc7f3a Merge branch 'ent-9965-error-sql-en-busqueda-de-widgets' into 'develop'
Fix sql error on widget search

See merge request artica/pandorafms!5323
2022-12-20 15:04:58 +00:00
Rafael Ameijeiras b640b9f7b9 Merge branch 'ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard' into 'develop'
new widget datamatrix pandora_enterprise#8619

See merge request artica/pandorafms!5257
2022-12-19 10:49:45 +00:00