Finished release 0.13.

brian_dashboard_manager/config.py

@@ -84,6 +84,7 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_nrens": [
             "CUSTOMER GEANT",
             "GEANT-IT",
+            "PSNC",
             "PIONIER",
         ],
         "excluded_dashboards": [

brian_dashboard_manager/grafana/provision.py

@@ -313,7 +313,11 @@ def provision(config):
         # NREN Access dashboards
         # uses a different template than the above.
         logger.info('Provisioning NREN Access dashboards')
+        # always recreate NREN folder
+        delete_folder(token_request, 'NREN Access')
+
         folder = find_folder(token_request, 'NREN Access')
+
         nrens = filter(is_nren, excluded_interfaces)
         generate_all_nrens(token_request,
                            nrens, folder['id'], datasource_name)

changelog.md

@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.13] - 2021-04-15
+- Delete NREN folder when provisioning, stale dashboards could otherwise never be removed.
+
 ## [0.12] - 2021-04-15
 - POL1-416 remaining changes
 

setup.py

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

test/test_update.py

 import responses
 import json
+import re
 from brian_dashboard_manager.templating.nren_access import get_nrens
 from brian_dashboard_manager.grafana.provision import provision_folder, \
     generate_all_nrens, provision
@@ -330,6 +331,14 @@ def test_provision(data_config, mocker, client):
         url=f"http://{data_config['hostname']}/api/folders",
         callback=folder_get)
 
+    def folder_delete(request):
+        return 200, {}, json.dumps({"message": "Deleted folder"})
+
+    responses.add_callback(
+        method=responses.DELETE,
+        url=re.compile(f"http://{data_config['hostname']}/api/folders"),
+        callback=folder_delete, )
+
     def folder_post(request):
         data = json.loads(request.body)
         return 200, {}, json.dumps(generate_folder(data))