mgr/dashboard: fix service/daemon events not showing up in service

details

There are no events under "Service events" and "daemon events" columns , even if we start, stop, reconfig service or daemon. But for that service and daemon, there are events in CLI output
This PR intends to fix this issue

Fixes: https://tracker.ceph.com/issues/69575
Signed-off-by: Aashish Sharma <aasharma@redhat.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html
index 8fe4e9da8a3b5f07469c2c77c0f644b261845d9d..7ef576d4626baf0dfd091722ac9869039de3d86b 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.html
@@ -44,7 +44,7 @@
 </ng-template>
 
 <ng-template #listTpl
-             let-events="value">
+             let-events="data.value">
   <ul class="list-group list-group-flush"
       *ngIf="events?.length else noEventsAvailable">
     <li class="list-group-item"
@@ -63,8 +63,7 @@
     </li>
   </ul>
   <ng-template #noEventsAvailable>
-    <div *ngIf="events?.length === 0"
-         class="list-group-item">
+    <div class="list-group-item">
       <span>No data available</span>
     </div>
   </ng-template>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts
index c626e4785122db33918bf43235ec97f66db7224e..a41d902dd10de257ea1bb1a4dc6db5f4772efed3 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/services/service-daemon-list/service-daemon-list.component.ts
@@ -189,18 +189,6 @@ export class ServiceDaemonListComponent implements OnInit, OnChanges, AfterViewI
     ];
 
     this.serviceColumns = [
-      {
-        name: $localize`Service Name`,
-        prop: 'service_name',
-        flexGrow: 2,
-        filterable: true
-      },
-      {
-        name: $localize`Service Type`,
-        prop: 'service_type',
-        flexGrow: 1,
-        filterable: true
-      },
       {
         name: $localize`Service Events`,
         prop: 'events',