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.x: Avoid mapping issues in kubernetes module #8506

Merged
merged 2 commits into from
Oct 3, 2018

Conversation

exekias
Copy link
Contributor

@exekias exekias commented Oct 1, 2018

Cherry-pick of PR #8487 to 6.x 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

@exekias
Copy link
Contributor Author

exekias commented Oct 1, 2018

this probably needs a make update

@@ -69,6 +69,9 @@ https://github.com/elastic/beats/compare/v6.4.0...6.x[Check the HEAD diff]
- Fixed the RPM by designating the modules.d config files as configuration data in the RPM spec. {issue}8075[8075]
- Fixed the location of the modules.d dir in Deb and RPM packages. {issue}8104[8104]
- Add docker diskio stats on Windows. {issue}6815[6815] {pull}8126[8126]
- Fix incorrect type conversion of average response time in Haproxy dashboards {pull}8404[8404]
Copy link
Member

Choose a reason for hiding this comment

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

Too many changelogs?

Copy link
Member

@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.

Will need make update and a rebase.

* 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)
@exekias
Copy link
Contributor Author

exekias commented Oct 1, 2018

should be ready now 👍

@exekias exekias merged commit 0c7e47e into elastic:6.x Oct 3, 2018
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