mgr/dashboard: fix upgrade's cluster alerts popover

keep the legacy view so that it shows the alert types when opening the
popover

Fixes: https://tracker.ceph.com/issues/73733
Signed-off-by: Nizamudeen A <nia@redhat.com>

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 04bedd508e590eb9bbef3205f39d84ddc771466f..d1a84b68f2b573fdc3386c125464d430ac1d36fe 100644 (file)
--- 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
@@ -59,7 +59,8 @@
             </div>
             <div cdsToggletipContent>
               <div class="cds--popover-scroll-container">
-                <cd-health-checks [healthData]="healthData.health.checks"></cd-health-checks>
+                <cd-health-checks [healthData]="healthData.health.checks"
+                                  [legacyHealthChecks]="true"></cd-health-checks>
               </div>
             </div>
           </cds-toggletip>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
index cd1105e1284c4bf3b6aa04615ba2e0cb41f23034..c33632ebfac18c98dcaccc32576fe336769ee34a 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.html
@@ -7,6 +7,11 @@
   <li *ngFor="let check of healthData |  keyvalue">
     <span [ngStyle]="check.value.severity | healthColor"
           [class.health-warn-description]="check.value.severity === 'HEALTH_WARN'">
-    {{ check.key }}</span>: {{ check.value.summary.message }} <br>
+    @if (legacyHealthChecks) {
+    {{ check.value.type }}
+    } @else {
+    {{ check.key }}
+    }
+  </span>: {{ check.value.summary.message }} <br>
   </li>
 </ul>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
index 6c047bc4b781d21f63bf405176285154af42e8dd..1bf84902f0edb998757178c00457b7100fc4b3d5 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/shared/health-checks/health-checks.component.ts
@@ -12,6 +12,9 @@ export class HealthChecksComponent {
   @Input()
   healthData: any;
 
+  @Input()
+  legacyHealthChecks = false;
+
   icons = Icons;
 
   permissions: Permissions;