778 Commits

Author SHA1 Message Date
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