diff --git a/brian_dashboard_manager/grafana/organization.py b/brian_dashboard_manager/grafana/organization.py index bf8f2e85f0533a5e3d008b1639f5c78a7c7a886d..fa2a99bd19ed0d393bd4bde7eef99875db96651f 100644 --- a/brian_dashboard_manager/grafana/organization.py +++ b/brian_dashboard_manager/grafana/organization.py @@ -84,7 +84,7 @@ def delete_expired_api_tokens(request: AdminRequest, org_id: int) -> bool: tokens = request.get('api/auth/keys', params={'includeExpired': True}) - now = datetime.now() + now = datetime.utcnow() def is_expired(token): date = datetime.strptime(token['expiration'], '%Y-%m-%dT%H:%M:%SZ') diff --git a/brian_dashboard_manager/grafana/provision.py b/brian_dashboard_manager/grafana/provision.py index 053fb7cdefdcaf3e6a303f10200f454ae529e30d..10ca00d1356eb9a6975ae5b058c8e7b10ce597a1 100644 --- a/brian_dashboard_manager/grafana/provision.py +++ b/brian_dashboard_manager/grafana/provision.py @@ -279,6 +279,13 @@ def _provision_interfaces(config, org_config, ds_name, token): # loop over interfaces and add them to the dashboard_name # -> folder mapping structure `dashboards` above, for convenience. + + for dash in DASHBOARDS: + DASHBOARDS[dash]['interfaces'] = [] + + for dash in AGG_DASHBOARDS: + AGG_DASHBOARDS[dash]['interfaces'] = [] + for iface in relevant_interfaces: for dash_name in iface['dashboards']: @@ -589,7 +596,7 @@ def provision(config): for uid in all_original_dashboard_uids - managed_dashboard_uids: logger.info(f'Deleting stale dashboard with UID {uid}') - delete_dashboard(token, {'uid': uid}) + delete_dashboard(token_request, {'uid': uid}) _delete_unknown_folders(config, token_request) diff --git a/changelog.md b/changelog.md index ceefcf5ad74af30a4170493b2ee890ac5d768952..47e4a3e0027542aa14781f7f1f7287f5c64ec030 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [0.24] - 2021-10-12 +- POL1-463: bugfixes + +## [0.24] - 2021-10-11 +- POL1-463: EUMETSAT multicast dashboards + ## [0.23] - 2021-09-28 - Remove exclusion of GWS (In-)direct for relevant organizations diff --git a/setup.py b/setup.py index 5c54dd5fd059d1dac458781628e1a1336c2c5ade..ed0a4bd395b1d0ba226ef1ee2da810ad06191f34 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='brian-dashboard-manager', - version="0.24", + version="0.25", author='GEANT', author_email='swd@geant.org', description='',