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

fixes

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@209 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2008-03-29 17:36:54 +00:00
parent 176dd1b453
commit c35328c28f
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/pages/device/dev-bgp.inc
View File

@@ -21,7 +21,7 @@
if($peerhost) { $peername = generatedevicelink($peerhost); } else { unset($peername); } if($peerhost) { $peername = generatedevicelink($peerhost); } else { unset($peername); }
echo("<tr bgcolor=$bg_colour> echo("<tr bgcolor=$bg_colour>
<td width=20><h3><center>$i</center></h3></td> <td width=20><span class=list-large>$i</span></td>
<td><span class=list-large>" . $peer['bgpPeerIdentifier'] . "</span><br />".$peername."</td> <td><span class=list-large>" . $peer['bgpPeerIdentifier'] . "</span><br />".$peername."</td>
<td>$peer_type</td> <td>$peer_type</td>
<td><strong>AS" . $peer['bgpPeerRemoteAs'] . "</strong><br />" . $peer['astext'] . "</td> <td><strong>AS" . $peer['bgpPeerRemoteAs'] . "</strong><br />" . $peer['astext'] . "</td>

1
includes/functions.php
View File

@@ -533,6 +533,7 @@ function fixifName ($inf) {
$inf = str_replace("vlan", "Vlan", $inf); $inf = str_replace("vlan", "Vlan", $inf);
$inf = str_replace("ether", "Ether", $inf); $inf = str_replace("ether", "Ether", $inf);
$inf = str_replace("-802.1q Vlan subif", "", $inf); $inf = str_replace("-802.1q Vlan subif", "", $inf);
$inf = str_replace("tunnel", "Tunnel", $inf);
$inf = str_replace("serial", "Serial", $inf); $inf = str_replace("serial", "Serial", $inf);
$inf = str_replace("-aal5 layer", " aal5", $inf); $inf = str_replace("-aal5 layer", " aal5", $inf);
$inf = str_replace("null", "Null", $inf); $inf = str_replace("null", "Null", $inf);

1
includes/syslog.php
View File

@@ -4,7 +4,6 @@ function process_syslog ($entry, $update) {
global $config; global $config;
foreach($config['syslog_filter'] as $bi) { foreach($config['syslog_filter'] as $bi) {
if (strstr($entry['msg'], $bi)) { if (strstr($entry['msg'], $bi)) {
$delete = 1; $delete = 1;

6
update-interface.php
View File

@@ -6,7 +6,7 @@ include("includes/functions.php");
if($argv[1]) { $where = "WHERE `interface_id` = '$argv[1]'"; } if($argv[1]) { $where = "WHERE `interface_id` = '$argv[1]'"; }
$interface_query = mysql_query("SELECT * FROM `interfaces` $where"); $interface_query = mysql_query("SELECT * FROM `interfaces` $where ORDER BY interface_id DESC");
while ($interface = mysql_fetch_array($interface_query)) { while ($interface = mysql_fetch_array($interface_query)) {
unset($this); unset($this);
@@ -63,7 +63,6 @@ while ($interface = mysql_fetch_array($interface_query)) {
if($this['ifTrunk']) { echo("Interface is a " . $this['ifTrunk'] . " trunk\n"); } if($this['ifTrunk']) { echo("Interface is a " . $this['ifTrunk'] . " trunk\n"); }
if($this['ifVlan']) { echo("Interface is a member of vlan " . $this['ifVlan'] . " \n"); } if($this['ifVlan']) { echo("Interface is a member of vlan " . $this['ifVlan'] . " \n"); }
} }
list($ifName, $ifDescr, $ifAdminStatus, $ifOperStatus, $ifAlias, $ifSpeed, $ifDuplex, $ifType, $ifMtu, $ifPhysAddress) = explode("\n", $snmp_output); list($ifName, $ifDescr, $ifAdminStatus, $ifOperStatus, $ifAlias, $ifSpeed, $ifDuplex, $ifType, $ifMtu, $ifPhysAddress) = explode("\n", $snmp_output);
@@ -74,6 +73,9 @@ while ($interface = mysql_fetch_array($interface_query)) {
$ifAlias = trim(str_replace("\"", "", $ifAlias)); $ifAlias = trim(str_replace("\"", "", $ifAlias));
$ifAlias = trim($ifAlias); $ifAlias = trim($ifAlias);
echo("\n$ifName\n");
$ifDescr = fixifname($ifDescr);
$ifPhysAddress = strtolower(str_replace("\"", "", $ifPhysAddress)); $ifPhysAddress = strtolower(str_replace("\"", "", $ifPhysAddress));
$ifPhysAddress = str_replace(" ", ":", $ifPhysAddress); $ifPhysAddress = str_replace(" ", ":", $ifPhysAddress);