History: Add id and uid dashboard attributes to report

Author: amotl

CHANGES.rst

@@ -10,6 +10,7 @@ in progress
 - Caching: Optionally configure TTL using environment variable ``CACHE_TTL``
 - History: Stop ``grafana-wtf log <UID>`` acquiring *all* dashboards
 - Refactoring: Move all report renderers to ``grafana_wtf.report``
+- History: Add ``id`` and ``uid`` dashboard attributes to report
 
 2023-03-05 0.14.1
 =================

grafana_wtf/core.py

@@ -376,13 +376,15 @@ def log(self, dashboard_uid=None):
             dashboard_versions = self.get_dashboard_versions(dashboard_data["id"])
             for dashboard_revision in dashboard_versions:
                 entry = OrderedDict(
+                    version=dashboard_revision["version"],
                     datetime=dashboard_revision["created"],
                     user=dashboard_revision["createdBy"],
                     message=dashboard_revision["message"],
                     folder=dashboard_meta.get("folderTitle"),
                     title=dashboard_data["title"],
-                    version=dashboard_revision["version"],
                     url=urljoin(self.grafana_url, dashboard_meta["url"]),
+                    id=dashboard_data["id"],
+                    uid=dashboard_data["uid"],
                 )
                 entries.append(entry)
 

tests/test_commands.py

@@ -234,18 +234,20 @@ def test_log_json_success(ldi_resources, capsys, caplog):
     assert 'Aggregating edit history for Grafana dashboard "ioUrPwQiz"' in caplog.text
 
     reference = {
+        "version": 1,
         # "datetime": "2021-09-29T17:32:23Z",
         "user": "admin",
         "message": "",
         "folder": "Testdrive",
         "title": "luftdaten.info generic trend v27",
-        "version": 1,
         "url": "http://localhost:33333/d/ioUrPwQiz/luftdaten-info-generic-trend-v27",
+        "uid": "ioUrPwQiz",
     }
 
     history = json.loads(captured.out)
     item = history[-1]
     del item["datetime"]
+    del item["id"]
 
     assert item == reference