hyperhive: make the values the meta-flake render reads swarm-wide
Five host options whose values hive-c0re renders into every agent's build move under services.hyperhive.swarm, so the swarm states each of them once instead of every hive carrying its own copy: c0re.dashboardPort -> swarm.dashboardPort c0re.claudeCodePackage -> swarm.claudeCodePackage github.enable -> swarm.github.enable otel.collector.port -> swarm.hiveOtel.collectorPort otel.extraResourceAttributes -> swarm.hiveOtel.extraResourceAttributes Every old path is a mkRenamedOptionModule alias, so a host that sets one keeps its value and gets an eval warning naming the new path. Types and defaults are unchanged, so the rendered meta flake, serve.json and hive-c0re's environment are the same as before on a host that sets none of them. The readers move with them: serve.json and its gc-root assertion, the hive-c0re environment, the hive collector's listen address and bridge port, the swarm collector's port-collision assertion, and the claude-login and review-classifier containers' claude pin. The swarm-services-switch fixture sets the swarm path and now also checks that serve.json carries the pinned claude. Part of #4857 (slice 2).
This commit is contained in:
parent
af7114eb49
commit
fc32f57481
25 changed files with 189 additions and 138 deletions
|
|
@ -24,12 +24,12 @@ let
|
|||
hyperhiveCfg = config.services.hyperhive;
|
||||
|
||||
# The `claude-code` the agents run, so this container does not trail them on
|
||||
# the CLI; `fallback`, the container's own nixpkgs', only where the hive pins
|
||||
# the CLI; `fallback`, the container's own nixpkgs', only where the swarm pins
|
||||
# none.
|
||||
claudeCode =
|
||||
fallback:
|
||||
if hyperhiveCfg.c0re.claudeCodePackage != null then
|
||||
hyperhiveCfg.c0re.claudeCodePackage
|
||||
if hyperhiveCfg.swarm.claudeCodePackage != null then
|
||||
hyperhiveCfg.swarm.claudeCodePackage
|
||||
else
|
||||
fallback;
|
||||
cfg = hyperhiveCfg.deploy.review-classifier;
|
||||
|
|
@ -100,7 +100,7 @@ let
|
|||
otelEnv = lib.optionalAttrs otelCfg.enable {
|
||||
CLAUDE_CODE_ENABLE_TELEMETRY = "1";
|
||||
OTEL_METRICS_EXPORTER = "otlp";
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT = "http://${networkCfg.bridgeIp}:${toString otelCfg.collector.port}";
|
||||
OTEL_EXPORTER_OTLP_ENDPOINT = "http://${networkCfg.bridgeIp}:${toString hyperhiveCfg.swarm.hiveOtel.collectorPort}";
|
||||
OTEL_EXPORTER_OTLP_PROTOCOL = "http/protobuf";
|
||||
# Claude Code defaults to delta, which the metrics store drops.
|
||||
OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = "cumulative";
|
||||
|
|
|
|||
Loading…
Reference in a new issue