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 #17400 to 7.x: [Metricbeat] Further revise check for bad data in docker/memory #17446

Merged
merged 2 commits into from
Apr 2, 2020

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Apr 2, 2020

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

What does this PR do?

Apparently, as I discovered in discuss, there are platforms where there's no cgroup memory data, and thus no memory stats for docker to send us. In this case, we were still sending NaNs to the output because of the && check.

Why is it important?

We don't want to send data with NaNs to the output.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

There's an added test. People have been reporting this bug against CentOS, but I haven't been able to reproduce it myself, as it appears to be a cgroup quirk.

…tic#17400)

* use OR to check for missing data and report lack of memory data

* add changelog entry

* remove space

(cherry picked from commit b80066c)
@@ -178,6 +178,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Use max in k8s overview dashboard aggregations. {pull}17015[17015]
- Fix Disk Used and Disk Usage visualizations in the Metricbeat System dashboards. {issue}12435[12435] {pull}17272[17272]
- Fix missing Accept header for Prometheus and OpenMetrics module. {issue}16870[16870] {pull}17291[17291]
- Further revise check for bad data in docker/memory. {pull}17400[17400]
- Fix issue in Jolokia module when mbean contains multiple quoted properties. {issue}17375[17375] {pull}17374[17374]
Copy link
Contributor

Choose a reason for hiding this comment

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

Extraneous entry.

@fearful-symmetry fearful-symmetry requested review from ycombinator and a team April 2, 2020 16:17
Copy link
Contributor

@ycombinator ycombinator left a comment

Choose a reason for hiding this comment

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

Backport LGTM.

@fearful-symmetry fearful-symmetry merged commit 5d46a4c into elastic:7.x Apr 2, 2020
@ycombinator
Copy link
Contributor

It looks like this PR was already merged but, for some reason, just not closed. So closing it now.

@zube zube bot added [zube]: Done and removed [zube]: Inbox labels May 8, 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.

3 participants