Skip to content
Snippets Groups Projects
Commit e23f74c0 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Only add ipv6 panel if the interface has v6 addr

parent e29f0841
Branches
Tags
No related merge requests found
......@@ -214,7 +214,8 @@ def get_interface_data(interfaces, name_parse_func=None):
peer.append({
'title': panel_title,
'interface': interface_name,
'hostname': host
'hostname': host,
'has_v6': len(interface.get('ipv6', [])) > 0
})
result[dashboard_name] = peer
return result
......@@ -245,7 +246,7 @@ def get_aggregate_interface_data(interfaces, agg_type):
'interface': interface_name,
'hostname': host,
'remote': remote,
'alias': f"{host.split('.')[1].upper()} - {remote}"
'alias': f"{host.split('.')[1].upper()} - {remote}",
})
return reduce(reduce_func, result, {})
......@@ -329,8 +330,9 @@ def get_dashboard_data(data, datasource, tag, errors=False):
for panel in panels:
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'traffic', datasource))
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'IPv6', datasource))
if panel.get('has_v6', False):
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'IPv6', datasource))
if errors:
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'errors', datasource))
......
......@@ -70,8 +70,9 @@ def get_panel_definitions(panels, datasource, errors=False):
for panel in panels:
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'traffic', datasource))
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'IPv6', datasource))
if panel.get('has_v6', False):
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'IPv6', datasource))
if errors:
result.append(get_panel_fields(
{**panel, **next(gridPos)}, 'errors', datasource))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment