From 550762ed872871ca63c44c68fca66ea74bea0cc4 Mon Sep 17 00:00:00 2001
From: nSedrickm <nsedrick101@gmail.com>
Date: Mon, 27 Apr 2020 21:04:37 +0100
Subject: [PATCH] mgr/dashboard: increase Grafana iframe height to avoid scroll
 bar

Add Grafana component style four with height 1160px
Fixes : https://tracker.ceph.com/issues/44966
Signed-off-by: Ngwa Sedrick Meh <nsedrick101@gmail.com>
---
 .../cluster/hosts/host-details/host-details.component.html    | 2 +-
 .../ceph/cluster/osd/osd-details/osd-details.component.html   | 2 +-
 .../src/app/ceph/cluster/osd/osd-list/osd-list.component.html | 2 +-
 .../app/ceph/pool/pool-details/pool-details.component.html    | 2 +-
 .../src/app/shared/components/grafana/grafana.component.scss  | 4 ++++
 .../src/app/shared/components/grafana/grafana.component.ts    | 3 ++-
 6 files changed, 10 insertions(+), 5 deletions(-)

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 fa4ce2f26e8f..79dd6daf6683 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
@@ -34,7 +34,7 @@
       <ng-template ngbNavContent>
         <cd-grafana [grafanaPath]="'host-details?var-ceph_hosts=' + selectedHostname"
                     uid="rtOg0AiWz"
-                    grafanaStyle="three">
+                    grafanaStyle="four">
         </cd-grafana>
       </ng-template>
     </li>
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 bca3f7407156..78fb16762cb3 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
@@ -80,7 +80,7 @@
       <ng-template ngbNavContent>
         <cd-grafana [grafanaPath]="'osd-device-details?var-osd=osd.' + osd['id']"
                     uid="CrAHE0iZz"
-                    grafanaStyle="GrafanaStyles.two">
+                    grafanaStyle="three">
         </cd-grafana>
       </ng-template>
     </li>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
index 81e1890e7a30..c8111e02612e 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
@@ -45,7 +45,7 @@
     <ng-template ngbNavContent>
       <cd-grafana [grafanaPath]="'osd-overview?'"
                   uid="lo02I1Aiz"
-                  grafanaStyle="three">
+                  grafanaStyle="four">
       </cd-grafana>
     </ng-template>
   </li>
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 7492ddde6079..c2c6513888e7 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
@@ -21,7 +21,7 @@
       <ng-template ngbNavContent>
         <cd-grafana [grafanaPath]="'ceph-pool-detail?var-pool_name='+ selection['pool_name']"
                     uid="-xyV8KCiz"
-                    grafanaStyle="one">
+                    grafanaStyle="three">
         </cd-grafana>
       </ng-template>
     </li>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.scss b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.scss
index bdb90ff7b723..7b43a460ff42 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.scss
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.scss
@@ -16,6 +16,10 @@
   height: 900px;
 }
 
+.grafana_four {
+  height: 1160px;
+}
+
 .timepicker {
   label {
     font-weight: 700;
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
index 18649d48870c..7f341a636635 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/components/grafana/grafana.component.ts
@@ -164,7 +164,8 @@ export class GrafanaComponent implements OnInit, OnChanges {
     this.styles = {
       one: 'grafana_one',
       two: 'grafana_two',
-      three: 'grafana_three'
+      three: 'grafana_three',
+      four: 'grafana_four'
     };
 
     this.settingsService.ifSettingConfigured('api/grafana/url', (url) => {
-- 
2.47.3