Skip to content

Commit

Permalink
Fix improperly set config for CRI Flag in Docker Input (#8899) (#8930)
Browse files Browse the repository at this point in the history
(cherry picked from commit cb4d61e)
  • Loading branch information
exekias authored Nov 6, 2018
1 parent 6a40085 commit ced7ca8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Fix RFC3339 timezone and nanoseconds parsing with the syslog input. {pull}8346[8346]
- Mark the TCP and UDP input as GA. {pull}8125[8125]
- Support multiline logs in logstash/log fileset of Filebeat. {pull}8562[8562]
- Fix improperly set config for CRI Flag in Docker Input {pull}8899[8899]

*Heartbeat*

Expand Down
2 changes: 1 addition & 1 deletion filebeat/input/docker/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ func NewInput(
return nil, errors.Wrap(err, "update input config")
}

if err := cfg.SetBool("docker-json.cri_flags", -1, config.Partial); err != nil {
if err := cfg.SetBool("docker-json.cri_flags", -1, config.CRIFlags); err != nil {
return nil, errors.Wrap(err, "update input config")
}

Expand Down

0 comments on commit ced7ca8

Please sign in to comment.