diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 0279b7cabc..1b47dfcc47 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1179,7 +1179,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 {
@@ -1197,9 +1197,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
@@ -1644,7 +1644,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 aa58df85d4..d3a66020b8 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -1728,14 +1728,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(2) + ' ' + unit));
+ .eq(i).html(label_aux + '= ' + parseFloat(y).toFixed(2) + ' ' + unit);
+ console.log($('#legend_' + graph_id + ' .legendLabel'));
}
$('#legend_' + graph_id + ' .legendLabel')
@@ -1838,8 +1837,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();