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 #8487 to 6.4: Avoid mapping issues in kubernetes module #8507

Merged
merged 3 commits into from
Oct 4, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Oct 1, 2018

Cherry-pick of PR #8487 to 6.4 branch. Original message:

This contains 2 changes:

  • Do not report start_time when it's empty, as that will throw a
    mapping exception
  • Fix fields.yml, as some fields were out of place for event
    metricset

closes #7736

* Avoid mapping issues in kubernetes module

This contains 2 changes:

 * Do not report `start_time` when it's empty, as that will throw a
 mapping exception
 * Fix `fields.yml`, as some fields were out of place for `event`
 metricset

(cherry picked from commit 3c363a0)
@@ -41,6 +41,8 @@ https://github.com/elastic/beats/compare/v6.4.1...6.4[Check the HEAD diff]
*Metricbeat*

- Fix incorrect type conversion of average response time in Haproxy dashboards {pull}8404[8404]
- Fix dropwizard module parsing of metric names. {issue}8365[8365] {pull}6385[8385]
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be removed I think?

Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Besides CHANGELOG LGTM

@exekias
Copy link
Contributor Author

exekias commented Oct 1, 2018

WFG

@exekias
Copy link
Contributor Author

exekias commented Oct 3, 2018

I had to merge 6.4 back as 6.4.2 was released, only conflict was on changelog

@exekias exekias requested a review from ruflin October 3, 2018 13:56
@exekias exekias merged commit dcb690b into elastic:6.4 Oct 4, 2018
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…odule (elastic#8507)

* Avoid mapping issues in kubernetes module (elastic#8487)

* Avoid mapping issues in kubernetes module

This contains 2 changes:

 * Do not report `start_time` when it's empty, as that will throw a
 mapping exception
 * Fix `fields.yml`, as some fields were out of place for `event`
 metricset

(cherry picked from commit 8d72865)

* Update CHANGELOG.asciidoc
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