Merge pull request #696 from stackhpc/upstream/2023.1-2025-03-31

priteau · web-flow · commit b14f1a76157c · 2025-03-31T09:51:48.000+02:00
Synchronise 2023.1 with upstream
diff --git a/ansible/roles/grafana/templates/prometheus.yaml.j2 b/ansible/roles/grafana/templates/prometheus.yaml.j2
@@ -10,6 +10,5 @@ datasources:
     basicAuthPassword: "{{ prometheus_grafana_password }}"
   orgId: 1
   url: {{ grafana_prometheus_url }}
-  version: 1
   jsonData:
     timeInterval: {{ prometheus_scrape_interval }}
diff --git a/releasenotes/notes/grafana_update_datasources-706e3cdc964c5272.yaml b/releasenotes/notes/grafana_update_datasources-706e3cdc964c5272.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with Grafana datasource updates by removing hardcoded
+    version number. This ensures proper datasource configuration updates.
+    `LP#[2096664] <https://launchpad.net/bugs/2096664>`__
