From b141a1d955ffb1b11530ff189da7b5e48e41a4d0 Mon Sep 17 00:00:00 2001
From: elkmaennchen <elkmaennchen@crans.org>
Date: Sat, 24 Feb 2024 13:16:19 +0100
Subject: [PATCH] grafana: minor fixes

---
 roles/grafana/tasks/main.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index e0666cc..6d748d3 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -8,18 +8,17 @@
   until: apt_result is succeeded
 
 - name: Import Grafana GPG signing key
-  apt_key:
-    url: https://packages.grafana.com/gpg.key
-    state: present
-  register: apt_key_result
-  retries: 3
-  until: apt_key_result is succeeded
+  get_url:
+    url: https://apt.grafana.com/gpg.key
+    dest: /usr/share/keyrings/grafana-release-keyring.gpg
 
 - name: Add Grafana repository
-  apt_repository:
-    repo: deb https://packages.grafana.com/oss/deb stable main
-    state: present
-    update_cache: true
+  deb822_repository:
+    name: collabora
+    types: deb
+    uris: https://apt.grafana.com
+    suites: stable
+    signed_by: /usr/share/keyrings/grafana-release-keyring.gpg
 
 - name: Install Grafana
   apt: