Skip to content

Commit

Permalink
Cherry-pick #15719 to 7.6: [Elastic Log Driver] Add redis and kafka o…
Browse files Browse the repository at this point in the history
…utputs (#15778)

* [Elastic Log Driver] Add redis and kafka outputs (#15719)

* add redis and kafka out

* add cloud output

* add changelog

(cherry picked from commit 1820369)

* fix changelog
  • Loading branch information
fearful-symmetry committed Jan 24, 2020
1 parent 6b08f43 commit 9aa6ef9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Affecting all Beats*

- Fix missing output in dockerlogbeat {pull}15719[15719]

*Auditbeat*

Expand Down
2 changes: 2 additions & 0 deletions x-pack/dockerlogbeat/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions x-pack/dockerlogbeat/pipelinemanager/libbeattools.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 9aa6ef9

Please sign in to comment.