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.

Sign up for GitHub

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

Jump to bottom

[Cherry-pick #13226 to 7.2] Add .* to kubernetes labels and annotations in fields.yml mapping #13284

Merged
merged 1 commit into from
Aug 27, 2019
Merged

[Cherry-pick #13226 to 7.2] Add .* to kubernetes labels and annotations in fields.yml mapping #13284

merged 1 commit into from
Aug 27, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Aug 18, 2019 •
edited
Loading

Cherry-pick of PR #13226 to 7.2 branch. Original message:

This PR is to fix mapping for kubernetes.labels and kubernetes.annotations in fields.yml. The error message is caused by this look like:

{"type":"mapper_parsing_exception","reason":"object mapping for [kubernetes.labels.app] tried to parse field [app] as object, but found a concrete value"}

(cherry picked from commit 2e4d292)

@kaiyan-sheng
Add .* to kubernetes labels and annotations in fields.yml mapping (#…
6f03a25 
…13226)

* Update labels and annotations object field

(cherry picked from commit 2e4d292)
@kaiyan-sheng kaiyan-sheng requested review from a team as code owners August 18, 2019 19:17
@kaiyan-sheng kaiyan-sheng self-assigned this Aug 18, 2019
@kaiyan-sheng
Copy link
Contributor Author

jenkins, test this please

@kaiyan-sheng kaiyan-sheng added backport review Team:Integrations Label for the Integrations team labels Aug 19, 2019
@urso urso removed the request for review from a team August 20, 2019 10:56
@kaiyan-sheng kaiyan-sheng merged commit ec44914 into elastic:7.2 Aug 27, 2019
@kaiyan-sheng kaiyan-sheng deleted the backport_13226_7.2 branch August 27, 2019 18:40
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@kaiyan-sheng
Add .* to kubernetes labels and annotations in fields.yml mapping (e…
937776e 
…lastic#13226) (elastic#13284)

* Update labels and annotations object field

(cherry picked from commit b89ac5e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
backport review Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaiyan-sheng @jsoriano @andresrc