From a157907d789f344d41873e42d6742aabd854ffb9 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>
(cherry picked from commit 550762ed872871ca63c44c68fca66ea74bea0cc4)

Conflicts:
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html
	src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-details/pool-details.component.html
- We are still using the tabset style in octopus, while we use the ngbNav directive in master;
  Also there are some more tabs in master vs. octopus which are not related to this PR and thus
  are not included
---
 .../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 ef072c8af6808..13edafb0ef1b4 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
@@ -19,7 +19,7 @@
        *ngIf="permissions.grafana.read">
     <cd-grafana [grafanaPath]="'host-details?var-ceph_hosts=' + selectedHostname"
                 uid="rtOg0AiWz"
-                grafanaStyle="three">
+                grafanaStyle="four">
     </cd-grafana>
   </tab>
   <tab heading="Device health"
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 3769577cb3786..3d9183814e192 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
@@ -62,7 +62,7 @@
        heading="Performance Details">
     <cd-grafana [grafanaPath]="'osd-device-details?var-osd=osd.' + osd['id']"
                 uid="CrAHE0iZz"
-                grafanaStyle="GrafanaStyles.two">
+                grafanaStyle="three">
     </cd-grafana>
   </tab>
 
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 84faaf14eef55..bc1bc78dc23a6 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
@@ -44,7 +44,7 @@
        heading="Overall Performance">
     <cd-grafana [grafanaPath]="'osd-overview?'"
                 uid="lo02I1Aiz"
-                grafanaStyle="three">
+                grafanaStyle="four">
     </cd-grafana>
   </tab>
 </tabset>
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 a1515e02b7840..5dc26d94dbc72 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
@@ -14,7 +14,7 @@
     <cd-grafana [grafanaPath]="'ceph-pool-detail?var-pool_name='
                 + selection['pool_name']"
                 uid="-xyV8KCiz"
-                grafanaStyle="one">
+                grafanaStyle="three">
     </cd-grafana>
   </tab>
   <tab *ngIf="selection.type === 'replicated'"
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 9a095d7e9bad3..63860a7f84942 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 7d8c49095bdc9..94f41a8d43f7b 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
@@ -154,7 +154,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.39.5