github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 09:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3435 from weaveworks/docker-memory-no-cache

Browse Source 
Subtract page cache from container memory usage
This commit is contained in:
Bryan Boreham
2018-12-13 15:10:41 -08:00
committed by GitHub
parent 9803fffa42 fb9c9e0140
commit a721b49885
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
probe/docker/container.go
View File

@@ -336,7 +336,10 @@ func (c *container) memoryUsageMetric(stats []docker.Stats) report.Metric {
samples := make([]report.Sample, len(stats))
for i, s := range stats {
samples[i].Timestamp = s.Read
samples[i].Value = float64(s.MemoryStats.Usage)
// This code adapted from
// https://github.com/docker/cli/blob/5931fb4276be0afdd6e5ed338d1b2b4b9b5ec8e5/cli/command/container/stats_helpers.go
// so that Scope numbers match Docker numbers. Page cache is intentionally excluded.
samples[i].Value = float64(s.MemoryStats.Usage - s.MemoryStats.Stats.Cache)
if float64(s.MemoryStats.Limit) > max {
max = float64(s.MemoryStats.Limit)
}