Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2024

Proposed commit message

Closes #40060
This deals with an issue where we were reporting docker memory rss metrics even though none exist under cgroups V2. This takes the easy way out by just changing the hashmaps to use option types, so we don't report 0 values when none should exist.

I'm not sure there's a better way to do this. As far as I can tell, there's no similar metrics in Docker's cgroups V2 reporting, and in my experience trying to be clever and derive a substitute value usually backfires for heterogeneous monitoring setups.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • 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.

Disruptive User Impact

In cases where the docker/memory metrics were reporting an invalid 0, they will not not report any value at all.


This is an automatic backport of pull request #41449 done by [Mergify](https://mergify.com).

* use opt values for docker memory metrics

* fix vars, comments

* add changelog

* spelling

(cherry picked from commit 249d0dc)
@mergify mergify bot added the backport label Nov 1, 2024
@mergify mergify bot requested a review from a team as a code owner November 1, 2024 15:19
@mergify mergify bot requested review from VihasMakwana and belimawr and removed request for a team November 1, 2024 15:19
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 1, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Nov 4, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

2 similar comments
@mergify
Copy link
Contributor Author

mergify bot commented Nov 11, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Nov 18, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@mergify
Copy link
Contributor Author

mergify bot commented Nov 18, 2024

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/8.x/pr-41449 upstream/mergify/bp/8.x/pr-41449
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-41449

@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Nov 18, 2024
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 18, 2024
@pierrehilbert pierrehilbert requested review from fearful-symmetry and removed request for VihasMakwana and belimawr November 18, 2024 14:43
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2024

This pull request has not been merged yet. Could you please review and merge it @fearful-symmetry? 🙏

@pierrehilbert pierrehilbert merged commit 5392443 into 8.x Nov 25, 2024
32 checks passed
@pierrehilbert pierrehilbert deleted the mergify/bp/8.x/pr-41449 branch November 25, 2024 08:06
@khushijain21 khushijain21 mentioned this pull request Jun 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants