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

poll q-bridge-mib for port VLAN, also fix links on device vlan tab

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2593 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-27 10:07:39 +00:00
parent 6529d41ce6
commit 1550b1f5cd
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/print-vlan.inc.php
View File

@@ -16,7 +16,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
echo("<div style='display: block; padding: 2px; margin: 2px; min-width: 139px; max-width:139px; min-height:85px; max-height:85px; text-align: center; float: left; background-color: ".$list_colour_b_b.";'> echo("<div style='display: block; padding: 2px; margin: 2px; min-width: 139px; max-width:139px; min-height:85px; max-height:85px; text-align: center; float: left; background-color: ".$list_colour_b_b.";'>
<div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div> <div style='font-weight: bold;'>".makeshortif($port['ifDescr'])."</div>
<a href='device/".$device['device_id']."/port/".$port['interface_id']."/' onmouseover=\"return overlib('\ <a href='device/device=".$device['device_id']."/tab=port/port=".$port['interface_id']."/' onmouseover=\"return overlib('\
<div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$port['ifDescr']."</div>\ <div style=\'font-size: 16px; padding:5px; font-weight: bold; color: #e5e5e5;\'>".$device['hostname']." - ".$port['ifDescr']."</div>\
".$port['ifAlias']." \ ".$port['ifAlias']." \
<img src=\'graph.php?type=$graph_type&amp;if=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=450&amp;height=150\'>\ <img src=\'graph.php?type=$graph_type&amp;if=".$port['interface_id']."&amp;from=-2day&amp;to=".$now."&amp;width=450&amp;height=150\'>\

9
includes/polling/ports.inc.php
View File

@@ -90,6 +90,8 @@ if ($device['os_group'] == "ios")
} }
$port_stats = snmpwalk_cache_oid($device, "dot1qPortVlanTable", $port_stats, "Q-BRIDGE-MIB");
$polled = time(); $polled = time();
/// End Building SNMP Cache Array /// End Building SNMP Cache Array
@@ -192,12 +194,17 @@ foreach ($ports as $port)
} }
/// Set VLAN and Trunk /// Set VLAN and Trunk
if(isset($this_port['vlanTrunkPortEncapsulationOperType']) && $this_port['vlanTrunkPortEncapsulationOperType'] != "notApplicable") if (isset($this_port['vlanTrunkPortEncapsulationOperType']) && $this_port['vlanTrunkPortEncapsulationOperType'] != "notApplicable")
{ {
$this_port['ifTrunk'] = $this_port['vlanTrunkPortEncapsulationOperType']; $this_port['ifTrunk'] = $this_port['vlanTrunkPortEncapsulationOperType'];
} }
$this_port['ifVlan'] = $this_port['vmVlan']; $this_port['ifVlan'] = $this_port['vmVlan'];
if(isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; } if(isset($this_port['vlanTrunkPortNativeVlan'])) { $this_port['ifVlan'] = $this_port['vlanTrunkPortNativeVlan']; }
if (isset($this_port['dot1qPvid']))
{
$this_port['ifVlan'] = $this_port['dot1qPvid'];
}
/// Update IF-MIB data /// Update IF-MIB data
foreach ($data_oids as $oid) foreach ($data_oids as $oid)