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.

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

Document autodiscover dedot option #10938

Merged
merged 3 commits into from
Mar 1, 2019
Merged

Document autodiscover dedot option #10938

merged 3 commits into from
Mar 1, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

labels.dedot is added in #10898 but not documented. This PR is to add the documentation for dedotting in docker autodiscover in 7.0 (default to true).

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner February 25, 2019 17:37
@kaiyan-sheng kaiyan-sheng self-assigned this Feb 25, 2019
@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team docs labels Feb 25, 2019
@kaiyan-sheng
Copy link
Contributor Author

jenkins, test this please

@jsoriano jsoriano requested a review from dedemorton February 26, 2019 14:24
Copy link
Contributor

@dedemorton dedemorton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor change, otherwise LGTM.

@@ -17,6 +18,7 @@ filebeat.autodiscover:
-------------------------------------------------------------------------------------

This configuration launches a `docker` logs input for all containers running an image with `redis` in the name.
`labels.dedot` is default to be `true` for docker autodiscover, which means dots in docker labels are replaced with '_' by default.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
`labels.dedot` is default to be `true` for docker autodiscover, which means dots in docker labels are replaced with '_' by default.
`labels.dedot` defaults to `true` for docker autodiscover, which means that dots in docker labels are replaced with '_' by default.

metricbeat/docs/autodiscover-docker-config.asciidoc Outdated Show resolved Hide resolved
@kaiyan-sheng kaiyan-sheng merged commit 0df955f into elastic:master Mar 1, 2019
@kaiyan-sheng kaiyan-sheng deleted the doc_docker_dedot branch March 1, 2019 16:11
kaiyan-sheng added a commit that referenced this pull request Mar 11, 2019
* Document autodiscover dedot option

(cherry picked from commit 0df955f)
@kaiyan-sheng kaiyan-sheng removed the needs_backport PR is waiting to be backported to other branches. label Mar 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants