From 827b0346a6132642daa083de1790741ceda2b944 Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 19 Jul 2015 17:27:12 +0100 Subject: [PATCH 1/4] ifAlias is now derived from ifDescr if NULL --- includes/polling/ports.inc.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 088b8a7223..8ef7cc3dff 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) { + $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( From a41bcf29da6d55dfc999689188f6fbef7f58f1cc Mon Sep 17 00:00:00 2001 From: laf Date: Sun, 19 Jul 2015 17:35:11 +0100 Subject: [PATCH 2/4] Added config option to rewrite ifAlias --- includes/definitions.inc.php | 1 + includes/polling/ports.inc.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 894b9bdbb1..c4cd4ef914 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 8ef7cc3dff..678f569c92 100644 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -352,7 +352,7 @@ foreach ($ports as $port) { } }//end foreach - if ($port['update']['ifAlias'] == '' || $port['update']['ifAlias'] == NULL) { + 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'); } From 00bbd02b1d53aeb9a3a39c8922749f83445b9c0b Mon Sep 17 00:00:00 2001 From: Louis Rossouw Date: Sun, 19 Jul 2015 21:08:11 +0200 Subject: [PATCH 3/4] Ignore links based on 'unreal' mac adresses. --- html/includes/print-map.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index 5e8e64e532..442b3728cf 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -68,6 +68,7 @@ if (in_array('mac',$config['network_map_items'])) { LEFT JOIN `devices` AS `D2` ON `P2`.`device_id`=`D2`.`device_id` $join_sql WHERE + `M`.`mac_address` NOT IN ('000000000000','ffffffffffff') `P1`.`port_id` IS NOT NULL AND `P2`.`port_id` IS NOT NULL AND `D1`.`device_id` != `D2`.`device_id` From e948db4e8ce0ccf3be2be0c2b12660a6a1ff26ab Mon Sep 17 00:00:00 2001 From: Neil Lathwood Date: Sun, 19 Jul 2015 22:04:18 +0100 Subject: [PATCH 4/4] Revert "Ignore links based on 'unreal' mac addresses." --- html/includes/print-map.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/html/includes/print-map.inc.php b/html/includes/print-map.inc.php index 442b3728cf..5e8e64e532 100644 --- a/html/includes/print-map.inc.php +++ b/html/includes/print-map.inc.php @@ -68,7 +68,6 @@ if (in_array('mac',$config['network_map_items'])) { LEFT JOIN `devices` AS `D2` ON `P2`.`device_id`=`D2`.`device_id` $join_sql WHERE - `M`.`mac_address` NOT IN ('000000000000','ffffffffffff') `P1`.`port_id` IS NOT NULL AND `P2`.`port_id` IS NOT NULL AND `D1`.`device_id` != `D2`.`device_id`