nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-12 16:06:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix BGP a bit. move CEF to routing.

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2102 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-19 21:54:43 +00:00
parent a90ef76205
commit b40b218f43
9 changed files with 90 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-menubar.php
+1 -1
View File
@@ -252,7 +252,7 @@ if ($_SESSION['userlevel'] >= '5')
if ($bgp_alerts)
{
echo('
<li><a href="bgp/alerts/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
<li><a href="routing/bgp/alerts/"><img src="images/16/link_error.png" border="0" align="absmiddle" /> Alerted BGP (' . $bgp_alerts . ')</a></li>
');
}
html/includes/print-quadgraphs.inc.php
+3 -2
View File
@@ -2,8 +2,9 @@
global $config;
$graph_array['height'] = "100";
$graph_array['width'] = "215";
if(!$graph_array['height']) { $graph_array['height'] = "100"; }
if(!$graph_array['width']) { $graph_array['width'] = "215"; }
$graph_array['to'] = $now;
$periods = array('day', 'week', 'month', 'year');
html/index.php
+1 -1
View File
@@ -10,7 +10,7 @@ if (strpos($_SERVER['REQUEST_URI'], "debug"))
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
ini_set('log_errors', 1);
ini_set('error_reporting', E_ALL);
ini_set('error_reporting', E_PARSE);
} else {
$debug = FALSE;
ini_set('display_errors', 0);
html/pages/device/routing.inc.php
+6 -1
View File
@@ -1,12 +1,17 @@
<?php
$bgp_count = mysql_result(mysql_query("select count(*) from bgpPeers WHERE device_id = '" . $device['device_id'] . "'"), 0);
$datas[] = 'overview';
$bgp_count = mysql_result(mysql_query("select count(*) from bgpPeers WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($bgp_count) { $datas[] = 'bgp'; }
$bgp_count = mysql_result(mysql_query("select count(*) from cef_switching WHERE device_id = '" . $device['device_id'] . "'"), 0);
if ($cef_count) { $datas[] = 'cef'; }
$type_text['overview'] = "Overview";
$type_text['bgp'] = "BGP";
$type_text['cef'] = "CEF";
print_optionbar_start();
html/pages/device/routing/bgp.inc.php
+54 -47
View File
@@ -5,8 +5,7 @@
<?php
print_optionbar_start();
echo("
<div style='margin: auto; text-align: left; padding-left: 11px; clear: both; display:block; height:20px;'>");
echo("<span style='font-weight: bold;'>BGP</span> &#187; ");
if (!isset($_GET['optb'])) { echo("<span class='pagemenu-selected'>"); }
echo("<a href='/device/" . $device['device_id'] . "/routing/bgp/'>Basic</a>");
@@ -42,15 +41,11 @@ echo("
echo("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/routing/bgp/macaccounting/'>Mac Accounting</a>");
if ($_GET['optb'] == "macaccounting") { echo("</span>"); }
echo("</div>
");
print_optionbar_end();
?>
<div style="margin: 5px;"><table border="0" cellspacing="0" cellpadding="5" width="100%">
echo('<table border="0" cellspacing="0" cellpadding="5" width="100%">');
echo('<tr style="height: 30px"><td width=1></td><th></th><th>Peer address</th><th>Type</th><th>Remote AS</th><th>State</th><th>Uptime</th></tr>');
<?php
$i = "1";
$peer_query = mysql_query("select * from bgpPeers WHERE device_id = '".$device['device_id']."' ORDER BY bgpPeerRemoteAs, bgpPeerIdentifier");
@@ -59,9 +54,14 @@ while ($peer = mysql_fetch_assoc($peer_query))
$has_macaccounting = mysql_result(mysql_query("SELECT COUNT(*) FROM `ipv4_mac` AS I, mac_accounting AS M WHERE I.ipv4_address = '".$peer['bgpPeerIdentifier']."' AND M.mac = I.mac_address"),0);
unset($bg_image);
if (!is_integer($i/2)) { $bg_colour = $list_colour_a; } else { $bg_colour = $list_colour_b; }
#if ($peer['bgpPeerAdminStatus'] == "start") { $img = "images/16/accept.png"; } else { $img = "images/16/delete.png"; }
if ($peer['bgpPeerState'] == "established") { $col = "green"; } else { $col = "red"; $bg_image = "images/warning-background.png"; }
if ($peer['bgpPeerAdminStatus'] == "start" || $peer['bgpPeerAdminStatus'] == "running") { $admin_col = "green"; } else { $admin_col = "red"; $bg_image = "images/warning-background.png"; }
unset ($alert, $bg_image);
if (!is_integer($i/2)) { $bg_colour = $list_colour_b; } else { $bg_colour = $list_colour_a; }
if ($peer['bgpPeerState'] == "established") { $col = "green"; } else { $col = "red"; $peer['alert']=1; }
if ($peer['bgpPeerAdminStatus'] == "start" || $peer['bgpPeerAdminStatus'] == "running") { $admin_col = "green"; } else { $admin_col = "gray"; }
if ($peer['bgpPeerAdminStatus'] == "stop") { $peer['alert']=0; $peer['disabled']=1; }
if ($peer['bgpPeerRemoteAs'] == $device['bgpLocalAs']) { $peer_type = "<span style='color: #00f;'>iBGP</span>"; } else { $peer_type = "<span style='color: #0a0;'>eBGP</span>"; }
@@ -121,8 +121,12 @@ while ($peer = mysql_fetch_assoc($peer_query))
$peer_daily_url = "graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=" . $graph_type . "&amp;from=$day&amp;to=$now&amp;width=500&amp;height=150";
$peeraddresslink = "<span class=list-large><a href='device/" . $peer['device_id'] . "/routing/bgp/updates/' onmouseover=\"return overlib('<img src=\'$peer_daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpPeerIdentifier'] . "</a></span>";
echo("<tr bgcolor=$bg_colour background=$bg_image>
<td width=20><span class=list-large>$i</span></td>
echo('<tr bgcolor="'.$bg_colour.'"' . ($peer['alert'] ? ' bordercolor="#cc0000"' : '') .
($peer['disabled'] ? ' bordercolor="#cccccc"' : '') . ">
");
echo(" <td width=20><span class=list-large>".$i."</span></td>
<td>" . $peeraddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), 'bgp/')."</td>
<td>$peer_type</td>
<td style='font-size: 10px; font-weight: bold; line-height: 10px;'>" . (isset($peer_af) ? $peer_af : '') . "</td>
@@ -130,31 +134,40 @@ while ($peer = mysql_fetch_assoc($peer_query))
<td><strong><span style='color: $admin_col;'>" . $peer['bgpPeerAdminStatus'] . "<span><br /><span style='color: $col;'>" . $peer['bgpPeerState'] . "</span></strong></td>
<td>" .formatUptime($peer['bgpPeerFsmEstablishedTime']). "<br />
Updates <img src='images/16/arrow_down.png' align=absmiddle> " . $peer['bgpPeerInUpdates'] . "
<img src='images/16/arrow_up.png' align=absmiddle> " . $peer['bgpPeerOutUpdates'] . "</td></tr>");
<img src='images/16/arrow_up.png' align=absmiddle> " . $peer['bgpPeerOutUpdates'] . "</td>
</tr>");
if (isset($_GET['optb']) && $_GET['optb'] != "macaccounting")
if ($_GET['optb'] != "basic" && isset($_GET['optb']) && $_GET['optb'] != "macaccounting")
{
unset($graph_array);
foreach (explode(" ", $_GET['optb']) as $graph_type)
{
if ($graph_type == "prefixes") { list($afi, $safi) = explode(".", $_GET['optc']); $afisafi = "&amp;afi=$afi&amp;safi=$safi"; }
if ($graph_type == "prefixes")
{
$graph_array['type'] = "bgp_prefixes";
list($afi, $safi) = explode(".", $_GET['optc']);
$graph_array['afi'] = $afi;
$graph_array['safi'] = $safi;
} else {
$graph_array['type'] = "bgp_updates";
}
$graph_array['height'] = "100";
$graph_array['width'] = "215";
$graph_array['to'] = $now;
$graph_array['id'] = $peer['bgpPeer_id'];
if ($graph_type == "updates" || $valid_afi_safi[$afi][$safi])
{
$daily_traffic = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$day&amp;to=$now&amp;width=210&amp;height=100$afisafi";
$daily_url = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$day&amp;to=$now&amp;width=500&amp;height=150$afisafi";
$weekly_traffic = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$week&amp;to=$now&amp;width=210&amp;height=100$afisafi";
$weekly_url = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150$afisafi";
$monthly_traffic = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$month&amp;to=$now&amp;width=210&amp;height=100$afisafi";
$monthly_url = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$month&amp;to=$now&amp;width=500&amp;height=150$afisafi";
$yearly_traffic = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$year&amp;to=$now&amp;width=210&amp;height=100$afisafi";
$yearly_url = $config['base_url'] . "/graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=bgp_$graph_type&amp;from=$year&amp;to=$now&amp;width=500&amp;height=150$afisafi";
echo("<tr bgcolor=$bg_colour><td colspan=7>");
echo("<a href='' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"><img src='$daily_traffic' border=0></a> ");
echo("<a href='' onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\"><img src='$weekly_traffic' border=0></a> ");
echo("<a href='' onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"><img src='$monthly_traffic' border=0></a> ");
echo("<a href='' onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\"><img src='$yearly_traffic' border=0></a>");
echo('<tr bgcolor="'.$bg_colour.'"><td colspan="7">');
include("includes/print-quadgraphs.inc.php");
echo("</td></tr>");
}
}
}
if ($_GET['opta'] == "macaccounting" && $has_macaccounting)
@@ -164,24 +177,18 @@ while ($peer = mysql_fetch_assoc($peer_query))
$database = $config['rrd_dir'] . "/" . $device['hostname'] . "/cip-" . $acc['ifIndex'] . "-" . $acc['mac'] . ".rrd";
if (is_file($database))
{
$daily_traffic = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$day&amp;to=$now&amp;width=210&amp;height=100";
$daily_url = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$day&amp;to=$now&amp;width=500&amp;height=150";
$weekly_traffic = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$week&amp;to=$now&amp;width=210&amp;height=100";
$weekly_url = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$week&amp;to=$now&amp;width=500&amp;height=150";
$monthly_traffic = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$month&amp;to=$now&amp;width=210&amp;height=100";
$monthly_url = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$month&amp;to=$now&amp;width=500&amp;height=150";
$yearly_traffic = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$year&amp;to=$now&amp;width=210&amp;height=100";
$yearly_url = "graph.php?id=" . $acc['ma_id'] . "&amp;type=$graph_type&amp;from=$year&amp;to=$now&amp;width=500&amp;height=150";
echo("<tr bgcolor=$bg_colour><td colspan=7>");
echo("<a href='?page=interface&amp;id=" . $interface['ma_id'] . "' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
<img src='$daily_traffic' border=0></a> ");
echo("<a href='?page=interface&amp;id=" . $interface['ma_id'] . "' onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
<img src='$weekly_traffic' border=0></a> ");
echo("<a href='?page=interface&amp;id=" . $interface['ma_id'] . "' onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
<img src='$monthly_traffic' border=0></a> ");
echo("<a href='?page=interface&amp;id=" . $interface['ma_id'] . "' onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
<img src='$yearly_traffic' border=0></a>");
$graph_array['graph_type'] = $graph_type;
$graph_array['height'] = "100";
$graph_array['width'] = "215";
$graph_array['to'] = $now;
$graph_array['id'] = $acc['ma_id'];
echo('<tr bgcolor="'.$bg_colour.'"><td colspan="8">');
include("includes/print-quadgraphs.inc.php");
echo("</td></tr>");
}
}
@@ -190,4 +197,4 @@ while ($peer = mysql_fetch_assoc($peer_query))
}
?>
</table></div>
</table>
html/pages/device/cefswitching.inc.php → html/pages/device/routing/cef.inc.php
+6 -4
View File
@@ -6,16 +6,18 @@ $menu_options = array('basic' => 'Basic',
'graphs' => 'Graphs',
);
if (!$_GET['opta']) { $_GET['opta'] = "basic"; }
if (!$_GET['optb']) { $_GET['opta'] = "basic"; }
echo('<span style="font-weight: bold;">CEF</span> &#187; ');
$sep = "";
foreach ($menu_options as $option => $text)
{
echo($sep);
if ($_GET['opta'] == $option) { echo("<span class='pagemenu-selected'>"); }
echo('<a href="'.$config['base_url'].'/device/' . $device['device_id'] . '/cefswitching/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text
if ($_GET['optb'] == $option) { echo("<span class='pagemenu-selected'>"); }
echo('<a href="device/' . $device['device_id'] . '/routing/cef/' . $option . ($_GET['optb'] ? '/' . $_GET['optb'] : ''). '/">' . $text
. '</a>');
if ($_GET['opta'] == $option) { echo("</span>"); }
if ($_GET['optb'] == $option) { echo("</span>"); }
$sep = " | ";
}
html/pages/routing/bgp.inc.php
+5 -6
View File
@@ -76,7 +76,6 @@ else
print_optionbar_end();
echo("<div style='margin: 5px;'>");
echo("<table border=0 cellspacing=0 cellpadding=5 width=100% class='sortable'>");
echo('<tr style="height: 30px"><td width=1></td><th>Local address</th><th></th><th>Peer address</th><th>Type</th><th>Remote AS</th><th>State</th><th>Uptime</th></tr>');
@@ -121,9 +120,9 @@ else
$peer_daily_url = "graph.php?id=" . $peer['bgpPeer_id'] . "&amp;type=" . $graph_type . "&amp;from=$day&amp;to=$now&amp;width=500&amp;height=150";
$peeraddresslink = "<span class=list-large><a href='device/" . $peer['device_id'] . "/routing/bgp/updates/' onmouseover=\"return overlib('<img src=\'$peer_daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">" . $peer['bgpPeerIdentifier'] . "</a></span>";
echo('<tr bgcolor="'.$bg_colour.'"' . ($peer['alert'] ? ' bordercolor="#cc0000"' : '') .
($peer['disabled'] ? ' bordercolor="#cccccc"' : '') . ">
<td></td>
echo('<tr bgcolor="'.$bg_colour.'"' . ($peer['alert'] ? ' bordercolor="#cc0000"' : '') . ($peer['disabled'] ? ' bordercolor="#cccccc"' : '') . ">");
echo(" <td></td>
<td width=150>" . $localaddresslink . "<br />".generate_device_link($peer, shorthost($peer['hostname']), 'routing/bgp/')."</td>
<td width=30>-></td>
<td width=150>" . $peeraddresslink . "</td>
@@ -138,7 +137,7 @@ else
if($graphs == "graphs")
{
$graph_array['height'] = "100";
$graph_array['width'] = "215";
$graph_array['width'] = "216";
$graph_array['to'] = $now;
$graph_array['id'] = $peer['bgpPeer_id'];
$graph_array['type'] = "bgp_updates";
@@ -153,7 +152,7 @@ else
$i++;
}
echo("</table></div>");
echo("</table>");
}
?>
includes/rewrites.php
+8
View File
@@ -44,6 +44,14 @@ function ifLabel ($interface, $device = NULL)
if (isset($config['os'][$os]['ifname']))
{
$interface['label'] = $interface['ifName'];
if($interface['ifName'] == "")
{
$interface['label'] = $interface['ifDescr'];
} else {
$interface['label'] = $interface['ifName'];
}
} elseif (isset($config['os'][$os]['ifalias']))
{
$interface['label'] = $interface['ifAlias'];
includes/static-config.php
+1
View File
@@ -78,6 +78,7 @@ $config['os'][$os]['type'] = "server";
$os = "adva";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['text'] = "Adva Optical";
$config['os'][$os]['over'][0]['graph'] = "device_bits";
$config['os'][$os]['over'][0]['text'] = "Device Traffic";