From: Kiefer Chang <kiefer.chang@suse.com>
Date: Fri, 31 May 2019 07:28:25 +0000 (+0800)
Subject: mgr/dashboard: fix MDS charts are stacked in Filesystems page
X-Git-Tag: v13.2.7~228^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=068b0956e35220e3de67f3ff4587acf9346932a6;p=ceph.git

mgr/dashboard: fix MDS charts are stacked in Filesystems page

Also include some UI enhancements:
- Fix MDS chart container is not aligned to other components.
- Show header on client table.

Fixes: https://tracker.ceph.com/issues/37579

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit a3e76ac5f5cf56f830fd2ae9d2e2ac4585195fc2)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-clients/cephfs-clients.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-detail/cephfs-detail.component.html

files above are renamed, their paths in mimic are:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss
index 62a023b9aaf..81457a14708 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.scss
@@ -1,6 +1,8 @@
 @import '../../../../styles/chart-tooltip.scss';
 
 .chart-container {
+  position: relative;
   height: 500px;
   width: 100%;
+  margin-bottom: 20px;
 }
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
index 39a03890add..51a3275780e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
@@ -68,6 +68,10 @@ export class CephfsChartComponent implements OnChanges, OnInit {
         }
       ],
       options: {
+        title: {
+          text: this.mdsCounter.name,
+          display: true
+        },
         responsive: true,
         maintainAspectRatio: false,
         legend: {
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
index f2ee88d2fb4..6f0337bdf15 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs/cephfs.component.html
@@ -42,9 +42,10 @@
   </div>
 </div>
 
+<legend i18n>MDS performance counters</legend>
 <div class="row"
      *ngFor="let mdsCounter of objectValues(mdsCounters); trackBy: trackByFn">
-  <div class="cold-md-12">
+  <div class="col-md-12">
     <cd-cephfs-chart [mdsCounter]="mdsCounter"></cd-cephfs-chart>
   </div>
 </div>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
index fe8f9f5b7ef..8cec3b81316 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/clients/clients.component.html
@@ -15,6 +15,5 @@
 
 <cd-table [data]="clients.data"
           [columns]="clients.columns"
-          (fetchData)="refresh()"
-          [header]="false">
+          (fetchData)="refresh()">
 </cd-table>