diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 9801f4f940..5d4b792291 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -399,6 +399,7 @@ $os = 'nos'; $config['os'][$os]['text'] = 'Brocade NOS'; $config['os'][$os]['type'] = 'network'; $config['os'][$os]['ifname'] = 1; +$config['os'][$os]['ifalias_null'] = 1; $config['os'][$os]['over'][0]['graph'] = 'device_bits'; $config['os'][$os]['over'][0]['text'] = 'Device Traffic'; $config['os'][$os]['over'][1]['graph'] = 'device_processor'; diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 088b8a7223..678f569c92 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -352,6 +352,11 @@ foreach ($ports as $port) { } }//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 if (isset($config['port_descr_parser']) && is_file($config['install_dir'].'/'.$config['port_descr_parser'])) { $port_attribs = array(