vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

nix: let nixpkgs own the store collector's Restart

Browse source 
`services.opentelemetry-collector` already defines
`serviceConfig.Restart = "always"` at the normal priority. The forwarder
added in #4537 defined `"on-failure"` beside it, and two definitions at
one priority are a conflict the module system refuses to resolve — so
`containers.swarm-bao` stopped evaluating at all (#4615).

Drop our definition rather than force a value over it, which is what the
sibling collector in swarm-otel.nix already does. The resolved value is
`"always"`, which is the one we want here: a forwarder that exits for any
reason, clean or not, has stopped shipping the store's journal.
`RestartSec` stays — it conflicts with nothing and is what keeps the
restarts during first-boot secret delivery under the default start-rate
limit.
This commit is contained in:
atlas 2026-09-21 17:29:46 +02:00
commit 10fb79efc9
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/host-modules/swarm-bao.nix
View file

@ -2056,9 +2056,20 @@ in
# not arrived yet is a collector that says so and retries, not one
# that quietly exports into a 401. The restart is what closes the
# first-boot window the host unit's own comment describes.
#
# ⚠️ `Restart` is deliberately NOT set here, same as the sibling
# collector in ./swarm-otel.nix: nixpkgs' own
# services/monitoring/opentelemetry-collector.nix already defines it
# as `"always"` at the normal priority, so a second definition beside
# it is a conflict the module system refuses to resolve rather than a
# stricter policy. `"always"` is also the value we want — a forwarder
# that exits for any reason, clean or not, has stopped shipping the
# store's journal. Only `RestartSec` is ours: systemd's 100ms default
# would burn the unit's default start-rate limit while the host unit
# is still delivering the secret, leaving it failed rather than
# retrying.
systemd.services.opentelemetry-collector.serviceConfig = {
LoadCredential = [ "${forwarderCredentialId}:${forwarderSecretInContainer}" ];
Restart = "on-failure";
RestartSec = 15;
};
};