vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Activity

Revert "swarm-otel: run in its own network namespace, receivers on unix sockets"

Browse source 
This reverts commit 8aad8db30d.
This commit is contained in:
atlas 2026-10-24 14:54:50 +02:00 • committed by mara
commit 65329fb506
6 changed files with 221 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

12
nix/module-eval/nats-authelia.nix
View file

@ -795,7 +795,7 @@ let
otel = h.services.hyperhive.swarm.otel;
s = h.containers.swarm-otel.config.services.opentelemetry-collector.settings;
clientOf = svc: h.services.hyperhive.swarm.${svc.name}.clientId;
socks = map (svc: s.receivers."otlp/${svc.machine}".protocols.http.endpoint) forwarderServices;
ports = map (svc: otel.serviceProducers.${svc.machine}.port) forwarderServices;
in
!h.services.hyperhive.deploy.builder.enable
&& lib.all (
@ -806,9 +806,9 @@ let
&& lib.elem "otlp/${svc.machine}" s.service.pipelines."logs/${otel.producerName}".receivers
&& h.services.nginx.virtualHosts.${otel.domain}.locations ? "/${svc.machine}/"
) forwarderServices
# Their receivers and the queue's on the collector's host, none sharing a socket.
# Their receivers and the queue's on the collector's host, none sharing a port.
&&
lib.length (lib.unique (socks ++ [ s.receivers."otlp/swarm-nats".protocols.http.endpoint ]))
lib.length (lib.unique (ports ++ [ otel.serviceProducers.swarm-nats.port ]))
== lib.length forwarderServices + 1;
}
{
@ -837,9 +837,7 @@ let
h = shared.baoWithCollector;
otel = h.services.hyperhive.swarm.otel;
s = h.containers.swarm-otel.config.services.opentelemetry-collector.settings;
socks = map (n: s.receivers."otlp/${n}".protocols.http.endpoint) (
lib.attrNames otel.serviceProducers
);
ports = map (p: p.port) (lib.attrValues otel.serviceProducers);
in
lib.all (
svc:
@ -849,7 +847,7 @@ let
&& lib.elem "otlp/${svc.machine}" s.service.pipelines."logs/${otel.producerName}".receivers
&& h.services.nginx.virtualHosts.${otel.domain}.locations ? "/${svc.machine}/"
) ownClientForwarders
&& lib.length (lib.unique socks) == lib.length socks;
&& lib.length (lib.unique ports) == lib.length ports;
}
{
# Grafana's forwarder is a second client beside its browser login, which