From 7b151d50ca2f57cd3f405fb2520f8df3fa55a4c8 Mon Sep 17 00:00:00 2001 From: Sofia Shnaidman Date: Wed, 4 Mar 2020 17:41:11 +0300 Subject: [PATCH] Removed disk/system dashboards. --- .../mock/payload/brokerMetrics.json | 10 +---- .../src/components/Brokers/Brokers.tsx | 37 ------------------- .../components/Brokers/BrokersContainer.ts | 7 +--- .../src/redux/interfaces/broker.ts | 3 -- .../src/redux/reducers/brokers/reducer.ts | 3 -- .../src/redux/reducers/brokers/selectors.ts | 23 ------------ 6 files changed, 3 insertions(+), 80 deletions(-) diff --git a/kafka-ui-react-app/mock/payload/brokerMetrics.json b/kafka-ui-react-app/mock/payload/brokerMetrics.json index b3c5e348b9..c284d5df02 100644 --- a/kafka-ui-react-app/mock/payload/brokerMetrics.json +++ b/kafka-ui-react-app/mock/payload/brokerMetrics.json @@ -6,8 +6,6 @@ "zooKeeperStatus": 1, "activeControllers": 1, "uncleanLeaderElectionCount": 0, - "networkPoolUsage": 0.001970896739179595, - "requestPoolUsage": 0.00730438980248805, "onlinePartitionCount": 19, "underReplicatedPartitionCount": 9, "offlinePartitionCount": 3, @@ -16,8 +14,7 @@ "brokerId": 1, "segmentSize": 479900675 } - ], - "diskUsageDistribution": "even" + ] }, { "clusterName": "kafka-ui.cluster", @@ -26,8 +23,6 @@ "zooKeeperStatus": 1, "activeControllers": 1, "uncleanLeaderElectionCount": 0, - "networkPoolUsage": 0.004401004145400575, - "requestPoolUsage": 0.004089519725388984, "onlinePartitionCount": 70, "underReplicatedPartitionCount": 1, "offlinePartitionCount": 2, @@ -36,7 +31,6 @@ "brokerId": 1, "segmentSize": 968226532 } - ], - "diskUsageDistribution": "even" + ] } ] diff --git a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx index 436556d339..810acc3a03 100644 --- a/kafka-ui-react-app/src/components/Brokers/Brokers.tsx +++ b/kafka-ui-react-app/src/components/Brokers/Brokers.tsx @@ -10,8 +10,6 @@ import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; interface Props extends BrokerMetrics { clusterName: ClusterName; isFetched: boolean; - minDiskUsage: number; - maxDiskUsage: number; fetchBrokers: (clusterName: ClusterName) => void; fetchBrokerMetrics: (clusterName: ClusterName) => void; } @@ -25,11 +23,6 @@ const Topics: React.FC = ({ onlinePartitionCount, offlinePartitionCount, underReplicatedPartitionCount, - diskUsageDistribution, - minDiskUsage, - maxDiskUsage, - networkPoolUsage, - requestPoolUsage, fetchBrokers, fetchBrokerMetrics, }) => { @@ -43,9 +36,6 @@ const Topics: React.FC = ({ useInterval(() => { fetchBrokerMetrics(clusterName); }, 5000); - const [minDiskUsageValue, minDiskUsageSize] = formatBytes(minDiskUsage); - const [maxDiskUsageValue, maxDiskUsageSize] = formatBytes(maxDiskUsage); - const zkOnline = zooKeeperStatus === ZooKeeperStatus.online; return ( @@ -87,33 +77,6 @@ const Topics: React.FC = ({ - - - - {maxDiskUsageValue} - {maxDiskUsageSize} - - - {minDiskUsageValue} - {minDiskUsageSize} - - - - {diskUsageDistribution} - - - - - - - {Math.round(networkPoolUsage * 10000) / 100} - % - - - {Math.round(requestPoolUsage * 10000) / 100} - % - - ); }; diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts b/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts index 57bb7d73fa..189919b7d4 100644 --- a/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts +++ b/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts @@ -20,14 +20,9 @@ const mapStateToProps = (state: RootState, { match: { params: { clusterName } }} brokerCount: brokerSelectors.getBrokerCount(state), zooKeeperStatus: brokerSelectors.getZooKeeperStatus(state), activeControllers: brokerSelectors.getActiveControllers(state), - networkPoolUsage: brokerSelectors.getNetworkPoolUsage(state), - requestPoolUsage: brokerSelectors.getRequestPoolUsage(state), onlinePartitionCount: brokerSelectors.getOnlinePartitionCount(state), offlinePartitionCount: brokerSelectors.getOfflinePartitionCount(state), - underReplicatedPartitionCount: brokerSelectors.getUnderReplicatedPartitionCount(state), - diskUsageDistribution: brokerSelectors.getDiskUsageDistribution(state), - minDiskUsage: brokerSelectors.getMinDiskUsage(state), - maxDiskUsage: brokerSelectors.getMaxDiskUsage(state), + underReplicatedPartitionCount: brokerSelectors.getUnderReplicatedPartitionCount(state) }); const mapDispatchToProps = { diff --git a/kafka-ui-react-app/src/redux/interfaces/broker.ts b/kafka-ui-react-app/src/redux/interfaces/broker.ts index 4e7d3891a1..8917181626 100644 --- a/kafka-ui-react-app/src/redux/interfaces/broker.ts +++ b/kafka-ui-react-app/src/redux/interfaces/broker.ts @@ -19,12 +19,9 @@ export interface BrokerMetrics { brokerCount: number; zooKeeperStatus: ZooKeeperStatus; activeControllers: number; - networkPoolUsage: number; - requestPoolUsage: number; onlinePartitionCount: number; offlinePartitionCount: number; underReplicatedPartitionCount: number; - diskUsageDistribution?: string; diskUsage: BrokerDiskUsage[]; } diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/reducer.ts b/kafka-ui-react-app/src/redux/reducers/brokers/reducer.ts index 3d73d60194..a72f05f6cf 100644 --- a/kafka-ui-react-app/src/redux/reducers/brokers/reducer.ts +++ b/kafka-ui-react-app/src/redux/reducers/brokers/reducer.ts @@ -13,12 +13,9 @@ export const initialState: BrokersState = { brokerCount: 0, zooKeeperStatus: ZooKeeperStatus.offline, activeControllers: 0, - networkPoolUsage: 0, - requestPoolUsage: 0, onlinePartitionCount: 0, offlinePartitionCount: 0, underReplicatedPartitionCount: 0, - diskUsageDistribution: undefined, diskUsage: [], }; diff --git a/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts b/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts index 71cc116d6f..ecbd607d8b 100644 --- a/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts +++ b/kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts @@ -16,29 +16,6 @@ const getBrokerList = createSelector(brokersState, ({ items }) => items); export const getBrokerCount = createSelector(brokersState, ({ brokerCount }) => brokerCount); export const getZooKeeperStatus = createSelector(brokersState, ({ zooKeeperStatus }) => zooKeeperStatus); export const getActiveControllers = createSelector(brokersState, ({ activeControllers }) => activeControllers); -export const getNetworkPoolUsage = createSelector(brokersState, ({ networkPoolUsage }) => networkPoolUsage); -export const getRequestPoolUsage = createSelector(brokersState, ({ requestPoolUsage }) => requestPoolUsage); export const getOnlinePartitionCount = createSelector(brokersState, ({ onlinePartitionCount }) => onlinePartitionCount); export const getOfflinePartitionCount = createSelector(brokersState, ({ offlinePartitionCount }) => offlinePartitionCount); -export const getDiskUsageDistribution = createSelector(brokersState, ({ diskUsageDistribution }) => diskUsageDistribution); export const getUnderReplicatedPartitionCount = createSelector(brokersState, ({ underReplicatedPartitionCount }) => underReplicatedPartitionCount); - -export const getMinDiskUsage = createSelector( - getBrokerList, - (brokers) => { - if (brokers.length === 0) { - return 0; - } - return Math.min(...brokers.map(({ segmentSize }) => segmentSize)); - }, -); - -export const getMaxDiskUsage = createSelector( - getBrokerList, - (brokers) => { - if (brokers.length === 0) { - return 0; - } - return Math.max(...brokers.map(({ segmentSize }) => segmentSize)); - }, -);