From: Patrick Seidensal <pseidensal@suse.com>
Date: Fri, 26 Feb 2021 16:27:17 +0000 (+0100)
Subject: cephadm: `cephadm ls` broken for SUSE downstream alertmanager container
X-Git-Tag: v17.1.0~2784^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f0dae05fb0c50fbfc0db952ecbfda3900a8a10c;p=ceph.git

cephadm: `cephadm ls` broken for SUSE downstream alertmanager container

Fixes: https://tracker.ceph.com/issues/49506

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 4f937200d4b..219908a3291 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -4563,9 +4563,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]