diff --git a/brian_dashboard_manager/grafana/provision.py b/brian_dashboard_manager/grafana/provision.py index 93721c6ee690ef53f3d9f8b8939405653f203bde..6e784d7a4f8f3f0b3c62ce13c21cb0021c86e997 100644 --- a/brian_dashboard_manager/grafana/provision.py +++ b/brian_dashboard_manager/grafana/provision.py @@ -46,7 +46,7 @@ logger = logging.getLogger(__name__) MAX_WORKERS = 4 DASHBOARDS = { - 'NRENBETA': { + 'NRENBETA': { # needed for POL1-642 BETA 'tag': ['customersbeta'], 'folder_name': 'NREN Access BETA', 'interfaces': [] @@ -194,12 +194,15 @@ def provision_folder(token_request, folder_name, dash, # dashboard should include error panels errors = dash.get('errors', False) - is_nren = folder_name == 'NREN Access' + # needed for POL1-642 BETA is_nren_beta = folder_name == 'NREN Access BETA' + + is_nren = folder_name == 'NREN Access' if is_nren: data = get_nren_interface_data_old(interfaces) dash_data = get_nren_dashboard_data(data, ds_name, tag) elif is_nren_beta: + # needed for POL1-642 BETA services = fetch_services(config['reporting_provider']) data = get_nren_interface_data( services, interfaces, excluded_dashboards) @@ -277,6 +280,8 @@ def is_excluded_folder(org_config, folder_name): def excluded_folder_dashboards(org_config, folder_name): excluded_folders = org_config.get('excluded_folders', {}) excluded = excluded_folders.get(folder_name, []) + # in is needed for POL1-642 BETA ('NREN Access BETA' folder) + # revert to == 'NREN Access' when beta is over if 'NREN Access' in folder_name: excluded_nrens = org_config.get('excluded_nrens', []) excluded = list(set(excluded).union(set(excluded_nrens)))