From a0a61781fc8f2f4feebe785ef2c101ba1adb7e34 Mon Sep 17 00:00:00 2001
From: Julian Rother <julian@cccv.de>
Date: Sat, 2 Nov 2024 02:40:01 +0100
Subject: [PATCH] Use Grafana's upstream Debian packages for loki

---
 defaults/main.yml |  8 ++++----
 handlers/main.yml |  4 ++--
 tasks/main.yml    | 34 +++++++++++++++++++++++++++-------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e253a6a..ac8773c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,11 +6,11 @@ loki:
       http_listen_port: 23100
       grpc_listen_port: 29096
     common:
-      path_prefix: /var/lib/grafana-loki
+      path_prefix: /var/lib/loki
       storage:
         filesystem:
-          chunks_directory: /var/lib/grafana-loki/chunks
-          rules_directory: /var/lib/grafana-loki/rules
+          chunks_directory: /var/lib/loki/chunks
+          rules_directory: /var/lib/loki/rules
       replication_factor: 1
       ring:
         instance_addr: 127.0.0.1
@@ -28,7 +28,7 @@ loki:
     ruler:
       alertmanager_url: http://localhost:9093
     compactor:
-      working_directory: /var/lib/grafana-loki/compactor
+      working_directory: /var/lib/loki/compactor
       retention_enabled: true
       delete_request_store: filesystem
     limits_config:
diff --git a/handlers/main.yml b/handlers/main.yml
index 32120b2..8648043 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,4 @@
-- name: restart grafana-loki
+- name: restart loki
   service:
-    name: grafana-loki
+    name: loki
     state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 6afedcf..8f11619 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,12 +1,32 @@
-- name: install grafana-loki
-  package:
-    name: grafana-loki
+- name: setup grafana repo key for loki
+  apt_key:
+    url: "https://apt.grafana.com/gpg.key"
 
-- name: write grafana-loki config
-  notify: restart grafana-loki
+- name: setup grafana repo for loki
+  apt_repository:
+    repo: "deb https://apt.grafana.com stable main"
+
+- name: create loki group
+  group:
+    name: loki
+    system: true
+
+- name: create loki user
+  user:
+    name: loki
+    system: true
+    group: loki
+    home: /var/lib/loki
+
+- name: install loki
+  package:
+    name: loki
+
+- name: write loki config
+  notify: restart loki
   copy:
     owner: root
-    group: grafana-loki
+    group: loki
     mode: 0640
-    dest: /etc/grafana-loki.yml
+    dest: /etc/loki/config.yml
     content: "{{ loki.config|to_nice_yaml(indent=2) }}"