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 4f937200d4b77f62f55cbdc85c35e8f91923d24c..219908a3291565d0961034189a1220ba5e34fbfb 100755 (executable)
--- 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]