hosts/monitoring-3/configuration.nix

@@ -1,29 +1,6 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
-with lib;
+{
-
-let
-  hosts = (import ../../lib/hosts.nix { inherit pkgs; }).hosts;
-
-  monitoringHosts = filterAttrs (name: host:
-    attrByPath ["clerie" "monitoring" "enable"] false host.config)
-    hosts;
-
-  monitoringHostsNames = mapAttrs' (name: host:
-    nameValuePair "fd00:327:327:327::${host.config.clerie.monitoring.id}"  ["${host.config.networking.hostName}.mon.clerie.de"])
-    monitoringHosts;
-
-  monitoringPeers = mapAttrsToList (name: host: {
-      allowedIPs = [ "fd00:327:327:327::${host.config.clerie.monitoring.id}/128" ];
-      publicKey = host.config.clerie.monitoring.pubkey;
-    })
-    monitoringHosts;
-
-  monitoringTargets = mapAttrsToList (name: host:
-    "${host.config.networking.hostName}.mon.clerie.de:9100")
-    monitoringHosts;
-
-in {
   imports =
     [
       ./hardware-configuration.nix
@@ -46,15 +23,21 @@ in {
 
   networking.hosts = {
     "fd00:327:327:327::1" = [ "monitoring-3.mon.clerie.de" ];
-  }
+    "fd00:327:327:327::102" = [ "porter.mon.clerie.de" ];
-  // monitoringHostsNames;
+  };
 
   networking.wireguard.enable = true;
   networking.wireguard.interfaces = {
     wg-monitoring = {
       ips = [ "fd00:327:327:327::1/64" ];
       listenPort = 54523;
-      peers = monitoringPeers;
+      peers = [
+        {
+          # porter
+          allowedIPs = [ "fd00:327:327:327::102/128" ];
+          publicKey = "+mJN+ustPo2ehP0wqajYs3nTdJ0SPuIDyiZQSHFIK3o=";
+        }
+      ];
       privateKeyFile = "/var/src/secrets/wireguard/wg-monitoring";
     };
   };
@@ -86,8 +69,8 @@ in {
           {
             targets = [
               "monitoring-3.mon.clerie.de:9100"
-            ]
+              "porter.mon.clerie.de:9100"
-            ++ monitoringTargets;
+            ];
           }
         ];
       }

hosts/osmium/configuration.nix

@@ -27,11 +27,5 @@
     git
   ];
 
-  clerie.monitoring = {
-    enable = true;
-    id = "201";
-    pubkey = "REWaiNU9AFSdDEL532XvcRul/rC79ZUfc7NOlwPSZzM=";
-  };
-
   system.stateVersion = "21.03";
 }

hosts/porter/configuration.nix

@@ -168,7 +168,7 @@
   clerie.monitoring = {
     enable = true;
     id = "102";
-    pubkey = "+mJN+ustPo2ehP0wqajYs3nTdJ0SPuIDyiZQSHFIK3o=";
+    pubkey = "";
   };
 
   system.stateVersion = "21.03";