From a2bc1a45135b85af81e6f7cb0afc17d849c471da Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Fri, 20 Nov 2015 15:33:56 +0000 Subject: [PATCH 1/5] Add possibility to merge all cpu in one graph in the device overview --- html/pages/device/overview/processors.inc.php | 90 ++++++++++++++----- includes/defaults.inc.php | 2 + 2 files changed, 69 insertions(+), 23 deletions(-) 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; From 8921c75d1ed56045a080169bb2ff630f3ffb3f35 Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Fri, 20 Nov 2015 15:40:57 +0000 Subject: [PATCH 2/5] Fix formatting --- html/pages/device/overview/processors.inc.php | 61 +++++++++---------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index a990d34af..bbc982984 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -10,12 +10,11 @@ if (count($processors)) {
- '; +'; echo ''; echo " Processors"; - echo '
'; - - echo ''; + echo ' +
'; $totalPercent=0; @@ -28,37 +27,37 @@ if (count($processors)) { if ($config['cpu_details_overview'] === true) { - $background = get_percentage_colours($percent); - $graph_colour = str_replace('#', '', $row_colour); + $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'; + $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); + $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); + $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'] = 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 ' - - - - '; + echo ' + + + + '; } else { $totalPercent = $totalPercent + $percent; @@ -95,7 +94,7 @@ if (count($processors)) { echo ' - '; + '; } From ee99ee89d68bf420f7e9f2b5bd49ece978a36098 Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Fri, 20 Nov 2015 15:48:44 +0000 Subject: [PATCH 3/5] Replace tab by space --- html/pages/device/overview/processors.inc.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index bbc982984..189013b0c 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -24,44 +24,44 @@ if (count($processors)) { // disable short hrDeviceDescr. need to make this prettier. // $text_descr = short_hrDeviceDescr($proc['processor_descr']); $percent = $proc['processor_usage']; - if ($config['cpu_details_overview'] === true) - { + if ($config['cpu_details_overview'] === true) + { $background = get_percentage_colours($percent); $graph_colour = str_replace('#', '', $row_colour); - $graph_array = array(); - $graph_array['height'] = '100'; + $graph_array = array(); + $graph_array['height'] = '100'; $graph_array['width'] = '210'; - $graph_array['to'] = $config['time']['now']; + $graph_array['to'] = $config['time']['now']; $graph_array['id'] = $proc['processor_id']; - $graph_array['type'] = $graph_type; + $graph_array['type'] = $graph_type; $graph_array['from'] = $config['time']['day']; - $graph_array['legend'] = 'no'; + $graph_array['legend'] = 'no'; $link_array = $graph_array; - $link_array['page'] = 'graphs'; + $link_array['page'] = 'graphs'; unset($link_array['height'], $link_array['width'], $link_array['legend']); - $link = generate_url($link_array); + $link = generate_url($link_array); $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - '.$text_descr); - $graph_array['width'] = 80; + $graph_array['width'] = 80; $graph_array['height'] = 20; - $graph_array['bg'] = 'ffffff00'; + $graph_array['bg'] = 'ffffff00'; // the 00 at the end makes the area transparent. - $minigraph = generate_lazy_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo ' - + - - '; - } - else { - $totalPercent = $totalPercent + $percent; - } + '; + } + else { + $totalPercent = $totalPercent + $percent; + } }//end foreach @@ -90,11 +90,11 @@ if (count($processors)) { echo ' '; - $totalPercent=$totalPercent/count($processors); - echo ' - - - '; + $totalPercent=$totalPercent/count($processors); + echo ' + + + '; } From 439193c9fa470cfcc28169173e228053e4ea798e Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Fri, 20 Nov 2015 15:53:02 +0000 Subject: [PATCH 4/5] Add the number of cpu between the type and percent graph --- html/pages/device/overview/processors.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index 189013b0c..416db4df9 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -93,6 +93,7 @@ if (count($processors)) { $totalPercent=$totalPercent/count($processors); echo ' + '; From a56344246a11831fdd647e854e220ec881a93511 Mon Sep 17 00:00:00 2001 From: Louis Bailleul Date: Mon, 23 Nov 2015 09:37:58 +0000 Subject: [PATCH 5/5] Cleanup and reorganize code Make the average cpu the default --- html/pages/device/overview/processors.inc.php | 40 +++++++++---------- includes/defaults.inc.php | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index 416db4df9..3aae5f5f8 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -1,7 +1,5 @@
'.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).' +
'.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).'
'.overlib_link($link, $text_descr, $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).' + '.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, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
'.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).'
'.overlib_link($link, $text_descr, $overlib_content).'x'.count($processors).' '.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'
'; + $graph_array = array(); + $graph_array['to'] = $config['time']['now']; + $graph_array['type'] = 'processor_usage'; + $graph_array['from'] = $config['time']['day']; + $graph_array['legend'] = 'no'; + $totalPercent=0; foreach ($processors as $proc) { $text_descr = rewrite_entity_descr($proc['processor_descr']); - // disable short hrDeviceDescr. need to make this prettier. - // $text_descr = short_hrDeviceDescr($proc['processor_descr']); $percent = $proc['processor_usage']; if ($config['cpu_details_overview'] === true) { $background = get_percentage_colours($percent); - $graph_colour = str_replace('#', '', $row_colour); - $graph_array = array(); + $graph_array['id'] = $proc['processor_id']; + + //Generate tooltip graphs $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); + //Generate the minigraph $graph_array['width'] = 80; $graph_array['height'] = 20; - $graph_array['bg'] = 'ffffff00'; - // the 00 at the end makes the area transparent. + $graph_array['bg'] = 'ffffff00'; // the 00 at the end makes the area transparent. $minigraph = generate_lazy_graph_tag($graph_array); echo ' @@ -65,22 +61,23 @@ if (count($processors)) { }//end foreach - if ($config['cpu_details_overview'] !== true) + if ($config['cpu_details_overview'] === false) { + + //Generate average cpu graph $graph_array['height'] = '100'; $graph_array['width'] = '485'; - $graph_array['to'] = $config['time']['now']; $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); + //Generate link to graphs $link_array = $graph_array; $link_array['page'] = 'graphs'; unset($link_array['height'], $link_array['width']); $link = generate_url($link_array); + //Generate tooltip $graph_array['width'] = '210'; $overlib_content = generate_overlib_content($graph_array, $device['hostname'].' - CPU usage'); @@ -90,10 +87,13 @@ if (count($processors)) { echo ' '; + //Add a row with CPU desc, count and percent graph $totalPercent=$totalPercent/count($processors); + $background = get_percentage_colours($totalPercent); + echo ' - + '; diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php index 47bcd0c5b..5e17eb5e7 100644 --- a/includes/defaults.inc.php +++ b/includes/defaults.inc.php @@ -408,7 +408,7 @@ $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 +$config['cpu_details_overview'] = false; //By default show only average cpu in device overview // The device overview page options $config['overview_show_sysDescr'] = true;
'.overlib_link($link, $text_descr, $overlib_content).'x'.count($processors).''.overlib_link($link,'x'.count($processors),$overlib_content).' '.overlib_link($link, print_percentage_bar(200, 20, $totalPercent, null, 'ffffff', $background['left'], $percent.'%', 'ffffff', $background['right']), $overlib_content).'