浏览代码

Get Rid of Zookeeper (#1789)

Mgrdich 3 年之前
父节点
当前提交
688b86a557

+ 1 - 9
kafka-ui-react-app/src/components/Brokers/Brokers.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
-import { ClusterName, ZooKeeperStatus } from 'redux/interfaces';
+import { ClusterName } from 'redux/interfaces';
 import useInterval from 'lib/hooks/useInterval';
 import BytesFormatted from 'components/common/BytesFormatted/BytesFormatted';
 import { useParams } from 'react-router';
-import { Tag } from 'components/common/Tag/Tag.styled';
 import TableHeaderCell from 'components/common/table/TableHeaderCell/TableHeaderCell';
 import { Table } from 'components/common/table/Table/Table.styled';
 import PageHeading from 'components/common/PageHeading/PageHeading';
@@ -21,7 +20,6 @@ const Brokers: React.FC = () => {
   const {
     brokerCount,
     activeControllers,
-    zooKeeperStatus,
     onlinePartitionCount,
     offlinePartitionCount,
     inSyncReplicasCount,
@@ -45,7 +43,6 @@ const Brokers: React.FC = () => {
     fetchBrokers(clusterName);
   }, 5000);
 
-  const zkOnline = zooKeeperStatus === ZooKeeperStatus.online;
   return (
     <>
       <PageHeading text="Brokers" />
@@ -57,11 +54,6 @@ const Brokers: React.FC = () => {
           <Metrics.Indicator label="Active Controllers">
             {activeControllers}
           </Metrics.Indicator>
-          <Metrics.Indicator label="Zookeeper Status">
-            <Tag color={zkOnline ? 'green' : 'gray'}>
-              {zkOnline ? 'online' : 'offline'}
-            </Tag>
-          </Metrics.Indicator>
           <Metrics.Indicator label="Version">{version}</Metrics.Indicator>
         </Metrics.Section>
         <Metrics.Section title="Partitions">

+ 0 - 1
kafka-ui-react-app/src/redux/actions/__test__/fixtures.ts

@@ -9,7 +9,6 @@ import {
 
 export const clusterStats: ClusterStats = {
   brokerCount: 1,
-  zooKeeperStatus: 1,
   activeControllers: 1,
   onlinePartitionCount: 6,
   offlinePartitionCount: 0,

+ 0 - 5
kafka-ui-react-app/src/redux/interfaces/broker.ts

@@ -2,11 +2,6 @@ import { ClusterStats, Broker } from 'generated-sources';
 
 export type BrokerId = Broker['id'];
 
-export enum ZooKeeperStatus {
-  offline,
-  online,
-}
-
 export interface BrokersState extends ClusterStats {
   items: Broker[];
 }

+ 0 - 3
kafka-ui-react-app/src/redux/reducers/brokers/__test__/fixtures.ts

@@ -5,7 +5,6 @@ export const brokersPayload = [
 
 export const clusterStatsPayload = {
   brokerCount: 2,
-  zooKeeperStatus: 1,
   activeControllers: 1,
   onlinePartitionCount: 138,
   offlinePartitionCount: 0,
@@ -22,7 +21,6 @@ export const clusterStatsPayload = {
 export const initialBrokersReducerState = {
   items: brokersPayload,
   brokerCount: 2,
-  zooKeeperStatus: 1,
   activeControllers: 1,
   onlinePartitionCount: 138,
   offlinePartitionCount: 0,
@@ -39,7 +37,6 @@ export const initialBrokersReducerState = {
 export const updatedBrokersReducerState = {
   items: brokersPayload,
   brokerCount: 2,
-  zooKeeperStatus: 1,
   activeControllers: 1,
   onlinePartitionCount: 138,
   offlinePartitionCount: 0,

+ 0 - 6
kafka-ui-react-app/src/redux/reducers/brokers/__test__/selectors.spec.ts

@@ -14,9 +14,6 @@ describe('Brokers selectors', () => {
     it('returns broker count', () => {
       expect(selectors.getBrokerCount(getState())).toEqual(0);
     });
-    it('returns zooKeeper status', () => {
-      expect(selectors.getZooKeeperStatus(getState())).toEqual(0);
-    });
     it('returns active controllers', () => {
       expect(selectors.getActiveControllers(getState())).toEqual(0);
     });
@@ -55,9 +52,6 @@ describe('Brokers selectors', () => {
     it('returns broker count', () => {
       expect(selectors.getBrokerCount(getState())).toEqual(2);
     });
-    it('returns zooKeeper status', () => {
-      expect(selectors.getZooKeeperStatus(getState())).toEqual(1);
-    });
     it('returns active controllers', () => {
       expect(selectors.getActiveControllers(getState())).toEqual(1);
     });

+ 1 - 7
kafka-ui-react-app/src/redux/reducers/brokers/brokersSlice.ts

@@ -1,10 +1,5 @@
 import { BrokersApi, ClustersApi, Configuration } from 'generated-sources';
-import {
-  BrokersState,
-  ClusterName,
-  RootState,
-  ZooKeeperStatus,
-} from 'redux/interfaces';
+import { BrokersState, ClusterName, RootState } from 'redux/interfaces';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { BASE_PARAMS } from 'lib/constants';
 
@@ -26,7 +21,6 @@ export const fetchClusterStats = createAsyncThunk(
 export const initialState: BrokersState = {
   items: [],
   brokerCount: 0,
-  zooKeeperStatus: ZooKeeperStatus.offline,
   activeControllers: 0,
   onlinePartitionCount: 0,
   offlinePartitionCount: 0,

+ 0 - 4
kafka-ui-react-app/src/redux/reducers/brokers/selectors.ts

@@ -7,10 +7,6 @@ export const getBrokerCount = createSelector(
   brokersState,
   ({ brokerCount }) => brokerCount
 );
-export const getZooKeeperStatus = createSelector(
-  brokersState,
-  ({ zooKeeperStatus }) => zooKeeperStatus
-);
 export const getActiveControllers = createSelector(
   brokersState,
   ({ activeControllers }) => activeControllers