Maybe this works

peterablehmann · Mar 15, 2024 · a4e6b72 · a4e6b72
1 parent 460bda3
commit a4e6b72
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/modules/common/exporters.nix b/modules/common/exporters.nix
@@ -24,9 +24,8 @@
     virtualHosts."${config.networking.hostName}.${config.networking.domain}" = {
       enableACME = true;
       forceSSL = true;
-      locations."/exporters/node-exporter" = {
+      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;
       };
     };
@@ -35,7 +34,7 @@
   services.prometheus.exporters.node = {
     enable = true;
     listenAddress = "127.0.0.1";
-    extraFlags = [ "--web.telemetry-path=\"/exporters/node-exporter\"" ];
+    extraFlags = [ "--web.telemetry-path=/exporters/node-exporter" ];
     enabledCollectors = [
       "systemd"
     ];

diff --git a/nodes/monitoring/modules/grafana.nix b/nodes/monitoring/modules/grafana.nix
@@ -50,7 +50,6 @@ in
       dashboards.settings.providers = [
         {
           name = "Node-Exporter";
-          folder = "Proxmox";
           type = "file";
           options.path = pkgs.fetchurl {
             url = "https://raw.githubusercontent.com/rfmoz/grafana-dashboards/master/prometheus/node-exporter-full.json";

diff --git a/nodes/monitoring/modules/prometheus.nix b/nodes/monitoring/modules/prometheus.nix
@@ -24,12 +24,22 @@
               "sync.xnee.de"
             ];
           }];
-          metrics_path = "/exporters/node-exporter";
+          metrics_path = "/exporters/node-exporter/metrics";
           basic_auth = {
             username = "prometheus";
             password_file = config.sops.secrets."basicAuth/password".path;
           };
         }
+        {
+          job_name = "prometheus";
+          scrape_interval = "5s";
+          scheme = "http";
+          static_configs = [{
+            targets = [
+              "monitoring.xnee.net:9001"
+            ];
+          }];
+        }
       ];
     };
   };