diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-12 01:36:50 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2021-07-14 01:36:04 +0200 |
| commit | cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b (patch) | |
| tree | 0198cb833acaf83f27594836610a1302ed6bbaea /nixos | |
| parent | 508408559ad2be029623dab18fbb8508340a3c41 (diff) | |
| download | nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar.gz nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar.bz2 nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar.lz nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar.xz nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.tar.zst nixlib-cf139f72033e0cd72ddb2f2a8dc2cac144f6d71b.zip | |
nixos/tests/prometheus-exporters/kea: migrate to kea nixos module
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/prometheus/exporters/kea.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/prometheus-exporters.nix | 47 |
2 files changed, 18 insertions, 30 deletions
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index b6cd89c3866b..9677281f8772 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -26,6 +26,7 @@ in { }; serviceOpts = { serviceConfig = { + User = "kea"; ExecStart = '' ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \ --address ${cfg.listenAddress} \ diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index a33aca29fd20..e8bc6339ecfd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -326,49 +326,36 @@ let ''; }; - kea = { + kea = let + controlSocketPath = "/run/kea/dhcp6.sock"; + in + { exporterConfig = { enable = true; controlSocketPaths = [ - "/run/kea/kea-dhcp6.sock" + controlSocketPath ]; }; metricProvider = { - users.users.kea = { - isSystemUser = true; - }; - users.groups.kea = {}; + systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ]; - systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ]; - - systemd.services.kea-dhcp6 = let - configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON { - Dhcp6 = { - "control-socket" = { - "socket-type" = "unix"; - "socket-name" = "/run/kea/kea-dhcp6.sock"; + services.kea = { + enable = true; + dhcp6 = { + enable = true; + settings = { + control-socket = { + socket-type = "unix"; + socket-name = controlSocketPath; }; }; - }); - in - { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - DynamicUser = false; - User = "kea"; - Group = "kea"; - ExecStart = "${pkgs.kea}/bin/kea-dhcp6 -c ${configFile}"; - StateDirectory = "kea"; - RuntimeDirectory = "kea"; - UMask = "0007"; }; }; }; + exporterTest = '' - wait_for_unit("kea-dhcp6.service") - wait_for_file("/run/kea/kea-dhcp6.sock") + wait_for_unit("kea-dhcp6-server.service") + wait_for_file("${controlSocketPath}") wait_for_unit("prometheus-kea-exporter.service") wait_for_open_port(9547) succeed( |