0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implements #610 (#673)

Browse source
This commit is contained in:
Roman Zabaluev 2021-07-14 11:08:42 +03:00 • committed by GitHub
parent 587e08ab01
commit 9b6952c480
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 82 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalClusterMetrics.java
View file

@ -27,4 +27,5 @@ public class InternalClusterMetrics {
private final Map<Integer, InternalBrokerMetrics> internalBrokerMetrics;
private final List<Metric> metrics;
private final int zooKeeperStatus;
private final String version;
}

1
kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/KafkaService.java
View file

@ -159,6 +159,7 @@ public class KafkaService {
.onlinePartitionCount(topicsMetrics.getOnlinePartitionCount())
.offlinePartitionCount(topicsMetrics.getOfflinePartitionCount())
.zooKeeperStatus(ClusterUtil.convertToIntServerStatus(zookeeperStatus))
.version(version)
.build();
return currentCluster.toBuilder()

2
kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
View file

@ -1417,6 +1417,8 @@ components:
type: array
items:
$ref: '#/components/schemas/BrokerDiskUsage'
version:
type: string
BrokerDiskUsage:
type: object

4
kafka-ui-react-app/src/components/Brokers/Brokers.tsx
View file

@ -27,6 +27,7 @@ const Brokers: React.FC<Props> = ({
diskUsage,
fetchClusterStats,
fetchBrokers,
version,
}) => {
const { clusterName } = useParams<{ clusterName: ClusterName }>();
@ -56,6 +57,9 @@ const Brokers: React.FC<Props> = ({
{zkOnline ? 'Online' : 'Offline'}
</span>
</Indicator>
<Indicator className="is-one-third" label="Version">
{version}
</Indicator>
</MetricsWrapper>
<MetricsWrapper title="Partitions">
<Indicator label="Online">

2
kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts
View file

@ -12,6 +12,7 @@ import {
getOutOfSyncReplicasCount,
getUnderReplicatedPartitionCount,
getDiskUsage,
getVersion,
} from 'redux/reducers/brokers/selectors';
import Brokers from 'components/Brokers/Brokers';
@ -26,6 +27,7 @@ const mapStateToProps = (state: RootState) => ({
outOfSyncReplicasCount: getOutOfSyncReplicasCount(state),
underReplicatedPartitionCount: getUnderReplicatedPartitionCount(state),
diskUsage: getDiskUsage(state),
version: getVersion(state),
});
const mapDispatchToProps = {

2
kafka-ui-react-app/src/components/Brokers/__test__/Brokers.spec.tsx
View file

@ -26,6 +26,7 @@ describe('Brokers Component', () => {
inSyncReplicasCount={0}
outOfSyncReplicasCount={0}
underReplicatedPartitionCount={0}
version="1"
fetchClusterStats={jest.fn()}
fetchBrokers={jest.fn()}
diskUsage={undefined}
@ -61,6 +62,7 @@ describe('Brokers Component', () => {
inSyncReplicasCount={64}
outOfSyncReplicasCount={0}
underReplicatedPartitionCount={0}
version="1"
fetchClusterStats={jest.fn()}
fetchBrokers={jest.fn()}
diskUsage={[

48
kafka-ui-react-app/src/components/Brokers/__test__/__snapshots__/Brokers.spec.tsx.snap
View file

@ -69,6 +69,7 @@ exports[`Brokers Component Brokers Empty matches Brokers Empty snapshot 1`] = `
onlinePartitionCount={0}
outOfSyncReplicasCount={0}
underReplicatedPartitionCount={0}
version="1"
zooKeeperStatus={0}
>
<div
@ -179,6 +180,29 @@ exports[`Brokers Component Brokers Empty matches Brokers Empty snapshot 1`] = `
</div>
</div>
</Indicator>
<Indicator
className="is-one-third"
label="Version"
>
<div
className="level-item is-one-third"
>
<div
title="Version"
>
<p
className="heading"
>
Version
</p>
<p
className="title has-text-centered"
>
1
</p>
</div>
</div>
</Indicator>
</div>
</div>
</MetricsWrapper>
@ -400,6 +424,7 @@ exports[`Brokers Component Brokers matches snapshot 1`] = `
onlinePartitionCount={64}
outOfSyncReplicasCount={0}
underReplicatedPartitionCount={0}
version="1"
zooKeeperStatus={1}
>
<div
@ -510,6 +535,29 @@ exports[`Brokers Component Brokers matches snapshot 1`] = `
</div>
</div>
</Indicator>
<Indicator
className="is-one-third"
label="Version"
>
<div
className="level-item is-one-third"
>
<div
title="Version"
>
<p
className="heading"
>
Version
</p>
<p
className="title has-text-centered"
>
1
</p>
</div>
</div>
</Indicator>
</div>
</div>
</MetricsWrapper>

5
kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClusterWidget.tsx
View file

@ -18,6 +18,7 @@ const ClusterWidget: React.FC<ClusterWidgetProps> = ({
bytesOutPerSec,
onlinePartitionCount,
readOnly,
version,
},
}) => (
<div className="column is-full-modile is-6">
@ -38,6 +39,10 @@ const ClusterWidget: React.FC<ClusterWidgetProps> = ({
<table className="table is-fullwidth">
<tbody>
<tr>
<th>Version</th>
<td>{version}</td>
</tr>
<tr>
<th>Brokers</th>
<td>

12
kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/__snapshots__/ClusterWidget.spec.tsx.snap
View file

@ -21,6 +21,12 @@ exports[`ClusterWidget when cluster is offline matches snapshot 1`] = `
className="table is-fullwidth"
>
<tbody>
<tr>
<th>
Version
</th>
<td />
</tr>
<tr>
<th>
Brokers
@ -100,6 +106,12 @@ exports[`ClusterWidget when cluster is online matches snapshot 1`] = `
className="table is-fullwidth"
>
<tbody>
<tr>
<th>
Version
</th>
<td />
</tr>
<tr>
<th>
Brokers

5
kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts
View file

@ -48,3 +48,8 @@ export const getDiskUsage = createSelector(
brokersState,
({ diskUsage }) => diskUsage
);
export const getVersion = createSelector(
brokersState,
({ version }) => version
);