From 38dbf45d581065b1fcdb1e4ab81d0fb2fe7dc0e5 Mon Sep 17 00:00:00 2001 From: Patrick Seidensal Date: Fri, 26 Feb 2021 17:27:17 +0100 Subject: [PATCH] cephadm: `cephadm ls` broken for SUSE downstream alertmanager container Fixes: https://tracker.ceph.com/issues/49506 Signed-off-by: Patrick Seidensal (cherry picked from commit 8f0dae05fb0c50fbfc0db952ecbfda3900a8a10c) --- src/cephadm/cephadm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 3a90939cf9192..e7575fd71f02d 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -4645,9 +4645,19 @@ def list_daemons(ctx, detail=True, legacy_dir=None): 'alertmanager', 'node-exporter']: cmd = daemon_type.replace('-', '_') - out, err, code = call(ctx, - [container_path, 'exec', container_id, - cmd, '--version']) + if daemon_type == 'alertmanager': + for cmd in ['alertmanager', 'prometheus-alertmanager']: + out, err, code = call(ctx, [ + container_path, 'exec', container_id, cmd, + '--version' + ], verbosity=CallVerbosity.SILENT) + if code == 0: + break + cmd = 'alertmanager' # reset cmd for version extraction + else: + out, err, code = call(ctx, [ + container_path, 'exec', container_id, cmd, '--version' + ]) if not code and \ err.startswith('%s, version ' % cmd): version = err.split(' ')[2] -- 2.39.5