Fixed grafana-wtf log subcommand for Grafana >= 11.6.0

Author: amotl

.github/workflows/tests.yml

@@ -34,6 +34,7 @@ jobs:
           "9.5.21",
           "10.3.12",
           "10.4.17",
+          "11.5.8",
           "11.6.5",
           "12.1.1",
         ]

CHANGES.rst

@@ -5,6 +5,7 @@ grafana-wtf changelog
 
 in progress
 ===========
+- Fixed ``grafana-wtf log`` subcommand for Grafana >= 11.6.0.
 
 2025-07-28 0.23.2
 =================

grafana_wtf/core.py

@@ -464,7 +464,11 @@ def search_items(self, expression, items, results):
     def get_dashboard_versions(self, dashboard_id):
         # https://grafana.com/docs/http_api/dashboard_versions/
         get_dashboard_versions_path = "/dashboards/id/%s/versions" % dashboard_id
-        return self.grafana.dashboard.client.GET(get_dashboard_versions_path)
+        data = self.grafana.dashboard.client.GET(get_dashboard_versions_path)
+        if "continueToken" in data:
+            return data["versions"]
+        else:
+            return data
 
     def explore_datasources(self):
         # Prepare indexes, mapping dashboards by uid, datasources by name

tests/.env

@@ -5,5 +5,9 @@
 #GRAFANA_VERSION=10.1.9
 #GRAFANA_VERSION=10.3.5
 #GRAFANA_VERSION=10.4.1
+#GRAFANA_VERSION=11.2.2
+#GRAFANA_VERSION=11.4.8
+#GRAFANA_VERSION=11.5.8
+#GRAFANA_VERSION=11.6.0
 #GRAFANA_VERSION=11.6.5
 GRAFANA_VERSION=12.1.1

tests/test_commands.py

@@ -3,6 +3,7 @@
 import re
 import shlex
 import sys
+from unittest import mock
 
 import docopt
 import grafana_client
@@ -337,7 +338,7 @@ def test_log_json_success(ldi_resources, capsys, caplog):
     reference = {
         "version": 1,
         # "datetime": "2021-09-29T17:32:23Z",
-        "message": "",
+        "message": mock.ANY,
         "folder": "Testdrive",
         "title": "luftdaten.info generic trend v27",
         "url": "http://localhost:33333/d/ioUrPwQiz/luftdaten-info-generic-trend-v27",