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

Cherry-pick to 6.x: Add DeDot in add_docker_metadata processor (#9505) #9602

Merged
merged 2 commits into from
Dec 18, 2018
Merged

Cherry-pick to 6.x: Add DeDot in add_docker_metadata processor (#9505) #9602

merged 2 commits into from
Dec 18, 2018

Conversation

kaiyan-sheng
Copy link
Contributor

From the original PR:
This pr is for issue: #9350
Currently metrics from docker container is after dedot, which look like this:

t docker.container.labels.com_docker_compose_service grafana
t docker.container.labels.com_docker_compose_version 1.22.0

and metrics from postgresql is not dedotted, which look like:

t docker.container.labels.com.docker.compose.service sentry-postgres
t docker.container.labels.com.docker.compose.version 1.22.0

This PR will add a config option in add_docker_metadata processor to enable/disable dedot.

(cherry picked from commit 58573a9)

* Add DeDot in add_docker_metadata processor

* Add dedot into config and default to be false

* Update changelog and documentation

* Add documentation into processors-using.asciidoc

* Run mage fmt update under x-pack filebeat

* Run mage fmt update on x-pack metricbeat

* Run update again

* Run make update fmt from top level dir

* Remove mistakes from rebase

* Remove repeated doc

(cherry picked from commit 58573a9)
@kaiyan-sheng
Copy link
Contributor Author

Travis CI failure is caused by #9597

@@ -97,6 +97,22 @@ endif::[]
[[docker]]
*docker:*

ifeval::["{release-state}"=="unreleased"]
Copy link
Member

Choose a reason for hiding this comment

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

How is this related to this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's make update generated this in the original PR. Sorry I should have waited for one last review from you and Jaime.

}
Copy link
Member

Choose a reason for hiding this comment

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

Nit: This change probably happened because you opened this file manually but it does not belong into this PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah hmm and I thought it's just an extra line but after deleting the extra line, it still shows up different.

Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM

@kaiyan-sheng kaiyan-sheng merged commit be89f4d into elastic:6.x Dec 18, 2018
@kaiyan-sheng kaiyan-sheng deleted the backport_9505_6.x branch December 18, 2018 17:32
DStape pushed a commit to DStape/beats that referenced this pull request Aug 20, 2019
…ic#9505) (elastic#9602)

* Cherry-pick to 6.x: Add DeDot in add_docker_metadata processor (elastic#9505)

* Add DeDot in add_docker_metadata processor

* Add dedot into config and default to be false

* Update changelog and documentation

* Add documentation into processors-using.asciidoc

* Run mage fmt update under x-pack filebeat

* Run mage fmt update on x-pack metricbeat

* Run update again

* Run make update fmt from top level dir

* Remove mistakes from rebase

* Remove repeated doc

(cherry picked from commit 58573a9)

* remove extra line in data.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants