Finished release 0.9.

brian_dashboard_manager/config.py

@@ -48,7 +48,7 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "GÉANT LAB devices"
+            "Lab Devices"
         ],
         "excluded_folders": {
             "Aggregates": ["CAE1"],
@@ -60,22 +60,25 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_nrens": [
             "CARNET",
             "PSNC",
+            "PIONIER",
             "CUSTOMER GEANT",
             "GEANT-IT"
         ],
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "GÉANT LAB devices"
+            "Lab Devices"
             "IAS",
-            "GEANTOPEN"
+            "GEANTOPEN",
+            "IAS Peers"
         ],
         "excluded_folders": {
-            "Aggregates": ["CAE1", "GWS UPSTREAMS"],
+            "Aggregates": ["CAE1", "GWS UPSTREAMS", "IAS PEERS"],
             "IAS CUSTOMER": True,
             "IAS PRIVATE": True,
             "IAS PUBLIC": True,
-            "IAS UPSTREAM": True
+            "IAS UPSTREAM": True,
+            "GWS PHY Upstream": True
         }
     },
     {
@@ -87,7 +90,7 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "GÉANT LAB devices",
+            "Lab Devices",
         ],
         "excluded_folders": {}
     },
@@ -96,21 +99,24 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_nrens": [
             "CARNET",
             "PSNC",
+            "PIONIER",
             "CUSTOMER GEANT",
             "GEANT-IT"
         ],
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "GÉANT LAB devices"
-            "IAS"
+            "Lab Devices"
+            "IAS",
+            "IAS Peers"
         ],
         "excluded_folders": {
-            "Aggregates": ["GWS UPSTREAMS"],
+            "Aggregates": ["GWS UPSTREAMS", "IAS PEERS"],
             "IAS CUSTOMER": True,
             "IAS PRIVATE": True,
             "IAS PUBLIC": True,
-            "IAS UPSTREAM": True
+            "IAS UPSTREAM": True,
+            "GWS PHY Upstream": True
         }
     }
 ]

brian_dashboard_manager/dashboards/infrastructure_lab.json

@@ -693,7 +693,7 @@
           "multi": true,
           "name": "interface_name",
           "options": [],
-          "query": "SHOW TAG VALUES ON test_brian WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
+          "query": "SHOW TAG VALUES WITH KEY IN (interface_name) WHERE hostname =~ /$hostname/ ",
           "refresh": 1,
           "regex": "",
           "skipUrlSync": false,

brian_dashboard_manager/grafana/dashboard.py

@@ -34,7 +34,8 @@ def delete_dashboard(request: TokenRequest, dashboard, folder_id=None):
             dash = _search_dashboard(request, dashboard, folder_id)
             if dash is None:
                 return True
-            r = request.delete(f'api/dashboards/uid/{dash.get("uid")}')
+            _delete_dashboard(request, dash.get(
+                'dashboard', {}).get('uid', ''))
 
         logger.info(f'Deleted dashboard: {dashboard.get("title")}')
         return r is not None

brian_dashboard_manager/grafana/provision.py

@@ -299,7 +299,7 @@ def provision(config):
                 agg_folder = find_folder(token_request, 'Aggregates')
                 for agg_type, dash in aggregate_dashboards.items():
                     if agg_type in exclude_agg:
-                        dash_name = f'Aggregates - {agg_type}'
+                        dash_name = {'title': f'Aggregate - {agg_type}'}
                         executor.submit(delete_dashboard,
                                         token_request, dash_name,
                                         agg_folder['id'])

brian_dashboard_manager/templating/templates/homedashboard.json.j2

@@ -640,88 +640,66 @@
     }
     {% else %}
     {
-      "datasource": "PollerInfluxDB",
+      "datasource": null,
       "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null,
-            "filterable": false
+          "defaults": {
+              "custom": {}
           },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
+          "overrides": []
       },
-      "folderId": null,
       "gridPos": {
-        "h": 24,
-        "w": 24,
-        "x": 0,
-        "y": 0
+          "h": 11,
+          "w": 6,
+          "x": 9,
+          "y": 0
       },
-      "headings": true,
-      "id": 2,
-      "limit": 100,
-      "pluginVersion": "7.2.1",
-      "query": "",
-      "recent": false,
-      "repeat": null,
-      "search": true,
-      "starred": true,
-      "tags": [],
+      "id": 4,
+      "options": {
+          "content": "<center><img src=\"https://connect.geant.org/wp-content/uploads/2021/04/geant_logo.png\" alt=\"GEANT Logo\" height=\"308\" width=\"616\"></center>",
+          "mode": "html"
+      },
+      "pluginVersion": "7.1.0",
       "targets": [
-        {
-          "groupBy": [
-            {
-              "params": [
-                "$__interval"
+          {
+              "groupBy": [
+                  {
+                      "params": [
+                          "$__interval"
+                      ],
+                      "type": "time"
+                  },
+                  {
+                      "params": [
+                          "null"
+                      ],
+                      "type": "fill"
+                  }
               ],
-              "type": "time"
-            },
-            {
-              "params": [
-                "null"
+              "orderByTime": "ASC",
+              "policy": "default",
+              "refId": "A",
+              "resultFormat": "time_series",
+              "select": [
+                  [
+                      {
+                          "params": [
+                              "value"
+                          ],
+                          "type": "field"
+                      },
+                      {
+                          "params": [],
+                          "type": "mean"
+                      }
+                  ]
               ],
-              "type": "fill"
-            }
-          ],
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": [
-                  "value"
-                ],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "mean"
-              }
-            ]
-          ],
-          "tags": []
-        }
+              "tags": []
+          }
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Dashboards",
-      "type": "dashlist"
+      "title": "BRIAN",
+      "type": "text"
     }
     {% endif %}
   ],

changelog.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9] - 2021-04-12
+- Show GEANT logo on home dashboards for non-staff organizations
+- Remove hardcoded database name from lab dashboard
+- Properly exclude a number of dashboards and folders
+- Add PIONIER alias of PSNC to exclude
+
 ## [0.8] - 2021-04-09
 - Templated home dashboard to provision different one for each organization
 - Add interface names to aggregate graph target aliases

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-dashboard-manager',
-    version="0.8",
+    version="0.9",
     author='GEANT',
     author_email='swd@geant.org',
     description='',