diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2022-11-06 12:05:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 12:05:09 +0100 |
| commit | 7519cb2c7cbdb95fe531d03846beba0c55256a38 (patch) | |
| tree | 62728c0647e3443077db023a0b9fa058783eb685 /nixos | |
| parent | 90454988a1c3fa9d8860a06806613c4b88b40218 (diff) | |
| parent | b3782f29ff392796bf7502d53e956eefb97c001c (diff) | |
Merge pull request #198638 from KFearsoff/fix-node-exporter-netdev-collector
nixos/prometheus-node-exporter: fix netdev collect
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/node.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index ae69c29d0a51e..dd8602e2c63db 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -4,6 +4,8 @@ with lib; let cfg = config.services.prometheus.exporters.node; + collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors; + collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors; in { port = 9100; @@ -35,15 +37,15 @@ in ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} ${concatStringsSep " " cfg.extraFlags} ''; - RestrictAddressFamilies = optionals (any (collector: (collector == "logind" || collector == "systemd")) cfg.enabledCollectors) [ + RestrictAddressFamilies = optionals (collectorIsEnabled "logind" || collectorIsEnabled "systemd") [ # needs access to dbus via unix sockets (logind/systemd) "AF_UNIX" - ] ++ optionals (any (collector: (collector == "network_route" || collector == "wifi")) cfg.enabledCollectors) [ + ] ++ optionals (collectorIsEnabled "network_route" || collectorIsEnabled "wifi" || ! collectorIsDisabled "netdev") [ # needs netlink sockets for wireless collector "AF_NETLINK" ]; # The timex collector needs to access clock APIs - ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors; + ProtectClock = collectorIsDisabled "timex"; # Allow space monitoring under /home ProtectHome = true; }; |