diff --git a/brian_dashboard_manager/dashboards/cls_peers.json b/brian_dashboard_manager/dashboards/cls_peers.json
deleted file mode 100755
index aea75fe68423544c7810eec820fad5860ec93aa5..0000000000000000000000000000000000000000
--- a/brian_dashboard_manager/dashboards/cls_peers.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
- "annotations": {
- "list": [
- {
- "builtIn": 1,
- "datasource": "-- Grafana --",
- "enable": true,
- "hide": true,
- "iconColor": "rgba(0, 211, 255, 1)",
- "name": "Annotations & Alerts",
- "type": "dashboard"
- }
- ]
- },
- "editable": true,
- "gnetId": null,
- "graphTooltip": 0,
- "id": 454,
- "links": [
- {
- "icon": "external link",
- "tags": [
- "cls_peers"
- ],
- "type": "dashboards",
- "targetBlank": true
- }
- ],
- "panels": [
- {
- "datasource": null,
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
- "folderId": null,
- "gridPos": {
- "h": 25,
- "w": 24,
- "x": 0,
- "y": 0
- },
- "headings": false,
- "id": 1,
- "limit": 100,
- "pluginVersion": "7.1.4",
- "query": "",
- "recent": false,
- "search": true,
- "starred": false,
- "tags": [
- "CLS"
- ],
- "targets": [
- {
- "groupBy": [
- {
- "params": [
- "$__interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "orderByTime": "ASC",
- "policy": "default",
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "Cloud Services (CLS)",
- "type": "dashlist"
- }
- ],
- "schemaVersion": 26,
- "style": "dark",
- "tags": [
- "peers"
- ],
- "templating": {
- "list": []
- },
- "time": {
- "from": "now-6h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "1m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ]
- },
- "timezone": "",
- "title": "CLS Peers",
- "version": 1
-}
diff --git a/brian_dashboard_manager/dashboards/services_cls.json b/brian_dashboard_manager/dashboards/services_cls.json
deleted file mode 100755
index 4e142c5114ecd11e0c6d22a90a0f3355a7b06e49..0000000000000000000000000000000000000000
--- a/brian_dashboard_manager/dashboards/services_cls.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "annotations": {
- "list": [
- {
- "builtIn": 1,
- "datasource": "-- Grafana --",
- "enable": true,
- "hide": true,
- "iconColor": "rgba(0, 211, 255, 1)",
- "name": "Annotations & Alerts",
- "type": "dashboard"
- }
- ]
- },
- "editable": true,
- "gnetId": null,
- "graphTooltip": 0,
- "id": 454,
- "links": [],
- "panels": [
- {
- "datasource": null,
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
- "folderId": null,
- "gridPos": {
- "h": 25,
- "w": 24,
- "x": 0,
- "y": 0
- },
- "headings": false,
- "id": 2,
- "limit": 100,
- "pluginVersion": "7.1.4",
- "query": "",
- "recent": false,
- "search": true,
- "starred": false,
- "tags": [
- "CLS"
- ],
- "targets": [
- {
- "groupBy": [
- {
- "params": [
- "$__interval"
- ],
- "type": "time"
- },
- {
- "params": [
- "null"
- ],
- "type": "fill"
- }
- ],
- "orderByTime": "ASC",
- "policy": "default",
- "refId": "A",
- "resultFormat": "time_series",
- "select": [
- [
- {
- "params": [
- "value"
- ],
- "type": "field"
- },
- {
- "params": [],
- "type": "mean"
- }
- ]
- ],
- "tags": []
- }
- ],
- "timeFrom": null,
- "timeShift": null,
- "title": "",
- "type": "dashlist"
- }
- ],
- "schemaVersion": 26,
- "style": "dark",
- "tags": [
- "services"
- ],
- "templating": {
- "list": []
- },
- "time": {
- "from": "now-6h",
- "to": "now"
- },
- "timepicker": {
- "refresh_intervals": [
- "5s",
- "10s",
- "30s",
- "1m",
- "5m",
- "15m",
- "30m",
- "1h",
- "2h",
- "1d"
- ]
- },
- "timezone": "",
- "title": "Cloud Services (CLS)",
- "version": 1
-}
diff --git a/brian_dashboard_manager/grafana/provision.py b/brian_dashboard_manager/grafana/provision.py
index 77544abc3f22ab3d05571a840fa684a9c1de7161..72fdfdb6ce360b120363a13c540b82b152b7b2ea 100644
--- a/brian_dashboard_manager/grafana/provision.py
+++ b/brian_dashboard_manager/grafana/provision.py
@@ -50,11 +50,6 @@ DASHBOARDS = {
'folder_name': 'NREN Access',
'interfaces': []
},
- 'CLS': {
- 'tag': 'CLS',
- 'folder_name': 'CLS',
- 'interfaces': []
- },
'RE_PEER': {
'tag': 'RE_PEER',
'folder_name': 'RE Peer',
diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index fc9930c721de15b531c38b53edf60829710da6a9..c51ab7318433084bbead2bca94e59641da35508d 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/brian_dashboard_manager/templating/helpers.py
@@ -107,6 +107,8 @@ def get_nren_interface_data(services, interfaces, excluded_dashboards):
lag_service = service['service_type'] == 'ETHERNET'
if lag_service:
+ if len(_interfaces) == 0:
+ continue
if len(_interfaces) > 1:
logger.info(
f'{sid} {name} aggregate service has > 1 interface')
diff --git a/changelog.md b/changelog.md
index b190f95f977241512cf379cf89af1a314f02fd3f..cbe6b9032779bf306301c4600b86fb9b076c4235 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,9 @@
All notable changes to this project will be documented in this file.
+## [0.43] - 2022-09-21
+- POL1-629: Remove CLS section (existing interfaces merged into Peering)
+
## [0.42] - 2022-08-25
- POL1-533: Add service-based panels to NREN Access dashboards
diff --git a/setup.py b/setup.py
index 8cf3a01e862034eb87861918afd528fd9d56678e..51d74284f55c2f9409655cd379debdc0a8065135 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name='brian-dashboard-manager',
- version="0.42",
+ version="0.43",
author='GEANT',
author_email='swd@geant.org',
description='',