-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Add Dedot for Kubernetes labels and annotations #9939
Conversation
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is looking good! There are some other places where Kubernetes metadata is generated, they can be tackled here or in a different PR (maybe this is better):
Autodiscover, add_kubernetes_metadata
and the rest of Metricbeat kubernetes metricsets make use of the metadata generator: https://github.com/elastic/beats/blob/master/libbeat/common/kubernetes/metadata.go
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is good on my side, WDYT @urso ?
LGTM. small 'generic' nit: I'd like to advocate for short descriptive names. E.g. |
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)
This is 100% the wrong place to ask this, but I couldn't find any official information about it. I'm assuming this feature will be included in |
This will land in 6.7 but we don't publish any release dates. |
…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)
@anton-johansson Let's move this discussion to discuss: https://discuss.elastic.co/c/beats |
Okay, fair point! I will post a topic about it. The topic can be found here. |
@ruflin there wasnt a reply on the beats discussion, and i am too wondering when this will be released? Can you cut a 6.7 release? |
A 6.7 release is coming in the near future. If you want to be a bit more adventurous and try out the master build, you can find snapshots here: https://beats-ci.elastic.co/job/elastic+beats+master+multijob-package-linux/398/gcsObjects/ @anton-johansson Sorry that we missed your discuss topic :-( |
@ruflin Thanks for the response! |
@ruflin: No worries! Technically, you had nothing to answer with, since there's no news. ¯\_(ツ)_/¯ Thanks for getting back to us! Yeah, it would be great with some kind of announced schedule or plan for atleast the upcoming release. I could try the master build, but it would depend on how far away this near future is. :D |
I can't provide you with a schedule but I could provide you with a snapshot build of 7.0 if you let me know the platform and beat you are looking for. |
@ruflin Thanks for the offer, but I cant really run snapshot builds in production. How do you decide to cut release 6.7? Could you not make this whole process transparent and automated in CI/CD? I am willing to help in any way do that! I keep asking because I need to decide if I just fork this for now, set up CI/CD, and build 6.7 and push a docker container to our private registry. Thats a couple hours work, and lots of people will disapprove of me doing so! At that point I might as well just use a snapshot build... |
All of the Elastic Stack is released together which includes a lot of manual testing which takes time. If you want to build a snapshot on your own, I recommend to do it based the 6.7 branch if that is the version you are looking for: https://github.com/elastic/beats/tree/6.7 This is mostly what should be released. |
@willejs, |
Need to be able to handle K8s label keys that include dots. Backporting this change from Beats 6.7: elastic#9939
Adding
labels.dedot
andannotations.dedot
in kubernetes metricbeat config file to control dedot.closes #9860