From 85ccfbecb57df622b77d0cbfa7b132635fa32aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Mon, 24 Sep 2018 11:21:13 +0200 Subject: [PATCH] Cherry-pick #8328 to 6.x: Promote `docker` input to GA (#8339) * Promote `docker` input to GA (#8328) (cherry picked from commit 06ae2466295a0892c30ad231796d4e4b6e8f950c) --- CHANGELOG.asciidoc | 1 + filebeat/docs/inputs/input-docker.asciidoc | 2 -- filebeat/input/docker/input.go | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3446f6eaadc..8926a8af929 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -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* diff --git a/filebeat/docs/inputs/input-docker.asciidoc b/filebeat/docs/inputs/input-docker.asciidoc index 6685745e078..4cf20e45566 100644 --- a/filebeat/docs/inputs/input-docker.asciidoc +++ b/filebeat/docs/inputs/input-docker.asciidoc @@ -7,8 +7,6 @@ Docker ++++ -experimental[] - Use the `docker` input to read logs from Docker containers. This input searches for container logs under its path, and parse them into diff --git a/filebeat/input/docker/input.go b/filebeat/input/docker/input.go index 56ffda2a699..fef86c065e9 100644 --- a/filebeat/input/docker/input.go +++ b/filebeat/input/docker/input.go @@ -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" ) @@ -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")