From 3a20ae41e961a354cf313696d9b53eb76d5319d1 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Tue, 19 Jan 2021 12:53:07 +1100 Subject: [PATCH] [docker_] memory: report `usage` if `total_rss` is not available Signed-off-by: Olivier Mehani --- plugins/docker/docker_ | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/docker/docker_ b/plugins/docker/docker_ index d886a5e0..e9e60a59 100755 --- a/plugins/docker/docker_ +++ b/plugins/docker/docker_ @@ -275,8 +275,14 @@ def print_containers_cpu(client): def print_containers_memory(client): for container, stats in parallel_container_stats(client): - print(container.name + '.value', stats['memory_stats']['stats']['total_rss']) - print(container.name + '.extinfo', container_attributes(container)) + if 'total_rss' in stats['memory_stats']['stats']: # cgroupv1 only? + memory_usage = stats['memory_stats']['stats']['total_rss'] + extinfo = 'Resident Set Size' + else: + memory_usage = stats['memory_stats']['usage'] + extinfo = 'Total memory usage' + print(container.name + '.value', memory_usage) + print(container.name + '.extinfo', container_attributes(container, extinfo)) def print_containers_network(client):