pin that the hive collector keeps file_storage for its exporter queue without a journald receiver
This commit is contained in:
parent
bcc317e452
commit
5ae0205e1d
2 changed files with 8 additions and 2 deletions
|
|
@ -566,8 +566,9 @@ in
|
||||||
|
|
||||||
# ⚠️ An extension not listed here is INERT: the collector starts
|
# ⚠️ An extension not listed here is INERT: the collector starts
|
||||||
# clean and the exporter naming it sends nothing authenticated —
|
# clean and the exporter naming it sends nothing authenticated —
|
||||||
# and, for `file_storage`, the journald receiver's `storage:`
|
# and, for `file_storage`, the exporter queue's `storage:` (and the journald
|
||||||
# above would name a component the collector never starts.
|
# receiver's, where it exists) would name a component the collector
|
||||||
|
# never starts.
|
||||||
service.extensions = [ "file_storage" ] ++ lib.optional senderAuth authName;
|
service.extensions = [ "file_storage" ] ++ lib.optional senderAuth authName;
|
||||||
|
|
||||||
# Host identity, so a sample can say WHICH machine it came from.
|
# Host identity, so a sample can say WHICH machine it came from.
|
||||||
|
|
|
||||||
|
|
@ -490,6 +490,11 @@ let
|
||||||
&& !(s.receivers ? journald)
|
&& !(s.receivers ? journald)
|
||||||
&& !(lib.elem "journald" s.service.pipelines.logs.receivers)
|
&& !(lib.elem "journald" s.service.pipelines.logs.receivers)
|
||||||
&& lib.elem "otlp" s.service.pipelines.logs.receivers
|
&& lib.elem "otlp" s.service.pipelines.logs.receivers
|
||||||
|
# `file_storage` stays: the exporter queue is on it whether or not a
|
||||||
|
# journald receiver exists.
|
||||||
|
&& s.extensions ? file_storage
|
||||||
|
&& lib.elem "file_storage" s.service.extensions
|
||||||
|
&& s.exporters."otlphttp/swarm".sending_queue.storage == "file_storage"
|
||||||
&& hiveOtelSettings.receivers ? journald;
|
&& hiveOtelSettings.receivers ? journald;
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue