fix: update docker mem usage to match latest docker CLI #10491
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Required for all PRs:
resolve: #10518
This updates the Docker input plugin memory statistics. Specifically, the
usage
measurement indocker_container_mem
is updated so that it will match the value given by the Docker CLI tool version 20.10+. The calculation used in the CLI tool can be seen here. In Docker 20.10, the memory stats available changed and thecache
field is no longer present. Instead, depending on the version of cgroups used, eithertotal_inactive_file
orinactive_file
will be present.I've added a test of this functionality. The values chosen are odd because in order for the test to pass, the percentage calculation had to match exactly despite floating-point inaccuracies.