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

merge $popgraph and $popdescr into $config['os'] as overgraph and overtext

Browse Source 
merge ifalias/ifdescr/ifname/ifindex decision making about port names into $config['os']


git-svn-id: http://www.observium.org/svn/observer/trunk@1265 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-06-25 13:04:03 +00:00
parent 19ccf99d8f
commit 9542635761
6 changed files with 119 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
includes/rewrites.php
View File

@@ -15,16 +15,16 @@ function ifLabel ($interface, $device = NULL) {
if(!$device) { $device = device_array($interface['device_id']); }
$os = strtolower($device['os']);
if(isset($config['ifname'][$os])) {
if (isset($config['os'][$os]['ifname'])) {
$interface['label'] = $interface['ifName'];
} elseif(isset($config['ifAlias'][$os])) {
} elseif (isset($config['os'][$os]['ifalias'])) {
$interface['label'] = $interface['ifAlias'];
} else {
$interface['label'] = $interface['ifDescr'];
if(isset($config['appendifindex'][$os])) { $interface['label'] = $interface['label'] . " " . $interface['ifIndex']; }
if (isset($config['os'][$os]['ifindex'])) { $interface['label'] = $interface['label'] . " " . $interface['ifIndex']; }
}
if($device['os'] == "speedtouch") {
if ($device['os'] == "speedtouch") {
list($interface['label']) = explode("thomson", $interface['label']);
}