Skip to content

Commit

Permalink
Cherry-pick #8328 to 6.x: Promote docker input to GA (#8339)
Browse files Browse the repository at this point in the history
* Promote `docker` input to GA (#8328)

(cherry picked from commit 06ae246)
  • Loading branch information
exekias committed Sep 24, 2018
1 parent 2e9f3bb commit 85ccfbe
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Add tag "truncated" to "log.flags" if incoming line is longer than configured limit. {pull}7991[7991]
- Add haproxy module. {pull}8014[8014]
- Add tag "multiline" to "log.flags" if event consists of multiple lines. {pull}7997[7997]
- Release `docker` input as GA. {pull}8328[8328]

*Heartbeat*

Expand Down
2 changes: 0 additions & 2 deletions filebeat/docs/inputs/input-docker.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<titleabbrev>Docker</titleabbrev>
++++

experimental[]

Use the `docker` input to read logs from Docker containers.

This input searches for container logs under its path, and parse them into
Expand Down
3 changes: 0 additions & 3 deletions filebeat/input/docker/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/elastic/beats/filebeat/input"
"github.com/elastic/beats/filebeat/input/log"
"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"

"github.com/pkg/errors"
)
Expand All @@ -43,8 +42,6 @@ func NewInput(
outletFactory channel.Connector,
context input.Context,
) (input.Input, error) {
cfgwarn.Experimental("Docker input is enabled.")

config := defaultConfig
if err := cfg.Unpack(&config); err != nil {
return nil, errors.Wrap(err, "reading docker input config")
Expand Down

0 comments on commit 85ccfbe

Please sign in to comment.