Commit Graph

480 Commits

Author SHA1 Message Date
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
vgilc d0458e0194 Merge branch 'ent-2102-graph-error' into 'develop'
Ent 2102 - Error SQL Graphs meta

See merge request artica/pandorafms!1416
2018-04-17 16:22:19 +02:00
fermin831 fb4be3cddf [SLA] Substitute the downplanned color 2018-04-11 16:22:16 +02:00
Alejandro Gallardo Escobar d22b2ba588 Bugfix 2018-04-10 11:37:17 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios
Conflicts:
	pandora_console/include/class/Tree.class.php
2018-04-10 09:29:14 +02:00
fermin831 e3341c98ce [Secondary Groups] Fixed agent graph agent status 2018-03-27 17:02:41 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
daniel f750d0f49e fixed errors in reports interfaces metaconsole 2018-03-23 08:00:32 +01:00
fermin831 b6688dda1c [SQL charts reports] Added top n report to set the maximum number of elements 2018-03-01 16:49:50 +01:00
fermin831 3359870c2f [SQL Charts] Added limit elements and some improves 2018-03-01 13:11:11 +01:00
fermin831 98b57ef642 [SQL charts] Added breadcrumbs to sql charts 2018-03-01 12:41:17 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +01:00
daniel 815e9c6759 fixed errors graph 2018-03-01 09:46:52 +01:00
daniel 3910b455ca fixed errors 2018-02-28 10:02:06 +01:00
daniel 51f22413a8 fixed errors in graphs 2018-02-28 08:46:51 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel 7bc9a6cfb5 graph 2018-02-12 13:29:25 +01:00
daniel 2417cae01d Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-12 12:47:53 +01:00
daniel 3e0edcfda8 fixed errors in automatic combined graph meta with TIP 2018-02-08 17:07:54 +01:00
daniel af9e11ffca reconfigure charts 2018-02-08 15:47:12 +01:00
vgilc 717ecb6adc Merge branch '1638-Si-creamos-una-gráfica-combinada-con-un-intervalo-pequeño-sale-vacía-dev' into 'develop'
Fixed interval when the period is less than resolution in custom graph

See merge request artica/pandorafms!1118
2018-01-29 12:53:27 +01:00
daniel 36429616f3 fixed minor error combined graph fullscale 2018-01-22 15:46:23 +01:00
daniel ead1161e0b add fullscale combined and custom graph 2018-01-03 12:13:00 +01:00
vgilc 349a9bbd35 Merge branch '1613-4894-No-aparece-fecha-final-en-las-graficas-24h-de-los-agentes' into 'develop'
Change time format in agent events 24h bar view and show the last start time - #1613

See merge request artica/pandorafms!1089
2017-12-21 09:04:55 +01:00
daniel a335732267 fixed errors in graphs webproc and keep alive 2017-12-19 13:13:42 +01:00
danielmaya 146802119d Fixed pdf label 2017-12-18 16:50:24 +01:00
danielmaya b65d649750 Fixed reporting custom graph 2017-12-18 13:12:29 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
daniel 4a1a0ae8b7 fixed errors in graphs 2017-12-13 17:17:45 +01:00
danielmaya 85ac142c6c Updated functions_graph and fixed percentil issue 2017-12-13 10:38:08 +01:00
danielmaya 1d3efb9d9e Updated functions_graph 2017-12-13 10:37:42 +01:00
danielmaya 61b33221bf Added check modules and series 2017-12-13 10:37:23 +01:00
Daniel Maya e01f00ac3d code backup 2017-12-13 10:36:08 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
Arturo Gonzalez 30c879b600 Added more changes to improve radial dynamic maps 2017-11-30 10:45:28 +01:00
vgilc 1895bf3fe9 Merge branch '1375-Que-se-muestre-la-unidad-en-las-custom-graphs-dev' into 'develop'
added unit in custom graphs

See merge request artica/pandorafms!979
2017-11-29 15:42:40 +01:00
Arturo Gonzalez 2883e45849 Added changes to get all hierachy to the chart 2017-11-24 12:08:15 +01:00
danielmaya 0b728375db Fixed interval when the period is less than resolution in custom graph 2017-11-24 11:55:25 +01:00
Arturo Gonzalez 06f83825dc Added code to fix agents generation in sunbrust chart 2017-11-24 11:27:10 +01:00
Arturo Gonzalez f4d035cfa5 Added changes to filter by group. Not finished 2017-11-21 10:27:17 +01:00
enriquecd 1f2f8fdc0c Change time format in agent events 24h bar view and show the last start time - #1613 2017-11-17 11:44:38 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
vgilc 2d87172558 Merge branch 'vulnerabilidad-en-consola' into 'develop'
Resolve: Vulnerabilidad en consola

See merge request artica/pandorafms!1020
2017-11-06 17:41:45 +01:00