Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick #15719 to 7.6: [Elastic Log Driver] Add redis and kafka outputs #15778

Merged
merged 2 commits into from
Jan 24, 2020
Merged

Cherry-pick #15719 to 7.6: [Elastic Log Driver] Add redis and kafka outputs #15778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ce1f4
[Elastic Log Driver] Add redis and kafka outputs (#15719)
fearful-symmetry Jan 23, 2020
177d3f3
fix changelog
fearful-symmetry Jan 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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