Remove Docker input from Filebeat (#28817) (#28863)

Users should use either `container` input or `filestream` input with `container` parser. (cherry picked from commit fa1cbbe) Co-authored-by: Noémi Ványi <kvch@users.noreply.github.com>
elastic · Nov 8, 2021 · 25f6d68 · 25f6d68
1 parent ae80fe8
commit 25f6d68
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 329 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -59,6 +59,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Fail to start Filebat if none between `queue_url`, `bucket_arn` or `non_aws_bucket_name` is set for a configured aws-s3 input {issue}13911[13911] {pull}28666[28666]
 - All modules: Replace usages of deprecated ECS fields `process.ppid` and `log.original` with `process.parent.pid` and `event.original`. {pull}28620[28620]
 - Replace usages of `host.user.*` fields with `user.*` in `cisco`, `microsoft` and `oracle` modules. {pull}28620[28620]
+- Remove `docker` input. Please use `filestream` input with `container` parser or `container` input. {pull}28817[28817]
 
 *Heartbeat*
 

diff --git a/filebeat/docs/filebeat-options.asciidoc b/filebeat/docs/filebeat-options.asciidoc
@@ -67,7 +67,6 @@ You can configure {beatname_uc} to use the following inputs:
 * <<{beatname_lc}-input-azure-eventhub>>
 * <<{beatname_lc}-input-cloudfoundry>>
 * <<{beatname_lc}-input-container>>
-* <<{beatname_lc}-input-docker>>
 * <<{beatname_lc}-input-filestream>>
 * <<{beatname_lc}-input-gcp-pubsub>>
 * <<{beatname_lc}-input-http_endpoint>>
@@ -97,8 +96,6 @@ include::../../x-pack/filebeat/docs/inputs/input-cloudfoundry.asciidoc[]
 
 include::inputs/input-container.asciidoc[]
 
-include::inputs/input-docker.asciidoc[]
-
 include::inputs/input-filestream.asciidoc[]
 
 include::../../x-pack/filebeat/docs/inputs/input-gcp-pubsub.asciidoc[]

diff --git a/filebeat/docs/inputs/input-docker.asciidoc b/filebeat/docs/inputs/input-docker.asciidoc
diff --git a/filebeat/include/list.go b/filebeat/include/list.go
diff --git a/filebeat/input/docker/config.go b/filebeat/input/docker/config.go
diff --git a/filebeat/input/docker/input.go b/filebeat/input/docker/input.go
diff --git a/filebeat/input/docker/input_test.go b/filebeat/input/docker/input_test.go
diff --git a/filebeat/tests/system/test_registrar.py b/filebeat/tests/system/test_registrar.py
@@ -1346,20 +1346,14 @@ def test_registrar_meta(self):
         """
 
         self.render_config_template(
-            type='docker',
+            type='container',
             input_raw='''
-  containers:
-    path: {path}
-    stream: stdout
-    ids:
-      - container_id
-- type: docker
-  containers:
-    path: {path}
-    stream: stderr
-    ids:
-      - container_id
-            '''.format(path=os.path.abspath(self.working_dir) + "/log/")
+  paths: {path}
+  stream: stdout
+- type: container
+  paths: {path}
+  stream: stderr
+'''.format(path=os.path.abspath(self.working_dir) + "/log/*/*.log")
         )
         os.mkdir(self.working_dir + "/log/")
         os.mkdir(self.working_dir + "/log/container_id")

diff --git a/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc b/x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
@@ -114,7 +114,7 @@ it was uploaded. For example: `application/json`.
 ==== `encoding`
 
 The file encoding to use for reading data that contains international
-characters. This only applies to non-JSON logs. See <<_encoding_5>>.
+characters. This only applies to non-JSON logs. See <<_encoding_3>>.
 
 
 [float]