Skip to content

Commit

Permalink
Promote docker input to GA (elastic#8328)
Browse files Browse the repository at this point in the history
(cherry picked from commit 06ae246)
  • Loading branch information
exekias authored and Carlos Pérez-Aradros Herce committed Sep 18, 2018
1 parent 2e0ec42 commit 27bd6e9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 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
4 changes: 2 additions & 2 deletions filebeat/input/docker/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ 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/elastic/beats/libbeat/logp"

"github.com/pkg/errors"
)
Expand All @@ -43,7 +43,7 @@ func NewInput(
outletFactory channel.Connector,
context input.Context,
) (input.Input, error) {
cfgwarn.Experimental("Docker input is enabled.")
logger := logp.NewLogger("docker")

config := defaultConfig
if err := cfg.Unpack(&config); err != nil {
Expand Down

0 comments on commit 27bd6e9

Please sign in to comment.