diff --git a/modules/common/exporters.nix b/modules/common/exporters.nix index 475ca99..6108581 100644 --- 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 index d1a6af2..841ff9c 100644 --- 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 index ffc85db..e41b000 100644 --- 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" + ]; + }]; + } ]; }; };