diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py index c4d1dba95715e0e03f095e54843b145f35711ef5..95d02258282f130e654b1467506a75d27a1e9b0b 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 diff --git a/changelog.md b/changelog.md index c443581c36e55c1cffce4cb77d85af57190714af..daf34eca055bbd923a89a3657018e92ce1be3553 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## [0.10] - 2021-04-12 +- Fix bug in config +- Add GEANTOPEN to General Public + ## [0.9] - 2021-04-12 - Show GEANT logo on home dashboards for non-staff organizations - Remove hardcoded database name from lab dashboard diff --git a/setup.py b/setup.py index 1767e49655d3a3d0320019eea8059f4562c2f32b..14920994748614747ff20a78b3805dd25b50f7f9 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='brian-dashboard-manager', - version="0.9", + version="0.10", author='GEANT', author_email='swd@geant.org', description='',