From f05c95602374b425454217211d7a46af81f41400 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Sat, 21 Jan 2012 05:51:58 +0000 Subject: [PATCH] netscaler per-vserver page with all graphs. git-svn-id: http://www.observium.org/svn/observer/trunk@2846 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/pages/device/loadbalancer.inc.php | 12 ++-- .../loadbalancer_rservers.inc.php | 4 +- .../loadbalancer_vservers.inc.php | 4 +- .../loadbalancer/netscaler_vsvr.inc.php | 65 ++++++++++++++++++- 4 files changed, 72 insertions(+), 13 deletions(-) diff --git a/html/pages/device/loadbalancer.inc.php b/html/pages/device/loadbalancer.inc.php index 49271e188c..fe4949f7a1 100644 --- a/html/pages/device/loadbalancer.inc.php +++ b/html/pages/device/loadbalancer.inc.php @@ -21,25 +21,25 @@ unset($sep); foreach ($loadbalancer_tabs as $type) { - if (!$vars['proto']) { $vars['proto'] = $type; } + if (!$vars['type']) { $vars['type'] = $type; } echo($sep); - if ($vars['proto'] == $type) + if ($vars['type'] == $type) { echo(''); } - echo(generate_link($type_text[$type] ." (".$device_loadbalancer_count[$type].")",$link_array,array('proto'=>$type))); - if ($vars['proto'] == $type) { echo(""); } + echo(generate_link($type_text[$type] ." (".$device_loadbalancer_count[$type].")",$link_array,array('type'=>$type))); + if ($vars['type'] == $type) { echo(""); } $sep = " | "; } print_optionbar_end(); -if (is_file("pages/device/loadbalancer/".mres($vars['proto']).".inc.php")) +if (is_file("pages/device/loadbalancer/".mres($vars['type']).".inc.php")) { - include("pages/device/loadbalancer/".mres($vars['proto']).".inc.php"); + include("pages/device/loadbalancer/".mres($vars['type']).".inc.php"); } else { foreach ($loadbalancer_tabs as $type) { diff --git a/html/pages/device/loadbalancer/loadbalancer_rservers.inc.php b/html/pages/device/loadbalancer/loadbalancer_rservers.inc.php index 6b2a3150de..24d557a006 100644 --- a/html/pages/device/loadbalancer/loadbalancer_rservers.inc.php +++ b/html/pages/device/loadbalancer/loadbalancer_rservers.inc.php @@ -15,7 +15,7 @@ $sep = ""; foreach ($menu_options as $option => $text) { if ($_GET['optd'] == $option) { echo(""); } - echo('' . $text + echo('' . $text . ''); if ($_GET['optd'] == $option) { echo(""); } echo(" | "); @@ -37,7 +37,7 @@ foreach ($graph_types as $type => $descr) { echo("$type_sep"); if ($_GET['opte'] == $type) { echo(""); } - echo(''.$descr.''); + echo(''.$descr.''); if ($_GET['opte'] == $type) { echo(""); } $type_sep = " | "; diff --git a/html/pages/device/loadbalancer/loadbalancer_vservers.inc.php b/html/pages/device/loadbalancer/loadbalancer_vservers.inc.php index 408660a48f..431766494c 100644 --- a/html/pages/device/loadbalancer/loadbalancer_vservers.inc.php +++ b/html/pages/device/loadbalancer/loadbalancer_vservers.inc.php @@ -15,7 +15,7 @@ $sep = ""; foreach ($menu_options as $option => $text) { if ($_GET['optd'] == $option) { echo(""); } - echo('' . $text + echo('' . $text . ''); if ($_GET['optd'] == $option) { echo(""); } echo(" | "); @@ -34,7 +34,7 @@ foreach ($graph_types as $type => $descr) { echo("$type_sep"); if ($_GET['opte'] == $type) { echo(""); } - echo(''.$descr.''); + echo(''.$descr.''); if ($_GET['opte'] == $type) { echo(""); } $type_sep = " | "; diff --git a/html/pages/device/loadbalancer/netscaler_vsvr.inc.php b/html/pages/device/loadbalancer/netscaler_vsvr.inc.php index 9a275367fd..4d18352801 100644 --- a/html/pages/device/loadbalancer/netscaler_vsvr.inc.php +++ b/html/pages/device/loadbalancer/netscaler_vsvr.inc.php @@ -1,11 +1,68 @@ VServer » "); +#echo('All'); +#print_optionbar_end(); + +$graph_types = array("bits" => "Bits", + "pkts" => "Packets", + "conns" => "Connections", + "reqs" => "Requests", + "hitmiss" => "Hit/Miss"); + +$i=0; + +echo("
"); +foreach (dbFetchRows("SELECT * FROM `netscaler_vservers` WHERE `device_id` = ? AND `vsvr_id` = ? ORDER BY `vsvr_name`", array($device['device_id'], $vars['vsvr'])) as $vsvr) +{ + + if (is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; } + + if($vsvr['vsvr_state'] == "up") { $vsvr_class="green"; } else { $vsvr_class="red"; } + + echo(""); + echo(''); + echo(""); + echo(""); + echo(""); + echo(""); + echo(""); + + foreach($graph_types as $graph_type => $graph_text) + { + $i++; + echo(''); + echo(' + "); + } +} + +echo("
' . $vsvr['vsvr_name'] . '" . $vsvr['vsvr_ip'] . ":" . $vsvr['vsvr_port'] . "" . $vsvr['vsvr_state'] . "" . format_si($vsvr['vsvr_bps_in']*8) . "bps" . format_si($vsvr['vsvr_bps_out']*8) . "bps
'); + $graph_type = "netscalervsvr_" . $graph_type; + $graph_array['height'] = "100"; + $graph_array['width'] = "213"; + $graph_array['to'] = $config['time']['now']; + $graph_array['id'] = $vsvr['vsvr_id']; + $graph_array['type'] = $graph_type; + + echo('

'.$graph_text.'

'); + + include("includes/print-quadgraphs.inc.php"); + + echo(" +
"); + + +} else { + print_optionbar_start(); echo("VServers » "); -#$auth = TRUE; - $menu_options = array('basic' => 'Basic', ); @@ -49,7 +106,7 @@ foreach (dbFetchRows("SELECT * FROM `netscaler_vservers` WHERE `device_id` = ? O if($vsvr['vsvr_state'] == "up") { $vsvr_class="green"; } else { $vsvr_class="red"; } echo(""); - echo("" . $vsvr['vsvr_name'] . ""); + echo('' . $vsvr['vsvr_name'] . ''); echo("" . $vsvr['vsvr_ip'] . ":" . $vsvr['vsvr_port'] . ""); echo("" . $vsvr['vsvr_state'] . ""); echo("" . format_si($vsvr['vsvr_bps_in']*8) . "bps"); @@ -81,4 +138,6 @@ echo(""); echo(""); +} + ?>