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

Promote docker input to GA #8328

Merged
merged 1 commit into from
Sep 18, 2018
Merged

Promote docker input to GA #8328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ https://github.com/elastic/beats/compare/v6.4.0...master[Check the HEAD diff]
- Add tag "truncated" to "log.flags" if incoming line is longer than configured limit. {pull}7991[7991]
- Add tag "multiline" to "log.flags" if event consists of multiple lines. {pull}7997[7997]
- Add haproxy module. {pull}8014[8014]
- Release `docker` input as GA. {pull}8328[8328]

*Heartbeat*

Expand Down
2 changes: 0 additions & 2 deletions filebeat/docs/inputs/input-docker.asciidoc
View file
Open in desktop
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
2 changes: 0 additions & 2 deletions filebeat/input/docker/input.go
View file
Open in desktop
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/elastic/beats/libbeat/logp"

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

// Wrap log input with custom docker settings
Expand Down