Skip to content

Commit da63a78

Browse files
authored
Merge pull request ceph#64698 from rhcs-dashboard/72044-make-grafana-iframe-scrollable-and-height-consistent
mgr/dashboard: Made expandable table row height consistent across the cluster
2 parents 7aa89a7 + 6436170 commit da63a78

File tree

23 files changed

+69
-33
lines changed

23 files changed

+69
-33
lines changed

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-list/cephfs-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
[type]="'metrics'"
6262
uid="718Bruins"
6363
*ngIf="permissions.grafana.read"
64-
grafanaStyle="two"
64+
grafanaStyle="three"
6565
>
6666
</cd-grafana>
6767
</ng-template>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-tabs/cephfs-tabs.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
[grafanaPath]="'ceph-filesystem-overview?var-name=' + details.name"
8989
[type]="'metrics'"
9090
uid="718Bruins"
91-
grafanaStyle="one"
91+
grafanaStyle="five"
92+
scrollable="no"
9293
>
9394
</cd-grafana>
9495
</ng-template>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/hosts/host-details/host-details.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
[grafanaPath]="'host-details?var-ceph_hosts=' + selectedHostname"
4040
[type]="'metrics'"
4141
uid="rtOg0AiWz"
42-
grafanaStyle="four">
42+
grafanaStyle="five">
4343
</cd-grafana>
4444
</ng-template>
4545
</ng-container>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-details/osd-details.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
[grafanaPath]="'osd-device-details?var-osd=osd.' + osd['id']"
6363
[type]="'metrics'"
6464
uid="CrAHE0iZz"
65+
scrollable="no"
6566
grafanaStyle="three">
6667
</cd-grafana>
6768
</ng-template>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
[grafanaPath]="'osd-overview?'"
5151
[type]="'metrics'"
5252
uid="lo02I1Aiz"
53-
grafanaStyle="four">
53+
grafanaStyle="three">
5454
</cd-grafana>
5555
</ng-template>
5656
</ng-container>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade-progress/upgrade-progress.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
[showFilterTools]="false"
4444
[showDownloadCopyButton]="false"
4545
defaultTab="cluster-logs"
46-
[scrollable]="true"></cd-logs>
46+
></cd-logs>

src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/upgrade/upgrade.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ <h5>
130130
[showNavLinks]="false"
131131
[showFilterTools]="false"
132132
[showDownloadCopyButton]="false"
133-
defaultTab="cluster-logs"
134-
[scrollable]="true"></cd-logs>
133+
defaultTab="cluster-logs"></cd-logs>
135134

136135

137136
<ng-template #upgradeStatusTpl>

src/pybind/mgr/dashboard/frontend/src/app/ceph/pool/pool-list/pool-list.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[grafanaPath]="'ceph-pools-overview?'"
4343
[type]="'metrics'"
4444
uid="z99hzWtmk"
45-
grafanaStyle="two">
45+
grafanaStyle="three">
4646
</cd-grafana>
4747
</ng-template>
4848
</ng-container>

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<a ngbNavLink
137137
i18n>Policies</a>
138138
<ng-template ngbNavContent>
139-
<div class="table-scroller">
139+
<div>
140140
<table class="cds--data-table--sort cds--data-table--no-border cds--data-table cds--data-table--md">
141141
<tbody>
142142
<tr>

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-details/rgw-bucket-details.component.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ table td {
88
word-wrap: break-word;
99
}
1010

11-
.table-scroller {
12-
height: 100%;
13-
max-height: 50vh;
14-
overflow: auto;
15-
}
16-
1711
.spacing-left {
1812
margin-left: layout.$spacing-03;
1913
}

0 commit comments

Comments
 (0)