diff options
| author | Nicolas Hennion <nicolashennion@gmail.com> | 2024-01-02 17:16:30 +0000 |
|---|---|---|
| committer | Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com> | 2024-04-29 22:54:49 +0530 |
| commit | 8edf6e70b5bfe304fd921ee2fcb3b4f87cd9cea4 (patch) | |
| tree | 03d927dbbabeabd84a1fea31f9806b221f418c32 /glances/outputs | |
| parent | de69635d41efa38428e0779e2467632d2cafdede (diff) | |
Docker memory usage is incorrect
Diffstat (limited to 'glances/outputs')
| -rw-r--r-- | glances/outputs/static/js/components/plugin-containers.vue | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/glances/outputs/static/js/components/plugin-containers.vue b/glances/outputs/static/js/components/plugin-containers.vue index 0470909d..ba9da77e 100644 --- a/glances/outputs/static/js/components/plugin-containers.vue +++ b/glances/outputs/static/js/components/plugin-containers.vue @@ -54,7 +54,7 @@ {{ $filters.number(container.cpu_percent, 1) }} </div> <div class="table-cell"> - {{ $filters.bytes(container.memory_usage) }} + {{ $filters.bytes(container.memory_usage_no_cache) }} </div> <div class="table-cell"> {{ $filters.bytes(container.limit) }} @@ -112,14 +112,21 @@ export default { const { sorter } = this; const containers = (this.stats || []).map( (containerData) => { - // prettier-ignore + let memory_usage_no_cache = '?' + if (containerData.memory.usage != undefined) { + memory_usage_no_cache = containerData.memory.usage; + if (containerData.memory.inactive_file != undefined) { + memory_usage_no_cache = memory_usage_no_cache - containerData.memory.inactive_file; + } + } + return { 'id': containerData.id, 'name': containerData.name, 'status': containerData.status, 'uptime': containerData.uptime, 'cpu_percent': containerData.cpu.total, - 'memory_usage': containerData.memory.usage != undefined ? containerData.memory.usage : '?', + 'memory_usage_no_cache': memory_usage_no_cache, 'limit': containerData.memory.limit != undefined ? containerData.memory.limit : '?', 'io_rx': containerData.io_rx != undefined ? containerData.io_rx : '?', 'io_wx': containerData.io_wx != undefined ? containerData.io_wx : '?', |