High hope

modules/common/exporters.nix

@@ -7,24 +7,25 @@
 
   sops.secrets."monitoring/basicAuthFile" = {
     sopsFile = "${inputs.self}/secrets/common.yaml";
+    owner = "nginx";
   };
 
   security.acme = {
     defaults.email = "[email protected]";
     acceptTerms = true;
-    certs."metrics.${config.networking.hostName}.${config.networking.domain}" = { };
+    certs."${config.networking.fqdn}" = { };
   };
 
   services.nginx = {
     enable = true;
     recommendedTlsSettings = true;
     recommendedOptimisation = true;
     recommendedProxySettings = true;
-    virtualHosts."metrics.${config.networking.hostName}.${config.networking.domain}" = {
+    virtualHosts."${config.networking.hostName}.${config.networking.domain}" = {
       enableACME = true;
       forceSSL = true;
-      locations."/node" = {
-        proxyPass = "http://${config.services.prometheus.exporters.node.listenAddress}:${builtins.toString config.services.prometheus.exporters.node.port}";
+      locations."/exporters/node-exporter" = {
+        proxyPass = "http://${config.services.prometheus.exporters.node.listenAddress}:${builtins.toString config.services.prometheus.exporters.node.port}/";
         proxyWebsockets = true;
         basicAuthFile = config.sops.secrets."monitoring/basicAuthFile".path;
       };
@@ -34,6 +35,7 @@
   services.prometheus.exporters.node = {
     enable = true;
     listenAddress = "127.0.0.1";
+    extraFlags = [ "--web.telemetry-path=\"/node_exporter/metrics\"" ];
     enabledCollectors = [
       "systemd"
     ];

nodes/monitoring/hardware-configuration.nix

@@ -1,14 +1,21 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
+{ lib
+, modulesPath
+, ...
+}:
 {
   imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd = {
+      availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+      kernelModules = [ ];
+    };
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

nodes/monitoring/modules/prometheus.nix

@@ -1,10 +1,7 @@
-{config
+{ config
 , inputs
 , ...
 }:
-let
-  domain = "monitoring.xnee.net";
-in
 {
   sops.secrets."basicAuth/password" = {
     sopsFile = "${inputs.self}/secrets/monitoring.yaml";
@@ -27,14 +24,7 @@ in
               "sync.xnee.de"
             ];
           }];
-          relabel_configs = [
-            {
-              source_labels = [ "__address__" ];
-              target_label = "__address__";
-              replacement = "metrics.$1";
-            }
-          ];
-          metrics_path = "/node";
+          metrics_path = "/exporters/node-exporter";
           basic_auth = {
             username = "prometheus";
             password_file = config.sops.secrets."basicAuth/password".path;