diff --git a/html/includes/graphs/c6kxbar/auth.inc.php b/html/includes/graphs/c6kxbar/auth.inc.php new file mode 100644 index 0000000000..fe4efc8e72 --- /dev/null +++ b/html/includes/graphs/c6kxbar/auth.inc.php @@ -0,0 +1,21 @@ + diff --git a/html/includes/graphs/c6kxbar/util.inc.php b/html/includes/graphs/c6kxbar/util.inc.php new file mode 100644 index 0000000000..de3aa95205 --- /dev/null +++ b/html/includes/graphs/c6kxbar/util.inc.php @@ -0,0 +1,19 @@ + diff --git a/html/pages/device/overview/c6kxbar.inc.php b/html/pages/device/overview/c6kxbar.inc.php index 1900656e72..0e9c7a3583 100644 --- a/html/pages/device/overview/c6kxbar.inc.php +++ b/html/pages/device/overview/c6kxbar.inc.php @@ -14,8 +14,8 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry) $entity = dbFetchRow("SELECT * FROM entPhysical WHERE device_id = ? AND entPhysicalIndex = ?", array($device['device_id'], $index)); echo(" - ".$entity['entPhysicalName']." - ".$entry['']['cc6kxbarModuleModeSwitchingMode']." + ".$entity['entPhysicalName']." + ".$entry['']['cc6kxbarModuleModeSwitchingMode']." "); foreach($entity_state['group']['c6kxbar'][$index] as $subindex => $fabric) @@ -35,12 +35,34 @@ foreach($entity_state['group']['c6kxbar'] as $index => $entry) $percent_out = $fabric['cc6kxbarStatisticsOutUtil']; $background_out = get_percentage_colours($percent_out); + $graph_array = array(); + $graph_array['height'] = "100"; + $graph_array['width'] = "210"; + $graph_array['to'] = $now; + $graph_array['id'] = $device['device_id']; + $graph_array['mod'] = $index; + $graph_array['chan'] = $subindex; + $graph_array['type'] = "c6kxbar_util"; + $graph_array['from'] = $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'] = $graph_colour; + + $minigraph = generate_graph_tag($graph_array); echo(" Fabric ".$subindex." ".$fabric['cc6kxbarModuleChannelFabStatus']." ".formatRates($fabric['cc6kxbarModuleChannelSpeed']*1000000)." + ".overlib_link($link, $minigraph, $overlib_content)." ".print_percentage_bar (125, 20, $percent_in, "Ingress", "ffffff", $background['left'], $percent_in . "%", "ffffff", $background['right'])." ".print_percentage_bar (125, 20, $percent_out, "Egress", "ffffff", $background['left'], $percent_out . "%", "ffffff", $background['right'])." ");