Merge branch 'monitoring' of codeberg.org:noe/nixos into monitoring

nixos/hosts/monitoring/default.nix

@@ -22,19 +22,34 @@
         domain = "monitoring.hoki-porgy.ts.net";
       };
     };
+
+    provision = {
+      enable = true;
+      datasources.settings.datasources = [
+        {
+          url = "http://localhost:4000";
+          type = "prometheus";
+          name = "Prometheus";
+        }
+      ];
+    };
   };
   
   services.prometheus = {
     enable = true;
     port = 4000;
     
-    scrapeConfigs = [
+    scrapeConfigs = let
-      {
+      static = name: ports: { 
-        job_name = "aerial";
+        job_name = name;
         static_configs = [
-          { targets = ["100.111.27.103:14200"]; }
+          { 
+            targets = map (port: "${name}.hoki-porgy.ts.net:${builtins.toString port}") ports;
+          }
         ]; 
-      }
+      };
+    in [
+      (static "aerial" [ 14200 ])
     ];
   };
 

nixos/templates/proxmox-lxc.nix

@@ -24,7 +24,7 @@
     serviceConfig.Restart = "always";
   };
 
-  services.tailscale = {
+  #services.tailscale = {
-    interfaceName = "userspace-networking";
+  #  interfaceName = "userspace-networking";
-  };
+  #};
 }