diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 7eebca4818c..f44cae16383 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -61,6 +61,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix `metricbeat test output` with an ipv6 ES host in the output.hosts. {pull}15368[15368] - Fix `convert` processor conversion of string to integer with leading zeros. {issue}15513[15513] {pull}15557[15557] - 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* diff --git a/x-pack/dockerlogbeat/main.go b/x-pack/dockerlogbeat/main.go index d60a12cbece..d763126f2dc 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" diff --git a/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go b/x-pack/dockerlogbeat/pipelinemanager/libbeattools.go index 04caca748db..e6ff0d8dbf7 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 {