mgr/dashboard: Add performance counters breadcrumb

Fixes: https://tracker.ceph.com/issues/23806
Signed-off-by: Ricardo Marques <rimarques@suse.com>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts
index de18f7924868933a25f2e3c469b9d3744ea5c6fc..d66e7ff6e7be769198decee04b60581eef2e7be2 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/monitor/monitor.component.ts
@@ -50,11 +50,13 @@ export class MonitorComponent {
       data.in_quorum.map((row) => {
         row.cdOpenSessions = row.stats.num_sessions.map(i => i[1]);
         row.cdLink = '/perf_counters/mon/' + row.name;
+        row.cdParams = {fromLink: '/monitor'};
         return row;
       });
 
       data.out_quorum.map((row) => {
         row.cdLink = '/perf_counters/mon/' + row.name;
+        row.cdParams = {fromLink: '/monitor'};
         return row;
       });
 

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
index ebb9ba93d62fdd48380d2a0fd14540c15b97d394..615228b7e68b29a8da864607aa49611946a3d699 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.html
@@ -1,6 +1,19 @@
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item">Cluster</li>
+    <li class="breadcrumb-item">
+      <a [routerLink]="fromLink">
+        <span *ngIf="fromLink === '/monitor'">Monitors</span>
+        <span *ngIf="fromLink === '/hosts'">Hosts</span>
+      </a>
+    </li>
+    <li class="breadcrumb-item active"
+        i18n>Performance Counters</li>
+  </ol>
+</nav>
+
 <fieldset>
-  <legend i18n>Performance Counters</legend>
-  <h3>{{ serviceType }}.{{ serviceId }}</h3>
+  <legend>{{ serviceType }}.{{ serviceId }}</legend>
   <cd-table-performance-counter [serviceType]="serviceType"
                                 [serviceId]="serviceId">
   </cd-table-performance-counter>

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts
index 06f5a9270ac45001fc792d999e971e489d9c0cd2..40287758b71bcd58265ec0a5396f505059302f7c 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/performance-counter/performance-counter/performance-counter.component.ts
@@ -7,10 +7,19 @@ import { ActivatedRoute } from '@angular/router';
   styleUrls: ['./performance-counter.component.scss']
 })
 export class PerformanceCounterComponent {
+
+  static defaultFromLink = '/hosts';
+
   serviceId: string;
   serviceType: string;
+  fromLink: string;
 
   constructor(private route: ActivatedRoute) {
+    this.route.queryParams.subscribe(
+      (params: { fromLink: string }) => {
+        this.fromLink = params.fromLink || PerformanceCounterComponent.defaultFromLink;
+      }
+    );
     this.route.params.subscribe(
       (params: { type: string; id: string }) => {
         this.serviceId = params.id;