mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

migrate pseudowires to new format

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2576 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-09-26 14:06:48 +00:00
parent bfd55da261
commit a42c178799
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/functions.inc.php
+2 -2
View File
@@ -413,8 +413,8 @@ function generate_port_url($port, $vars=array())
function generate_port_thumbnail($args) function generate_port_thumbnail($args)
{ {
if (!$args['bg']) { $args['bg'] = "FFFFF"; } if (!$args['bg']) { $args['bg'] = "FFFFFF"; }
$args['content'] = "<img src='graph.php?type=".$args['graph_type']."&amp;id=".$args['interface_id']."&amp;from=".$args['from']."&amp;to=".$args['to']."&amp;width=".$args['width']."&amp;height=".$args['height']."&amp;legend=no&amp;bg=".$args['bg']."'>"; $args['content'] = "<img src='graph.php?type=".$args['graph_type']."&amp;id=".$args['interface_id']."&amp;from=".$args['from']."&amp;to=".$args['to']."&amp;width=".$args['width']."&amp;height=".$args['height']."&amp;bg=".$args['bg']."'>";
echo(generate_port_link($args, $args['content'])); echo(generate_port_link($args, $args['content']));
} }
html/pages/pseudowires.inc.php
+20 -11
View File
@@ -1,15 +1,25 @@
<?php <?php
if(!isset($vars['view'])) { $vars['view'] = 'detail'; }
$link_array = array('page' => 'pseudowires');
print_optionbar_start(); print_optionbar_start();
echo("<a href='pseudowires/'>Details</a> | Graphs : echo('<span style="font-weight: bold;">Pseudowires</span> &#187; ');
<a href='pseudowires/graphs/mini/'>Mini</a>
"); if ($vars['view'] == "detail") { echo('<span class="pagemenu-selected">'); }
echo(generate_link("Details",$link_array,array('view'=> 'detail')));
if ($vars['view'] == "detail") { echo('</span>'); }
echo(" | ");
if ($vars['view'] == "minigraphs") { echo('<span class="pagemenu-selected">'); }
echo(generate_link("Mini Graphs",$link_array,array('view' => "minigraphs")));
if ($vars['view'] == "minigraphs") { echo('</span>'); }
print_optionbar_end(); print_optionbar_end();
list($opta, $optb, $optc, $optd, $opte) = explode("/", $_GET['opta']);
echo("<table cellpadding=5 cellspacing=0 class=devicetable width=100%>"); echo("<table cellpadding=5 cellspacing=0 class=devicetable width=100%>");
foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr") as $pw_a) foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D WHERE P.interface_id = I.interface_id AND I.device_id = D.device_id ORDER BY D.hostname,I.ifDescr") as $pw_a)
@@ -38,10 +48,9 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
<td>".generate_device_link($pw_b)."</td><td>".generate_port_link($pw_b)."</td></tr>"); <td>".generate_device_link($pw_b)."</td><td>".generate_port_link($pw_b)."</td></tr>");
echo("<tr style=\"background-color: #$bg;\"><td colspan=2>".$pw_a['ifAlias']."</td><td colspan=2>".$pw_b['ifAlias']."</td></tr>"); echo("<tr style=\"background-color: #$bg;\"><td colspan=2>".$pw_a['ifAlias']."</td><td colspan=2>".$pw_b['ifAlias']."</td></tr>");
if ($opta == "graphs") if ($vars['view'] == "minigraphs")
{ {
echo("<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>"); echo("<tr style=\"background-color: #$bg;\"><td></td><td colspan=2>");
if (!$optb) { $optb = "mini"; }
if ($pw_a) if ($pw_a)
{ {
@@ -50,10 +59,10 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
$pw_a['from'] = $day; $pw_a['from'] = $day;
$pw_a['to'] = $now; $pw_a['to'] = $now;
$pw_a['bg'] = $bg; $pw_a['bg'] = $bg;
$types = array('bits','pkts','errors'); $types = array('bits','upkts','errors');
foreach ($types as $graph_type) foreach ($types as $graph_type)
{ {
$pw_a['graph_type'] = $graph_type; $pw_a['graph_type'] = "port_".$graph_type;
generate_port_thumbnail($pw_a); generate_port_thumbnail($pw_a);
} }
} }
@@ -66,10 +75,10 @@ foreach (dbFetchRows("SELECT * FROM pseudowires AS P, ports AS I, devices AS D W
$pw_b['from'] = $day; $pw_b['from'] = $day;
$pw_b['to'] = $now; $pw_b['to'] = $now;
$pw_b['bg'] = $bg; $pw_b['bg'] = $bg;
$types = array('bits','pkts','errors'); $types = array('bits','upkts','errors');
foreach ($types as $graph_type) foreach ($types as $graph_type)
{ {
$pw_b['graph_type'] = $graph_type; $pw_b['graph_type'] = "port_".$graph_type;
generate_port_thumbnail($pw_b); generate_port_thumbnail($pw_b);
} }
} }