didi · ZQKC · Dec 3, 2023 · Nov 30, 2023 · Dec 3, 2023 · Dec 3, 2023
diff --git a/Releases_Notes.md b/Releases_Notes.md
@@ -1,4 +1,78 @@
 
+## v3.4.0
+
+
+
+**问题修复**
+- [Bugfix]修复 Overview 指标文案错误的错误 ([#1190](https://github.com/didi/KnowStreaming/issues/1190))
+- [Bugfix]修复删除 Kafka 集群后，Connect 集群任务出现 NPE 问题 ([#1129](https://github.com/didi/KnowStreaming/issues/1129))
+- [Bugfix]修复在 Ldap 登录时，设置 auth-user-registration: false 会导致空指针的问题 ([#1117](https://github.com/didi/KnowStreaming/issues/1117))
+- [Bugfix]修复 Ldap 登录，调用 user.getId() 出现 NPE 的问题 ([#1108](https://github.com/didi/KnowStreaming/issues/1108))
+- [Bugfix]修复前端新增角色失败等问题 ([#1107](https://github.com/didi/KnowStreaming/issues/1107))
+- [Bugfix]修复 ZK 四字命令解析错误的问题
+- [Bugfix]修复 zk standalone 模式下，状态获取错误的问题
+- [Bugfix]修复 Broker 元信息解析方法未调用导致接入集群失败的问题 ([#993](https://github.com/didi/KnowStreaming/issues/993))
+- [Bugfix]修复 ConsumerAssignment 类型转换错误的问题
+- [Bugfix]修复对 Connect 集群的 clusterUrl 的动态更新导致配置不生效的问题 ([#1079](https://github.com/didi/KnowStreaming/issues/1079))
+- [Bugfix]修复消费组不支持重置到最旧 Offset 的问题 ([#1059](https://github.com/didi/KnowStreaming/issues/1059))
+- [Bugfix]后端增加查看 User 密码的权限点 ([#1095](https://github.com/didi/KnowStreaming/issues/1095))
+- [Bugfix]修复 Connect-JMX 端口维护信息错误的问题 ([#1146](https://github.com/didi/KnowStreaming/issues/1146))
+- [Bugfix]修复系统管理子应用无法正常启动的问题 ([#1167](https://github.com/didi/KnowStreaming/issues/1167))
+- [Bugfix]修复 Security 模块，权限点缺失问题 ([#1069](https://github.com/didi/KnowStreaming/issues/1069)), ([#1154](https://github.com/didi/KnowStreaming/issues/1154))
+- [Bugfix]修复 Connect-Worker Jmx 不生效的问题 ([#1067](https://github.com/didi/KnowStreaming/issues/1067))
+- [Bugfix]修复权限 ACL 管理中，消费组列表展示错误的问题 ([#1037](https://github.com/didi/KnowStreaming/issues/1037))
+- [Bugfix]修复 Connect 模块没有默认勾选指标的问题（[#1022](https://github.com/didi/KnowStreaming/issues/1022)）
+- [Bugfix]修复 es 索引 create/delete 死循环的问题 ([#1021](https://github.com/didi/KnowStreaming/issues/1021))
+- [Bugfix]修复 Connect-GroupDescription 解析失败的问题 ([#1015](https://github.com/didi/KnowStreaming/issues/1015))
+- [Bugfix]修复 Prometheus 开放接口中，Partition 指标 tag 缺失的问题 ([#1014](https://github.com/didi/KnowStreaming/issues/1014))
+- [Bugfix]修复 Topic 消息展示，offset 为 0 不显示的问题 ([#1192](https://github.com/didi/KnowStreaming/issues/1192))
+- [Bugfix]修复重置offset接口调用过多问题
+- [Bugfix]Connect 提交任务变更为只保存用户修改的配置，并修复 JSON 模式下配置展示不全的问题 ([#1158](https://github.com/didi/KnowStreaming/issues/1158))
+- [Bugfix]修复消费组 Offset 重置后，提示重置成功，但是前端不刷新数据，Offset 无变化的问题 ([#1090](https://github.com/didi/KnowStreaming/issues/1090))
+- [Bugfix]修复未勾选系统管理查看权限，但是依然可以查看系统管理的问题 ([#1105](https://github.com/didi/KnowStreaming/issues/1105))
+
+
+**产品优化**
+- [Optimize]补充接入集群时，可选的 Kafka 版本列表 ([#1204](https://github.com/didi/KnowStreaming/issues/1204))
+- [Optimize]GroupTopic 信息修改为实时获取 ([#1196](https://github.com/didi/KnowStreaming/issues/1196))
+- [Optimize]增加 AdminClient 观测信息 ([#1111](https://github.com/didi/KnowStreaming/issues/1111))
+- [Optimize]增加 Connector 运行状态指标 ([#1110](https://github.com/didi/KnowStreaming/issues/1110))
+- [Optimize]统一 DB 元信息更新格式 ([#1127](https://github.com/didi/KnowStreaming/issues/1127)), ([#1125](https://github.com/didi/KnowStreaming/issues/1125)), ([#1006](https://github.com/didi/KnowStreaming/issues/1006))
+- [Optimize]日志输出增加支持 MDC，方便用户在 logback.xml 中 json 格式化日志 ([#1032](https://github.com/didi/KnowStreaming/issues/1032))
+- [Optimize]Jmx 相关日志优化 ([#1082](https://github.com/didi/KnowStreaming/issues/1082))
+- [Optimize]Topic-Partitions增加主动超时功能 ([#1076](https://github.com/didi/KnowStreaming/issues/1076))
+- [Optimize]Topic-Messages页面后端增加按照Partition和Offset纬度的排序 ([#1075](https://github.com/didi/KnowStreaming/issues/1075))
+- [Optimize]Connect-JSON模式下的JSON格式和官方API的格式不一致 ([#1080](https://github.com/didi/KnowStreaming/issues/1080)), ([#1153](https://github.com/didi/KnowStreaming/issues/1153)), ([#1192](https://github.com/didi/KnowStreaming/issues/1192))
+- [Optimize]登录页面展示的 star 数量修改为最新的数量
+- [Optimize]Group 列表的 maxLag 指标调整为实时获取 ([#1074](https://github.com/didi/KnowStreaming/issues/1074))
+- [Optimize]Connector增加重启、编辑、删除等权限点 ([#1066](https://github.com/didi/KnowStreaming/issues/1066)), ([#1147](https://github.com/didi/KnowStreaming/issues/1147))
+- [Optimize]优化 pom.xml 中，KS版本的标签名
+- [Optimize]优化集群Brokers中, Controller显示存在延迟的问题 ([#1162](https://github.com/didi/KnowStreaming/issues/1162))
+- [Optimize]bump jackson version to 2.13.5
+- [Optimize]权限新增 ACL，自定义权限配置，资源 TransactionalId 优化 ([#1192](https://github.com/didi/KnowStreaming/issues/1192))
+- [Optimize]Connect 样式优化
+- [Optimize]消费组详情控制数据实时刷新
+
+
+**功能新增**
+- [Feature]新增删除 Group 或 GroupOffset 功能 ([#1064](https://github.com/didi/KnowStreaming/issues/1064)), ([#1084](https://github.com/didi/KnowStreaming/issues/1084)), ([#1040](https://github.com/didi/KnowStreaming/issues/1040)), ([#1144](https://github.com/didi/KnowStreaming/issues/1144))
+- [Feature]增加 Truncate 数据功能 ([#1062](https://github.com/didi/KnowStreaming/issues/1062)), ([#1043](https://github.com/didi/KnowStreaming/issues/1043)), ([#1145](https://github.com/didi/KnowStreaming/issues/1145))
+- [Feature]支持指定 Server 的具体 Jmx 端口 ([#965](https://github.com/didi/KnowStreaming/issues/965))
+
+
+**文档更新**
+- [Doc]FAQ 补充 ES 8.x 版本使用说明 ([#1189](https://github.com/didi/KnowStreaming/issues/1189))
+- [Doc]补充启动失败的说明 ([#1126](https://github.com/didi/KnowStreaming/issues/1126))
+- [Doc]补充 ZK 无数据排查说明 ([#1004](https://github.com/didi/KnowStreaming/issues/1004))
+- [Doc]无数据排查文档，补充 ES 集群 Shard 满的异常日志
+- [Doc]README 补充页面无数据排查手册链接
+- [Doc]补充连接特定 Jmx 端口的说明 ([#965](https://github.com/didi/KnowStreaming/issues/965))
+- [Doc]补充 zk_properties 字段的使用说明 ([#1003](https://github.com/didi/KnowStreaming/issues/1003))
+
+
+---
+
+
 ## v3.3.0
 
 **问题修复**

diff --git a/...mmon/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionEnum.java b/...mmon/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/version/VersionEnum.java
@@ -73,9 +73,27 @@ public enum VersionEnum {
      * 3.x.x
      */
     V_3_0_0("3.0.0", normailze("3.0.0")),
+
     V_3_1_0("3.1.0", normailze("3.1.0")),
+    V_3_1_1("3.1.1", normailze("3.1.1")),
+    V_3_1_2("3.1.2", normailze("3.1.2")),
+
     V_3_2_0("3.2.0", normailze("3.2.0")),
+    V_3_2_1("3.2.1", normailze("3.2.1")),
+    V_3_2_3("3.2.3", normailze("3.2.3")),
+
     V_3_3_0("3.3.0", normailze("3.3.0")),
+    V_3_3_1("3.3.1", normailze("3.3.1")),
+    V_3_3_2("3.3.2", normailze("3.3.2")),
+
+    V_3_4_0("3.4.0", normailze("3.4.0")),
+    V_3_4_1("3.4.1", normailze("3.4.1")),
+
+    V_3_5_0("3.5.0", normailze("3.5.0")),
+    V_3_5_1("3.5.1", normailze("3.5.1")),
+
+    V_3_6_0("3.6.0", normailze("3.6.0")),
+
 
     V_MAX("x.x.x.x", Long.MAX_VALUE),
 

diff --git a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/Detail.tsx b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/Detail.tsx
@@ -236,6 +236,7 @@ const GroupDetail = (props: any) => {
                   chartData={chartData}
                   groupName={hashDataParse(location.hash).groupName}
                   loading={loadingObj}
+                  refreshKey={refreshKey}
                 />
               ),
               // expandedRowRender,
@@ -268,7 +269,12 @@ const GroupDetail = (props: any) => {
           },
         }}
       />
-      <ResetOffsetDrawer visible={resetOffsetVisible} setVisible={setResetOffsetVisible} record={resetOffsetArg}></ResetOffsetDrawer>
+      <ResetOffsetDrawer
+        visible={resetOffsetVisible}
+        setVisible={setResetOffsetVisible}
+        record={resetOffsetArg}
+        resetOffsetFn={forceRefresh}
+      ></ResetOffsetDrawer>
     </Drawer>
   );
 };

diff --git a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ExpandedRow.tsx b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ExpandedRow.tsx
@@ -8,7 +8,6 @@ import { IconFont } from '@knowdesign/icons';
 import API from '@src/api/index';
 import { hashDataParse } from '@src/constants/common';
 const { Option } = Select;
-import PubSub from 'pubsub-js'
 
 export interface MetricLine {
   createTime?: number;
@@ -42,7 +41,7 @@ const metricWithType = [
   { metricName: 'Lag', metricType: 102 },
 ];
 
-export const ExpandedRow: any = ({ record, groupName }: any) => {
+export const ExpandedRow: any = ({ record, groupName, refreshKey }: any) => {
   const params: any = useParams<{
     clusterId: string;
   }>();
@@ -194,7 +193,7 @@ export const ExpandedRow: any = ({ record, groupName }: any) => {
       endTime: timeRange[1],
       topNu: 0,
     };
-    Utils.post(API.getTopicGroupMetricHistory(clusterId), params).then((data: Array<MetricData>) => {
+    Utils.post(API.getTopicGroupMetricHistory(clusterId), params, { timeout: 300000 }).then((data: Array<MetricData>) => {
       // ! 替换接口返回
       setAllGroupMetricsData(data);
     });
@@ -211,15 +210,6 @@ export const ExpandedRow: any = ({ record, groupName }: any) => {
     getTopicGroupMetric({ pagination, sorter });
   };
 
-  // useEffect(() => {
-  //   getTopicGroupMetric();
-  // }, [sortObj]);
-
-  // 订阅重置offset成功的消息
-  PubSub.subscribe('ConsumerGroup-ResetOffset', function(data){
-    getTopicGroupMetric({});
-  })
-
   useEffect(() => {
     const hashData = hashDataParse(location.hash);
     // if (!hashData.groupName) return;
@@ -248,7 +238,7 @@ export const ExpandedRow: any = ({ record, groupName }: any) => {
       // 获取Consumer列表 表格模式
       getTopicGroupMetric({});
     });
-  }, [hashDataParse(location.hash).groupName]);
+  }, [hashDataParse(location.hash).groupName, refreshKey]);
 
   useEffect(() => {
     if (partitionList.length === 0) return;

diff --git a/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx b/km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
@@ -4,7 +4,6 @@ import { useParams } from 'react-router-dom';
 import EditTable from '../TestingProduce/component/EditTable';
 import Api from '@src/api/index';
 import moment from 'moment';
-import PubSub from 'pubsub-js';
 
 const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number | String) => void }) => {
   const { value, onChange } = props;
@@ -45,7 +44,7 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number
 };
 
 export default (props: any) => {
-  const { record, visible, setVisible } = props;
+  const { record, visible, setVisible, resetOffsetFn } = props;
   const routeParams = useParams<{
     clusterId: string;
   }>();
@@ -108,7 +107,7 @@ export default (props: any) => {
         });
         setVisible(false);
         // 发布重置offset成功的消息
-        PubSub.publish('ConsumerGroup-ResetOffset', '1');
+        resetOffsetFn();
       } else {
         notification.error({
           message: '重置offset失败',