Commit Graph

437 Commits

Author SHA1 Message Date
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
Daniel Cebrian acd36289b0 #10103 added module name in A-A THRESHOLDS 2023-01-09 17:17:04 +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
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
alejandro.campos@artica.es 2922276654 minor change 2022-12-16 11:38:40 +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
Daniel Barbero 14f548aa3a fixed error format data datamatrix pandora_enterprise#8619 2022-12-13 11:06:42 +01:00
Daniel Barbero 2d638a61cf Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-12-13 09:59:30 +01:00
Calvo 6913f237dc Fix sql error on widget search 2022-12-12 15:48:10 +01:00
Luis Calvo cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
alejandro.campos@artica.es b4079bd557 fixed query errors 2022-11-30 16:52:40 +01:00
alejandro.campos@artica.es eda1ace809 fix alerts fired widget 2022-11-17 12:46:37 +01:00
Daniel Barbero e10455c902 new widget datamatrix pandora_enterprise#8619 2022-11-10 16:10:50 +01:00
Daniel Barbero f273813869 new widget datamatrix pandora_enterprise#8619 2022-11-10 12:05:25 +01:00
Daniel Barbero 4b4f92b11b new widget datamatrix pandora_enterprise#8619 2022-11-08 16:30:25 +01:00
alejandro.campos@artica.es e3d01930b1 minor change 2022-11-07 14:13:04 +01:00
alejandro.campos@artica.es 75fe9dd8d3 fix xss 2022-11-07 11:26:00 +01: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
Daniel Barbero 821bdf16da fix error types php7.2 pandora_enterprise#9695 2022-10-24 09:26:22 +02:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop'
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
2022-10-20 12:10:59 +00:00
alejandro.campos@artica.es 17d7261173 implement cluster in open project 2022-10-20 13:17:26 +02:00
Daniel Rodriguez 6657052308 Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop'
fix several problems in history db settings

See merge request artica/pandorafms!5188
2022-10-20 07:21:11 +00:00
alejandro.campos@artica.es 17a87392e3 minor fix 2022-10-19 18:38:27 +02:00
alejandro.campos@artica.es f87737a093 minor fix 2022-10-19 17:07:22 +02:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00
Daniel Barbero 40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Alejandro Campos c995a5eafb Merge branch 'develop' into 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php'
# Conflicts:
#   pandora_console/extras/mr/58.sql
2022-10-18 07:23:29 +00:00
Daniel Rodriguez f7549f88cd Merge branch 'ent-9300-cambio-de-label-de-enable-sunburst-a-show-sunburst-by-default' into 'develop'
Ent 9300 cambio de label de enable sunburst a show sunburst by default

See merge request artica/pandorafms!5157
2022-10-14 11:19:00 +00:00
Daniel Barbero 370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/functions_modules.php
2022-10-14 11:46:20 +02:00
Diego Muñoz-Reja f45b185250 Merge branch 'ent-9431-14085-anadir-modulo-webserver-a-cluster-activo-pasivo' into 'develop'
Ent 9431 14085 anadir modulo webserver a cluster activo pasivo

See merge request artica/pandorafms!5129
2022-10-13 16:22:27 +00: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
alejandro.campos@artica.es ac7f8419a6 fix several problems in history db settings 2022-10-11 13:39:47 +02:00
alejandro.campos@artica.es b218cd0d15 fix several problems in history db settings 2022-10-11 13:32:29 +02:00
alejandro.campos@artica.es 07232d82d1 fix several problems in history db settings 2022-10-11 13:26:25 +02:00
Daniel Barbero ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
Daniel Barbero 014441a2da new widget grouped meter graphs pandora_enterprise#8620 2022-10-06 17:13:45 +02:00
Daniel Barbero 54b44cc7fc new widget grouped meter graphs pandora_enterprise#8620 2022-10-06 09:41:31 +02:00