From aa7cf807f2063142c6a86b98033c2ed02c812aa3 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sat, 10 Dec 2022 15:15:43 +0100
Subject: [PATCH] renge/grafana: Migrate to 22.11 options

---
 machines/renge/services/grafana.nix | 38 +++++++++++++++++------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/machines/renge/services/grafana.nix b/machines/renge/services/grafana.nix
index 9d6d35f..c6ec7c2 100644
--- a/machines/renge/services/grafana.nix
+++ b/machines/renge/services/grafana.nix
@@ -5,19 +5,28 @@ in
 {
   services.grafana = {
     enable = true;
-    # grafana supports sockets, but no permission management (always 660 grafana:grafana)
-    addr = "127.0.0.1";
-    port = 3002;
-    domain = "grafana.sbruder.de";
-    rootUrl = "https://%(domain)s/";
-    database = {
-      type = "postgres";
-      host = "/run/postgresql";
-      user = "grafana";
+    settings = {
+      server = {
+        # grafana supports sockets, but no permission management (always 660 grafana:grafana)
+        http_addr = "127.0.0.1";
+        http_port = 3002;
+        domain = "grafana.sbruder.de";
+        rootUrl = "https://%(domain)s/";
+      };
+      database = {
+        type = "postgres";
+        host = "/run/postgresql";
+        user = "grafana";
+      };
+      analytics = {
+        reporting_enabled = false;
+        check_for_updates = false;
+        check_for_plugin_updates = false;
+      };
     };
     provision = {
       enable = true;
-      datasources = [
+      datasources.settings.datasources = [
         {
           name = "Prometheus";
           type = "prometheus";
@@ -26,18 +35,17 @@ in
         }
       ];
     };
-    analytics.reporting.enable = false;
   };
 
   systemd.services.grafana.after = [ "postgresql.service" ];
 
   services.postgresql = {
     enable = true;
-    ensureDatabases = [ cfg.database.name ];
+    ensureDatabases = [ cfg.settings.database.name ];
     ensureUsers = [
       {
-        name = cfg.database.user;
-        ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; };
+        name = cfg.settings.database.user;
+        ensurePermissions = { "DATABASE ${cfg.settings.database.name}" = "ALL PRIVILEGES"; };
       }
     ];
   };
@@ -47,7 +55,7 @@ in
     forceSSL = true;
 
     locations = {
-      "/".proxyPass = "http://${cfg.addr}:${toString cfg.port}";
+      "/".proxyPass = "http://${cfg.settings.server.http_addr}:${toString cfg.settings.server.http_port}";
     };
   };
 }