From f7db4adc52280fc78f828a767904a1284778ffdc Mon Sep 17 00:00:00 2001 From: Alex Kristiansen <alex.kristiansen@elastic.co> Date: Tue, 21 Jan 2020 12:06:08 -0800 Subject: [PATCH 1/3] add redis and kafka out --- x-pack/dockerlogbeat/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/dockerlogbeat/main.go b/x-pack/dockerlogbeat/main.go index d60a12cbece3..d763126f2dc2 100644 --- a/x-pack/dockerlogbeat/main.go +++ b/x-pack/dockerlogbeat/main.go @@ -15,7 +15,9 @@ import ( _ "github.com/elastic/beats/libbeat/outputs/console" _ "github.com/elastic/beats/libbeat/outputs/elasticsearch" _ "github.com/elastic/beats/libbeat/outputs/fileout" + _ "github.com/elastic/beats/libbeat/outputs/kafka" _ "github.com/elastic/beats/libbeat/outputs/logstash" + _ "github.com/elastic/beats/libbeat/outputs/redis" _ "github.com/elastic/beats/libbeat/publisher/queue/memqueue" _ "github.com/elastic/beats/libbeat/publisher/queue/spool" "github.com/elastic/beats/libbeat/service" From 36b679592d65b1a1c71a4b2251506fa72081a4f0 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen <alex.kristiansen@elastic.co> Date: Wed, 22 Jan 2020 07:20:03 -0800 Subject: [PATCH 2/3] add cloud output --- x-pack/dockerlogbeat/pipelinemanager/libbeattools.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go index 04caca748db0..e6ff0d8dbf76 100644 --- a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go +++ b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go @@ -15,6 +15,7 @@ import ( yaml "gopkg.in/yaml.v2" "github.com/elastic/beats/libbeat/beat" + "github.com/elastic/beats/libbeat/cloudid" "github.com/elastic/beats/libbeat/common" "github.com/elastic/beats/libbeat/idxmgmt" "github.com/elastic/beats/libbeat/logp" @@ -67,6 +68,13 @@ func loadNewPipeline(logOptsConfig map[string]string, name string, log *logp.Log if err != nil { return nil, err } + + // Attach CloudID config if needed + err = cloudid.OverwriteSettings(cfg) + if err != nil { + return nil, errors.Wrap(err, "Error creating CloudID") + } + config := containerConfig{} err = cfg.Unpack(&config) if err != nil { From 528756010ae080469f4d42fda43564e75c0904a5 Mon Sep 17 00:00:00 2001 From: Alex Kristiansen <alex.kristiansen@elastic.co> Date: Thu, 23 Jan 2020 06:44:50 -0800 Subject: [PATCH 3/3] add changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 252e214e044d..6c1d58281c58 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -40,6 +40,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d TLS or Beats that accept connections over TLS and validate client certificates. {pull}14146[14146] - Fix panic in the Logstash output when trying to send events to closed connection. {pull}15568[15568] +- Fix missing output in dockerlogbeat {pull}15719[15719] *Auditbeat*