From: Tiago Melo <tmelo@suse.com>
Date: Fri, 23 Feb 2018 15:35:48 +0000 (+0000)
Subject: mgr/dashboard_v2: enable rbd-mirror perf counters
X-Git-Tag: v13.0.2~84^2~17
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53c65ea29242c143f73c1905ca7f96ef1abb6ad4;p=ceph.git

mgr/dashboard_v2: enable rbd-mirror perf counters

Signed-off-by: Tiago Melo <tmelo@suse.com>
---

diff --git a/src/pybind/mgr/dashboard_v2/controllers/perf_counters.py b/src/pybind/mgr/dashboard_v2/controllers/perf_counters.py
index ee957a20d9db..70b78e4b5592 100644
--- a/src/pybind/mgr/dashboard_v2/controllers/perf_counters.py
+++ b/src/pybind/mgr/dashboard_v2/controllers/perf_counters.py
@@ -57,6 +57,7 @@ class PerfCounters(RESTController):
         self.mon = PerfCounter('mon', self.mgr)
         self.osd = PerfCounter('osd', self.mgr)
         self.rgw = PerfCounter('rgw', self.mgr)
+        self.rbd_mirror = PerfCounter('rbd-mirror', self.mgr)
 
     def list(self):
         counters = self.mgr.get_all_perf_counters()
diff --git a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts b/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts
index 2f6ecf3e16d9..45a80ff0ce82 100644
--- a/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts
+++ b/src/pybind/mgr/dashboard_v2/frontend/src/app/ceph/performance-counter/services/table-performance-counter.service.ts
@@ -17,7 +17,9 @@ export class TablePerformanceCounterService {
   }
 
   get(service_type: string, service_id: string) {
-    return this.http.get(`${this.url}/${service_type}/${service_id}`)
+    const serviceType = service_type.replace('-', '_');
+
+    return this.http.get(`${this.url}/${serviceType}/${service_id}`)
       .toPromise()
       .then((resp: object): Array<object> => {
         return resp['counters'];