diff --git a/app/funct.py b/app/funct.py index b893f847..bf073640 100644 --- a/app/funct.py +++ b/app/funct.py @@ -483,4 +483,6 @@ def get_files(dir = get_config_var('configs', 'haproxy_save_configs_dir'), forma return sorted(return_files, reverse=True) else: return files - \ No newline at end of file + +def get_key(item): + return item[0] \ No newline at end of file diff --git a/app/options.py b/app/options.py index c2fda4f5..f757cdde 100644 --- a/app/options.py +++ b/app/options.py @@ -485,8 +485,9 @@ if form.getvalue('metrics'): plots = [] for key, value in p.items(): plots.append(value) - - grid = gridplot(plots, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) + + plots_sorted = sorted(plots, key=funct.get_key) + grid = gridplot(plots_sorted, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) show(grid) if form.getvalue('waf_metrics'): @@ -555,8 +556,8 @@ if form.getvalue('waf_metrics'): plots = [] for key, value in p.items(): plots.append(value) - - grid = gridplot(plots, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) + plots_sorted = sorted(plots, key=funct.get_key) + grid = gridplot(plots_sorted, ncols=2, plot_width=800, plot_height=250, toolbar_location = "left", toolbar_options=dict(logo=None)) show(grid) if form.getvalue('get_hap_v'): diff --git a/app/ovw.py b/app/ovw.py index cc9a15c8..77bd07e7 100644 --- a/app/ovw.py +++ b/app/ovw.py @@ -27,7 +27,7 @@ async def get_runner_overview(): for i, future in enumerate(asyncio.as_completed(futures)): result = await future servers.append(result) - servers_sorted = sorted(servers, key=getKey) + servers_sorted = sorted(servers, key=funct.get_key) template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value)) print(template) @@ -51,7 +51,7 @@ async def get_runner_overviewWaf(url): for i, future in enumerate(asyncio.as_completed(futures)): result = await future servers.append(result) - servers_sorted = sorted(servers, key=getKey) + servers_sorted = sorted(servers, key=funct.get_key) template = template.render(service_status=servers_sorted, role=sql.get_user_role_by_uuid(user_id.value), url=url) print(template) @@ -83,7 +83,7 @@ async def get_runner_overviewServers(): for i, future in enumerate(asyncio.as_completed(futures)): result = await future servers.append(result) - servers_sorted = sorted(servers, key=getKey) + servers_sorted = sorted(servers, key=funct.get_key) template = template.render(service_status=servers_sorted) print(template)