From 7dcb06d368753faa6da7b334ee115c756fe951f7 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Sun, 9 Jul 2023 19:06:02 +0530
Subject: [PATCH] mgr/dashboard: update the upgrade layout by introducing new
 items

Shows Cluster Health
Shows the count of mgr daemons
Shows a table with all the daemon versions
Display the cluster logs

Fixes: https://tracker.ceph.com/issues/62016
Signed-off-by: Nizamudeen A <nia@redhat.com>
---
 .../mgr/dashboard/controllers/daemon.py       |  18 +-
 .../frontend/src/app/app-routing.module.ts    |  13 +-
 .../app/ceph/cluster/logs/logs.component.html |  21 +-
 .../app/ceph/cluster/logs/logs.component.scss |   4 +
 .../app/ceph/cluster/logs/logs.component.ts   |  14 +-
 .../upgrade-start-modal.component.spec.ts     |   3 +-
 .../cluster/upgrade/upgrade.component.html    | 192 +++++++++++++-----
 .../cluster/upgrade/upgrade.component.spec.ts |  48 +++--
 .../ceph/cluster/upgrade/upgrade.component.ts |  82 ++++++--
 .../ceph/dashboard-v3/dashboard-v3.module.ts  |  12 +-
 .../dashboard/dashboard-v3.component.spec.ts  |  10 +-
 .../rgw-overview-dashboard.component.spec.ts  |   6 +-
 .../src/app/shared/api/daemon.service.ts      |   8 +
 .../src/app/shared/api/upgrade.service.ts     |  15 +-
 .../card-row/card-row.component.html          |   0
 .../card-row/card-row.component.scss          |   0
 .../card-row/card-row.component.spec.ts       |   0
 .../card-row/card-row.component.ts            |   0
 .../components}/card/card.component.html      |   0
 .../components}/card/card.component.scss      |   0
 .../components}/card/card.component.spec.ts   |   0
 .../components}/card/card.component.ts        |   0
 .../shared/components/components.module.ts    |  10 +-
 .../shared/datatable/table/table.component.ts |   5 +-
 src/pybind/mgr/dashboard/openapi.yaml         |  31 +++
 src/pybind/mgr/dashboard/tests/test_daemon.py |   5 +
 26 files changed, 366 insertions(+), 131 deletions(-)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card-row/card-row.component.html (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card-row/card-row.component.scss (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card-row/card-row.component.spec.ts (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card-row/card-row.component.ts (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card/card.component.html (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card/card.component.scss (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card/card.component.spec.ts (100%)
 rename src/pybind/mgr/dashboard/frontend/src/app/{ceph/dashboard-v3 => shared/components}/card/card.component.ts (100%)

diff --git a/src/pybind/mgr/dashboard/controllers/daemon.py b/src/pybind/mgr/dashboard/controllers/daemon.py
index eeea5a3262555..d5c288131b92e 100644
--- a/src/pybind/mgr/dashboard/controllers/daemon.py
+++ b/src/pybind/mgr/dashboard/controllers/daemon.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from typing import Optional
+from typing import List, Optional
 
 from ..exceptions import DashboardException
 from ..security import Scope
@@ -31,3 +31,19 @@ class Daemon(RESTController):
         orch = OrchClient.instance()
         res = orch.daemons.action(action=action, daemon_name=daemon_name, image=container_image)
         return res
+
+    @raise_if_no_orchestrator([OrchFeature.DAEMON_LIST])
+    @handle_orchestrator_error('daemon')
+    @RESTController.MethodMap(version=APIVersion.DEFAULT)
+    def list(self, daemon_types: Optional[List[str]] = None):
+        """List all daemons in the cluster. Also filter by the daemon types specified
+
+        :param daemon_types: List of daemon types to filter by.
+        :return: Returns list of daemons.
+        :rtype: list
+        """
+        orch = OrchClient.instance()
+        daemons = [d.to_dict() for d in orch.services.list_daemons()]
+        if daemon_types:
+            daemons = [d for d in daemons if d['daemon_type'] in daemon_types]
+        return daemons
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
index 98d14779ddf1f..d57fb9855a77a 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
@@ -286,8 +286,19 @@ const routes: Routes = [
       },
       {
         path: 'upgrade',
+        canActivate: [ModuleStatusGuardService],
         component: UpgradeComponent,
-        data: { breadcrumbs: 'Cluster/Upgrade' }
+        data: {
+          moduleStatusGuardConfig: {
+            uiApiPath: 'orchestrator',
+            redirectTo: 'error',
+            backend: 'cephadm',
+            section: 'orch',
+            section_info: 'Orchestrator',
+            header: 'Orchestrator is not available'
+          },
+          breadcrumbs: 'Cluster/Upgrade'
+        }
       },
       {
         path: 'perf_counters/:type/:id',
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
index dbf2c28b687d1..f92674e50743d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.html
@@ -6,7 +6,7 @@
        class="nav-tabs"
        cdStatefulTab="logs"
        [cdStatefulTabDefault]="defaultTab"
-       [hidden]="hideNavLinks">
+       [hidden]="!showNavLinks">
     <ng-container ngbNavItem="cluster-logs">
       <a ngbNavLink
          i18n>Cluster Logs</a>
@@ -15,19 +15,20 @@
              *ngIf="clog">
           <div class="btn-group"
                role="group"
-               *ngIf="clog.length && !hideClusterLogs">
+               *ngIf="clog.length && showClusterLogs">
             <cd-download-button [objectItem]="clog"
                                 [textItem]="clogText"
                                 fileName="cluster_log"
-                                *ngIf="!hideDwnldCpyBtn">
+                                *ngIf="showDownloadCopyButton">
             </cd-download-button>
             <cd-copy-2-clipboard-button
                     [source]="clogText"
                     [byId]="false"
-                    *ngIf="!hideDwnldCpyBtn">
+                    *ngIf="showDownloadCopyButton">
             </cd-copy-2-clipboard-button>
           </div>
-          <div class="card-body">
+          <div class="card-body"
+               [ngClass]="{'overflow-auto': scrollable}">
             <p *ngFor="let line of clog">
               <span class="timestamp">{{ line.stamp | cdDate }}</span>
               <span class="priority {{ line.priority | logPriority }}">{{ line.priority }}</span>
@@ -45,19 +46,19 @@
          i18n>Audit Logs</a>
       <ng-template ngbNavContent>
         <div class="card bg-light mb-3"
-             *ngIf="audit_log && !hideAuditLogs">
+             *ngIf="audit_log && showAuditLogs">
           <div class="btn-group"
                role="group"
                *ngIf="audit_log.length">
             <cd-download-button [objectItem]="audit_log"
                                 [textItem]="auditLogText"
                                 fileName="audit_log"
-                                *ngIf="!hideDwnldCpyBtn">
+                                *ngIf="showDownloadCopyButton">
             </cd-download-button>
             <cd-copy-2-clipboard-button
                     [source]="auditLogText"
                     [byId]="false"
-                    *ngIf="!hideDwnldCpyBtn">
+                    *ngIf="showDownloadCopyButton">
             </cd-copy-2-clipboard-button>
           </div>
           <div class="card-body">
@@ -77,7 +78,7 @@
       <a ngbNavLink
          i18n>Daemon Logs</a>
       <ng-template ngbNavContent>
-        <ng-container *ngIf="!hideDaemonLogs && lokiServiceStatus$ | async as lokiServiceStatus ; else daemonLogsTpl ">
+        <ng-container *ngIf="showDaemonLogs && lokiServiceStatus$ | async as lokiServiceStatus ; else daemonLogsTpl ">
           <div *ngIf="promtailServiceStatus$ | async as promtailServiceStatus; else daemonLogsTpl">
             <cd-grafana i18n-title
                         title="Daemon logs"
@@ -97,7 +98,7 @@
 
 <ng-template #logFiltersTpl>
   <div class="row mb-3"
-       *ngIf="!hideFilterTools">
+       *ngIf="showFilterTools">
   <div class="col-lg-10 d-flex">
     <div class="col-sm-1 me-3">
       <label for="logs-priority"
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.scss
index 54ab44250603c..56580e5151930 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.scss
@@ -52,3 +52,7 @@ p {
 ::ng-deep cd-logs ngb-timepicker input.ngb-tp-input {
   width: 3.5rem !important;
 }
+
+.card-body.overflow-auto {
+  height: 50vh;
+}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
index acddc0194b212..4c381eab037e7 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/logs/logs.component.ts
@@ -16,19 +16,21 @@ import { Icons } from '~/app/shared/enum/icons.enum';
 })
 export class LogsComponent implements OnInit, OnDestroy {
   @Input()
-  hideClusterLogs = false;
+  showClusterLogs = true;
   @Input()
-  hideAuditLogs = false;
+  showAuditLogs = true;
   @Input()
-  hideDaemonLogs = false;
+  showDaemonLogs = true;
   @Input()
-  hideNavLinks = false;
+  showNavLinks = true;
   @Input()
-  hideFilterTools = false;
+  showFilterTools = true;
   @Input()
-  hideDwnldCpyBtn = false;
+  showDownloadCopyButton = true;
   @Input()
   defaultTab = '';
+  @Input()
+  scrollable = false;
 
   contentData: any;
   clog: Array<any>;
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.spec.ts
index cb68a3f1f515c..a6232ee082aad 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-form/upgrade-start-modal.component.spec.ts
@@ -6,13 +6,14 @@ import { UpgradeService } from '~/app/shared/api/upgrade.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { SharedModule } from '~/app/shared/shared.module';
+import { ToastrModule } from 'ngx-toastr';
 
 describe('UpgradeComponent', () => {
   let component: UpgradeComponent;
   let fixture: ComponentFixture<UpgradeComponent>;
 
   configureTestBed({
-    imports: [HttpClientTestingModule, SharedModule],
+    imports: [HttpClientTestingModule, SharedModule, ToastrModule.forRoot()],
     schemas: [NO_ERRORS_SCHEMA],
     declarations: [UpgradeComponent],
     providers: [UpgradeService]
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
index dd8f66950b3b0..c91af1cdcce05 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html
@@ -1,13 +1,49 @@
-<ng-container *ngIf="{upgradeInfo: upgradeInfo$ | async, error: upgradeInfoError$ } as upgrade">
-  <div class="row h-25 ms-1"
-       *ngIf="!upgrade.upgradeInfoError && upgrade.upgradeInfo as upgradeInfo; else checkUpgrade">
-    <ng-container *ngIf="healthData$ | async as healthData">
-      <div class="col-lg-3 h-50 d-flex flex-column border justify-content-center align-items-center">
-        <span class="bold">Current Version</span>
-        <span class="mt-1">{{ version }}</span>
+<div class="row h-25"
+     *cdScope="'configOpt'">
+  <ng-container *ngIf="healthData$ | async as healthData">
+    <cd-card class="col-sm-3 px-3 d-flex"
+             cardTitle="New Version"
+             i18n-cardTitle
+             aria-label="New Version"
+             i18n-aria-label
+             id="newVersionAvailable">
+      <div class="d-flex flex-column justify-content-center align-items-center"
+           *ngIf="info$ | async as info; else checkingForUpgradeStatus">
+        <ng-container *ngIf="info.versions.length > 0; else noUpgradesAvailable">
+          <div i18n-ngbTooltip
+               [ngbTooltip]="(healthData.mgr_map | mgrSummary).total <= 1 ? 'To upgrade, you need minimum 2 mgr daemons.' : ''">
+            <button class="btn btn-accent mt-2"
+                    id="upgrade"
+                    aria-label="Upgrade now"
+                    (click)="upgradeNow(info.versions[info.versions.length - 1])"
+                    [disabled]="(healthData.mgr_map | mgrSummary).total <= 1"
+                    i18n>Upgrade to {{ info.versions[info.versions.length - 1] }}</button>
+          </div>
+          <a class="mt-2 link-primary mb-2"
+             (click)="startUpgradeModal()"
+             i18n>Select another version...</a>
+        </ng-container>
+      </div>
+    </cd-card>
+
+    <cd-card class="col-sm-3 px-3 d-flex"
+             cardTitle="Current Version"
+             i18n-cardTitle
+             aria-label="Current Version"
+             i18n-aria-label
+             id="currentVersion">
+      <div class="d-flex flex-column justify-content-center align-items-center">
+        <h5>{{ version }}</h5>
       </div>
-      <div class="col-lg-3 h-50 d-flex flex-column border justify-content-center align-items-center">
-        <span class="bold">Cluster Status</span>
+    </cd-card>
+
+    <cd-card class="col-sm-3 px-3 d-flex"
+             cardTitle="Cluster Status"
+             i18n-cardTitle
+             aria-label="Cluster Status"
+             i18n-aria-label
+             id="clusterStatus">
+      <div class="d-flex flex-column justify-content-center align-items-center">
         <ng-template #healthChecks>
           <ul>
             <li *ngFor="let check of healthData.health.checks">
@@ -21,68 +57,74 @@
              [ngStyle]="healthData.health.status | healthColor"
              [ngbPopover]="healthChecks"
              popoverClass="info-card-popover-cluster-status">
-             {{ healthData.health.status | healthLabel | uppercase }}
+            {{ healthData.health.status | healthLabel | uppercase }}
           <i *ngIf="healthData.health?.status !== 'HEALTH_OK'"
              class="fa fa-exclamation-triangle"></i>
         </div>
       </div>
-      <div class="col-lg-3 h-50 d-flex flex-column border justify-content-center align-items-center">
-        <span class="bold">Upgrade Status</span>
-        <ng-container *ngIf="upgradeInfo.versions.length > 0; else noUpgradesAvailable">
-          <span class="mt-2"
-                i18n>
-          <i [ngClass]="[icons.up]"
-             class="text-info"></i>
-            Upgrade available</span>
-          <div i18n-ngbTooltip
-               [ngbTooltip]="(healthData.mgr_map | mgrSummary).total <= 1 ? 'To upgrade, you need minimum 2 mgr daemons.' : ''">
-            <button class="btn btn-accent mt-2"
-                    id="upgrade"
-                    aria-label="Upgrade now"
-                    [disabled]="(healthData.mgr_map | mgrSummary).total <= 1"
-                    (click)="startUpgradeModal()"
-                    i18n>Upgrade now</button>
-          </div>
-        </ng-container>
-      </div>
-      <div class="col-lg-3 h-50 d-flex flex-column border justify-content-center align-items-center">
-        <span class="bold">MGR Count</span>
-        <span class="mt-1">
+    </cd-card>
+
+    <cd-card class="col-sm-3 px-3 d-flex"
+             cardTitle="MGR Count"
+             i18n-cardTitle
+             aria-label="MGR Count"
+             i18n-aria-label
+             id="mgrCount">
+      <div class="d-flex flex-column justify-content-center align-items-center">
+        <h5>
           <i class="text-success"
              [ngClass]="[icons.success]"
              *ngIf="(healthData.mgr_map | mgrSummary).total > 1; else warningIcon">
           </i>
           {{ (healthData.mgr_map | mgrSummary).total }}
-        </span>
+        </h5>
       </div>
+    </cd-card>
 
-      <div class="d-flex mt-3 p-0">
-        <dl class="w-50"
-            *ngIf="fsid$ | async as fsid">
-          <dt class="bold mt-5"
-              i18n>Cluster FSID</dt>
-          <dd class="mt-2">{{ fsid }}</dd>
+    <div class="d-flex mt-3">
+      <dl class="w-50"
+          *ngIf="fsid$ | async as fsid">
+        <dt class="bold mt-5"
+            i18n>Cluster FSID</dt>
+        <dd class="mt-2">{{ fsid }}</dd>
+
+        <ng-container *ngIf="info$ | async as info; else loadingDetails">
           <dt class="bold mt-5"
               i18n>Release Image</dt>
-          <dd class="mt-2">{{ upgradeInfo.image }}</dd>
+          <dd class="mt-2">{{ info.image }}</dd>
           <dt class="bold mt-5"
               i18n>Registry</dt>
-          <dd class="mt-2">{{ upgradeInfo.registry }}</dd>
-        </dl>
+          <dd class="mt-2">{{ info.registry }}</dd>
+        </ng-container>
+      </dl>
+      <div class="w-50">
+        <ng-container *ngIf="daemons$ | async as daemons">
+          <legend class="cd-header"
+                  i18n>Daemon versions</legend>
+          <div>
+            <cd-table #daemonsTable
+                      [data]="daemons"
+                      selectionType="single"
+                      [columns]="columns"
+                      columnMode="flex"
+                      [limit]="5">
+            </cd-table>
+          </div>
+        </ng-container>
       </div>
-    </ng-container>
-  </div>
-</ng-container>
+    </div>
 
-<ng-template #checkUpgrade>
-  <div class="row h-75 justify-content-center align-items-center">
-    <h3 class="mt-1 bold text-center"
-        id="checking-for-upgrades"
-        i18n>Checking for upgrades
-      <i [ngClass]="[icons.spin, icons.spinner]"></i>
-    </h3>
-  </div>
-</ng-template>
+    <legend class="cd-header"
+            i18n>Cluster logs</legend>
+    <cd-logs [showAuditLogs]="false"
+             [showDaemonLogs]="false"
+             [showNavLinks]="false"
+             [showFilterTools]="false"
+             [showDownloadCopyButton]="false"
+             defaultTab="cluster-logs"
+             [scrollable]="true"></cd-logs>
+  </ng-container>
+</div>
 
 <ng-template #noUpgradesAvailable>
   <span class="mt-1"
@@ -100,3 +142,45 @@
      title="To upgrade, you need minimum 2 mgr daemons.">
   </i>
 </ng-template>
+
+<ng-template #checkingForUpgradeStatus>
+  <div class="d-flex flex-column justify-content-center align-items-center"
+       *ngIf="!errorMessage; else upgradeStatusError">
+    <button class="btn btn-accent mt-2 mb-4"
+            id="upgrade"
+            aria-label="Upgrade now"
+            [disabled]="true"
+            i18n>Checking for upgrades
+      <i [ngClass]="[icons.spin, icons.spinner]"></i>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #loadingDetails>
+  <div class="w-50"
+       *ngIf="!errorMessage; else upgradeInfoError">
+    <span class="text-info justify-content-center align-items-center"
+          i18n>Fetching registry informations
+      <i [ngClass]="[icons.spin, icons.spinner]"></i>
+    </span>
+  </div>
+</ng-template>
+
+<ng-template #upgradeStatusError>
+  <div class="d-flex flex-column justify-content-center align-items-center">
+    <span class="text-danger mt-2 mb-4"
+          id="upgrade-status-error"
+          i18n>
+      <i [ngClass]="[icons.danger]"></i>
+      {{ errorMessage }}
+    </span>
+  </div>
+</ng-template>
+
+<ng-template #upgradeInfoError>
+  <span class="text-danger justify-content-center align-items-center"
+        i18n>
+    <i [ngClass]="[icons.danger]"></i>
+    Failed to fetch registry informations
+  </span>
+</ng-template>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.spec.ts
index 0250fe9b122db..407a7da58e12d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.spec.ts
@@ -7,9 +7,13 @@ import { BehaviorSubject, of } from 'rxjs';
 import { UpgradeService } from '~/app/shared/api/upgrade.service';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { UpgradeInfoInterface } from '~/app/shared/models/upgrade.interface';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { HealthService } from '~/app/shared/api/health.service';
 import { SharedModule } from '~/app/shared/shared.module';
+import { LogsComponent } from '../logs/logs.component';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ToastrModule } from 'ngx-toastr';
+import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
 
 export class SummaryServiceMock {
   summaryDataSource = new BehaviorSubject({
@@ -47,9 +51,9 @@ describe('UpgradeComponent', () => {
   };
 
   configureTestBed({
-    imports: [HttpClientTestingModule, SharedModule],
+    imports: [HttpClientTestingModule, SharedModule, NgbNavModule, ToastrModule.forRoot()],
+    declarations: [UpgradeComponent, LogsComponent],
     schemas: [NO_ERRORS_SCHEMA],
-    declarations: [UpgradeComponent],
     providers: [UpgradeService, { provide: SummaryService, useClass: SummaryServiceMock }]
   });
 
@@ -59,6 +63,15 @@ describe('UpgradeComponent', () => {
     upgradeInfoSpy = spyOn(TestBed.inject(UpgradeService), 'list').and.callFake(() => of(null));
     getHealthSpy = spyOn(TestBed.inject(HealthService), 'getMinimalHealth');
     getHealthSpy.and.returnValue(of(healthPayload));
+    const upgradeInfoPayload = {
+      image: 'quay.io/ceph-test/ceph',
+      registry: 'quay.io',
+      versions: ['18.1.0', '18.1.1', '18.1.2']
+    };
+    upgradeInfoSpy.and.returnValue(of(upgradeInfoPayload));
+    spyOn(TestBed.inject(AuthStorageService), 'getPermissions').and.callFake(() => ({
+      configOpt: { read: true }
+    }));
     fixture.detectChanges();
   });
 
@@ -67,16 +80,12 @@ describe('UpgradeComponent', () => {
   });
 
   it('should load the view once check for upgrade is done', () => {
-    const upgradeInfoPayload = {
-      image: 'quay.io/ceph-test/ceph',
-      registry: 'quay.io',
-      versions: ['18.1.0', '18.1.1', '18.1.2']
-    };
-    upgradeInfoSpy.and.returnValue(of(upgradeInfoPayload));
     component.ngOnInit();
     fixture.detectChanges();
-    const firstCellSpan = fixture.debugElement.nativeElement.querySelector('span');
-    expect(firstCellSpan.textContent).toBe('Current Version');
+    const firstCellSpan = fixture.debugElement.nativeElement.querySelector(
+      'cd-card[cardTitle="New Version"] .card-title'
+    );
+    expect(firstCellSpan.textContent).toContain('New Version');
   });
 
   it('should show button to Upgrade if a new version is available', () => {
@@ -108,11 +117,15 @@ describe('UpgradeComponent', () => {
   });
 
   it('should show the loading screen while the api call is pending', () => {
-    const loading = fixture.debugElement.nativeElement.querySelector('h3');
-    expect(loading.textContent).toBe('Checking for upgrades ');
+    upgradeInfoSpy.and.returnValue(of(null));
+    component.ngOnInit();
+    fixture.detectChanges();
+    const loading = fixture.debugElement.nativeElement.querySelector('#newVersionAvailable');
+    expect(loading.textContent).toContain('Checking for upgrade');
   });
 
   it('should upgrade only when there are more than 1 mgr', () => {
+    // Only one mgr in payload
     const upgradeInfoPayload = {
       image: 'quay.io/ceph-test/ceph',
       registry: 'quay.io',
@@ -146,4 +159,13 @@ describe('UpgradeComponent', () => {
     fixture.detectChanges();
     expect(upgradeBtn.disabled).toBeFalsy();
   });
+
+  it('should show the error message when the upgrade fetch fails', () => {
+    upgradeInfoSpy.and.returnValue(of(null));
+    component.errorMessage = 'Failed to retrieve';
+    component.ngOnInit();
+    fixture.detectChanges();
+    const loading = fixture.debugElement.nativeElement.querySelector('#upgrade-status-error');
+    expect(loading.textContent).toContain('Failed to retrieve');
+  });
 });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.ts
index b779a213d6031..a271a24202d72 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.ts
@@ -1,13 +1,17 @@
 import { Component, OnInit } from '@angular/core';
 import { Observable, of } from 'rxjs';
-import { catchError, ignoreElements, tap } from 'rxjs/operators';
+import { catchError, publishReplay, refCount, tap } from 'rxjs/operators';
+import { DaemonService } from '~/app/shared/api/daemon.service';
 import { HealthService } from '~/app/shared/api/health.service';
 import { UpgradeService } from '~/app/shared/api/upgrade.service';
 import { Icons } from '~/app/shared/enum/icons.enum';
+import { NotificationType } from '~/app/shared/enum/notification-type.enum';
+import { CdTableColumn } from '~/app/shared/models/cd-table-column';
+import { Daemon } from '~/app/shared/models/daemon.interface';
 import { Permission } from '~/app/shared/models/permissions';
 import { UpgradeInfoInterface } from '~/app/shared/models/upgrade.interface';
-import { AuthStorageService } from '~/app/shared/services/auth-storage.service';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { NotificationService } from '~/app/shared/services/notification.service';
 import { SummaryService } from '~/app/shared/services/summary.service';
 import { ModalService } from '~/app/shared/services/modal.service';
 import { UpgradeStartModalComponent } from './upgrade-form/upgrade-start-modal.component';
@@ -19,13 +23,16 @@ import { UpgradeStartModalComponent } from './upgrade-form/upgrade-start-modal.c
 })
 export class UpgradeComponent implements OnInit {
   version: string;
-  upgradeInfo$: Observable<UpgradeInfoInterface>;
-  upgradeInfoError$: Observable<any>;
+  info$: Observable<UpgradeInfoInterface>;
   permission: Permission;
   healthData$: Observable<any>;
+  daemons$: Observable<Daemon[]>;
   fsid$: Observable<any>;
   modalRef: NgbModalRef;
   upgradableVersions: string[];
+  errorMessage: string;
+
+  columns: CdTableColumn[] = [];
 
   icons = Icons;
 
@@ -33,33 +40,72 @@ export class UpgradeComponent implements OnInit {
     private modalService: ModalService,
     private summaryService: SummaryService,
     private upgradeService: UpgradeService,
-    private authStorageService: AuthStorageService,
-    private healthService: HealthService
-  ) {
-    this.permission = this.authStorageService.getPermissions().configOpt;
-  }
+    private healthService: HealthService,
+    private daemonService: DaemonService,
+    private notificationService: NotificationService
+  ) {}
 
   ngOnInit(): void {
+    this.columns = [
+      {
+        name: $localize`Daemon name`,
+        prop: 'daemon_name',
+        flexGrow: 1,
+        filterable: true
+      },
+      {
+        name: $localize`Version`,
+        prop: 'version',
+        flexGrow: 1,
+        filterable: true
+      }
+    ];
+
     this.summaryService.subscribe((summary) => {
       const version = summary.version.replace('ceph version ', '').split('-');
       this.version = version[0];
     });
-    this.upgradeInfo$ = this.upgradeService
-      .list()
-      .pipe(
-        tap((upgradeInfo: UpgradeInfoInterface) => (this.upgradableVersions = upgradeInfo.versions))
-      );
-    this.upgradeInfoError$ = this.upgradeInfo$?.pipe(
-      ignoreElements(),
-      catchError((error) => of(error))
+    this.info$ = this.upgradeService.list().pipe(
+      tap((upgradeInfo: UpgradeInfoInterface) => (this.upgradableVersions = upgradeInfo.versions)),
+      publishReplay(1),
+      refCount(),
+      catchError((err) => {
+        err.preventDefault();
+        this.errorMessage = $localize`Not retrieving upgrades`;
+        this.notificationService.show(
+          NotificationType.error,
+          this.errorMessage,
+          err.error.detail || err.error.message
+        );
+        return of(null);
+      })
     );
     this.healthData$ = this.healthService.getMinimalHealth();
+    this.daemons$ = this.daemonService.list(this.upgradeService.upgradableServiceTypes);
     this.fsid$ = this.healthService.getClusterFsid();
   }
 
   startUpgradeModal() {
     this.modalRef = this.modalService.show(UpgradeStartModalComponent, {
-      versions: this.upgradableVersions.sort()
+      versions: this.upgradableVersions
+    });
+  }
+
+  upgradeNow(version: string) {
+    this.upgradeService.start(version).subscribe({
+      error: (error) => {
+        this.notificationService.show(
+          NotificationType.error,
+          $localize`Failed to start the upgrade`,
+          error
+        );
+      },
+      complete: () => {
+        this.notificationService.show(
+          NotificationType.success,
+          $localize`Started upgrading the cluster`
+        );
+      }
     });
   }
 }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard-v3.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard-v3.module.ts
index 9e1529c3e3794..50db430906e27 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard-v3.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard-v3.module.ts
@@ -9,12 +9,10 @@ import { SimplebarAngularModule } from 'simplebar-angular';
 
 import { SharedModule } from '~/app/shared/shared.module';
 import { CephSharedModule } from '../shared/ceph-shared.module';
-import { CardComponent } from './card/card.component';
 import { DashboardAreaChartComponent } from './dashboard-area-chart/dashboard-area-chart.component';
 import { DashboardPieComponent } from './dashboard-pie/dashboard-pie.component';
 import { DashboardTimeSelectorComponent } from './dashboard-time-selector/dashboard-time-selector.component';
 import { DashboardV3Component } from './dashboard/dashboard-v3.component';
-import { CardRowComponent } from './card-row/card-row.component';
 import { PgSummaryPipe } from './pg-summary.pipe';
 
 @NgModule({
@@ -34,20 +32,12 @@ import { PgSummaryPipe } from './pg-summary.pipe';
 
   declarations: [
     DashboardV3Component,
-    CardComponent,
     DashboardPieComponent,
-    CardRowComponent,
     PgSummaryPipe,
     DashboardAreaChartComponent,
     DashboardTimeSelectorComponent
   ],
 
-  exports: [
-    DashboardV3Component,
-    CardComponent,
-    CardRowComponent,
-    DashboardAreaChartComponent,
-    DashboardTimeSelectorComponent
-  ]
+  exports: [DashboardV3Component, DashboardAreaChartComponent, DashboardTimeSelectorComponent]
 })
 export class DashboardV3Module {}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.spec.ts
index f2f5d0bb50832..c274a2f540677 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/dashboard/dashboard-v3.component.spec.ts
@@ -18,8 +18,6 @@ import { SummaryService } from '~/app/shared/services/summary.service';
 import { SharedModule } from '~/app/shared/shared.module';
 import { configureTestBed } from '~/testing/unit-test-helper';
 import { PgCategoryService } from '../../shared/pg-category.service';
-import { CardRowComponent } from '../card-row/card-row.component';
-import { CardComponent } from '../card/card.component';
 import { DashboardPieComponent } from '../dashboard-pie/dashboard-pie.component';
 import { PgSummaryPipe } from '../pg-summary.pipe';
 import { DashboardV3Component } from './dashboard-v3.component';
@@ -138,13 +136,7 @@ describe('Dashbord Component', () => {
 
   configureTestBed({
     imports: [RouterTestingModule, HttpClientTestingModule, ToastrModule.forRoot(), SharedModule],
-    declarations: [
-      DashboardV3Component,
-      CardComponent,
-      DashboardPieComponent,
-      CardRowComponent,
-      PgSummaryPipe
-    ],
+    declarations: [DashboardV3Component, DashboardPieComponent, PgSummaryPipe],
     schemas: [NO_ERRORS_SCHEMA],
     providers: [
       { provide: SummaryService, useClass: SummaryServiceMock },
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.spec.ts
index f887bcd8224f7..8a2a158f0a3d5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-overview-dashboard/rgw-overview-dashboard.component.spec.ts
@@ -5,8 +5,6 @@ import { of } from 'rxjs';
 import { RgwDaemonService } from '~/app/shared/api/rgw-daemon.service';
 import { RgwDaemon } from '../models/rgw-daemon';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { CardComponent } from '../../dashboard-v3/card/card.component';
-import { CardRowComponent } from '../../dashboard-v3/card-row/card-row.component';
 import { DimlessBinaryPipe } from '~/app/shared/pipes/dimless-binary.pipe';
 import { RgwRealmService } from '~/app/shared/api/rgw-realm.service';
 import { RgwZonegroupService } from '~/app/shared/api/rgw-zonegroup.service';
@@ -14,6 +12,9 @@ import { RgwZoneService } from '~/app/shared/api/rgw-zone.service';
 import { RgwBucketService } from '~/app/shared/api/rgw-bucket.service';
 import { RgwUserService } from '~/app/shared/api/rgw-user.service';
 import { HealthService } from '~/app/shared/api/health.service';
+import { CardRowComponent } from '~/app/shared/components/card-row/card-row.component';
+import { CardComponent } from '~/app/shared/components/card/card.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('RgwOverviewDashboardComponent', () => {
   let component: RgwOverviewDashboardComponent;
@@ -134,6 +135,7 @@ describe('RgwOverviewDashboardComponent', () => {
         CardRowComponent,
         DimlessBinaryPipe
       ],
+      schemas: [NO_ERRORS_SCHEMA],
       imports: [HttpClientTestingModule]
     }).compileComponents();
   });
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/daemon.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/daemon.service.ts
index a66ed7edb1983..0912e693139f5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/daemon.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/daemon.service.ts
@@ -1,7 +1,9 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
 
 import { cdEncode } from '~/app/shared/decorators/cd-encode';
+import { Daemon } from '../models/daemon.interface';
 
 @cdEncode
 @Injectable({
@@ -25,4 +27,10 @@ export class DaemonService {
       }
     );
   }
+
+  list(daemonTypes: string[]): Observable<Daemon[]> {
+    return this.http.get<Daemon[]>(this.url, {
+      params: { daemon_types: daemonTypes }
+    });
+  }
 }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/upgrade.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/upgrade.service.ts
index 6e713ae512299..8421fc57f37c9 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/upgrade.service.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/upgrade.service.ts
@@ -11,6 +11,19 @@ import { UpgradeInfoInterface } from '../models/upgrade.interface';
 export class UpgradeService extends ApiClient {
   baseURL = 'api/cluster/upgrade';
 
+  upgradableServiceTypes = [
+    'mgr',
+    'mon',
+    'crash',
+    'osd',
+    'mds',
+    'rgw',
+    'rbd-mirror',
+    'cephfs-mirror',
+    'iscsi',
+    'nfs'
+  ];
+
   constructor(private http: HttpClient, private summaryService: SummaryService) {
     super();
   }
@@ -38,7 +51,7 @@ export class UpgradeService extends ApiClient {
         cVersion[0] === tVersion[0] && (cVersion[1] < tVersion[1] || cVersion[2] < tVersion[2])
       );
     });
-    upgradeInfo.versions = upgradableVersions;
+    upgradeInfo.versions = upgradableVersions.sort();
     return upgradeInfo;
   }
 
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.html
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.html
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.scss
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.scss
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.spec.ts
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.spec.ts
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.spec.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.ts
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card-row/card-row.component.ts
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card-row/card-row.component.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.html
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.html
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.scss
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.scss
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.scss
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.spec.ts
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.spec.ts
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.spec.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.ts
similarity index 100%
rename from src/pybind/mgr/dashboard/frontend/src/app/ceph/dashboard-v3/card/card.component.ts
rename to src/pybind/mgr/dashboard/frontend/src/app/shared/components/card/card.component.ts
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
index 5350e2bd50b00..17f418d1e148f 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/components.module.ts
@@ -49,6 +49,8 @@ import { SubmitButtonComponent } from './submit-button/submit-button.component';
 import { TelemetryNotificationComponent } from './telemetry-notification/telemetry-notification.component';
 import { UsageBarComponent } from './usage-bar/usage-bar.component';
 import { WizardComponent } from './wizard/wizard.component';
+import { CardComponent } from './card/card.component';
+import { CardRowComponent } from './card-row/card-row.component';
 
 @NgModule({
   imports: [
@@ -101,7 +103,9 @@ import { WizardComponent } from './wizard/wizard.component';
     WizardComponent,
     CustomLoginBannerComponent,
     CdLabelComponent,
-    ColorClassFromTextPipe
+    ColorClassFromTextPipe,
+    CardComponent,
+    CardRowComponent
   ],
   providers: [],
   exports: [
@@ -131,7 +135,9 @@ import { WizardComponent } from './wizard/wizard.component';
     MotdComponent,
     WizardComponent,
     CustomLoginBannerComponent,
-    CdLabelComponent
+    CdLabelComponent,
+    CardComponent,
+    CardRowComponent
   ]
 })
 export class ComponentsModule {}
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
index 1b5e6db946df8..6e39f4bff138e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
@@ -37,6 +37,7 @@ import { CdTableSelection } from '~/app/shared/models/cd-table-selection';
 import { CdUserConfig } from '~/app/shared/models/cd-user-config';
 import { TimerService } from '~/app/shared/services/timer.service';
 
+const TABLE_LIST_LIMIT = 10;
 @Component({
   selector: 'cd-table',
   templateUrl: './table.component.html',
@@ -104,7 +105,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O
   footer? = true;
   // Page size to show. Set to 0 to show unlimited number of rows.
   @Input()
-  limit? = 10;
+  limit? = TABLE_LIST_LIMIT;
   @Input()
   maxLimit? = 9999;
   // Has the row details?
@@ -343,7 +344,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O
       this._loadUserConfig();
       this._initUserConfigAutoSave();
     }
-    if (!this.userConfig.limit) {
+    if (this.limit !== TABLE_LIST_LIMIT || !this.userConfig.limit) {
       this.userConfig.limit = this.limit;
     }
     if (!(this.userConfig.offset >= 0)) {
diff --git a/src/pybind/mgr/dashboard/openapi.yaml b/src/pybind/mgr/dashboard/openapi.yaml
index 23e00468369b6..8afa6a4ba9e93 100644
--- a/src/pybind/mgr/dashboard/openapi.yaml
+++ b/src/pybind/mgr/dashboard/openapi.yaml
@@ -3183,6 +3183,37 @@ paths:
       - jwt: []
       tags:
       - CrushRule
+  /api/daemon:
+    get:
+      description: "List all daemons in the cluster. Also filter by the daemon types\
+        \ specified\n\n        :param daemon_types: List of daemon types to filter\
+        \ by.\n        :return: Returns list of daemons.\n        :rtype: list\n \
+        \       "
+      parameters:
+      - allowEmptyValue: true
+        in: query
+        name: daemon_types
+        schema:
+          type: string
+      responses:
+        '200':
+          content:
+            application/vnd.ceph.api.v1.0+json:
+              type: object
+          description: OK
+        '400':
+          description: Operation exception. Please check the response body for details.
+        '401':
+          description: Unauthenticated access. Please login first.
+        '403':
+          description: Unauthorized access. Please check your permissions.
+        '500':
+          description: Unexpected error. Please check the response body for the stack
+            trace.
+      security:
+      - jwt: []
+      tags:
+      - Daemon
   /api/daemon/{daemon_name}:
     put:
       parameters:
diff --git a/src/pybind/mgr/dashboard/tests/test_daemon.py b/src/pybind/mgr/dashboard/tests/test_daemon.py
index 2008c8630f51d..4ba23866d076a 100644
--- a/src/pybind/mgr/dashboard/tests/test_daemon.py
+++ b/src/pybind/mgr/dashboard/tests/test_daemon.py
@@ -39,3 +39,8 @@ class DaemonTest(ControllerTestCase):
                 'component': None
             })
             self.assertStatus(400)
+
+    def test_daemon_list(self):
+        with patch_orch(True):
+            self._get(f'{self.URL_DAEMON}')
+            self.assertStatus(200)
-- 
2.39.5