From 2a2e438c4a6157afb3d3d340274238d5dd2f6503 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Wed, 29 Oct 2025 12:44:35 -0400
Subject: [PATCH] grafana stuff

---
 clients/quadraticserver/stats/grafana.nix    | 9 ++++-----
 clients/quadraticserver/stats/prometheus.nix | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/clients/quadraticserver/stats/grafana.nix b/clients/quadraticserver/stats/grafana.nix
index 8f13664..9266212 100644
--- a/clients/quadraticserver/stats/grafana.nix
+++ b/clients/quadraticserver/stats/grafana.nix
@@ -33,9 +33,7 @@
               name = "Prometheus";
               type = "prometheus";
               url = with config.services.prometheus; "http://${listenAddress}:${toString port}";
-              jsonData = {
-                timeInterval = config.services.prometheus.globalConfig.scrape_interval;
-              };
+              jsonData.timeInterval = config.services.prometheus.globalConfig.scrape_interval;
             }
           ];
 
@@ -45,7 +43,7 @@
               options.path = pkgs.fetchurl {
                 name = "dashboard-node-exporter-full.json";
                 url = "https://grafana.com/api/dashboards/1860/revisions/42/download";
-                hash = "";
+                hash = "sha256-pNgn6xgZBEu6LW0lc0cXX2gRkQ8lg/rer34SPE3yEl4=";
               };
             }
           ];
@@ -54,5 +52,6 @@
       caddy.virtualHosts."${domain}".extraConfig =
         "reverse_proxy unix/${config.services.grafana.settings.server.socket}";
     };
-  users.users.grafana = "caddy";
+
+  users.users.caddy.extraGroups = [ "grafana" ];
 }
diff --git a/clients/quadraticserver/stats/prometheus.nix b/clients/quadraticserver/stats/prometheus.nix
index 758ef73..e0b2ac1 100644
--- a/clients/quadraticserver/stats/prometheus.nix
+++ b/clients/quadraticserver/stats/prometheus.nix
@@ -11,7 +11,7 @@
         static_configs = [
           {
             targets = with config.services.prometheus.exporters.node; [
-              "${toStringlistenAddress}:${toString port}"
+              "${listenAddress}:${toString port}"
             ];
           }
         ];