diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 0e38fb27508f..d3298742772c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -10,11 +10,9 @@ let inherit (lib) concatStrings - foldl foldl' genAttrs literalExpression - maintainers mapAttrs mapAttrsToList mkDefault @@ -22,9 +20,7 @@ let mkIf mkMerge mkOption - optional types - mkOptionDefault flip attrNames xor @@ -328,6 +324,7 @@ let description = "Prometheus ${name} exporter service user"; isSystemUser = true; inherit (conf) group; + extraGroups = mkIf (name == "libvirt") [ "libvirtd" ]; } ); users.groups = mkMerge [ diff --git a/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix index 8a4b5f481022..37b16c331598 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/libvirt.nix @@ -24,6 +24,11 @@ in --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --libvirt.uri ${cfg.libvirtUri} ${lib.concatStringsSep " " cfg.extraFlags} ''; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; }; }; } diff --git a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix index 2f6862ac6dcd..97d8506cc77c 100644 --- a/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-libvirt-exporter/package.nix @@ -30,5 +30,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/Tinkoff/libvirt-exporter"; license = lib.licenses.asl20; maintainers = [ ]; + mainProgram = "libvirt-exporter"; }; })