diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py index c4d1dba95715e0e03f095e54843b145f35711ef5..85adb888bf8e8866fac6b877a8f8977876d634a6 100644 --- a/brian_dashboard_manager/config.py +++ b/brian_dashboard_manager/config.py @@ -67,9 +67,9 @@ DEFAULT_ORGANIZATIONS = [ "excluded_dashboards": [ "GÉANT Office devices", "GÉANT VM", - "Lab Devices" + "Lab Devices", "IAS", - "GEANTOPEN", + "GÉANT Open", "IAS Peers" ], "excluded_folders": { @@ -78,7 +78,8 @@ DEFAULT_ORGANIZATIONS = [ "IAS PRIVATE": True, "IAS PUBLIC": True, "IAS UPSTREAM": True, - "GWS PHY Upstream": True + "GWS PHY Upstream": True, + "GEANTOPEN" : True, } }, { @@ -106,7 +107,7 @@ DEFAULT_ORGANIZATIONS = [ "excluded_dashboards": [ "GÉANT Office devices", "GÉANT VM", - "Lab Devices" + "Lab Devices", "IAS", "IAS Peers" ], diff --git a/brian_dashboard_manager/grafana/dashboard.py b/brian_dashboard_manager/grafana/dashboard.py index 4b0fba74ff2529f972f67505a8471bb820c09874..5b11704a675e52d603064b025e7ac589fe8a100c 100644 --- a/brian_dashboard_manager/grafana/dashboard.py +++ b/brian_dashboard_manager/grafana/dashboard.py @@ -30,7 +30,9 @@ def delete_dashboard(request: TokenRequest, dashboard, folder_id=None): uid = dashboard.get('uid') if uid: return _delete_dashboard(request, uid) - elif dashboard.get('title') and folder_id: + elif dashboard.get('title'): + # if a folder ID is not supplied, + # dashboard title should be globally unique dash = _search_dashboard(request, dashboard, folder_id) if dash is None: return True