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 @@
Status
CPU%
MEM
+
RSS
IOR/s
IOW/s
RX/s
@@ -19,6 +20,7 @@
{{ container.cpu | number:1 }}
{{ container.memory | bytes }}
+
{{ container.rss | bytes }}
{{ container.ior / container.io_time_since_update | bits }}
{{ container.iow / container.io_time_since_update | bits }}
{{ container.rx / container.net_time_since_update | bits }}
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']