refactor: define ports in ports.nix

1 files changed, 5 insertions, 4 deletions

diff --git a/nixos/hosts/tente/grafana.nix b/nixos/hosts/tente/grafana.nix
index 02d26c5..f7c8789 100644
--- a/nixos/hosts/tente/grafana.nix
+++ b/nixos/hosts/tente/grafana.nix
@@ -2,6 +2,7 @@
 
 let
   cfg = config.grafana;
+  evPorts = import <top/hosts/ev/ports.nix>;
 in
 {
   options.grafana = {
@@ -42,24 +43,24 @@ in
           {
             name = "Prometheus Tente";
             type = "prometheus";
-            url = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}";
+            url = "http://${config.services.prometheus.listenAddress}:${toString config.monitoring.prometheusPort}";
           }
           {
             name = "Loki Tente";
             type = "loki";
             access = "proxy";
-            url = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}";
+            url = "http://127.0.0.1:${toString config.monitoring.lokiPort}";
           }
           {
             name = "Prometheus Ev";
             type = "prometheus";
-            url = "http://ev.tailnet:9090";
+            url = "http://ev.tailnet:${toString evPorts.prometheus}";
           }
           {
             name = "Loki Ev";
             type = "loki";
             access = "proxy";
-            url = "http://ev.tailnet:3030";
+            url = "http://ev.tailnet:${toString evPorts.grafanaLoki}";
           }
         ];
       };