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 for Kubernetes labels and annotations (#9939) #10039

Merged
merged 1 commit into from
Jan 14, 2019
Merged

Cherry-pick to 6.x: Add Dedot for Kubernetes labels and annotations (#9939) #10039

merged 1 commit into from
Jan 14, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

Original commit message:

  • Add Dedot for Kubernetes labels and annotations

  • Add dedot options in libbeat kubernetes metadata

  • Update changelog

  • Refactor TestGenerateMapStrFromEvent

  • Update shared-autodiscover.asciidoc with dedot params

  • Add names for each unit test case in event_test.go

  • Fix rebase errors

(cherry picked from commit d5bda76)

* 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 for Kubernetes labels and annotations

* Add dedot options in libbeat kubernetes metadata

* Update changelog

* Refactor TestGenerateMapStrFromEvent

* Update shared-autodiscover.asciidoc with dedot params

* Add names for each unit test case in event_test.go

* Fix rebase errors

(cherry picked from commit d5bda76)
@kaiyan-sheng kaiyan-sheng merged commit 6374a9b into elastic:6.x Jan 14, 2019
@kaiyan-sheng kaiyan-sheng deleted the backport_9939_6.x branch January 14, 2019 14:36
bashofmann pushed a commit to syseleven/beats that referenced this pull request Jan 28, 2019
…ic#10039)

Fixes: elastic#8384

* Add Dedot for Kubernetes labels and annotations

* Add dedot options in libbeat kubernetes metadata

* Update changelog

* Refactor TestGenerateMapStrFromEvent

* Update shared-autodiscover.asciidoc with dedot params

* Add names for each unit test case in event_test.go

* Fix rebase errors

(cherry picked from commit d5bda76)
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