From eafeabac63135421b1394a36c8f2ac2c37a0c0ab Mon Sep 17 00:00:00 2001
From: Kiefer Chang <kiefer.chang@suse.com>
Date: Mon, 20 May 2019 14:18:32 +0800
Subject: [PATCH] mgr/dashboard: fix some performance data are not displayed

Several Grafana dashboards were updated and their uids are changed.
Update corresponding uids in angular templates. Also fix that when a user
clicks performance details of an OSD, wrong OSD metrics are displayed.

Fixes: http://tracker.ceph.com/issues/39971
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit acf90c5512678c43b4424d592c2212e4f45d3c0c)
---
 .../ceph/cephfs/cephfs-detail/cephfs-detail.component.html    | 2 +-
 .../cluster/hosts/host-details/host-details.component.html    | 2 +-
 .../frontend/src/app/ceph/cluster/hosts/hosts.component.html  | 2 +-
 .../ceph/cluster/osd/osd-details/osd-details.component.html   | 4 ++--
 .../app/ceph/pool/pool-details/pool-details.component.html    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
index a4848790b58da..81ae6060849bd 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html
@@ -44,7 +44,7 @@
        *ngIf="grafanaPermission.read"
        heading="Performance Details">
     <cd-grafana [grafanaPath]="'mds-performance?var-mds_servers=mds.' + grafanaId"
-                uid="rRfFzWtik"
+                uid="tbO9LAiZz"
                 grafanaStyle="one">
     </cd-grafana>
   </tab>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
index 7e1aa38a82bb5..005a87497a658 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
@@ -2,7 +2,7 @@
   <tab i18n-heading
        heading="Performance Details">
     <cd-grafana [grafanaPath]="'host-details?var-ceph_hosts=' + host['hostname']"
-                uid="7IGu2Ttmz"
+                uid="rtOg0AiWz"
                 grafanaStyle="three">
     </cd-grafana>
   </tab>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
index b0eb93470f8c6..39dcedb313ed5 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/hosts.component.html
@@ -28,7 +28,7 @@
        *ngIf="permissions.grafana.read"
        heading="Overall Performance">
     <cd-grafana [grafanaPath]="'host-overview?'"
-                uid="lxnjcTAmk"
+                uid="y0KGL0iZz"
                 grafanaStyle="two">
     </cd-grafana>
   </tab>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
index ba2c34cfda467..defec482623ca 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
@@ -44,8 +44,8 @@
   <tab i18n-heading
        *ngIf="grafanaPermission.read"
        heading="Performance Details">
-    <cd-grafana [grafanaPath]="'osd-device-details?var-osd_id=' + osd['id']"
-                uid="MKj_9ipiz"
+    <cd-grafana [grafanaPath]="'osd-device-details?var-osd=osd.' + osd['id']"
+                uid="CrAHE0iZz"
                 grafanaStyle="GrafanaStyles.two">
     </cd-grafana>
   </tab>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.html
index 7c1b1b5f9e951..5fd9edbad3b9d 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.html
@@ -13,7 +13,7 @@
        heading="Performance Details">
     <cd-grafana [grafanaPath]="'ceph-pool-detail?var-pool_name='
                 + selection.first()['pool_name']"
-                uid="8ypfkWpik"
+                uid="-xyV8KCiz"
                 grafanaStyle="one">
     </cd-grafana>
   </tab>
-- 
2.39.5