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

Jump to bottom

Remove Docker input from Filebeat #28817

Merged
merged 7 commits into from
Nov 8, 2021
Merged

Remove Docker input from Filebeat #28817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e1c4e1c
Remove Docker input
kvch Nov 4, 2021
48311af
add changelog entry
kvch Nov 4, 2021
56b6f58
update include list
kvch Nov 4, 2021
76ebef5
update registry test
kvch Nov 4, 2021
5b9ce7c
fix registrar tests
kvch Nov 5, 2021
064a4fc
be more verbose in changelog
kvch Nov 5, 2021
8598e7f
Do not link to stdin input in s3
kvch Nov 5, 2021
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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,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*

Expand Down
3 changes: 0 additions & 3 deletions filebeat/docs/filebeat-options.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand Down Expand Up @@ -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[]
Expand Down
108 changes: 0 additions & 108 deletions filebeat/docs/inputs/input-docker.asciidoc
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion filebeat/include/list.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 0 additions & 49 deletions filebeat/input/docker/config.go
View file
Open in desktop

This file was deleted.

119 changes: 0 additions & 119 deletions filebeat/input/docker/input.go
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions filebeat/input/docker/input_test.go
View file
Open in desktop

This file was deleted.

20 changes: 7 additions & 13 deletions filebeat/tests/system/test_registrar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
kvch marked this conversation as resolved.
Show resolved Hide resolved
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")
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/docs/inputs/input-aws-s3.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down