Skip to content

HDDS-11545. [UI] Add OM and SCM ID information #7287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dombizita merged 2 commits into from
Oct 16, 2024
Merged

HDDS-11545. [UI] Add OM and SCM ID information #7287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c7d0ae
HDDS-11545. Added OM ID and SCM ID information
devabhishekpal Oct 8, 2024
32d2ee6
Added css changes
devabhishekpal Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/src/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,9 @@ body {

.pointer {
cursor: pointer;
}

.data-container {
padding: 24px;
height: 80vh;
}
2 changes: 1 addition & 1 deletion ...e/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/buckets/buckets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ const Buckets: React.FC<{}> = () => {
onReload={loadData}
/>
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<div className='content-div'>
<div className='table-header-section'>
<div className='table-filter-section'>
Expand Down
2 changes: 1 addition & 1 deletion ...con/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/datanodes/datanodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ const Datanodes: React.FC<{}> = () => {
togglePolling={autoReloadHelper.handleAutoReloadToggle}
onReload={loadData} />
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<div className='content-div'>
<div className='table-header-section'>
<div className='table-filter-section'>
Expand Down
2 changes: 1 addition & 1 deletion ...con/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/diskUsage/diskUsage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const DiskUsage: React.FC<{}> = () => {
<div className='page-header-v2'>
Disk Usage
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<Alert
className='du-alert-message'
message="Additional block size is added to small entities, for better visibility.
Expand Down
15 changes: 12 additions & 3 deletions ...recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/overview/overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ const Overview: React.FC<{}> = () => {
deletePendingSummarytotalUnrepSize: deletePendingResponse?.value?.data?.totalUnreplicatedDataSize,
deletePendingSummarytotalRepSize: deletePendingResponse?.value?.data?.totalReplicatedDataSize,
deletePendingSummarytotalDeletedKeys: deletePendingResponse?.value?.data?.totalDeletedKeys,
scmServiceId: clusterState?.scmServiceId,
omServiceId: clusterState?.omServiceId
scmServiceId: clusterState?.scmServiceId ?? 'N/A',
omServiceId: clusterState?.omServiceId ?? 'N/A'
});
setStorageReport({
...storageReport,
Expand Down Expand Up @@ -345,7 +345,7 @@ const Overview: React.FC<{}> = () => {
lastUpdatedOMDBDelta={lastUpdatedOMDBDelta} lastUpdatedOMDBFull={lastUpdatedOMDBFull}
togglePolling={autoReloadHelper.handleAutoReloadToggle} onReload={loadOverviewPageData} omSyncLoad={syncOmData} omStatus={omStatus} />
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<Row
align='stretch'
gutter={[
Expand Down Expand Up @@ -534,6 +534,15 @@ const Overview: React.FC<{}> = () => {
linkToUrl='/Om' />
</Col>
</Row>
<span style={{ paddingLeft: '8px' }}>
<span style={{ color: '#6E6E6E' }}>OM ID:&nbsp;</span>
{omServiceId}
</span>
<span style={{ marginLeft: '12px', marginRight: '12px' }}> | </span>
<span>
<span style={{ color: '#6E6E6E' }}>SCM ID:&nbsp;</span>
{scmServiceId}
</span>
</div>
</>
);
Expand Down
2 changes: 1 addition & 1 deletion ...con/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/pipelines/pipelines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ const Pipelines: React.FC<{}> = () => {
togglePolling={autoReloadHelper.handleAutoReloadToggle}
onReload={loadData} />
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<div className='content-div'>
<div className='table-header-section'>
<div className='table-filter-section'>
Expand Down
2 changes: 1 addition & 1 deletion ...e/recon/src/main/resources/webapps/recon/ozone-recon-web/src/v2/pages/volumes/volumes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ const Volumes: React.FC<{}> = () => {
onReload={loadData}
/>
</div>
<div style={{ padding: '24px' }}>
<div className='data-container'>
<div className='content-div'>
<div className='table-header-section'>
<div className='table-filter-section'>
Expand Down