This is an automated email from the ASF dual-hosted git repository. dockerzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new f3c6d442a [INLONG-7043][Dashboard] Add field prompt for ES sink (#7044) f3c6d442a is described below commit f3c6d442a1cea4277060f7c3deab182dcefeca4b Author: Lizhen <88174078+bluew...@users.noreply.github.com> AuthorDate: Mon Dec 26 17:39:52 2022 +0800 [INLONG-7043][Dashboard] Add field prompt for ES sink (#7044) Co-authored-by: Charles Zhang <dockerzh...@apache.org> --- inlong-dashboard/src/locales/cn.json | 1 + inlong-dashboard/src/locales/en.json | 1 + inlong-dashboard/src/metas/sinks/defaults/Elasticsearch.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/inlong-dashboard/src/locales/cn.json b/inlong-dashboard/src/locales/cn.json index 405bf0132..e1d316d4f 100644 --- a/inlong-dashboard/src/locales/cn.json +++ b/inlong-dashboard/src/locales/cn.json @@ -167,6 +167,7 @@ "meta.Sinks.ES.RetryTimes": "重试次数", "meta.Sinks.ES.RetryTimesUnit": "次", "meta.Sinks.ES.EsVersion": "Elasticsearch 版本", + "meta.Sinks.ES.EsVersionHelp": "Elasticsearch 大版本号,比如 5/6/7", "meta.Sinks.ES.DocumentType": "文档类型", "meta.Sinks.ES.PrimaryKey": "主键", "meta.Sinks.ES.PrimaryKeyHelp": "是否将某字段作为 `_id` 字段,如果不指定,则 ES 将自动为每个文档生成唯一的 `_id`", diff --git a/inlong-dashboard/src/locales/en.json b/inlong-dashboard/src/locales/en.json index 592fb85f0..d66986604 100644 --- a/inlong-dashboard/src/locales/en.json +++ b/inlong-dashboard/src/locales/en.json @@ -167,6 +167,7 @@ "meta.Sinks.ES.RetryTimes": "RetryTimes", "meta.Sinks.ES.RetryTimesUnit": "items", "meta.Sinks.ES.EsVersion": "Elasticsearch Version", + "meta.Sinks.ES.EsVersionHelp": "Elasticsearch major version number, such as 5/6/7", "meta.Sinks.ES.DocumentType": "Document Type", "meta.Sinks.ES.PrimaryKey": "PrimaryKey", "meta.Sinks.ES.PrimaryKeyHelp": "Whether to use a certain field as the `_id` field, if not specified, ES will automatically generate a unique `_id` for each document", diff --git a/inlong-dashboard/src/metas/sinks/defaults/Elasticsearch.ts b/inlong-dashboard/src/metas/sinks/defaults/Elasticsearch.ts index 9600ac492..0bc5ce6a0 100644 --- a/inlong-dashboard/src/metas/sinks/defaults/Elasticsearch.ts +++ b/inlong-dashboard/src/metas/sinks/defaults/Elasticsearch.ts @@ -168,6 +168,7 @@ export default class ElasticsearchSink @FieldDecorator({ type: 'inputnumber', rules: [{ required: true }], + tooltip: i18n.t('meta.Sinks.ES.EsVersionHelp'), props: values => ({ min: 1, disabled: [110, 130].includes(values?.status),