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 #16321 to 7.x: Add support for kubernetes provider to recognize namespace level defaults #17054

Merged
merged 3 commits into from
Mar 24, 2020

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Mar 17, 2020

Cherry-pick of PR #16321 to 7.x branch. Original message:

This PR allows namespace level defaults to be configured on the namespace object for either service or pod hints autodiscover. This will need:

add_resource_metadata.namespace.enabled: true

to be set on the kubernetes autodiscover provider.

This PR has a known gap where a pod is deployed before the namespace annotations are added. In this case, autodiscover wouldnt be able to add in the defaults. To fix that behavior we would need to ensure that we handle resync events as updates. Currently we ignore resync events as the resource version remains the same.

…ults (elastic#16321)

* Add support for kubernetes provider to recognize namespace level default hints

(cherry picked from commit 004d36c)
@@ -201,6 +201,9 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Remove experimental flag from `setup.template.append_fields` {pull}16576[16576]
- Add `add_cloudfoundry_metadata` processor to annotate events with Cloud Foundry application data. {pull}16621[16621]
- Add `translate_sid` processor on Windows for converting Windows security identifier (SID) values to names. {issue}7451[7451] {pull}16013[16013]
- Add Kerberos support to Kafka input and output. {pull}16781[16781]
Copy link
Contributor

Choose a reason for hiding this comment

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

extra entries here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ups, fixed, thanks!

@exekias exekias requested a review from kaiyan-sheng March 24, 2020 14:08
@exekias exekias merged commit 8415430 into elastic:7.x Mar 24, 2020
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.

4 participants