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) #9601

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Dec 17, 2018

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)

* Never default to a qualifier when none of them are set. (#9148)

Remove default version qualifier and rename the environment variable to set it from `BEAT_VERSION_QUALIFIER` to `VERSION_QUALIFIER` this will align with other parts of the stack.

**Tested with filebeat.**
```
 ❯ ./filebeat version                                                                                                                                                                                                                                                                                                                                          [08:39:01]
filebeat version 7.0.0 (amd64), libbeat 7.0.0 [0a0c267 built 2018-11-19 13:38:15 +0000 UTC]
```

**Without the patch**
```
 ❯ ./filebeat version                                                                                                                                                                                                                                                                                                                                          [08:40:07]
filebeat version 7.0.0-alpha1 (amd64), libbeat 7.0.0-alpha1 [b007837 built 2018-11-19 13:39:59 +0000 UTC]
```

Fixes: #8384

* 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 kaiyan-sheng deleted the backport_9505_6.x branch December 17, 2018 23:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant