Skip to content

Cherry-pick #21992 to 7.10: Fix diskio and memory bugs under windows#22000

Merged
fearful-symmetry merged 1 commit intoelastic:7.10from
fearful-symmetry:backport_21992_7.10
Oct 20, 2020
Merged

Cherry-pick #21992 to 7.10: Fix diskio and memory bugs under windows#22000
fearful-symmetry merged 1 commit intoelastic:7.10from
fearful-symmetry:backport_21992_7.10

Conversation

@fearful-symmetry
Copy link
Copy Markdown
Contributor

@fearful-symmetry fearful-symmetry commented Oct 19, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #21992 to 7.10 branch. Original message:

What does this PR do?

Fixes some Windows bugs found under testing. We need to only call CalcIOStatistics under linux, and memory.share should be removed outside of agent, since it's a "null zero" metric under windows.

Checklist

  • My code follows the style guidelines of this project
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

How to test this PR locally

  • pull down and build on Windows
  • On windows, make sure system/diskio works, and system.process.memory.share does not work.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 19, 2020

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Oct 19, 2020
@fearful-symmetry fearful-symmetry self-assigned this Oct 19, 2020
@fearful-symmetry fearful-symmetry requested a review from a team October 19, 2020 20:30
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 19, 2020

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22000 opened]

  • Start Time: 2020-10-19T20:31:24.973+0000

  • Duration: 96 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 2237
Skipped 505
Total 2742

@fearful-symmetry fearful-symmetry merged commit 9e8f6bc into elastic:7.10 Oct 20, 2020
@zube zube bot added [zube]: Done and removed [zube]: Inbox labels Oct 20, 2020
@zube zube bot removed the [zube]: Done label Jan 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@fearful-symmetry fearful-symmetry

Labels

backport 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

@fearful-symmetry @elasticmachine @kaiyan-sheng