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 pull request #1479 from laf/issue-1361

Browse Source 
ifAlias is now derived from ifDescr if NULL
This commit is contained in:
Daniel Preussker
2015-07-19 20:04:04 +02:00
parent fe8ead7e0e a41bcf29da
commit 9908eb2e37
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
includes/definitions.inc.php
View File

@@ -399,6 +399,7 @@ $os = 'nos';
$config['os'][$os]['text'] = 'Brocade NOS'; $config['os'][$os]['text'] = 'Brocade NOS';
$config['os'][$os]['type'] = 'network'; $config['os'][$os]['type'] = 'network';
$config['os'][$os]['ifname'] = 1; $config['os'][$os]['ifname'] = 1;
$config['os'][$os]['ifalias_null'] = 1;
$config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic'; $config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['over'][1]['graph'] = 'device_processor'; $config['os'][$os]['over'][1]['graph'] = 'device_processor';

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

@@ -352,6 +352,11 @@ foreach ($ports as $port) {
} }
}//end foreach }//end foreach
if (($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) && $config['os'][$os]['ifalias_null'] == 1) {
$port['update']['ifAlias'] = $port['ifDescr'];
d_echo('Using ifDescr due to ifAlias being NULL');
}
// Parse description (usually ifAlias) if config option set // Parse description (usually ifAlias) if config option set
if (isset($config['port_descr_parser']) && is_file($config['install_dir'].'/'.$config['port_descr_parser'])) { if (isset($config['port_descr_parser']) && is_file($config['install_dir'].'/'.$config['port_descr_parser'])) {
$port_attribs = array( $port_attribs = array(