From b9d1e942bc5041bb86be990bafedc414cd043a06 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 27 Feb 2024 13:55:29 +0100
Subject: [PATCH] Fix issues with grafana 10.3.3
---
brian_dashboard_manager/templating/helpers.py | 8 +++-----
.../nren_access/nren-dashboard.json.j2 | 11 +++++-----
.../templates/shared/dashboard.json.j2 | 11 +++++-----
config.json.example | 20 +++++++++++++++----
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/brian_dashboard_manager/templating/helpers.py b/brian_dashboard_manager/templating/helpers.py
index 5f7a44e..e7bbd68 100644
--- a/brian_dashboard_manager/templating/helpers.py
+++ b/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)
diff --git a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2 b/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
index eeb9dbb..7383eab 100644
--- a/brian_dashboard_manager/templating/templates/nren_access/nren-dashboard.json.j2
+++ b/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 %}
diff --git a/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2 b/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2
index 7132cf0..6b2e1d5 100644
--- a/brian_dashboard_manager/templating/templates/shared/dashboard.json.j2
+++ b/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 %}
diff --git a/config.json.example b/config.json.example
index a50cc66..c0071e0 100644
--- a/config.json.example
+++ b/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
--
GitLab