diff --git a/brian_dashboard_manager/grafana/folder.py b/brian_dashboard_manager/grafana/folder.py index 4de848d9e65418252470a63b41291619ea421834..e55a07797c5b65fc3966929b2318db1ff9407f9b 100644 --- a/brian_dashboard_manager/grafana/folder.py +++ b/brian_dashboard_manager/grafana/folder.py @@ -6,7 +6,7 @@ from brian_dashboard_manager.grafana.utils.request import TokenRequest logger = logging.getLogger(__name__) -def list_folder_dashboards(request: TokenRequest, folder_uid): +def list_folder_dashboards(request: TokenRequest, folder_uid) -> dict: """ Lists all dashboards in a folder. @@ -19,7 +19,7 @@ def list_folder_dashboards(request: TokenRequest, folder_uid): dashboards = r.json() except HTTPError: logger.exception(f'Error when listing dashboards in folder: {folder_uid}') - return [] + return {} return {dash['title'].lower(): dash for dash in dashboards} diff --git a/brian_dashboard_manager/grafana/provision.py b/brian_dashboard_manager/grafana/provision.py index 636666ad6db8dc296e2e097f61278304a1adcc67..afa19ab5f16f10588d229be8c55df711c9e75261 100644 --- a/brian_dashboard_manager/grafana/provision.py +++ b/brian_dashboard_manager/grafana/provision.py @@ -158,7 +158,7 @@ SERVICE_DASHBOARDS = { 'RE_PEERS': { 'tag': ['RE_PEER'], 'service_type': 'IP PEERING - R&E', - 'folder_name': 'RE Peers', + 'folder_name': 'RE Peers BETA', 'interfaces': [], 'services': [] }, @@ -307,7 +307,7 @@ def provision_folder(thread_executor: ThreadPoolExecutor, token_request, folder_ else: rendered = render_simple_dashboard(**dashboard) - dash_title = rendered.get("title").lower() + dash_title = rendered.get("title", "").lower() if dash_title in excluded_dashboards: if dash_title in folder_dashboards_by_name: delete_dashboard(token_request, rendered, folder['id']) diff --git a/changelog.md b/changelog.md index 51200720f13a70acfad1278906763fdd3f8b38e8..79fbb19e2f54b9f26bcfe1320e63b2409dc540df 100644 --- a/changelog.md +++ b/changelog.md @@ -2,11 +2,13 @@ All notable changes to this project will be documented in this file. +## [0.81] - 2025-06-04 +- Add BETA to RE Peers folder name to indicate that it is still in development + ## [0.80] - 2025-06-03 - POL1-899: Add service-based RE Peers dashboard for GEANT staff validation - Make the /update endpoint synchronous instead of spinning off a thread to provision the dashboards. - ## [0.79] - 2025-05-30 - POL1-898: Unify logic for selecting interface between poller-udf and brian-dashboard-manager - Add EAP Nren dashboard to NREN Access dropdown diff --git a/setup.py b/setup.py index eb3aa9b7d454f6b77898dfd610dc44a771848079..d4a9b03a8cb650415adbd22624d14f100026552b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='brian-dashboard-manager', - version="0.80", + version="0.81", author='GEANT', author_email='swd@geant.org', description='',