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

569 Commits

Author SHA1 Message Date
daniel 727b173392 fixed error library pdf example 2018-05-22 13:15:09 +02:00
fbsanchez 9f140e6197 Applied lukasr patch for pchart 2018-05-22 10:51:03 +02:00
daniel 25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
daniel 123d49d604 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/styles/pandora.css
 2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
enriquecd 734c52d8bd New graph thermometer - #2214 2018-05-04 11:13:26 +02:00
fermin831 2885885cc4 Fixed a JS error (invalid parameter in pandoraAreaGraph) 2018-05-03 13:02:17 +02:00
daniel b11e256c8b fixed custom graph 2018-04-27 13:51:13 +02:00
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