Finished release 0.43.

brian_dashboard_manager/dashboards/cls_peers.json

-{
-  "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
-}

brian_dashboard_manager/dashboards/services_cls.json

-{
-  "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
-}

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',

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')

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
 

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='',