broker config

2021-11-04 16:50:20 +08:00
parent 2c2558d157
commit 2f2ee7f901
11 changed files with 345 additions and 37 deletions
--- a/src/main/java/com/xuxd/kafka/console/beans/dto/AlterConfigDTO.java
+++ b/src/main/java/com/xuxd/kafka/console/beans/dto/AlterConfigDTO.java
@@ -0,0 +1,24 @@
+package com.xuxd.kafka.console.beans.dto;
+
+import lombok.Data;
+import org.apache.kafka.clients.admin.ConfigEntry;
+
+/**
+ * kafka-console-ui.
+ *
+ * @author xuxd
+ * @date 2021-11-04 15:39:07
+ **/
+@Data
+public class AlterConfigDTO {
+
+    private String entity;
+
+    private String name;
+
+    private String value;
+
+    public ConfigEntry to() {
+        return new ConfigEntry(name, value);
+    }
+}
--- a/src/main/java/com/xuxd/kafka/console/beans/enums/AlterType.java
+++ b/src/main/java/com/xuxd/kafka/console/beans/enums/AlterType.java
@@ -0,0 +1,11 @@
+package com.xuxd.kafka.console.beans.enums;
+
+/**
+ * kafka-console-ui.
+ *
+ * @author xuxd
+ * @date 2021-11-04 15:36:09
+ **/
+public enum AlterType {
+    SET,DELETE
+}
--- a/src/main/java/com/xuxd/kafka/console/beans/vo/ConfigEntryVO.java
+++ b/src/main/java/com/xuxd/kafka/console/beans/vo/ConfigEntryVO.java
@@ -50,13 +50,14 @@ public class ConfigEntryVO implements Comparable {

        ConfigEntryVO that = (ConfigEntryVO) o;

-        if (!this.source.equals(that.source)) {
-            return ORDER_DICTIONARY.get(this.source) - ORDER_DICTIONARY.get(that.source);
-        }
        if (this.readOnly != that.readOnly) {
            return this.readOnly ? 1 : -1;
        }

+        if (!this.source.equals(that.source)) {
+            return ORDER_DICTIONARY.get(this.source) - ORDER_DICTIONARY.get(that.source);
+        }
+
        return this.name.compareTo(that.name);
    }
 }
--- a/src/main/java/com/xuxd/kafka/console/controller/ConfigController.java
+++ b/src/main/java/com/xuxd/kafka/console/controller/ConfigController.java
@@ -1,11 +1,16 @@
 package com.xuxd.kafka.console.controller;

 import com.xuxd.kafka.console.beans.ResponseData;
+import com.xuxd.kafka.console.beans.dto.AlterConfigDTO;
+import com.xuxd.kafka.console.beans.enums.AlterType;
 import com.xuxd.kafka.console.config.KafkaConfig;
 import com.xuxd.kafka.console.service.ConfigService;
 import com.xuxd.kafka.console.utils.ConvertUtil;
 import java.util.Map;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

@@ -45,4 +50,14 @@ public class ConfigController {
    public Object getBrokerConfig(String brokerId) {
        return configService.getBrokerConfig(brokerId);
    }
+
+    @PostMapping("/broker")
+    public Object setBrokerConfig(@RequestBody AlterConfigDTO dto) {
+        return configService.alterBrokerConfig(dto.getEntity(), dto.to(), AlterType.SET);
+    }
+
+    @DeleteMapping("/broker")
+    public Object deleteBrokerConfig(@RequestBody AlterConfigDTO dto) {
+        return configService.alterBrokerConfig(dto.getEntity(), dto.to(), AlterType.DELETE);
+    }
 }
--- a/src/main/java/com/xuxd/kafka/console/service/ConfigService.java
+++ b/src/main/java/com/xuxd/kafka/console/service/ConfigService.java
@@ -1,6 +1,8 @@
 package com.xuxd.kafka.console.service;

 import com.xuxd.kafka.console.beans.ResponseData;
+import com.xuxd.kafka.console.beans.enums.AlterType;
+import org.apache.kafka.clients.admin.ConfigEntry;

 /**
 * kafka-console-ui.
@@ -13,4 +15,6 @@ public interface ConfigService {
    ResponseData getTopicConfig(String topic);

    ResponseData getBrokerConfig(String brokerId);
+
+    ResponseData alterBrokerConfig(String brokerId, ConfigEntry entry, AlterType type);
 }
--- a/src/main/java/com/xuxd/kafka/console/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/xuxd/kafka/console/service/impl/ConfigServiceImpl.java
@@ -1,6 +1,7 @@
 package com.xuxd.kafka.console.service.impl;

 import com.xuxd.kafka.console.beans.ResponseData;
+import com.xuxd.kafka.console.beans.enums.AlterType;
 import com.xuxd.kafka.console.beans.vo.ConfigEntryVO;
 import com.xuxd.kafka.console.service.ConfigService;
 import java.util.List;
@@ -9,6 +10,7 @@ import kafka.console.ConfigConsole;
 import org.apache.kafka.clients.admin.ConfigEntry;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import scala.Tuple2;

 /**
 * kafka-console-ui.
@@ -34,4 +36,17 @@ public class ConfigServiceImpl implements ConfigService {
        return ResponseData.create().data(vos).success();
    }

+    @Override public ResponseData alterBrokerConfig(String brokerId, ConfigEntry entry, AlterType type) {
+        Tuple2<Object, String> tuple2 = null;
+        switch (type) {
+            case SET:
+                tuple2 = configConsole.setBrokerConfig(brokerId, entry);
+                break;
+            case DELETE:
+                tuple2 = configConsole.deleteBrokerConfig(brokerId, entry);
+                break;
+        }
+        return (boolean) tuple2._1() ? ResponseData.create().success() : ResponseData.create().failed(tuple2._2());
+    }
+
 }
--- a/src/main/scala/kafka/console/ConfigConsole.scala
+++ b/src/main/scala/kafka/console/ConfigConsole.scala
@@ -7,11 +7,11 @@ import java.util.concurrent.TimeUnit
 import com.xuxd.kafka.console.config.KafkaConfig
 import kafka.admin.ConfigCommand.BrokerLoggerConfigType
 import kafka.server.ConfigType
-import org.apache.kafka.clients.admin.{Config, ConfigEntry, DescribeConfigsOptions}
+import org.apache.kafka.clients.admin.{AlterConfigOp, Config, ConfigEntry, DescribeConfigsOptions}
 import org.apache.kafka.common.config.ConfigResource
 import org.apache.kafka.common.internals.Topic

-import scala.jdk.CollectionConverters.{CollectionHasAsScala, SeqHasAsJava}
+import scala.jdk.CollectionConverters.{CollectionHasAsScala, MapHasAsJava, SeqHasAsJava}

 /**
 * kafka-console-ui.
@@ -31,11 +31,52 @@ class ConfigConsole(config: KafkaConfig) extends KafkaConsole(config: KafkaConfi
        getConfig(ConfigType.Broker, broker)
    }

+    def setBrokerConfig(broker: String, entry: ConfigEntry): (Boolean, String) = {
+        alterConfig(ConfigType.Broker, broker, entry, AlterConfigOp.OpType.SET)
+    }
+
+    def deleteBrokerConfig(broker: String, entry: ConfigEntry): (Boolean, String) = {
+        alterConfig(ConfigType.Broker, broker, entry, AlterConfigOp.OpType.DELETE)
+    }
+
    def getConfig(entityType: String, entityName: String): List[ConfigEntry] = {
        getResourceConfig(entityType, entityName, false).asJava
    }

+    def alterConfig(entityType: String, entityName: String, entry: ConfigEntry,
+        opType: AlterConfigOp.OpType): (Boolean, String) = {
+        withAdminClientAndCatchError(admin => {
+            val configResource = new ConfigResource(getResourceTypeAndValidate(entityType, entityName), entityName)
+
+            val config = Map(configResource -> Collections.singletonList(new AlterConfigOp(entry, opType)).asInstanceOf[util.Collection[AlterConfigOp]])
+            admin.incrementalAlterConfigs(config.asJava).all().get(timeoutMs, TimeUnit.MILLISECONDS)
+            (true, "")
+        }, e => {
+            log.error("alter config error.", e)
+            (false, e.getMessage)
+        }).asInstanceOf[(Boolean, String)]
+    }
+
    private def getResourceConfig(entityType: String, entityName: String, includeSynonyms: Boolean) = {
+        val configResourceType = getResourceTypeAndValidate(entityType, entityName)
+
+        val configResource = new ConfigResource(configResourceType, entityName)
+        val describeOptions = new DescribeConfigsOptions().includeSynonyms(includeSynonyms)
+        val configs = withAdminClientAndCatchError(admin => Some(admin.describeConfigs(Collections.singleton(configResource), describeOptions)
+            .all.get(30, TimeUnit.SECONDS)),
+            e => {
+                log.error("describeConfigs error.", e)
+                None
+            })
+
+        configs match {
+            case None => Seq.empty
+            case Some(c: util.Map[ConfigResource, Config]) => c.get(configResource).entries.asScala.toSeq
+        }
+
+    }
+
+    private def getResourceTypeAndValidate(entityType: String, entityName: String): ConfigResource.Type = {
        def validateBrokerId(): Unit = try entityName.toInt catch {
            case _: NumberFormatException =>
                throw new IllegalArgumentException(s"The entity name for $entityType must be a valid integer broker id, found: $entityName")
@@ -55,20 +96,6 @@ class ConfigConsole(config: KafkaConfig) extends KafkaConsole(config: KafkaConfi
                ConfigResource.Type.BROKER_LOGGER
            case entityType => throw new IllegalArgumentException(s"Invalid entity type: $entityType")
        }
-
-        val configResource = new ConfigResource(configResourceType, entityName)
-        val describeOptions = new DescribeConfigsOptions().includeSynonyms(includeSynonyms)
-        val configs = withAdminClientAndCatchError(admin => Some(admin.describeConfigs(Collections.singleton(configResource), describeOptions)
-            .all.get(30, TimeUnit.SECONDS)),
-            e => {
-                log.error("describeConfigs error.", e)
-                None
-            })
-
-        configs match {
-            case None => Seq.empty
-            case Some(c: util.Map[ConfigResource, Config]) => c.get(configResource).entries.asScala.toSeq
-        }
-
+        configResourceType
    }
 }
--- a/ui/src/utils/api.js
+++ b/ui/src/utils/api.js
@@ -58,6 +58,14 @@ export const KafkaConfigApi = {
    url: "/config/broker",
    method: "get",
  },
+  setBrokerConfig: {
+    url: "/config/broker",
+    method: "post",
+  },
+  deleteBrokerConfig: {
+    url: "/config/broker",
+    method: "delete",
+  },
 };

 export const KafkaTopicApi = {
--- a/ui/src/views/cluster/BrokerConfig.vue
+++ b/ui/src/views/cluster/BrokerConfig.vue
@@ -2,7 +2,7 @@
  <a-modal
    title="Broker配置"
    :visible="show"
-    :width="1200"
+    :width="1400"
    :mask="false"
    :destroyOnClose="true"
    :footer="null"
@@ -11,23 +11,51 @@
  >
    <div>
      <a-spin :spinning="loading">
+        <div>
+          <a-input-search
+            placeholder="属性"
+            style="width: 200px"
+            v-model="search"
+            @input="searchData"
+            @search="searchData"
+          />
+          <br /><br />
+        </div>
+
        <a-table
          :columns="columns"
-          :data-source="data"
+          :data-source="filterData"
          bordered
-          :rowKey="(record) => record.memberId"
+          :rowKey="(record) => record.name"
        >
-          <ul slot="partitions" slot-scope="text">
-            <ol v-for="i in text" :key="i.topic + i.partition">
-              {{
-                i.topic
-              }}:
-              {{
-                i.partition
-              }}
-            </ol>
-          </ul>
+          <div slot="operation" slot-scope="record">
+            <a-button
+              size="small"
+              href="javascript:;"
+              class="operation-btn"
+              v-show="!record.readOnly"
+              @click="openEditConfigDialog(record)"
+              >编辑
+            </a-button>
+            <a-popconfirm
+              :title="'删除配置项: ' + record.name + '？'"
+              ok-text="确认"
+              cancel-text="取消"
+              v-show="isDynamic(record.source)"
+              @confirm="deleteBrokerConfig(record)"
+            >
+              <a-button size="small" href="javascript:;" class="operation-btn"
+                >删除
+              </a-button>
+            </a-popconfirm>
+          </div>
        </a-table>
+        <EditConfig
+          :visible="showEditConfigDialog"
+          :record="selectData"
+          :broker-id="id"
+          @closeEditConfigDialog="closeEditConfigDialog"
+        ></EditConfig>
      </a-spin>
    </div>
  </a-modal>
@@ -37,9 +65,11 @@
 import request from "@/utils/request";
 import { KafkaConfigApi } from "@/utils/api";
 import notification from "ant-design-vue/es/notification";
+import EditConfig from "@/views/cluster/EditConfig";

 export default {
  name: "BrokerConfig",
+  components: { EditConfig },
  props: {
    group: {
      type: String,
@@ -60,18 +90,22 @@ export default {
      show: this.visible,
      data: [],
      loading: false,
+      search: "",
+      filterData: [],
+      showEditConfigDialog: false,
+      selectData: {},
    };
  },
  watch: {
    visible(v) {
      this.show = v;
      if (this.show) {
-        this.getPartitionInfo();
+        this.getBrokerConfig();
      }
    },
  },
  methods: {
-    getPartitionInfo() {
+    getBrokerConfig() {
      this.loading = true;
      request({
        url: KafkaConfigApi.getBrokerConfig.url + "?brokerId=" + this.id,
@@ -85,13 +119,55 @@ export default {
          });
        } else {
          this.data = res.data;
+          this.searchData();
        }
      });
    },
+    deleteBrokerConfig(record) {
+      this.selectData = record;
+      this.loading = true;
+      request({
+        url: KafkaConfigApi.deleteBrokerConfig.url,
+        method: KafkaConfigApi.deleteBrokerConfig.method,
+        data: {
+          name: record.name,
+          value: record.value,
+          entity: this.id,
+        },
+      }).then((res) => {
+        this.loading = false;
+        if (res.code != 0) {
+          notification.error({
+            message: "error",
+            description: res.msg,
+          });
+        } else {
+          this.getBrokerConfig();
+        }
+      });
+    },
+    searchData() {
+      this.filterData = this.data.filter(
+        (e) => e.name.indexOf(this.search) >= 0
+      );
+    },
    handleCancel() {
      this.data = [];
      this.$emit("closeBrokerConfigDialog", {});
    },
+    openEditConfigDialog(record) {
+      this.showEditConfigDialog = true;
+      this.selectData = record;
+    },
+    closeEditConfigDialog(params) {
+      this.showEditConfigDialog = false;
+      if (params.refresh) {
+        this.getBrokerConfig();
+      }
+    },
+    isDynamic(source) {
+      return source.startsWith("DYNAMIC_");
+    },
  },
 };

@@ -113,7 +189,17 @@ const columns = [
    key: "source",
    width: 200,
  },
+  {
+    title: "操作",
+    key: "operation",
+    scopedSlots: { customRender: "operation" },
+    width: 150,
+  },
 ];
 </script>

-<style scoped></style>
+<style scoped>
+.operation-btn {
+  margin-right: 3%;
+}
+</style>
--- a/ui/src/views/cluster/Cluster.vue
+++ b/ui/src/views/cluster/Cluster.vue
@@ -26,7 +26,7 @@
      </div>
      <BrokerConfig
        :visible="showBrokerConfigDialog"
-        :id="this.select.id"
+        :id="this.select.idString"
        @closeBrokerConfigDialog="closeBrokerConfigDialog"
      ></BrokerConfig>
    </a-spin>
--- a/ui/src/views/cluster/EditConfig.vue
+++ b/ui/src/views/cluster/EditConfig.vue
@@ -0,0 +1,117 @@
+<template>
+  <a-modal
+    title="编辑配置"
+    :visible="show"
+    :width="1000"
+    :mask="false"
+    :destroyOnClose="true"
+    :footer="null"
+    :maskClosable="false"
+    @cancel="handleCancel"
+  >
+    <div>
+      <a-spin :spinning="loading">
+        <a-form
+          :form="form"
+          :label-col="{ span: 5 }"
+          :wrapper-col="{ span: 12 }"
+          @submit="handleSubmit"
+        >
+          <a-form-item label="属性">
+            <a-input
+              :disabled="true"
+              v-decorator="['name', { initialValue: record.name }]"
+              placeholder="name"
+            />
+          </a-form-item>
+          <a-form-item label="值">
+            <a-input
+              v-decorator="[
+                'value',
+                {
+                  initialValue: record.value,
+                  rules: [{ required: true, message: '输入属性值!' }],
+                },
+              ]"
+              placeholder="value"
+            />
+          </a-form-item>
+          <a-form-item :wrapper-col="{ span: 12, offset: 5 }">
+            <a-button type="primary" html-type="submit"> 提交 </a-button>
+          </a-form-item>
+        </a-form>
+      </a-spin>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+import request from "@/utils/request";
+import { KafkaConfigApi } from "@/utils/api";
+import notification from "ant-design-vue/es/notification";
+export default {
+  name: "EditConfig",
+  props: {
+    topic: {
+      type: String,
+      default: "",
+    },
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    record: {
+      default: {},
+    },
+    brokerId: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {
+      show: this.visible,
+      data: [],
+      loading: false,
+      form: this.$form.createForm(this, { name: "coordinated" }),
+    };
+  },
+  watch: {
+    visible(v) {
+      this.show = v;
+    },
+  },
+  methods: {
+    handleSubmit(e) {
+      e.preventDefault();
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          this.loading = true;
+          request({
+            url: KafkaConfigApi.setBrokerConfig.url,
+            method: KafkaConfigApi.setBrokerConfig.method,
+            data: Object.assign({ entity: this.brokerId }, values),
+          }).then((res) => {
+            this.loading = false;
+            if (res.code == 0) {
+              this.$message.success(res.msg);
+              this.$emit("closeEditConfigDialog", { refresh: true });
+            } else {
+              notification.error({
+                message: "error",
+                description: res.msg,
+              });
+            }
+          });
+        }
+      });
+    },
+    handleCancel() {
+      this.data = [];
+      this.$emit("closeEditConfigDialog", { refresh: false });
+    },
+  },
+};
+</script>
+
+<style scoped></style>