Skip to content
Snippets Groups Projects
Commit 4ea3042c authored by Sam Roberts's avatar Sam Roberts
Browse files

some hasty renaming of variables to make it clearer what they're doing

parent f3c8028b
Branches
Tags 0.60
No related merge requests found
......@@ -495,7 +495,7 @@ def get_panel_fields(panel, panel_type, datasource):
})
def default_interface_panel_generator(gridPos, use_ipv4=True, use_ipv6=True):
def default_interface_panel_generator(gridPos, use_all_traffic=True, use_ipv6=True):
"""
Helper for generating panel definitions for dashboards.
......@@ -503,7 +503,7 @@ def default_interface_panel_generator(gridPos, use_ipv4=True, use_ipv6=True):
panel data and panel type.
:param gridPos: generator for grid positions
:param use_ipv4: include ipv4 interfaces
:param use_all_traffic: include ipv4 + other traffic interfaces
:param use_ipv6: include ipv6 interfaces
:return: function that generates panel definitions
......@@ -519,14 +519,14 @@ def default_interface_panel_generator(gridPos, use_ipv4=True, use_ipv6=True):
:param panels: panel data
:param datasource: datasource to use for the panel
:param errors: whether or not to include an error panel
:param errors: whether to include an error panel
:return: list of panel definitions
"""
result = []
for panel in panels:
if use_ipv4:
if use_all_traffic:
result.append(get_panel_fields({
**panel,
**next(gridPos)
......@@ -577,8 +577,8 @@ def get_nren_dashboard_data_single(data, datasource, tag):
gridPos = gridPos_generator(id_gen)
agg_panels = []
panel_gen = default_interface_panel_generator(gridPos, use_ipv4=True, use_ipv6=False)
panel_ipv6_gen = default_interface_panel_generator(gridPos, use_ipv4=False, use_ipv6=True)
panel_gen = default_interface_panel_generator(gridPos, use_all_traffic=True, use_ipv6=False)
panel_ipv6_gen = default_interface_panel_generator(gridPos, use_all_traffic=False, use_ipv6=True)
services_dropdown = create_dropdown_panel('Services', **next(gridPos))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment