Finished release 0.57.

brian_dashboard_manager/templating/helpers.py

@@ -34,7 +34,7 @@ def num_generator(start=30):
         num += 1
 
 
-def gridPos_generator(id_generator, start=0, agg=False):
+def gridPos_generator(id_generator, start=1, agg=False):
     """
     Generator of gridPos objects used in Grafana dashboards to position panels.
 
@@ -573,16 +573,14 @@ def get_nren_dashboard_data_single(data, datasource, tag):
     nren, dash = data
     id_gen = num_generator()
 
-    gridPos = gridPos_generator(id_gen, start=1)
-
     if len(dash['AGGREGATES']) > 0:
         agg_panels = create_aggregate_panel(
             f'Aggregate - {nren}',
             gridPos_generator(id_gen, agg=True),
             dash['AGGREGATES'], datasource)
+        gridPos = gridPos_generator(id_gen, start=2)
     else:
-        # if there's no aggregate panel(s), start other stuff at y=0.
-        gridPos = gridPos_generator(id_gen, start=0)
+        gridPos = gridPos_generator(id_gen)
         agg_panels = []
 
     panel_gen = default_interface_panel_generator(gridPos)

brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2

@@ -42,18 +42,17 @@
     {
       "datasource": null,
       "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
+        "h": 2,
+        "w": 15,
+        "x": 4,
         "y": 0
       },
       "id": 1,
       "options": {
-        "content": "",
+        "content": "<div style=\"display: flex; justify-content: center; align-items: center; height: 100%;\"><span>INFO: The average values displayed are only mean values for timescales of 2 days or less</span></div>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.5",
-      "title": "INFO: The average values displayed are only mean values for timescales of 2 days or less",
+      "title": "",
       "type": "text"
     },
     {% for panel in aggregate_panels %}

brian_dashboard_manager/templating/templates/shared/dashboard.json.j2

@@ -42,18 +42,17 @@
     {
       "datasource": null,
       "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
+        "h": 2,
+        "w": 15,
+        "x": 4,
         "y": 0
       },
       "id": 1,
       "options": {
-        "content": "",
+        "content": "<div style=\"display: flex; justify-content: center; align-items: center; height: 100%;\"><span>INFO: The average values displayed are only mean values for timescales of 2 days or less</span></div>",
         "mode": "html"
       },
-      "pluginVersion": "8.2.5",
-      "title": "INFO: The average values displayed are only mean values for timescales of 2 days or less",
+      "title": "",
       "type": "text"
     }{{ "," if panels }}
     {% for panel in panels %}

changelog.md

@@ -2,13 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.56] - 2023-02-15
+## [0.57] - 2024-02-27
+- Fix layout for Grafana 10.3.3
+
+## [0.56] - 2024-02-15
 - Change Customers on home dashboard to be the first series shown
 
-## [0.55] - 2023-02-12
+## [0.55] - 2024-02-12
 - POL1-648 minor change/fix: don't show IPv6 graph sections for dashboards lacking IPv6 graphs
 
-## [0.54] - 2023-02-09
+## [0.54] - 2024-02-09
 - POL1-648: Added IPv6 graphs for NREN dashboards
 
 ## [0.53] - 2023-06-21

config.json.example

@@ -3,16 +3,28 @@
   "admin_password": "admin",
   "hostname": "localhost:3000",
   "inventory_provider": "http://inventory-provider01.geant.org:8080",
+  "reporting_provider": "http://prod-tableau-wdc.geant.org:9090",
   "datasources": {
     "influxdb": {
       "name": "PollerInfluxDB",
       "type": "influxdb",
       "access": "proxy",
-      "url": "http://test-poller-ui01.geant.org:8086",
-      "database": "poller",
+      "jsonData": {
+        "httpMode": "POST",
+        "timeInterval": "5m"
+      },
+      "url": "https://prod-influxdb-data01.geant.org:8086",
+      "database": "brian",
       "basicAuth": false,
       "isDefault": true,
-      "readOnly": false
+      "readOnly": false,
+      "user": "username",
+      "secureJsonData": {
+        "password": "password"
+      }
     }
-  }
+  },
+  "ignored_folders": [
+    "web"
+  ]
 }
\ No newline at end of file

setup.py

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