tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,225 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

157 Commits

Author SHA1 Message Date
daniel 06c436e5bf add new tocken zoom graph visual styles 2018-08-03 10:01:04 +02:00
fermin831 04cfbe4ef9 Fixed acl in module graph view 2018-08-01 13:16:21 +02:00
daniel c26a50e838 fixed errors in graphs 2018-07-06 11:56:38 +02:00
manuel.montes 5436c64800 Merge branch '2396-fallo-acl-en-vista-de-cluster' of https://brutus.artica.lan:8081/artica/pandorafms into 2396-fallo-acl-en-vista-de-cluster 2018-06-29 08:52:46 +02:00
manuel.montes 4f23407ea8 Fixed for group All 2018-06-28 17:03:02 +02:00
daniel 65eb4744a1 fixed boolean graph no zoom 2018-06-27 16:17:17 +02:00
slerena 99271a4822 Merge branch '1797-Menú-desplegable-de-gráficas-miniaturizado' into 'develop' 
fixed resize in stat_win.php

See merge request artica/pandorafms!1503
 2018-06-25 18:59:09 +02:00
daniel 05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel 9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
manuel.montes 5021144405 fixed resize in stat_win.php 2018-05-29 13:19:20 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
Fermin 29f56df1fd [Rebranding] Open operation/agents 2018-05-11 15:17:53 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
fermin831 bc2c92807a Fixed agent view graphs (stat_win.php entry point) 2018-04-19 13:15:13 +02:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
fermin831 6093f6a0d8 [Metaconsole] Fixed img broken links on metaconsole 2018-02-28 12:08:15 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
enriquecd 0fac48d71c Fix only show average graphs checkbox - #1460 2018-01-02 16:43:13 +01:00
vgilc 66b88f3764 Merge branch 'graph-window-resize-change' into 'develop' 
Resolve: "Graph window resize change"

See merge request artica/pandorafms!1111
 2018-01-02 10:29:49 +01:00
vgilc 3dad6d1837 Merge branch '1460-4706-No-funciona-token-Mostrar-solo-la-media-en-Visual-Styles' into 'develop' 
Only average token for graphs fix - #1460

See merge request artica/pandorafms!1040
 2017-12-21 10:42:12 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
Alejandro Gallardo Escobar dc579f6bbe [Console] Fixed the graph popup size in Firefox 2017-11-23 13:51:43 +01:00
Alejandro Gallardo Escobar 279a864d82 [Console] Adjustments to the graph popup size 2017-11-23 12:53:54 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
enriquecd 24770c79ac Only average token for graphs fix - #1460 2017-11-08 10:40:03 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
daniel 8fbe360333 fixed minor errors 2017-10-13 14:44:12 +02:00
daniel e912e151a9 fixed errors in setup tip AND prediction modules 2017-10-11 13:17:29 +02:00
Daniel Maya 076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
daniel 45743e2dc5 Merge branch 'develop' into 1335-Configurar_graficas_full_scale_por_defecto 2017-10-06 08:37:56 +02:00
daniel e032f40525 fixed minor error TIP 2017-09-26 12:03:00 +02:00
daniel 4ec6b4e053 add new select to setup for TIP 2017-09-26 11:53:57 +02:00
vgilc e250e0eeae Revert "Merge branch '1196-Time-range-en-gráficas-de-módulo-dev' into 'develop'" 
This reverts merge request !722
 2017-08-09 09:27:06 +02:00
Daniel Maya 032995fc83 Disabled select for not admins 2017-08-08 14:59:30 +02:00
Arturo Gonzalez ec2872b83b Added second check to period field in module charts (admin have diferent field name) 2017-06-21 16:41:31 +02:00
artu30 c0a4cd9df5 Merge branch 'develop' into '757-full-scale-graph-dev' 
# Conflicts:
#   pandora_console/include/functions_graph.php
 2017-06-05 09:38:06 +02:00
Arturo Gonzalez 913aa4334b Save work and continue with more tests 2017-05-18 17:06:49 +02:00
m-lopez-f 9e1b467850 new changes in graphs 2017-03-17 13:30:11 +01:00
Daniel Maya a36e74990d Merge branch 'feature/alias_friendly_name' into 'develop' 
Feature/alias friendly name

See merge request !188
 2017-02-21 16:46:05 +01:00
Arturo Gonzalez cb7ab827d2 Fixed module type chart selected in conf. Ticket #345 2017-02-21 16:36:46 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
daniel d0faeb3ec1 fixed errors in graphs 2017-02-16 11:18:42 +01:00