diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index f3c298ec55..d9ec87549a 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -1196,7 +1196,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, $module_name = io_safe_output( modules_get_agentmodule_name ($agent_module_id)); - $module_name_list[$i] = $agent_name ." / ". $module_name; + $module_name_list[$i] = '' . $agent_name . " / " . $module_name. ''; } } else { @@ -1214,9 +1214,9 @@ function graphic_combined_module ($module_list, $weight_list, $period, $module_name = ui_print_truncate_text($module_name, 'module_small', false, true, false, '...', false); if ($labels[$agent_module_id] != '') - $module_name_list[$i] = $labels[$agent_module_id]; + $module_name_list[$i] = '' . $labels[$agent_module_id] . ''; else - $module_name_list[$i] = $agent_name . ' / ' . $module_name; + $module_name_list[$i] = '' . $agent_name . ' / ' . $module_name . ''; } // Data iterator @@ -1746,7 +1746,7 @@ function graphic_combined_module ($module_list, $weight_list, $period, //Work around for fixed the agents name with huge size chars. - $fixed_font_size = $config['font_size']; + $fixed_font_size = $config['font_size'] - 2; //Set graph color diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index ee8f1daac8..bf5482bf21 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -1733,13 +1733,13 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, $('#timestamp_'+graph_id).hide(); } - var label_aux = series.label + ' = '; + var label_aux = series.label; // The graphs of points type and unknown graphs will dont be updated if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) { $('#legend_' + graph_id + ' .legendLabel') - .eq(i).text(label_aux.replace(/=.*/, - '= ' + parseFloat(y).toFixed(precision_graph) + ' ' + unit)); + .eq(i).html(label_aux + '= ' + parseFloat(y).toFixed(2) + ' ' + unit); + console.log($('#legend_' + graph_id + ' .legendLabel')); } $('#legend_' + graph_id + ' .legendLabel') @@ -1842,8 +1842,10 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend, $('#timestamp_'+graph_id).hide(); dataset = plot.getData(); for (i = 0; i < dataset.length; ++i) { + var series = dataset[i]; + var label_aux = series.label; $('#legend_' + graph_id + ' .legendLabel') - .eq(i).text(legends.eq(i).text().replace(/=.*/, '')); + .eq(i).html(label_aux); } plot.clearCrosshair(); overview.clearCrosshair();