tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed module type chart selected in conf. Ticket #345

This commit is contained in:
Arturo Gonzalez 2017-02-21 16:36:46 +01:00
parent 63d582586b
commit cb7ab827d2
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/ajax/graph.ajax.php
View File

@ -107,7 +107,7 @@ if ($print_sparse_graph) {
$pure, $date, $unit, $baseline, $return_data, $show_title, $pure, $date, $unit, $baseline, $return_data, $show_title,
$only_image, $homeurl, $ttl, $projection, $adapt_key, $compare, $only_image, $homeurl, $ttl, $projection, $adapt_key, $compare,
$show_unknown, $menu, $backgroundColor, $percentil, $show_unknown, $menu, $backgroundColor, $percentil,
$dashboard, $vconsole); $dashboard, $vconsole, $config['type_module_charts']);
return; return;
} }

3
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -161,7 +161,8 @@ switch ($action) {
$img = grafico_modulo_sparse($id_agent_module, $img = grafico_modulo_sparse($id_agent_module,
$period, 0, $width, $height, '', null, false, 1, $period, 0, $width, $height, '', null, false, 1,
0, 0, '', 0, 0, true, true, '', 1, false, '', 0, 0, '', 0, 0, true, true, '', 1, false, '',
false, false, true, $background_color); false, false, true, $background_color,
false, false, false, $config['type_module_charts']);
} }
//Restore db connection //Restore db connection

5
pandora_console/include/functions_api.php
View File

@ -9287,8 +9287,9 @@ function api_get_module_graph($id_module, $thrash2, $other, $thrash4) {
$graph_html = grafico_modulo_sparse( $graph_html = grafico_modulo_sparse(
$id_module, $graph_seconds, false, 600, 300, '', $id_module, $graph_seconds, false, 600, 300, '',
'', false, false, true, time(), '', 0, 0, true, true, '', false, false, true, time(), '', 0, 0, true, true,
ui_get_full_url(false) . '/', 1, false, '', false, true); ui_get_full_url(false) . '/', 1, false, '', false, true,
true, 'white', null, false, false, $config['type_module_charts']);
$graph_image_file_encoded = false; $graph_image_file_encoded = false;
if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) { if (preg_match("/<img src='(.+)'./", $graph_html, $matches)) {
$file_url = $matches[1]; $file_url = $matches[1];

6
pandora_console/include/functions_graph.php
View File

@ -790,12 +790,11 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events,
$only_image = false, $homeurl = '', $ttl = 1, $projection = false, $only_image = false, $homeurl = '', $ttl = 1, $projection = false,
$adapt_key = '', $compare = false, $show_unknown = false, $adapt_key = '', $compare = false, $show_unknown = false,
$menu = true, $backgroundColor = 'white', $percentil = null, $menu = true, $backgroundColor = 'white', $percentil = null,
$dashboard = false, $vconsole = false,$type_graph = 'area') { $dashboard = false, $vconsole = false, $type_graph = 'area') {
global $config; global $config;
global $graphic_type; global $graphic_type;
$flash_chart = $config['flash_charts']; $flash_chart = $config['flash_charts'];
enterprise_include_once("include/functions_reporting.php"); enterprise_include_once("include/functions_reporting.php");
@ -4059,6 +4058,7 @@ function grafico_modulo_boolean ($agent_module_id, $period, $show_events,
'url' => ui_get_full_url("/images/logo_vertical_water.png", 'url' => ui_get_full_url("/images/logo_vertical_water.png",
false, false, false)); false, false, false));
$type_graph = $config['type_module_charts']; $type_graph = $config['type_module_charts'];
if ($type_graph === 'area') { if ($type_graph === 'area') {
if ($compare === 'separated') { if ($compare === 'separated') {
return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend, return area_graph($flash_chart, $chart, $width, $height/2, $color, $legend,

5
pandora_console/include/functions_reporting.php
View File

@ -5960,7 +5960,10 @@ function reporting_simple_graph($report, $content, $type = 'dinamic',
true, true,
true, true,
'white', 'white',
($content['style']['percentil'] == 1) ? $config['percentil'] : null); ($content['style']['percentil'] == 1) ? $config['percentil'] : null,
false,
false,
$config['type_module_charts']);
} }
break; break;
case 'data': case 'data':

3
pandora_console/mobile/operation/module_graph.php
View File

@ -187,7 +187,8 @@ class ModuleGraph {
1, 1,
false, false,
'adapter_' . $this->graph_type, 'adapter_' . $this->graph_type,
$time_compare, $this->unknown_graph, false); $time_compare, $this->unknown_graph, false,
'white', null, false, false, $config['type_module_charts']);
if ($this->draw_events) { if ($this->draw_events) {
$graph .= '<br>'; $graph .= '<br>';
$graph .= graphic_module_events($this->id, $graph .= graphic_module_events($this->id,

3
pandora_console/operation/agentes/stat_win.php
View File

@ -222,7 +222,8 @@ $id = get_parameter('id');
false, $urlImage, 1, false, false, $urlImage, 1, false,
'adapter_' . $graph_type, $time_compare, 'adapter_' . $graph_type, $time_compare,
$unknown_graph, true, 'white', $unknown_graph, true, 'white',
(($show_percentil)? $config['percentil'] : null)); (($show_percentil)? $config['percentil'] : null),
false, false, $config['type_module_charts']);
echo '<br>'; echo '<br>';
if ($show_events_graph) if ($show_events_graph)
echo graphic_module_events($id, $width, $height, echo graphic_module_events($id, $width, $height,