From 5cd95909072586f0277a763d85c84afc684237c2 Mon Sep 17 00:00:00 2001 From: Jast Date: Tue, 3 Sep 2024 21:35:14 +0800 Subject: [PATCH 1/2] [improve] Update ElasticSearch monitoring template. Description supports i18n (#2662) Co-authored-by: Calvin --- manager/src/main/resources/define/app-elasticsearch.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/manager/src/main/resources/define/app-elasticsearch.yml b/manager/src/main/resources/define/app-elasticsearch.yml index be6e3ccb60b..6119fef2e9d 100644 --- a/manager/src/main/resources/define/app-elasticsearch.yml +++ b/manager/src/main/resources/define/app-elasticsearch.yml @@ -121,6 +121,9 @@ params: metrics: # metrics - cpu - name: health + i18n: + zh-CN: 集群健康状态 + en-US: Cluster Health Status # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue priority: 0 @@ -224,6 +227,9 @@ metrics: parseType: default - name: nodes + i18n: + zh-CN: 集群节点信息 + en-US: Cluster Nodes priority: 1 fields: - field: total @@ -260,6 +266,9 @@ metrics: parseScript: '$._nodes' - name: nodes_detail + i18n: + zh-CN: 节点详细信息 + en-US: Node Detail priority: 2 fields: - field: node_name From 9024b2aca2ca860da31785fd8aa31e3757dce161 Mon Sep 17 00:00:00 2001 From: Calvin Date: Tue, 3 Sep 2024 22:06:50 +0800 Subject: [PATCH 2/2] [improve] improve markdown format for MD033 (#2657) Co-authored-by: aias00 Co-authored-by: Jast --- .markdownlint-cli2.jsonc | 4 +++- home/docs/community/code-style-and-quality-guide.md | 2 +- .../current/community/code-style-and-quality-guide.md | 2 +- .../version-v1.5.x/community/code-style-and-quality-guide.md | 2 +- .../version-v1.5.x/community/code-style-and-quality-guide.md | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc index 75dc779b7f3..03ba976d89e 100644 --- a/.markdownlint-cli2.jsonc +++ b/.markdownlint-cli2.jsonc @@ -29,7 +29,9 @@ }, "MD025": true, "MD029": true, - "MD033": false, + "MD033": { + "allowed_elements": ["table", "tr", "td", "a", "img", "sub", "b", "br", "img", "tbody", "mark", "font"] + }, "MD036": false, "MD040": true, "MD045": false, diff --git a/home/docs/community/code-style-and-quality-guide.md b/home/docs/community/code-style-and-quality-guide.md index e0ec5231c26..32b85edf13b 100644 --- a/home/docs/community/code-style-and-quality-guide.md +++ b/home/docs/community/code-style-and-quality-guide.md @@ -229,7 +229,7 @@ Error code description: For example, if the parameter cannot be null, it is best to add a `@Nonnull` annotation. If the returned value can be null, the `@Nullable` annotation should be added first. - Note: that the package name is javax.validation.requirements + Note: that the package name is javax.validation.requirements 3. If there are too many lines of code in the method, please have a try on using multiple sub methods at appropriate points to segment the method body. diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md index ca23f3db755..52c581a1f64 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md @@ -231,7 +231,7 @@ limitations under the License. 例如，如果参数不能为 null，最好添加一个 `@Nonnull` 注释。如果返回值可以为 null，则应首先添加 `@Nullable` 注释。 - 注意：包名为 javax.validation.requirements + 注意：包名为 javax.validation.requirements 3. 如果方法中的代码行数太多，请尝试在适当的点上使用多个子方法来分段方法体。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/community/code-style-and-quality-guide.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/community/code-style-and-quality-guide.md index dea85bc8aae..2e328a31eda 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/community/code-style-and-quality-guide.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.5.x/community/code-style-and-quality-guide.md @@ -168,7 +168,7 @@ limitations under the License. 例如，如果参数不能为 null，最好添加一个 `@Nonnull` 注释。如果返回值可以为 null，则应首先添加 `@Nullable` 注释。 - 注意：包名为 javax.validation.requirements + 注意：包名为 javax.validation.requirements 3. 如果方法中的代码行数太多，请尝试在适当的点上使用多个子方法来分段方法体。 diff --git a/home/versioned_docs/version-v1.5.x/community/code-style-and-quality-guide.md b/home/versioned_docs/version-v1.5.x/community/code-style-and-quality-guide.md index ef27d0d5f21..afde10c4510 100644 --- a/home/versioned_docs/version-v1.5.x/community/code-style-and-quality-guide.md +++ b/home/versioned_docs/version-v1.5.x/community/code-style-and-quality-guide.md @@ -168,7 +168,7 @@ limitations under the License. For example, if the parameter cannot be null, it is best to add a `@Nonnull` annotation. If the returned value can be null, the `@Nullable` annotation should be added first. - Note: that the package name is javax.validation.requirements + Note: that the package name is javax.validation.requirements 3. If there are too many lines of code in the method, please have a try on using multiple sub methods at appropriate points to segment the method body.