From d162b312300b574be758e0c260b2c0a02741ad5c Mon Sep 17 00:00:00 2001 From: Lex Li Date: Wed, 24 Jan 2024 11:03:12 +0800 Subject: [PATCH 1/4] Update cluster_manage.md --- docs/docs/user_guide/register_center/cluster_manage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/user_guide/register_center/cluster_manage.md b/docs/docs/user_guide/register_center/cluster_manage.md index 2cd5a7c539..6742c0da8a 100644 --- a/docs/docs/user_guide/register_center/cluster_manage.md +++ b/docs/docs/user_guide/register_center/cluster_manage.md @@ -52,7 +52,7 @@ title: 集群 | 集群名称 | 集群名称, 用于区分不同集群 | 是 | 无 | flink-session | | 集群别名 | 集群别名, 用于区分不同集群, 如不填默认同集群名称 | 否 | 同集群名称 | flink-session | | 集群类型 | 集群类型, 目前支持 Local, Standalone, Yarn Session, Kubernetes Session | 是 | 无 | Standalone | -| JobManger 高可用地址 | 添加 Flink 集群的 JobManager 的 RestApi 地址。当 HA 模式时，地址间用英文逗号分隔，例如：192.168.123.101 | 是 | 无 | +| JobManager 高可用地址 | 添加 Flink 集群的 JobManager 的 RestApi 地址。当 HA 模式时，地址间用英文逗号分隔，例如：192.168.123.101 | 是 | 无 | | 备注 | 备注, 用于备注集群信息 | 否 | 无 | flink-session | ## 集群配置 From 8b6d0330adac2cbe6bd7c869e0268c3378e7db06 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Wed, 24 Jan 2024 11:10:15 +0800 Subject: [PATCH 2/4] Update FlinkAPI.java --- dinky-core/src/main/java/org/dinky/api/FlinkAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java b/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java index e73771c579..14d4aaef97 100644 --- a/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java +++ b/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java @@ -94,7 +94,7 @@ private JsonNode get(String route) { } /** - * get请求获取jobManger/TaskManager的日志 (结果为字符串并不是json格式) + * get请求获取jobManager/TaskManager的日志 (结果为字符串并不是json格式) * * @param route route * @return {@link String} From a2a7e8aa364c83e351b43bc6b9120098e10a1d91 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Wed, 24 Jan 2024 11:12:23 +0800 Subject: [PATCH 3/4] Update pages.ts --- dinky-web/src/locales/en-US/pages.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dinky-web/src/locales/en-US/pages.ts b/dinky-web/src/locales/en-US/pages.ts index 85fc848876..4ea4f2d9af 100644 --- a/dinky-web/src/locales/en-US/pages.ts +++ b/dinky-web/src/locales/en-US/pages.ts @@ -800,8 +800,8 @@ export default { 'rc.ci.killConfirm': 'Are you sure to stop this Flink Cluster instance? Please note that after stopping, it will not be recovered! The associated task will affect, please be careful!', 'rc.ci.kill': 'Stop Flink Cluster Instance', - 'rc.ci.jma': 'JobManger Address', - 'rc.ci.jmha': 'JobManger HA Address', + 'rc.ci.jma': 'JobManager Address', + 'rc.ci.jmha': 'JobManager HA Address', 'rc.ci.jmha.tips': 'Add the RestApi address of the JobManager of the Flink cluster. In HA mode, the addresses are separated by commas, for example', 'rc.ci.jmha.validate.port': 'Does not meet the rules! Port number range [0-65535]', @@ -811,7 +811,7 @@ export default { 'rc.ci.modify': 'Modify cluster Instance', 'rc.ci.name': 'Name', 'rc.ci.autoRegisterCannotModify': - 'Automatically registered instances can only modify the `JobManger high-availability address` attribute, and others cannot be modified!', + 'Automatically registered instances can only modify the `JobManager high-availability address` attribute, and others cannot be modified!', 'rc.ci.namePlaceholder': 'Please enter a name!', 'rc.ci.recycle': 'Recycle Flink Cluster Instances', 'rc.ci.recycleConfirm': From 768708e56c6c8a3976a741ce824274fa42d9b6b7 Mon Sep 17 00:00:00 2001 From: Lex Li Date: Wed, 24 Jan 2024 11:17:58 +0800 Subject: [PATCH 4/4] Update pages.ts --- dinky-web/src/locales/zh-CN/pages.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dinky-web/src/locales/zh-CN/pages.ts b/dinky-web/src/locales/zh-CN/pages.ts index 3e6cc7e8db..6fa5e374d0 100644 --- a/dinky-web/src/locales/zh-CN/pages.ts +++ b/dinky-web/src/locales/zh-CN/pages.ts @@ -766,8 +766,8 @@ export default { '确定停止该 Flink 实例吗? 请注意,停止后将无法恢复!关联的任务将会收到影响,请谨慎操作!', 'rc.ci.heartbeat': '心跳检测', 'rc.ci.kill': '停止 Flink 实例', - 'rc.ci.jma': 'JobManger 地址', - 'rc.ci.jmha': 'JobManger 高可用地址', + 'rc.ci.jma': 'JobManager 地址', + 'rc.ci.jmha': 'JobManager 高可用地址', 'rc.ci.jmha.tips': '添加 Flink 集群的 JobManager 的 RestApi 地址。当 HA 模式时，地址间用英文逗号分隔，例如：192.168.123.101', 'rc.ci.jmha.validate.port': '不符合规则! 端口号区间[0-65535]', @@ -777,7 +777,7 @@ export default { 'rc.ci.modify': '修改集群', 'rc.ci.name': '实例名称', 'rc.ci.autoRegisterCannotModify': - '自动注册的实例仅能修改 `JobManger高可用地址` 属性,其他无法修改!', + '自动注册的实例仅能修改 `JobManager高可用地址` 属性,其他无法修改!', 'rc.ci.namePlaceholder': '请输入名称!', 'rc.ci.recycle': '回收 Flink 实例', 'rc.ci.recycleConfirm': '确定回收所有自动创建且过期的 Flink 实例吗？',