summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2021-08-14 12:37:14 +0200
committernicolargo <nicolas@nicolargo.com>2021-08-14 12:37:14 +0200
commitb59a33ee0c008cfaac7d5ea109a5d095a6ad5e08 (patch)
treef5de50a23248a5bab465520e78f3516c1200ceb7
parentff4cfcd0c9acddf9ccddca1665e4e6bd65e03e13 (diff)
Docker container monitoring only show half command? #1912
-rw-r--r--glances/plugins/glances_docker.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/glances/plugins/glances_docker.py b/glances/plugins/glances_docker.py
index 77e250e4..b82c9641 100644
--- a/glances/plugins/glances_docker.py
+++ b/glances/plugins/glances_docker.py
@@ -249,8 +249,16 @@ class Plugin(GlancesPlugin):
# Container Image
container_stats['Image'] = container.image.tags
# Global stats (from attrs)
+ # Container Status
container_stats['Status'] = container.attrs['State']['Status']
- container_stats['Command'] = container.attrs['Config']['Entrypoint']
+ # Container Command (see #1912)
+ container_stats['Command'] = []
+ if container.attrs['Config'].get('Entrypoint', None):
+ container_stats['Command'].extend(container.attrs['Config'].get('Entrypoint', []))
+ if container.attrs['Config'].get('Cmd', None):
+ container_stats['Command'].extend(container.attrs['Config'].get('Cmd', []))
+ if container_stats['Command'] == []:
+ container_stats['Command'] = None
# Standards stats
# See https://docs.docker.com/engine/api/v1.41/#operation/ContainerStats
# Be aware that the API can change... (example see issue #1857)