cephadm: replace detail fetching in list_daemons with updaters

Replace the deetail fetching functions with the recently added listing
updater classes. The functionality is designed to be unchanged with this
update.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

src/cephadm/cephadm.py

@@ -90,7 +90,6 @@
     check_container_engine,
     find_container_engine,
     normalize_container_id,
-    parsed_container_cpu_perc,
     parsed_container_image_stats,
     parsed_container_mem_usage,
     pull_command,
@@ -101,12 +100,10 @@
     get_legacy_daemon_fsid,
     is_fsid,
     normalize_image_digest,
-    try_convert_datetime,
     read_config,
     _extract_host_info_from_applied_spec,
 )
 from cephadmlib.file_utils import (
-    get_file_timestamp,
     makedirs,
     pathify,
     read_file,
@@ -194,10 +191,19 @@
 )
 from cephadmlib.agent import http_query
 from cephadmlib.listing import (
-    LegacyDaemonEntry,
+    DaemonStatusUpdater,
+    NoOpDaemonStatusUpdater,
+    CombinedStatusUpdater,
     daemons_matching,
     daemons_summary,
 )
+from cephadmlib.listing_updaters import (
+    CPUUsageStatusUpdater,
+    CoreStatusUpdater,
+    DigestsStatusUpdater,
+    MemUsageStatusUpdater,
+    VersionStatusUpdater,
+)
 
 
 FuncT = TypeVar('FuncT', bound=Callable)
@@ -3397,315 +3403,24 @@ def list_daemons(
     daemon_name: Optional[str] = None,
     type_of_daemon: Optional[str] = None,
 ) -> List[Dict[str, str]]:
-    legacy_cache: Dict[str, Any] = {}
-    ls = []
-
-    data_dir = ctx.data_dir
-    if legacy_dir is not None:
-        data_dir = os.path.abspath(legacy_dir + data_dir)
-
-    if not os.path.exists(data_dir):
-        # data_dir (/var/lib/ceph typically) is missing. Return empty list.
-        logger.warning('%s is missing: no daemon listing available', data_dir)
-        return []
-
-    # keep track of ceph versions we see
-    seen_versions: Dict[str, Optional[str]] = {}
-
-    # keep track of image digests
-    seen_digests: Dict[str, List[str]] = {}
-
-    # keep track of memory and cpu usage we've seen
-    seen_memusage_cid_len, seen_memusage = parsed_container_mem_usage(ctx)
-    seen_cpuperc_cid_len, seen_cpuperc = parsed_container_cpu_perc(ctx)
+    _updater: DaemonStatusUpdater = NoOpDaemonStatusUpdater()
+    if detail:
+        detail_updaters = [
+            CoreStatusUpdater(),
+            DigestsStatusUpdater(),
+            VersionStatusUpdater(),
+            MemUsageStatusUpdater(),
+            CPUUsageStatusUpdater(),
+        ]
+        _updater = CombinedStatusUpdater(detail_updaters)
 
     daemon_entries = daemons_matching(
         ctx,
         legacy_dir,
         daemon_name=daemon_name,
         daemon_type=type_of_daemon,
     )
-    for entry in daemon_entries:
-        if isinstance(entry, LegacyDaemonEntry):
-            status = cast(Dict[str, Any], entry.status)
-            if detail:
-                _update_legacy_status(
-                    status, ctx, entry.name, legacy_cache,
-                )
-            ls.append(status)
-        else:
-            status = cast(Dict[str, Any], entry.status)
-            if detail:
-                _update_daemon_and_container_status(
-                    status,
-                    ctx,
-                    entry.identity,
-                    data_dir,
-                    seen_versions,
-                    seen_digests,
-                    seen_memusage_cid_len,
-                    seen_memusage,
-                    seen_cpuperc_cid_len,
-                    seen_cpuperc,
-                )
-            ls.append(status)
-    return ls
-
-
-def _update_legacy_status(
-    val: Dict[str, Any],
-    ctx: CephadmContext,
-    legacy_unit_name: str,
-    cache: Dict[str, Any],
-) -> None:
-    (val['enabled'], val['state'], _) = check_unit(
-        ctx, legacy_unit_name
-    )
-    if not cache.get('host_version'):
-        try:
-            out, err, code = call(
-                ctx,
-                ['ceph', '-v'],
-                verbosity=CallVerbosity.QUIET,
-            )
-            if not code and out.startswith('ceph version '):
-                cache['host_version'] = out.split(' ')[2]
-        except Exception:
-            pass
-    val['host_version'] = cache.get('host_version')
-
-
-def _update_daemon_and_container_status(
-    val: Dict[str, Any],
-    ctx: CephadmContext,
-    identity: DaemonIdentity,
-    data_dir: str,
-    seen_versions: Dict[str, Optional[str]],
-    seen_digests: Dict[str, List[str]],
-    seen_memusage_cid_len: int,
-    seen_memusage: Dict[str, int],
-    seen_cpuperc_cid_len: int,
-    seen_cpuperc: Dict[str, str],
-) -> None:
-    # aliases (to clean up later)
-    container_path = ctx.container_engine.path
-    fsid = identity.fsid
-    daemon_type = identity.daemon_type
-    daemon_id = identity.daemon_id
-    name = j = identity.daemon_name
-
-    # get container id
-    (val['enabled'], val['state'], _) = check_unit(
-        ctx, identity.unit_name
-    )
-    container_id = None
-    image_name = None
-    image_id = None
-    image_digests = None
-    version = None
-    start_stamp = None
-
-    cinfo = get_container_stats(
-        ctx,
-        DaemonIdentity(fsid, daemon_type, daemon_id),
-        container_path=container_path,
-    )
-    if cinfo:
-        container_id = cinfo.container_id
-        image_name = cinfo.image_name
-        image_id = cinfo.image_id
-        start = cinfo.start
-        version = cinfo.version
-        image_id = normalize_container_id(image_id)
-        daemon_type = name.split('.', 1)[0]
-        start_stamp = try_convert_datetime(start)
-
-        # collect digests for this image id
-        image_digests = seen_digests.get(image_id)
-        if not image_digests:
-            out, err, code = call(
-                ctx,
-                [
-                    container_path,
-                    'image',
-                    'inspect',
-                    image_id,
-                    '--format',
-                    '{{.RepoDigests}}',
-                ],
-                verbosity=CallVerbosity.QUIET,
-            )
-            if not code:
-                image_digests = list(
-                    set(
-                        map(
-                            normalize_image_digest,
-                            out.strip()[1:-1].split(' '),
-                        )
-                    )
-                )
-                seen_digests[image_id] = image_digests
-
-        # identify software version inside the container (if we can)
-        if not version or '.' not in version:
-            version = seen_versions.get(image_id, None)
-        if daemon_type == NFSGanesha.daemon_type:
-            version = NFSGanesha.get_version(
-                ctx, container_id
-            )
-        if daemon_type == CephIscsi.daemon_type:
-            version = CephIscsi.get_version(ctx, container_id)
-        if daemon_type == CephNvmeof.daemon_type:
-            version = CephNvmeof.get_version(
-                ctx, container_id
-            )
-        if daemon_type == SMB.daemon_type:
-            version = SMB.get_version(ctx, container_id)
-        elif not version:
-            if daemon_type in ceph_daemons():
-                out, err, code = call(
-                    ctx,
-                    [
-                        container_path,
-                        'exec',
-                        container_id,
-                        'ceph',
-                        '-v',
-                    ],
-                    verbosity=CallVerbosity.QUIET,
-                )
-                if not code and out.startswith(
-                    'ceph version '
-                ):
-                    version = out.split(' ')[2]
-                    seen_versions[image_id] = version
-            elif daemon_type == 'grafana':
-                out, err, code = call(
-                    ctx,
-                    [
-                        container_path,
-                        'exec',
-                        container_id,
-                        'grafana',
-                        'server',
-                        '-v',
-                    ],
-                    verbosity=CallVerbosity.QUIET,
-                )
-                if not code and out.startswith('Version '):
-                    version = out.split(' ')[1]
-                    seen_versions[image_id] = version
-            elif daemon_type in [
-                'prometheus',
-                'alertmanager',
-                'node-exporter',
-                'loki',
-                'promtail',
-            ]:
-                version = Monitoring.get_version(
-                    ctx, container_id, daemon_type
-                )
-                seen_versions[image_id] = version
-            elif daemon_type == 'haproxy':
-                out, err, code = call(
-                    ctx,
-                    [
-                        container_path,
-                        'exec',
-                        container_id,
-                        'haproxy',
-                        '-v',
-                    ],
-                    verbosity=CallVerbosity.QUIET,
-                )
-                if (
-                    not code
-                    and out.startswith('HA-Proxy version ')
-                    or out.startswith('HAProxy version ')
-                ):
-                    version = out.split(' ')[2]
-                    seen_versions[image_id] = version
-            elif daemon_type == 'keepalived':
-                out, err, code = call(
-                    ctx,
-                    [
-                        container_path,
-                        'exec',
-                        container_id,
-                        'keepalived',
-                        '--version',
-                    ],
-                    verbosity=CallVerbosity.QUIET,
-                )
-                if not code and err.startswith('Keepalived '):
-                    version = err.split(' ')[1]
-                    if version[0] == 'v':
-                        version = version[1:]
-                    seen_versions[image_id] = version
-            elif daemon_type == CustomContainer.daemon_type:
-                # Because a custom container can contain
-                # everything, we do not know which command
-                # to execute to get the version.
-                pass
-            elif daemon_type == SNMPGateway.daemon_type:
-                version = SNMPGateway.get_version(
-                    ctx, fsid, daemon_id
-                )
-                seen_versions[image_id] = version
-            elif daemon_type == MgmtGateway.daemon_type:
-                version = MgmtGateway.get_version(
-                    ctx, container_id
-                )
-                seen_versions[image_id] = version
-            elif daemon_type == OAuth2Proxy.daemon_type:
-                version = OAuth2Proxy.get_version(
-                    ctx, container_id
-                )
-                seen_versions[image_id] = version
-            else:
-                logger.warning(
-                    'version for unknown daemon type %s'
-                    % daemon_type
-                )
-    else:
-        vfile = os.path.join(data_dir, fsid, j, 'unit.image')
-        try:
-            with open(vfile, 'r') as f:
-                image_name = f.read().strip() or None
-        except IOError:
-            pass
-
-    # unit.meta?
-    mfile = os.path.join(data_dir, fsid, j, 'unit.meta')
-    try:
-        with open(mfile, 'r') as f:
-            meta = json.loads(f.read())
-            val.update(meta)
-    except IOError:
-        pass
-
-    val['container_id'] = container_id
-    val['container_image_name'] = image_name
-    val['container_image_id'] = image_id
-    val['container_image_digests'] = image_digests
-    if container_id:
-        val['memory_usage'] = seen_memusage.get(
-            container_id[0:seen_memusage_cid_len]
-        )
-        val['cpu_percentage'] = seen_cpuperc.get(
-            container_id[0:seen_cpuperc_cid_len]
-        )
-    val['version'] = version
-    val['started'] = start_stamp
-    val['created'] = get_file_timestamp(
-        os.path.join(data_dir, fsid, j, 'unit.created')
-    )
-    val['deployed'] = get_file_timestamp(
-        os.path.join(data_dir, fsid, j, 'unit.image')
-    )
-    val['configured'] = get_file_timestamp(
-        os.path.join(data_dir, fsid, j, 'unit.configured')
-    )
+    return [_updater.expand(ctx, entry) for entry in daemon_entries]
 
 
 def get_daemon_description(ctx, fsid, name, detail=False, legacy_dir=None):