services/router: init

modules/monitoring/alerts.nix

@@ -61,7 +61,7 @@ in
       }
       {
         # WAN quality on the site gateways, fed by the hourly speedtest timer
-        # (modules/router/speedtest.nix) via the node_exporter textfile
+        # (modules/clan/router/speedtest.nix) via the node_exporter textfile
         # collector. Degradation is judged against the link's own 7-day median,
         # so no per-site/per-ISP-plan threshold needs maintaining.
         name = "wan";

modules/monitoring/exporters.nix

@@ -10,7 +10,10 @@
   ...
 }:
 let
-  mesh = import ../mesh-hosts.nix { inherit config lib; };
+  mesh = import ../mesh-hosts.nix {
+    dir = config.clan.core.settings.directory;
+    inherit lib;
+  };
   knotEnabled = config.services.knot.enable;
   # node_exporter on every host; knot-exporter only where Knot runs.
   ports = [ 9100 ] ++ lib.optional knotEnabled 9433;

modules/monitoring/parsedmarc.nix

@@ -16,7 +16,10 @@
   ...
 }:
 let
-  mesh = import ../mesh-hosts.nix { inherit config lib; };
+  mesh = import ../mesh-hosts.nix {
+    dir = config.clan.core.settings.directory;
+    inherit lib;
+  };
 
   # Grafana 13 (since the externalisation of core data sources) no longer bundles
   # the Elasticsearch data source, and nixpkgs has no grafanaPlugins entry for it,

modules/monitoring/server.nix

@@ -9,7 +9,10 @@
   ...
 }:
 let
-  mesh = import ../mesh-hosts.nix { inherit config lib; };
+  mesh = import ../mesh-hosts.nix {
+    dir = config.clan.core.settings.directory;
+    inherit lib;
+  };
   probes = import ./blackbox-probes.nix { inherit lib; };
   vmPort = 8428;
   logsPort = 9428;