From 1d64342ac080a6568834c09298aec2fc70fb03b0 Mon Sep 17 00:00:00 2001 From: gaohongsong Date: Mon, 11 Sep 2023 16:35:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(kafka):=20=E6=94=AF=E6=8C=81=E6=97=A0?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=83=A8=E7=BD=B2=20close=20#1030?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/backend/ticket/builders/kafka/kafka_apply.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dbm-ui/backend/ticket/builders/kafka/kafka_apply.py b/dbm-ui/backend/ticket/builders/kafka/kafka_apply.py index dd0a6e7a9f..7fc2eba9eb 100644 --- a/dbm-ui/backend/ticket/builders/kafka/kafka_apply.py +++ b/dbm-ui/backend/ticket/builders/kafka/kafka_apply.py @@ -33,6 +33,7 @@ class KafkaApplyDetailSerializer(BigDataApplyDetailsSerializer): "port": 9200, "password": "password", "partition_num": 2, + "no_security": 0, "nodes": { "zookeeper": [ { @@ -69,6 +70,9 @@ class KafkaApplyDetailSerializer(BigDataApplyDetailsSerializer): } """ + no_security = serializers.IntegerField( + help_text=_("无认证开关, 1表示无认证。0表示认证,默认0"), min_value=0, max_value=1, required=False, default=0 + ) replication_num = serializers.IntegerField( help_text=_("副本数量"), ) From 31c2031fde0951b2a8b0af0bc19c544ee8a0d753 Mon Sep 17 00:00:00 2001 From: daryl Date: Tue, 12 Sep 2023 10:58:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(kafka):=20=E6=94=AF=E6=8C=81=E6=97=A0?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=83=A8=E7=BD=B2=20#1032?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/frontend/src/locales/en.json | 7 +++++-- dbm-ui/frontend/src/locales/zh-cn.json | 3 +++ dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue | 10 ++++++++++ .../views/tickets/components/bigdata/DetailsKafka.vue | 8 ++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/locales/en.json b/dbm-ui/frontend/src/locales/en.json index 23c9793a42..004f46961f 100644 --- a/dbm-ui/frontend/src/locales/en.json +++ b/dbm-ui/frontend/src/locales/en.json @@ -12,7 +12,7 @@ "Proxy起始端口": "Proxy start port", "Slave数量至少为1台_且机器数要和Master相等": "The number of hosts for Slave requires at least 1 and also be equal to that of Slave", "http端口": "Http port", - "kafka版本": "Kafka version", + "kafka版本": "Kafka version", "rpc端口": "RPC port", "zookeeper需3台": "Zookeeper requires 3 host hosts", "业务": "Business", @@ -1075,7 +1075,7 @@ "添加从库": "Add Slave", "清除表数据_truncatetable": "Truncate table", "清除表数据和结构_droptable": "Drop table", - "特殊符号序": "Special character sequence", + "特殊符号序": "Special character sequence", "申请MySQL单节点部署": "Apply for MySQL standalone deployment", "申请MySQL高可用部署": "Apply for MySQL HA deployment", "申请Redis集群部署": "Apply for Redis cluster deployment", @@ -1382,5 +1382,8 @@ "扩容任务进行中": "The expansion task is in progress", "实例重启任务进行中": "The instance restart task is in progress", "启用任务进行中": "Enable task in progress", + "不开启": "Off", + "开启": "On", + "开启认证": "Turn on authentication", "删除任务进行中": "Delete task in progress" } diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index dfc1fcafaf..d063cc9f6d 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -1381,5 +1381,8 @@ "启用任务进行中": "启用任务进行中", "禁用任务进行中": "禁用任务进行中", "删除任务进行中": "删除任务进行中", + "开启认证": "开启认证", + "开启": "开启", + "不开启": "不开启", "实例重启任务进行中": "实例重启任务进行中" } diff --git a/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue b/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue index dbbf66ebc1..1ca3f55351 100644 --- a/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue +++ b/dbm-ui/frontend/src/views/kafka-manage/apply/Index.vue @@ -187,6 +187,15 @@ + + + @@ -272,6 +281,7 @@ partition_num: 1, retention_hours: 1, replication_num: 1, + no_security: 0, }, }); diff --git a/dbm-ui/frontend/src/views/tickets/components/bigdata/DetailsKafka.vue b/dbm-ui/frontend/src/views/tickets/components/bigdata/DetailsKafka.vue index f990246b83..823745c70a 100644 --- a/dbm-ui/frontend/src/views/tickets/components/bigdata/DetailsKafka.vue +++ b/dbm-ui/frontend/src/views/tickets/components/bigdata/DetailsKafka.vue @@ -77,6 +77,12 @@ +
+ {{ $t('开启认证') }}: + {{ security }} +
{{ $t('备注') }}: (props.ticketDetails?.no_security === 0 ? t('开启') : t('不开启'))); + /** * 获取服务器数量 */