POL1-579: New layout for R&E Peer dashboards

brian_dashboard_manager/grafana/provision.py

@@ -33,13 +33,14 @@ from brian_dashboard_manager.templating.helpers import \
     get_aggregate_dashboard_data, get_interface_data, \
     get_nren_interface_data, get_dashboard_data, \
     get_nren_dashboard_data, get_aggregate_interface_data, \
-    get_nren_interface_data_old
+    get_nren_interface_data_old, get_re_peer_dashboard_data, get_re_peer_interface_data
 
-from brian_dashboard_manager.templating.gws import generate_gws, \
-    generate_indirect
-from brian_dashboard_manager.templating.eumetsat \
-    import generate_eumetsat_multicast
-from brian_dashboard_manager.templating.render import render_dashboard
+from brian_dashboard_manager.templating.gws import generate_gws, generate_indirect
+from brian_dashboard_manager.templating.eumetsat import generate_eumetsat_multicast
+from brian_dashboard_manager.templating.render import (
+    render_complex_dashboard,
+    render_simple_dashboard,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -214,10 +215,10 @@ def provision_folder(token_request, folder_name, dash,
     # dashboard should include error panels
     errors = dash.get('errors', False)
 
-    # needed for POL1-642 BETA
-    is_nren_beta = folder_name == 'NREN Access BETA'
+    is_nren_beta = folder_name == "NREN Access BETA"  # needed for POL1-642 BETA
+    is_nren = folder_name == "NREN Access"
+    is_re_peer = folder_name == "RE Peer"
 
-    is_nren = folder_name == 'NREN Access'
     if is_nren:
         data = get_nren_interface_data_old(interfaces)
         dash_data = get_nren_dashboard_data(data, ds_name, tag)
@@ -227,6 +228,9 @@ def provision_folder(token_request, folder_name, dash,
         data = get_nren_interface_data(
             services, interfaces, excluded_dashboards)
         dash_data = get_nren_dashboard_data(data, ds_name, tag)
+    elif is_re_peer:
+        data = get_re_peer_interface_data(interfaces)
+        dash_data = get_re_peer_dashboard_data(data, ds_name, tag)
     else:
         data = get_interface_data(interfaces)
         dash_data = get_dashboard_data(
@@ -239,11 +243,13 @@ def provision_folder(token_request, folder_name, dash,
 
     with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
         for dashboard in dash_data:
-            rendered = render_dashboard(
-                dashboard, nren=is_nren or is_nren_beta)
-            if rendered.get('title').lower() in excluded_dashboards:
-                executor.submit(delete_dashboard, token_request,
-                                rendered, folder['id'])
+            if is_nren or is_nren_beta or is_re_peer:
+                rendered = render_complex_dashboard(**dashboard)
+            else:
+                rendered = render_simple_dashboard(**dashboard)
+
+            if rendered.get("title").lower() in excluded_dashboards:
+                executor.submit(delete_dashboard, token_request, rendered, folder["id"])
                 continue
             provisioned.append(executor.submit(create_dashboard, token_request,
                                                rendered, folder['id']))
@@ -273,7 +279,7 @@ def provision_aggregate(token_request, folder,
     dashboard = get_aggregate_dashboard_data(
         f'Aggregate - {name}', data, ds_name, tag)
 
-    rendered = render_dashboard(dashboard)
+    rendered = render_simple_dashboard(**dashboard)
     return create_dashboard(token_request, rendered, folder['id'])
 
 
@@ -460,7 +466,7 @@ def _provision_gws_indirect(config, org_config, ds_name, token):
             provisioned = []
             dashes = generate_indirect(gws_indirect_data, ds_name)
             for dashboard in dashes:
-                rendered = render_dashboard(dashboard)
+                rendered = render_simple_dashboard(**dashboard)
                 provisioned.append(executor.submit(create_dashboard,
                                                    token,
                                                    rendered, folder['id']))
@@ -495,7 +501,7 @@ def _provision_gws_direct(config, org_config, ds_name, token):
             provisioned = []
 
             for dashboard in generate_gws(gws_data, ds_name):
-                rendered = render_dashboard(dashboard)
+                rendered = render_simple_dashboard(**dashboard)
                 provisioned.append(executor.submit(create_dashboard,
                                                    token,
                                                    rendered, folder['id']))
@@ -530,7 +536,7 @@ def _provision_eumetsat_multicast(config, org_config, ds_name, token):
 
             for dashboard in generate_eumetsat_multicast(
                     subscriptions, ds_name):
-                rendered = render_dashboard(dashboard)
+                rendered = render_simple_dashboard(**dashboard)
                 provisioned.append(
                     executor.submit(
                         create_dashboard,