From 14c9d0515f741d1e28a8afe88e8d5028b7658ee7 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@private.storage>
Date: Thu, 13 Jan 2022 18:43:01 +0000
Subject: [PATCH] Fix Grafana start on local dev after upgrade to NixOS 21.11
Grafana 8 on NixOS 21.11 fails harder than 7.x on 21.05 when its
`grafana-admin.password` file is missing. Provide it regardless
whether Google auth is configured or not.
---
morph/lib/monitoring.nix | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/morph/lib/monitoring.nix b/morph/lib/monitoring.nix
index 0cedcf64..18359738 100644
--- a/morph/lib/monitoring.nix
+++ b/morph/lib/monitoring.nix
@@ -121,6 +121,8 @@ in {
permissions = "0400";
action = ["sudo" "systemctl" "restart" "grafana.service"];
};
+ })
+ {
"grafana-admin-password" = {
source = "${privateKeyPath}/grafana-admin.password";
destination = "/run/keys/grafana-admin.password";
@@ -129,7 +131,7 @@ in {
permissions = "0400";
action = ["sudo" "systemctl" "restart" "grafana.service"];
};
- })
+ }
(lib.mkIf cfg.enableSlackAlert {
"grafana-slack-url" = {
source = "${privateKeyPath}/grafana-slack-url";
--
GitLab