diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php index 5973e80047..934dbca6aa 100644 --- a/pandora_console/include/functions.php +++ b/pandora_console/include/functions.php @@ -3205,6 +3205,9 @@ function series_type_graph_array($data, $show_elements_graph){ $data_return['color'][$key] = $color_series[$i]; $i++; } + if($i > 14){ + $i = 0; + } } return $data_return; } diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 81db07101a..948784ca96 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2248,7 +2248,7 @@ function graphic_agentaccess ($id_agent, $width, $height, $period = 0, $return = 'only_image' => $only_image, 'homeurl' => $homeurl, 'menu' => true, - 'backgroundColor' => '#f9faf9', + 'backgroundColor' => 'transparent', 'type_graph' => 'area', 'font' => $config['fontpath'], 'font_size' => $config['font_size'], diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index f1bfe993fb..5c50f853b8 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -727,10 +727,9 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals //echo '
 
'; if ($config["agentaccess"]) { - $access_graph = '
hjhhjhhj
'; - $access_graph = '
'; - $access_graph .= graphic_agentaccess($id_agente, 380, 90, SECONDS_1DAY, true, true); - $access_graph .= '


'; + $access_graph = '
'; + $access_graph .= graphic_agentaccess($id_agente, 380, 120, SECONDS_1DAY, true, true); + $access_graph .= '
'; ui_toggle($access_graph, __('Agent access rate (24h)')); } @@ -815,11 +814,9 @@ function treeview_printTable($id_agente, $server_data = array(), $no_head = fals ui_toggle($table_interfaces, __('Interface information') . ' (SNMP)'); } - if (!empty($server_data) && is_metaconsole()) { metaconsole_restore_db(); } - return; } ?> diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index 94cd4c8daa..620659eead 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -400,7 +400,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, // with all 0 values. options['yaxis']['tickDecimals'] = 0; } - + if (max) { options['xaxis']['max'] = max; } @@ -409,15 +409,14 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, } var plot = $.plot($('#' + graph_id), datas, options ); - + $('#' + graph_id).HUseTooltip(); $('#' + graph_id).css("margin-left","auto"); $('#' + graph_id).css("margin-right","auto"); //~ $('#' + graph_id).find('div.legend-tooltip').tooltip({ track: true }); - + function yFormatter(v, axis) { format = new Array(); - for (i = 0; i < labels_total.length; i++) { var label = labels_total[i][1]; // var shortLabel = reduceText(label, 25); @@ -427,8 +426,10 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, label = reduceText(label, 30); } var div_attributes = 'style="font-size:'+font_size+'pt !important;' - + ' margin: 0; max-width: 150px;' - + 'margin-right:5px;'; + + ' margin: 0; max-width: 150px;' + + 'margin-right:5px'; + + 'margin-left: -1.5em'; + + 'text-align: right'; if (label.indexOf("
") != -1) { div_attributes += "min-height: 2.5em;"; @@ -442,7 +443,7 @@ function pandoraFlotHBars(graph_id, values, labels, water_mark, } return format; } - + function xFormatter(v, axis) { label = parseFloat(v); text = label.toLocaleString(); diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index 2dfbac6e0d..6d6d1ace9e 100755 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -247,11 +247,11 @@ enterprise_hook('close_meta_frame'); ?> - + - + - +