#4375 - use memory usage without memory cache #4383
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
glinton
reviewed
Jul 5, 2018
| @@ -41,8 +41,8 @@ func calculateCPUPercentWindows(v *types.StatsJSON) float64 { | |||
|
|
|||
| // calculateMemUsageUnixNoCache calculate memory usage of the container. | |||
| // Page cache is intentionally excluded to avoid misinterpretation of the output. | |||
| func calculateMemUsageUnixNoCache(mem types.MemoryStats) float64 { | |||
| return float64(mem.Usage - mem.Stats["cache"]) | |||
| func calculateMemUsageUnixNoCache(mem types.MemoryStats) uint64 { | |||
There was a problem hiding this comment.
@danielnelson may need to weigh in, but I believe changing types isn't supported in certain outputs.
There was a problem hiding this comment.
That's true but in this case I believe the field types are retained: usage is a uint64 and usage_percent is a float64. I think it would be nice to leave this function returning a float64 though so that our code is closer to the upstream code, and then convert to an uint64 just for the usage field.
danielnelson
reviewed
Jul 5, 2018
Gopkg.lock
Outdated
| @@ -413,6 +413,217 @@ | |||
| ] | |||
| revision = "c43482518d410361b6c383d7aebce33d0471d7bc" | |||
|
|
|||
| [[projects]] | |||
There was a problem hiding this comment.
The changes to this file should be removed.
julienmathevet
force-pushed
the
4375-fix_focekr_mem_usage
branch
from
3e23835 to
4c9603d
Compare
danielnelson
approved these changes
Jul 17, 2018
glinton
pushed a commit
that referenced
this pull request
Jul 17, 2018
(cherry picked from commit 4c27862)
|
very good 👍 |
otherpirate
pushed a commit
to otherpirate/telegraf
that referenced
this pull request
Mar 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
closes #4375
Required for all PRs: