diff options
| author | Nicolas Hennion <nicolas@nicolargo.com> | 2020-08-13 18:10:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 18:10:44 +0200 |
| commit | e13cf7e5d71bd6de2f6401172c50e54a06a1ea54 (patch) | |
| tree | 8746b2f12c363888882f8595970fba9643304aaf | |
| parent | 9f8a812081dc30ed17b387f9b47740cfd4272e99 (diff) | |
| parent | c6e604201425f0eed2455940ccd3e9771549ce88 (diff) | |
Merge pull request #1695 from anjz/feature/containers-rss
Add RSS metric for containers
| -rw-r--r-- | glances/outputs/static/js/components/plugin-docker/controller.js | 1 | ||||
| -rw-r--r-- | glances/outputs/static/js/components/plugin-docker/view.html | 2 | ||||
| -rw-r--r-- | glances/plugins/glances_docker.py | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/glances/outputs/static/js/components/plugin-docker/controller.js b/glances/outputs/static/js/components/plugin-docker/controller.js index cf60fb40..05bd8a6e 100644 --- a/glances/outputs/static/js/components/plugin-docker/controller.js +++ b/glances/outputs/static/js/components/plugin-docker/controller.js @@ -19,6 +19,7 @@ export default function GlancesPluginDockerController($scope, GlancesStats) { 'status': containerData.Status, 'cpu': containerData.cpu.total, 'memory': containerData.memory.usage != undefined ? containerData.memory.usage : '?', + 'rss': containerData.memory.rss != undefined ? containerData.memory.usage: '?', 'ior': containerData.io.ior != undefined ? containerData.io.ior : '?', 'iow': containerData.io.iow != undefined ? containerData.io.iow : '?', 'io_time_since_update': containerData.io.time_since_update, diff --git a/glances/outputs/static/js/components/plugin-docker/view.html b/glances/outputs/static/js/components/plugin-docker/view.html index 3b5dcc72..63cfb487 100644 --- a/glances/outputs/static/js/components/plugin-docker/view.html +++ b/glances/outputs/static/js/components/plugin-docker/view.html @@ -7,6 +7,7 @@ <div class="table-cell">Status</div> <div class="table-cell">CPU%</div> <div class="table-cell">MEM</div> + <div class="table-cell">RSS</div> <div class="table-cell">IOR/s</div> <div class="table-cell">IOW/s</div> <div class="table-cell">RX/s</div> @@ -19,6 +20,7 @@ </div> <div class="table-cell">{{ container.cpu | number:1 }}</div> <div class="table-cell">{{ container.memory | bytes }}</div> + <div class="table-cell">{{ container.rss | bytes }}</div> <div class="table-cell">{{ container.ior / container.io_time_since_update | bits }}</div> <div class="table-cell">{{ container.iow / container.io_time_since_update | bits }}</div> <div class="table-cell">{{ container.rx / container.net_time_since_update | bits }}</div> diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py index eaac481c..80c550df 100644 --- a/glances/plugins/glances_docker.py +++ b/glances/plugins/glances_docker.py @@ -319,9 +319,8 @@ class Plugin(GlancesPlugin): ret = {} # Read the stats try: - # Do not exist anymore with Docker 1.11 (issue #848) - # ret['rss'] = all_stats['memory_stats']['stats']['rss'] - # ret['cache'] = all_stats['memory_stats']['stats']['cache'] + ret['rss'] = all_stats['memory_stats']['stats']['rss'] + ret['cache'] = all_stats['memory_stats']['stats']['cache'] ret['usage'] = all_stats['memory_stats']['usage'] ret['limit'] = all_stats['memory_stats']['limit'] ret['max_usage'] = all_stats['memory_stats']['max_usage'] |