Merge branch 'master' into test/ut

apache · Sep 3, 2024 · a088916 · a088916
2 parents 55f82ca + 9024b2a
commit a088916
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git 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
@@ -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.
 
-   <mark> Note: that the package name is <code>javax.validation.requirements </code> </mark>
+   <mark> Note: that the package name is <b>javax.validation.requirements</b> </mark>
 
 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/...ocusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md b/...ocusaurus-plugin-content-docs/current/community/code-style-and-quality-guide.md
@@ -231,7 +231,7 @@ limitations under the License.
 
    例如，如果参数不能为 null，最好添加一个 `@Nonnull` 注释。如果返回值可以为 null，则应首先添加 `@Nullable` 注释。
 
-   <mark> 注意：包名为 <code>javax.validation.requirements </code> </mark>
+   <mark> 注意：包名为 <b>javax.validation.requirements</b> </mark>
 
 3. 如果方法中的代码行数太多，请尝试在适当的点上使用多个子方法来分段方法体。
 

diff --git a/...us-plugin-content-docs/version-v1.5.x/community/code-style-and-quality-guide.md b/...us-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` 注释。
 
-   <mark> 注意：包名为 <code>javax.validation.requirements </code> </mark>
+   <mark> 注意：包名为 <b>javax.validation.requirements</b> </mark>
 
 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
@@ -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.
 
-   <mark> Note: that the package name is <code>javax.validation.requirements </code> </mark>
+   <mark> Note: that the package name is <b>javax.validation.requirements</b> </mark>
 
 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/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