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

respect enable_bgp more on website and on discovery, also detect more huawei vrp

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1498 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2010-07-27 20:49:31 +00:00
parent 4820454468
commit e733ca1558
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
html/includes/print-menubar.php
View File

@@ -5,7 +5,10 @@
$device_alerts = "0"; $device_alerts = "0";
$device_alert_sql = "WHERE 0"; $device_alert_sql = "WHERE 0";
if (isset($config['enable_bgp']) && $config['enable_bgp'])
{
$bgp_alerts = mysql_result(mysql_query("SELECT COUNT(*) FROM bgpPeers AS B where (bgpPeerAdminStatus = 'start' OR bgpPeerAdminStatus = 'running') AND bgpPeerState != 'established'"), 0); $bgp_alerts = mysql_result(mysql_query("SELECT COUNT(*) FROM bgpPeers AS B where (bgpPeerAdminStatus = 'start' OR bgpPeerAdminStatus = 'running') AND bgpPeerState != 'established'"), 0);
}
$query_a = mysql_query("SELECT * FROM `devices`"); $query_a = mysql_query("SELECT * FROM `devices`");
while($device = mysql_fetch_array($query_a)) { while($device = mysql_fetch_array($query_a)) {
@@ -225,7 +228,7 @@ echo('<li><a href="ports/?status=0"><img src="images/16/link_error.png" border="
<?php <?php
if ($_SESSION['userlevel'] >= '5') { if ($_SESSION['userlevel'] >= '5' && (isset($config['enable_bgp']) && $config['enable_bgp'])) {
echo(' echo('
<li><a class="menu2four" href="bgp/"><img src="images/16/link.png" border="0" align="absmiddle" /> BGP Sessions</a> <li><a class="menu2four" href="bgp/"><img src="images/16/link.png" border="0" align="absmiddle" /> BGP Sessions</a>
<table><tr><td> <table><tr><td>
@@ -248,7 +251,7 @@ echo(' <li><hr /></li>
</td></tr></table> </td></tr></table>
</li> </li>
'); ');
} } # If level > 5 && BGP enabled
?> ?>

18
html/pages/front/default.php
View File

@@ -69,19 +69,21 @@ while($service = mysql_fetch_array($sql)){
} }
if($_SESSION['userlevel'] == '10') { if (isset($config['enable_bgp']) && $config['enable_bgp'])
$sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0"); {
} else { if($_SESSION['userlevel'] == '10') {
$sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0"); $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B WHERE bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
} } else {
while($peer = mysql_fetch_array($sql)){ $sql = mysql_query("SELECT * FROM `devices` AS D, bgpPeers AS B, devices_perms AS P WHERE D.device_id = P.device_id AND P.user_id = '" . $_SESSION['user_id'] . "' AND bgpPeerState != 'established' AND bgpPeerState != '' AND B.device_id = D.device_id AND D.ignore = 0");
}
while($peer = mysql_fetch_array($sql))
{
generate_front_box("alert", "<center><strong>".generatedevicelink($peer, shorthost($peer['hostname']))."</strong><br /> generate_front_box("alert", "<center><strong>".generatedevicelink($peer, shorthost($peer['hostname']))."</strong><br />
<span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>BGP Down</span> <span style='font-size: 14px; font-weight: bold; margin: 5px; color: #c00;'>BGP Down</span>
<span style='" . (strstr($peer['bgpPeerIdentifier'],':') ? 'font-size: 10px' : '') . "'><strong>".$peer['bgpPeerIdentifier']."</strong></span><br /> <span style='" . (strstr($peer['bgpPeerIdentifier'],':') ? 'font-size: 10px' : '') . "'><strong>".$peer['bgpPeerIdentifier']."</strong></span><br />
<span title='" . $peer['astext'] . "' class=body-date-1>AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)."</span> <span title='" . $peer['astext'] . "' class=body-date-1>AS".$peer['bgpPeerRemoteAs']." ".truncate($peer['astext'], 10)."</span>
</center>"); </center>");
}
} }
if($_SESSION['userlevel'] == '10') { if($_SESSION['userlevel'] == '10') {

3
includes/discovery/bgp-peers.inc.php
View File

@@ -1,5 +1,7 @@
<?php <?php
if ($config['enable_bgp'])
{
### Discover BGP peers ### Discover BGP peers
echo("BGP Sessions : "); echo("BGP Sessions : ");
@@ -139,5 +141,6 @@ while ($entry = mysql_fetch_array($query)) {
unset($peerlist); unset($peerlist);
echo("\n"); echo("\n");
}
?> ?>

1
includes/discovery/os/vrp.inc.php
View File

@@ -4,6 +4,7 @@ if(!$os) {
if(strstr($sysDescr, "VRP (R) Software")) { $os = "vrp"; } if(strstr($sysDescr, "VRP (R) Software")) { $os = "vrp"; }
else if(strstr($sysDescr, "VRP Software Version")) { $os = "vrp"; } else if(strstr($sysDescr, "VRP Software Version")) { $os = "vrp"; }
else if(strstr($sysDescr, "Software Version VRP")) { $os = "vrp"; }
} }