diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index 4f631567a..a990d34af 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -10,11 +10,14 @@ if (count($processors)) {
-'; + '; echo ''; echo " Processors"; - echo '
- '; + echo ''; + + echo '
'; + + $totalPercent=0; foreach ($processors as $proc) { $text_descr = rewrite_entity_descr($proc['processor_descr']); @@ -22,38 +25,79 @@ if (count($processors)) { // disable short hrDeviceDescr. need to make this prettier. // $text_descr = short_hrDeviceDescr($proc['processor_descr']); $percent = $proc['processor_usage']; - $background = get_percentage_colours($percent); - $graph_colour = str_replace('#', '', $row_colour); + if ($config['cpu_details_overview'] === true) + { - $graph_array = array(); + $background = get_percentage_colours($percent); + $graph_colour = str_replace('#', '', $row_colour); + + $graph_array = array(); + $graph_array['height'] = '100'; + $graph_array['width'] = '210'; + $graph_array['to'] = $config['time']['now']; + $graph_array['id'] = $proc['processor_id']; + $graph_array['type'] = $graph_type; + $graph_array['from'] = $config['time']['day']; + $graph_array['legend'] = 'no'; + + $link_array = $graph_array; + $link_array['page'] = 'graphs'; + unset($link_array['height'], $link_array['width'], $link_array['legend']); + $link = generate_url($link_array); + + $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - '.$text_descr); + + $graph_array['width'] = 80; + $graph_array['height'] = 20; + $graph_array['bg'] = 'ffffff00'; + // the 00 at the end makes the area transparent. + $minigraph = generate_lazy_graph_tag($graph_array); + + echo ' + + + + '; + } + else { + $totalPercent = $totalPercent + $percent; + } + + }//end foreach + + if ($config['cpu_details_overview'] !== true) + { $graph_array['height'] = '100'; - $graph_array['width'] = '210'; + $graph_array['width'] = '485'; $graph_array['to'] = $config['time']['now']; - $graph_array['id'] = $proc['processor_id']; - $graph_array['type'] = $graph_type; + $graph_array['device'] = $device['device_id']; + $graph_array['type'] = 'device_processor'; $graph_array['from'] = $config['time']['day']; $graph_array['legend'] = 'no'; + $graph = generate_lazy_graph_tag($graph_array); $link_array = $graph_array; $link_array['page'] = 'graphs'; - unset($link_array['height'], $link_array['width'], $link_array['legend']); + unset($link_array['height'], $link_array['width']); $link = generate_url($link_array); - $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - '.$text_descr); - - $graph_array['width'] = 80; - $graph_array['height'] = 20; - $graph_array['bg'] = 'ffffff00'; - // the 00 at the end makes the area transparent. - $minigraph = generate_lazy_graph_tag($graph_array); + $graph_array['width'] = '210'; + $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - CPU usage'); echo ' - - - - '; - }//end foreach + + '; + + $totalPercent=$totalPercent/count($processors); + echo ' + + + '; + + } echo '
'.overlib_link($link, $text_descr, $overlib_content).''.overlib_link($link, $minigraph, $overlib_content).''.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).' +
'.overlib_link($link, $text_descr, $overlib_content).''.overlib_link($link, $minigraph, $overlib_content).''.overlib_link($link, print_percentage_bar(200, 20, $percent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).' -
'; + echo overlib_link($link, $graph, $overlib_content, null); + echo '
'.overlib_link($link, $text_descr, $overlib_content).''.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 1ea8f3e15..47bcd0c5b 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -408,6 +408,8 @@ $config['network_map_vis_options'] = '{ // Device page options $config['show_overview_tab'] = true; +$config['cpu_details_overview'] = true; //By default show all cpus in the overview + // The device overview page options $config['overview_show_sysDescr'] = true;