Finished release 0.47.

brian_dashboard_manager/grafana/provision.py

@@ -303,18 +303,20 @@ def _provision_interfaces(config, org_config, ds_name, token):
 
     excluded_nrens = org_config['excluded_nrens']
 
-    def excluded(interface):
-        desc = interface['description'].lower()
-        lab = 'lab.office' in interface['router'].lower()
-        to_exclude = any(nren.lower() in desc for nren in excluded_nrens)
-        if not (to_exclude or lab):
-            if 'dashboards_info' not in interface:
-                to_exclude = True
-                logger.info(f'No "dashboards_info" for '
-                            f'{interface["router"]}:{interface["name"]}')
-        return not (to_exclude or lab)
-
-    relevant_interfaces = list(filter(excluded, interfaces))
+    def interfaces_to_keep(interface):
+        dash_info = interface.get('dashboards_info')
+        if dash_info is None:
+            logger.info(f'No "dashboards_info" for '
+                        f'{interface["router"]}:{interface["name"]}')
+            # throw it away
+            return False
+        dashboards = {nren['name'].lower() for nren in dash_info}
+        is_lab_router = 'lab.office' in interface['router'].lower()
+        should_keep = not (is_lab_router or any(
+            nren.lower() in dashboards for nren in excluded_nrens))
+        return should_keep
+
+    relevant_interfaces = list(filter(interfaces_to_keep, interfaces))
     for interface in relevant_interfaces:
         interface['dashboards_info'] = list(filter(
             lambda x: x['name'] != '',

brian_dashboard_manager/templating/helpers.py

@@ -199,6 +199,7 @@ def get_nren_interface_data(services, interfaces, excluded_dashboards):
             if 'MDVPN' in service['service_type']:
                 # MDVPN type services don't have data in BRIAN
                 continue
+
             title = f'{name} ({sid})'
             dashboard['SERVICES'].append({
                 'measurement': measurement,
@@ -256,6 +257,12 @@ def get_nren_interface_data(services, interfaces, excluded_dashboards):
                 })
 
             result[dashboard_name] = dashboard
+
+    for customer in list(result.keys()):
+        lengths = [len(val) for val in result[customer].values()]
+        if sum(lengths) == 0:
+            # no services/interfaces, so remove it
+            del result[customer]
     return result
 
 

changelog.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.47] - 2023-02-27
+- POL1-653: Changed filtering of excluded_nrens to be based on destination dashboard rather than interface description parsing
+- Changed service-based dashboards code to not provision empty dashboards
+
 ## [0.46] - 2022-12-7
 - POL1-645: Changed NREN aggregate code to not add duplicate interfaces
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-dashboard-manager',
-    version="0.46",
+    version="0.47",
     author='GEANT',
     author_email='swd@geant.org',
     description='',

tox.ini

@@ -14,7 +14,7 @@ deps =
 
 commands =
     coverage erase
-    coverage run --source brian_dashboard_manager -m py.test {posargs}
+    coverage run --source brian_dashboard_manager -m pytest {posargs}
     coverage combine
     coverage xml
     coverage html