From f423f868c53b735728952f104940566a203a1825 Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Sun, 27 Aug 2023 16:26:17 +0200
Subject: [PATCH] cluster/services/monitoring: grafana: use distributed service

---
 cluster/services/monitoring/grafana-ha.nix | 32 ++++------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/cluster/services/monitoring/grafana-ha.nix b/cluster/services/monitoring/grafana-ha.nix
index 67f55cb..8d8f9a6 100644
--- a/cluster/services/monitoring/grafana-ha.nix
+++ b/cluster/services/monitoring/grafana-ha.nix
@@ -82,31 +82,12 @@ in
 
   systemd.services = {
     grafana = {
-      enable = false;
-      serviceConfig.EnvironmentFile = config.age.secrets.grafana-secrets.path;
-    };
-    grafana-ha = let
-      base = config.systemd.services.grafana;
-      inherit (config.services) consul;
-      svc = config.consul.services.grafana;
-      run = pkgs.writeShellScript "grafana-ha-start" ''
-        trap '${svc.commands.deregister}' EXIT
-        ${svc.commands.register}
-        ${base.serviceConfig.ExecStart}
-      '';
-    in {
-      inherit (base) wantedBy;
-      description = "Grafana | High Availability";
-      aliases = [ "grafana.service" ];
-
-      after = base.after ++ [ "consul.service" ];
-      requires = [ "consul.service" ];
-
-      serviceConfig = base.serviceConfig // {
-        ExecStart = "${consul.package}/bin/consul lock --shell=false services/grafana ${run}";
-        ExecStopPost = "${svc.commands.deregister}";
-        # consul uses AF_NETLINK to determine interface addresses, even when just registering a service
-        RestrictAddressFamilies = base.serviceConfig.RestrictAddressFamilies ++ [ "AF_NETLINK" ];
+      distributed = {
+        enable = true;
+        registerService = "grafana";
+      };
+      serviceConfig = {
+        EnvironmentFile = config.age.secrets.grafana-secrets.path;
         Restart = "on-failure";
         RestartSec = "10s";
       };
@@ -128,7 +109,6 @@ in
 
   consul.services.grafana = {
     mode = "manual";
-    unit = "grafana-ha";
     definition = rec {
       name = "grafana";
       address = depot.reflection.interfaces.primary.addrPublic;