From f01e703036f543176d5bfb5dc0f7a7921ed24975 Mon Sep 17 00:00:00 2001 From: Tiago Queiroz Date: Thu, 21 Dec 2023 17:51:57 +0100 Subject: [PATCH] fix dockerlogbeat --- .../dockerlogbeat/pipelinemanager/libbeattools.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go index de3436156b42..774feda6765c 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go +++ b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go @@ -21,6 +21,7 @@ import ( "github.com/elastic/beats/v7/libbeat/version" "github.com/elastic/elastic-agent-libs/file" "github.com/elastic/elastic-agent-libs/logp" + "github.com/elastic/elastic-agent-libs/logp/configure" ) // load pipeline starts up a new pipeline with the given config @@ -66,6 +67,16 @@ func loadNewPipeline(logOptsConfig ContainerOutputConfig, hostname string, log * Processors: processing, } + // Get the default/current logging configuration + // we need some defaults to be populates otherwise Unpack will + // fail + eventsLoggerCfg := logp.DefaultConfig(configure.GetEnvironment()) + + // Ensure the default filename is set + if eventsLoggerCfg.Files.Name == "" { + eventsLoggerCfg.Files.Name = "dockerlogbeat-events-data" + } + pipeline, err := pipeline.LoadWithSettings( info, pipeline.Monitors{ @@ -76,7 +87,7 @@ func loadNewPipeline(logOptsConfig ContainerOutputConfig, hostname string, log * pipelineCfg, func(stat outputs.Observer) (string, outputs.Group, error) { cfg := config.Output - out, err := outputs.Load(idxMgr, info, stat, cfg.Name(), cfg.Config()) + out, err := outputs.Load(idxMgr, info, stat, cfg.Name(), cfg.Config(), eventsLoggerCfg) return cfg.Name(), out, err }, settings,