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

Use optional values for docker memory metrics #41449

Merged

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Oct 24, 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.

@fearful-symmetry fearful-symmetry added bug Team:Security-External Integrations Label for the Security External Integrations team labels Oct 24, 2024
@fearful-symmetry fearful-symmetry self-assigned this Oct 24, 2024
@fearful-symmetry fearful-symmetry requested a review from a team as a code owner October 24, 2024 21:17
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External 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 24, 2024
@fearful-symmetry fearful-symmetry changed the title use opt values for docker memory metrics use optional values for docker memory metrics Oct 24, 2024
Copy link
Contributor

mergify bot commented Oct 24, 2024

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @fearful-symmetry? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit

Copy link
Contributor

mergify bot commented Oct 24, 2024

backport-8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Oct 24, 2024
@fearful-symmetry fearful-symmetry changed the title use optional values for docker memory metrics Use optional values for docker memory metrics Oct 24, 2024
@pierrehilbert pierrehilbert added the Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team label Oct 25, 2024
@elasticmachine
Copy link
Collaborator

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

@pierrehilbert pierrehilbert requested review from mauri870 and removed request for faec October 25, 2024 07:38
CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
Copy link
Member

@mauri870 mauri870 left a comment

Choose a reason for hiding this comment

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

LGTM

@fearful-symmetry fearful-symmetry merged commit 249d0dc into elastic:main Nov 1, 2024
32 checks passed
mergify bot pushed a commit that referenced this pull request Nov 1, 2024
* use opt values for docker memory metrics

* fix vars, comments

* add changelog

* spelling

(cherry picked from commit 249d0dc)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8.x Automated backport to the 8.x branch with mergify bug Team:Elastic-Agent-Data-Plane Label for the Agent Data Plane team Team:Security-External Integrations Label for the Security External Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Docker memory metrics don't consider cgroups version of running container
5 participants