diff options
| author | Nicolas Hennion <nicolashennion@gmail.com> | 2024-01-03 07:23:09 +0000 |
|---|---|---|
| committer | Bharath Vignesh J K <52282402+RazCrimson@users.noreply.github.com> | 2024-04-29 22:54:53 +0530 |
| commit | f640b6b8b453a2a6d2a575b46785191dd8ab1cba (patch) | |
| tree | 95ae3c61ce417fc823b2078094c14ee4661b4cf8 | |
| parent | 8edf6e70b5bfe304fd921ee2fcb3b4f87cd9cea4 (diff) | |
Docker memory usage uses the same algorithm than docker stats #2637
| -rw-r--r-- | NEWS.rst | 1 | ||||
| -rw-r--r-- | glances/outputs/static/js/components/plugin-containers.vue | 4 | ||||
| -rw-r--r-- | glances/plugins/containers/engines/docker.py | 6 |
3 files changed, 7 insertions, 4 deletions
@@ -23,6 +23,7 @@ Under development: https://github.com/nicolargo/glances/issues?q=is%3Aopen+is%3A alias=sda1:InternalDisk,sdb1:ExternalDisk * Alert data model change from a list of list to a list of dict #2633 + * Docker memory usage uses the same algorithm than docker stats #2637 =============== Version 3.4.0.5 diff --git a/glances/outputs/static/js/components/plugin-containers.vue b/glances/outputs/static/js/components/plugin-containers.vue index ba9da77e..db5abfd8 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_no_cache) }} + {{ $filters.bytes(container.memory_usage) }} </div> <div class="table-cell"> {{ $filters.bytes(container.limit) }} @@ -126,7 +126,7 @@ export default { 'status': containerData.status, 'uptime': containerData.uptime, 'cpu_percent': containerData.cpu.total, - 'memory_usage_no_cache': memory_usage_no_cache, + 'memory_usage': 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 : '?', diff --git a/glances/plugins/containers/engines/docker.py b/glances/plugins/containers/engines/docker.py index a76a0022..1ac2cab1 100644 --- a/glances/plugins/containers/engines/docker.py +++ b/glances/plugins/containers/engines/docker.py @@ -120,7 +120,9 @@ class DockerStatsFetcher: def _get_memory_stats(self): """Return the container MEMORY. - Output: a dict {'usage': ..., 'limit': ..., 'max_usage': ...} + Output: a dict {'usage': ..., 'limit': ..., 'inactive_file': ...} + + Note:the displayed memory usage is 'usage - inactive_file' """ memory_stats = self._streamer.stats.get('memory_stats') @@ -131,7 +133,7 @@ class DockerStatsFetcher: stats = {field: memory_stats[field] for field in self.MANDATORY_MEMORY_FIELDS} - # Optional field + # Optional field stats:inactive_file stats['inactive_file'] = 0 if 'stats' in memory_stats: stats['inactive_file'] = memory_stats['stats'].get('inactive_file', 0) |