Commit Graph

609 Commits

Author SHA1 Message Date
daniel 30dc841bae custom graph 2018-04-27 10:03:05 +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
vgilc f7ae6f78b1 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop'
Fixed issue in dashboard with firefox

See merge request artica/pandorafms!1431
2018-04-18 11:11:35 +02:00
danielmaya e6dc7799c8 Fixed issue in dashboard with firefox 2018-04-18 10:30:24 +02:00
fermin831 4d78256937 Fixed Y-axis label decimals 2018-04-17 11:54:52 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
enriquecd 09d712d1ab Not blink separatos points in visual console digital clock - #2026 2018-03-28 18:42:59 +02:00
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
vgilc 9e276aa8a2 Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop'
Not blink separator dots for digital clocks - #2026

See merge request artica/pandorafms!1356
2018-03-22 10:04:04 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
fermin831 d38df88c79 [Pie charts] Adding more space in legend 2018-03-13 19:07:31 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00
enriquecd 97bcaec720 Not blink separator dots for digital clocks - #2026 2018-03-08 11:58:31 +01:00
fermin831 52e6503018 [Vertical Bar Charts] Fixed strpos check 2018-03-01 17:07:55 +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 4719742ba2 [Pie Charts] Maximized the number of elements 2018-03-01 13:19:58 +01:00
fermin831 287d28de4e [Vertical Bar Charts] Preserve order after truncate label 2018-03-01 13:16:36 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +01:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
daniel 815e9c6759 fixed errors graph 2018-03-01 09:46:52 +01:00
danielmaya 9d36887a02 Fixed graph precision 2018-02-28 14:33:22 +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 f69fb8a5f9 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-21 14:00:14 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
enriquecd 9a525f3b2e Change visual console digital clock colors - #1403 2018-02-19 19:17:53 +01:00
daniel 8be776e3ea fixed errrors graphs 2018-02-19 09:31:45 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +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 af9e11ffca reconfigure charts 2018-02-08 15:47:12 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
	pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
daniel 63e5d23288 change xasis to time 2018-02-02 12:25:23 +01:00
daniel d79bd6973f Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-01-31 15:29:37 +01:00
vgilc d9825c08b5 Merge branch '1660-WUX-stats-charts-dev' into 'develop'
Fixed jquery error

See merge request artica/pandorafms!1151
2018-01-29 13:31:19 +01:00
vgilc 2e486ffac0 Merge branch '1727-Gráficas-horizontales-texto' into 'develop'
Fix hbar grpahs label - #1727

See merge request artica/pandorafms!1246
2018-01-29 13:25:04 +01:00
vgilc 94e2e0b908 Merge branch 'fix-module-graph-decimals' into 'develop'
Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
2018-01-29 12:58:13 +01:00
fbsanchez f3855ac7e9 Added flot.time plugin 2018-01-25 13:14:21 +01:00
enriquecd 6e10baac32 Fix hbar grpahs label - #1727 2018-01-11 11:12:41 +01:00
vgilc 097bc3df32 Merge branch 'ent-1577-vista-general-descuadrada-en-graph-containers' into 'develop'
Added resize functionality to flot graphs and fix overview in container graphs

See merge request artica/pandorafms!1068
2017-12-21 10:46:42 +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 43e697a1cb Added hint in field Add summatory series 2017-12-13 11:50:15 +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
danielmaya dab2525355 Fixed jquery error 2017-12-01 13:32:50 +01:00
enriquecd 521eb8f4cb Add clocks to visual console - #1403 2017-12-01 12:14:56 +01:00
Alejandro Gallardo Escobar 82012959af [Console > Module area graph] Now the value shown into the legend uses the config value to show shortened of full data 2017-11-27 12:41:10 +01:00
Alejandro Gallardo Escobar b26c46a7c6 [Console > Module area graph] Now the value shown into the legend has 2 decimals instead of 1 2017-11-27 12:31:40 +01:00
Alejandro Gallardo Escobar b431f4afd3 [Console > Module area graph] Now the Y legend values are rounded properly to 2 dec when 'Shortened module graph data' is enabled 2017-11-27 11:56:52 +01:00
fbsanchez 0ea2475d60 minor fix pandora.flot.js 2017-11-14 19:02:13 +01:00
fermin831 78ef64ead2 Added resize functionality to flot graphs and fix overview in container graphs 2017-11-14 18:44:29 +01:00
fbsanchez 958ef2bd38 Merge branch 'develop' into 1278-extension-vmware-ext-4456-y-4479
Added max/min thresholds to hbar graphs
2017-11-14 10:49:15 +01:00
Arturo Gonzalez 833983e34e Added visual changes to donut graph 2017-11-13 12:54:28 +01:00
vgilc 3493b9c15c Revert "code backup"
This reverts commit b9851a3a71
2017-11-13 10:21:38 +01:00
vgilc 86a5599aad Revert "Fixed traces"
This reverts commit 173efae22d
2017-11-13 10:20:58 +01:00
vgilc 68a10343fb Revert "Merge branch…"
This reverts merge request !1025
2017-11-10 12:24:33 +01:00
fbsanchez a42a2ee7e2 Minor changes to allow hbar min/max ranges 2017-11-08 16:41:23 +01:00
Arturo Gonzalez 092c43bede Merge branch 'develop' into 1378-donut-graph-element-in-visual-console-dev
pandora_console/godmode/reporting/visual_console_builder.editor.js
	pandora_console/include/ajax/visual_console_builder.ajax.php
	pandora_console/include/functions_visual_map_editor.php
2017-11-08 10:27:44 +01:00
Arturo Gonzalez 3de0e38c2d Added color to resume data 2017-11-08 10:21:09 +01:00
Arturo Gonzalez b9b8b37abe Added grid color to bars graph in visual console 2017-11-08 09:55:36 +01:00
vgilc 3c920e9d10 Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-fix-2' into 'develop'
Fix pdf graph labels 2 - #417

See merge request artica/pandorafms!1032
2017-11-07 12:04:57 +01:00
vgilc 601d67fc7e Merge branch '1522-Fallos_a_la_hora_de_representar_las_gráficas_con_rangos_en_desconocido_v714' into 'develop'
fixed errors in fullscale graph and normal graph

See merge request artica/pandorafms!1025
2017-11-07 11:50:23 +01:00
enriquecd 2eec3dc766 Fix pdf graph labels 2 - #417 2017-11-07 11:43:42 +01:00
Arturo Gonzalez 31577a823c Fixed problems with unit 2017-11-07 10:57:30 +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
enriquecd b6d3444212 Fix PDF reports labels - #417 2017-11-06 17:02:54 +01:00
vgilc 9b163ce3e0 Merge branch '1367-radial-dinamic-rotate-texts-around-center-dev' into 'develop'
Added some modifications to sunburst d3 function

See merge request artica/pandorafms!1018
2017-11-06 12:15:30 +01:00
Arturo Gonzalez b01d0e78af Added some modifications to sunburst d3 function 2017-11-06 10:52:27 +01:00
Arturo Gonzalez 4a6c7f1783 Fixed encoding problems and default label color 2017-11-06 08:35:42 +01:00
danielmaya 173efae22d Fixed traces 2017-11-03 13:38:59 +01:00
vgilc 594b6e9417 Merge branch '1320-Exportación-CSV-saca-entities-dev' into 'develop'
1320 exportación csv saca entities dev

See merge request artica/pandorafms!1007
2017-11-02 15:35:38 +01:00
fermin831 0a0506b9ff Merge branch 'develop' into ent-1365-graficas-gauge-no-muestran-umbrales-menores-a-1
Conflicts resolved:
*  pandora_console/include/graphs/pandora.d3.js
2017-10-31 12:47:42 +01:00
Daniel Maya b9851a3a71 code backup 2017-10-31 11:51:19 +01:00
Alejandro Gallardo Escobar 849eba10d4 [Console] Fixed a vulnerability into the 'fgraph.php' script 2017-10-30 18:03:09 +01:00
Arturo Gonzalez eb99b0a885 Added lost code 2017-10-26 15:37:43 +02:00
Arturo Gonzalez 802cb3ef5e Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 14:41:07 +02:00
Arturo Gonzalez 5a59f9e2a5 Merge branch 'develop' into 1378-donut-graph-in-visual-console-dev 2017-10-26 14:20:35 +02:00
Arturo Gonzalez 704511aa56 Merge branch 'develop' into 1396-new-circular-percentile-item-in-visual-console-dev 2017-10-26 13:40:01 +02:00
vgilc 2f9d999978 Merge branch '1397-Grafica-combinada-y-fondo-negro-transparente-Consola-visual' into 'develop'
Enable background color options for gauge charts - #1397

See merge request artica/pandorafms!900
2017-10-26 13:35:44 +02:00
vgilc e8a14b6981 Merge branch '1416-new-h-and-v-bar-charts-in-visual-console-dev' into 'develop'
1416 new h and v bar charts in visual console dev

See merge request artica/pandorafms!956
2017-10-26 13:30:52 +02:00
vgilc b62dcd2f1f Merge branch '417-Labels-de-las-gráficas-en-Informes-PDF-se-ven-muy-pequeños-open' into 'develop'
Change pchart vertical and horizontal graphs style - #417

See merge request artica/pandorafms!858
2017-10-26 12:31:58 +02:00
Arturo Gonzalez 1f20247ae3 Added background color to bars charts 2017-10-26 12:24:14 +02:00
vgilc 00c8efb335 Merge branch '1364-Graficas-gauge-no-muestran-umbrales-menores-a-1' into 'develop'
Unable show float numbers in gauge charts - #1364

See merge request artica/pandorafms!896
2017-10-26 10:39:57 +02:00
fermin831 7379243946 Fixed lower than 1 values on gauges 2017-10-25 18:40:58 +02:00
Arturo Gonzalez 92633f21b4 Added element to view 2017-10-23 16:19:11 +02:00
Arturo Gonzalez ddbe2a298c Adapts donut graph to meta 2017-10-18 16:29:51 +02:00
Arturo Gonzalez f6fca4e46d Added donut to node visual consoles 2017-10-18 11:40:40 +02:00
Arturo Gonzalez 13f0d4c1f7 Added donut to visual console view 2017-10-17 16:50:00 +02:00
Arturo Gonzalez d35b420c36 Init d3 donut function 2017-10-17 12:09:55 +02:00
Arturo Gonzalez d18dded93a Added a lot of code to add donut graph to visual console. Print donut in progress. 2017-10-17 10:54:08 +02:00
enriquecd 806b282e8f Fix resize sla graphs in visual console - #1334 2017-10-10 18:48:58 +02:00
Arturo Gonzalez 8980edf2ad Adapt new items to meta 2017-10-09 12:55:57 +02:00
enriquecd c04d4ed08e Enable background color options for gauge charts - #1397 2017-10-09 12:03:19 +02:00
Arturo Gonzalez 4cb4a699a5 Added minor changes to percent items 2017-10-09 11:57:31 +02:00
Arturo Gonzalez bbd296052b Added good styles 2017-10-06 14:30:36 +02:00
Arturo Gonzalez 7410d66192 Bubble item and percentile bar item are new. Fixed some visual errors 2017-10-06 14:04:20 +02:00
enriquecd dfbc8fec69 Unable show float numbers in gauge charts - #1364 2017-10-06 13:48:45 +02:00
Arturo Gonzalez 3b03bfe6b5 Added modifications to value option 2017-10-05 17:33:37 +02:00
Arturo Gonzalez 7d455d3ac2 Added d3 items 2017-10-05 16:38:21 +02:00
Daniel Maya edeeb19bed fixed csv import 2017-10-05 15:22:55 +02:00
Arturo Gonzalez 01df63b179 Fixed minor errors and init d3 function 2017-10-05 13:33:34 +02:00
fermin831 40dcdad0de Added two significant digits to labels on pChart 2017-10-04 16:52:49 +02:00
vgilc 45c35a1a0f Merge branch '1251-export-data-to-csv-in-graph-container-dev' into 'develop'
Fixed error in js library and added good export to graph container graphs

See merge request !828
2017-10-04 14:28:38 +02:00
enriquecd 3061c35746 Change pchart vertical and horizontal grphs style - #417 2017-09-26 15:39:46 +02:00
Arturo Gonzalez ae657210f8 Fixed error in js library and added good export to graph container graphs 2017-09-19 17:46:12 +02:00
Arturo Gonzalez 7445ff755f Added lost changes 2017-09-11 16:19:45 +02:00
Arturo Gonzalez 5664c72f8b Added option to short data or not 2017-09-05 16:23:21 +02:00
daniel d74a3f74b4 Merge branch 'develop' into 1056-pandora-wux-grid-server 2017-09-01 10:51:54 +02:00
daniel b0263a8806 fixed error values negatives in reports pdf 2017-08-31 16:52:41 +02:00
daniel b078d48918 fixed errors in wux 2017-08-30 09:47:57 +02:00
daniel 487711d567 fixed errors in simple graphs value negative 2017-08-29 09:28:05 +02:00
daniel 9c141c9049 fixed errors wux 2017-08-23 17:21:15 +02:00
daniel c29d8a4fdb Revert "merge develop"
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
2017-08-23 09:35:17 +02:00
daniel 8232911713 merge develop 2017-08-22 18:39:34 +02:00
daniel 0408a2bee6 resize pie graph 2017-08-21 13:53:50 +02:00
daniel 86125a3c40 changes visual console wux 2017-08-18 13:29:07 +02:00
vgilc a5d3f916d7 Merge branch '1005-Graficas_de_alerta_con_umbrales' into 'develop'
1005 graficas de alerta con umbrales

See merge request !702
2017-08-18 12:42:27 +02:00
vgilc 0083d57297 Merge branch '1177-Graficas_con_valores_negativos' into 'develop'
fixed errors in graphs value negative

See merge request !703
2017-08-18 12:41:10 +02:00
daniel ab3cd7dcc0 wux console view 2017-08-17 18:38:12 +02:00
daniel 104a1a83b4 fixed minor error 2017-08-16 16:30:44 +02:00
Daniel Maya 80faddcbb8 Xaxisname deleted from xaxes 2017-08-16 10:38:02 +02:00
daniel afc481098d fixed error exportation csv in custom graphs 2017-08-16 10:36:30 +02:00
daniel 571c74d558 fixed error export csv custom graph 2017-08-16 10:16:04 +02:00
Daniel Maya c3d1d7e397 Xaxisname deleted from xaxes 2017-08-14 12:36:49 +02:00
daniel fb9f187287 fixed error exportation csv in custom graphs 2017-08-03 13:09:41 +02:00
daniel 89b0ec2584 fixed errors in graphs value negative 2017-08-02 16:46:50 +02:00
daniel 6e45b3cd9e add threshold graph send for mail 2017-08-02 11:48:37 +02:00
artu30 14a439faab Merge branch 'develop' into '618-new-item-auto-sla-graph-in-visual-console-dev'
# Conflicts:
#   pandora_console/godmode/reporting/visual_console_builder.editor.js
#   pandora_console/include/functions_visual_map_editor.php
#   pandora_console/include/graphs/flot/pandora.flot.js
2017-07-28 10:30:17 +02:00
Arturo Gonzalez 9ddb47741f Added new events bar to meta 2017-07-24 16:34:22 +02:00
Arturo Gonzalez d57508f09e Added sla_auto_graph item to vc first version 2017-07-13 16:23:16 +02:00
Arturo Gonzalez 1b766f8ce2 Fixed events filter from agent events graph 2017-07-10 16:22:41 +02:00
Arturo Gonzalez 09b90be1ca Works in good dashboards module graphs 2017-05-25 10:08:30 +02:00
Arturo Gonzalez 4a03298b69 Added unit to module name and recolocate yaxis label 2017-05-24 12:18:43 +02:00
vgilc e89be76e61 Merge branch 'fixed-graphs-styles' into 'develop'
Fixed graphs styles Gitlab: #537

See merge request !283
2017-05-17 17:45:55 +02:00
vgilc 8be3e434c8 Merge branch '761-pandora-ux-widget-dev' into 'develop'
761 pandora ux widget dev

See merge request !414
2017-05-17 17:39:52 +02:00
m-lopez-f 808e579af7 Merge branch 'develop' into fixed-graphs-styles 2017-05-10 11:07:39 +02:00
Arturo Gonzalez 658ff78efb Added homedir lost reference to functions_html 2017-05-08 11:49:54 +02:00
Arturo Gonzalez 504665aaf0 Added more width to widget container 2017-04-26 13:27:53 +02:00
Arturo Gonzalez 40a42a6a29 Added ; to code 2017-04-25 17:43:26 +02:00
Arturo Gonzalez ed195ff909 Added pie slice by time, good job arturo. Thanks arturo. 2017-04-25 16:57:59 +02:00
Arturo Gonzalez 8383552a1f Added minor changes to ux widget 2017-04-25 16:16:25 +02:00
Arturo Gonzalez 078d5e4357 Added data donut to ux widget 2017-04-25 15:34:11 +02:00
enriquecd f2d52e80b6 Chango left margin in pie float - #99 2017-04-24 17:29:13 +02:00
vgilc 6805dcf363 Merge branch '549-errores-en-dashboard-moviles' into 'develop'
Fixed a typo error

See merge request !382
2017-04-18 16:48:49 +02:00
m-lopez-f 3454490220 Fixed a typo error 2017-04-18 16:20:50 +02:00