From cb795e18f4626ca5bd5f103fbf56e69660ba7b8b Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sat, 3 Dec 2022 14:36:27 +0100
Subject: monitoring-server: don't use deprecated grafana options

---
 usecases/server/monitoring-server.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'usecases/server/monitoring-server.nix')

diff --git a/usecases/server/monitoring-server.nix b/usecases/server/monitoring-server.nix
index 94319b5..1123739 100644
--- a/usecases/server/monitoring-server.nix
+++ b/usecases/server/monitoring-server.nix
@@ -21,7 +21,7 @@ inputs:
       {
         job_name = "grafana";
         static_configs = [
-          { targets = [ "localhost:${toString config.services.grafana.port}" ]; }
+          { targets = [ "localhost:${toString config.services.grafana.settings.server.http_port}" ]; }
         ];
       }
     ];
@@ -30,13 +30,14 @@ inputs:
   services.grafana = {
     enable = true;
 
-    addr = config.topology.mainVpn.currentNodeIP;
-    port = 3001;
-
-    analytics.reporting.enable = false;
+    settings = {
+      server.http_addr = config.topology.mainVpn.currentNodeIP;
+      server.http_port = 3001;
+      analytics.reporting_enabled = false;
+    };
   };
 
   networking.firewall.interfaces.${config.topology.mainVpn.interfaceName}.allowedTCPPorts = [
-    config.services.grafana.port
+    config.services.grafana.settings.server.http_port
   ];
 }
-- 
cgit v1.2.3