pyrox.dev
Merge pull request #281555 from fpletz/nixos/ntpd-rs-fix-metrics
nixos/ntpd-rs: fix metrics service
authored by Robin Gloster and committed by GitHub e5952456 2c7c5603
+2
-2
nixos/modules/services/networking/ntp/ntpd-rs.nix
+2
-2
nixos/modules/services/networking/ntp/ntpd-rs.nix
···
74
74
};
75
75
};
76
76
77
-
systemd.services.ntp-rs-metrics = lib.mkIf cfg.metrics.enable {
77
+
systemd.services.ntpd-rs-metrics = lib.mkIf cfg.metrics.enable {
78
78
wantedBy = [ "multi-user.target" ];
79
79
serviceConfig = {
80
80
User = "";
81
81
Group = "";
82
82
DynamicUser = true;
83
-
ExecStart = [ "" "${lib.makeBinPath [ cfg.package ]}/bin/ntp-metrics-exporter --config=${configFile}" ];
83
+
ExecStart = [ "" "${lib.makeBinPath [ cfg.package ]}/ntp-metrics-exporter --config=${configFile}" ];
84
84
};
85
85
};
86
86
};
+6
-4
nixos/tests/ntpd-rs.nix
+6
-4
nixos/tests/ntpd-rs.nix
···
41
41
42
42
testScript = { nodes, ... }: ''
43
43
start_all()
44
-
server.wait_for_unit('multi-user.target')
45
-
client.wait_for_unit('multi-user.target')
46
-
server.succeed('systemctl is-active ntpd-rs.service')
47
-
client.succeed('systemctl is-active ntpd-rs.service')
44
+
45
+
for machine in (server, client):
46
+
machine.wait_for_unit('multi-user.target')
47
+
machine.succeed('systemctl is-active ntpd-rs.service')
48
+
machine.succeed('systemctl is-active ntpd-rs-metrics.service')
49
+
machine.succeed('curl http://localhost:9975/metrics | grep ntp_uptime_seconds')
48
50
'';
49
51
})