modules/prometheus: refactor

machines/massicot/default.nix

@@ -24,10 +24,6 @@
       hedgedoc_env = {
         owner = "hedgedoc";
       };
-      grafana_cloud_api = {
-        owner = "prometheus";
-        sopsFile = ../secrets.yaml;
-      };
       grafana_oauth_secret = {
         owner = "grafana";
       };
@@ -62,6 +58,8 @@
     hostName = "massicot";
   };
 
+  services.tailscale.enable = true;
+
   commonSettings = {
     auth.enable = true;
     nix = {

machines/massicot/networking.nix

@@ -3,8 +3,10 @@
   networking.useNetworkd = true;
   systemd.network.networks."10-wan" = {
     matchConfig.MACAddress = "96:00:02:68:7d:2d";
-    networkConfig.DHCP = "ipv4";
-    networkConfig.Gateway = "fe80::1";
+    networkConfig = {
+      DHCP = "ipv4";
+      Gateway = "fe80::1";
+    };
     address = [
       "2a01:4f8:c17:345f::3/64"
     ];

machines/massicot/services.nix

@@ -43,10 +43,14 @@ in
     environmentFile = config.sops.secrets.hedgedoc_env.path;
   };
 
-  custom.prometheus = {
+  custom.prometheus.exporters = {
     enable = true;
-    exporters.blackbox.enable = true;
-    exporters.miniflux.enable = true;
+    blackbox = {
+      enable = true;
+    };
+    node = {
+      enable = true;
+    };
   };
 
   security.acme = {