Merge remote-tracking branch 'origin/xml_path_23_8' into xml_path_23_8

apache · Aug 24, 2024 · db9fffc · db9fffc
2 parents 8e36967 + 3da4419
commit db9fffc
Show file tree

Hide file tree

Showing 238 changed files with 333 additions and 18,872 deletions.
diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc
@@ -17,7 +17,7 @@
 {
   "config": {
     "default": true,
-    "MD001": false,
+    "MD001": true,
     "MD052": false,
     "MD003": false,
     "MD013": false,
@@ -30,12 +30,13 @@
     "MD035": false,
     "MD036": false,
     "MD040": false,
-    "MD041": false,
     "MD045": false,
     "MD046": false,
-    "MD047": false
+    "MD047": true
   },
   "ignore": [
-    "node_modules/"
+    "node_modules/",
+    "target/",
+    "dist/"
   ]
 }
diff --git a/alerter/pom.xml b/alerter/pom.xml
@@ -73,19 +73,19 @@
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-annotation</artifactId>
-            <version>4.3.0</version>
+            <version>${easy-poi.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>4.1.1</version>
+            <version>${poi.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>4.1.1</version>
+            <version>${poi.version}</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/collector/pom.xml b/collector/pom.xml
@@ -30,8 +30,6 @@
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     </properties>
 
     <dependencies>
@@ -89,7 +87,7 @@
         <dependency>
             <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
             <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <version>1.4.2</version>
+            <version>${concurrentlinkedhashmap-lru.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -126,12 +124,12 @@
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-core</artifactId>
-            <version>2.13.1</version>
+            <version>${sshd-core.version}</version>
         </dependency>
         <dependency>
             <groupId>net.i2p.crypto</groupId>
             <artifactId>eddsa</artifactId>
-            <version>0.3.0</version>
+            <version>${eddsa.version}</version>
         </dependency>
         <!-- sql server -->
         <dependency>
@@ -163,40 +161,40 @@
         <dependency>
             <groupId>org.snmp4j</groupId>
             <artifactId>snmp4j</artifactId>
-            <version>3.6.7</version>
+            <version>${snmp4j.version}</version>
         </dependency>
 
         <!-- rocketmq -->
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-tools</artifactId>
-            <version>4.9.4</version>
+            <version>${rocketmq-tools.version}</version>
         </dependency>
 
         <!--dns-->
         <dependency>
             <groupId>dnsjava</groupId>
             <artifactId>dnsjava</artifactId>
-            <version>3.5.2</version>
+            <version>${dnsjava.version}</version>
         </dependency>
 
         <!-- consul -->
         <dependency>
             <groupId>com.ecwid.consul</groupId>
             <artifactId>consul-api</artifactId>
-            <version>1.4.5</version>
+            <version>${consul-api.version}</version>
         </dependency>
         <!-- nacos -->
         <dependency>
             <groupId>com.alibaba.nacos</groupId>
             <artifactId>nacos-client</artifactId>
-            <version>2.2.1</version>
+            <version>${nacos-client.version}</version>
         </dependency>
         <!-- nebula graph client -->
         <dependency>
             <groupId>com.vesoft</groupId>
             <artifactId>client</artifactId>
-            <version>3.6.0</version>
+            <version>${vesoft-client.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>javax.servlet</groupId>

diff --git a/common/pom.xml b/common/pom.xml
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.eclipse.persistence</groupId>
             <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>4.0.2</version>
+            <version>${eclipse-jpa.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -126,7 +126,7 @@
         <dependency>
             <groupId>com.beetstra.jutf7</groupId>
             <artifactId>jutf7</artifactId>
-            <version>1.0.0</version>
+            <version>${jutf7.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/home/docs/community/how-to-release.md b/home/docs/community/how-to-release.md
@@ -168,6 +168,8 @@ $ svn ci -m "add gpg key for muchunjin"
 
 ## 3. Prepare material package & release
 
+### Build Package
+
 #### 3.1 Based on the master branch, create a release-${release_version}-rcx branch, such as release-1.6.0-rc1, And create a tag named v1.6.0-rc1 based on the release-1.6.0-rc1 branch, and set this tag as pre-release
 
 ```shell
@@ -228,6 +230,8 @@ release-1.6.0-rc1
 
 The archive package is here `dist/apache-hertzbeat-1.6.0-incubating-src.tar.gz`
 
+### Sign package
+
 #### 3.5 Sign binary and source packages
 
 > The `gpg -u 33545C76`  `33545C76` is your gpg secret ID, see from `gpg --keyid-format SHORT --list-keys`
@@ -333,7 +337,7 @@ svn commit -m "release for HertzBeat 1.6.0"
 
 ## 4. Enter the community voting stage
 
-#### 4.1 Send a Community Vote Email
+### 4.1 Send a Community Vote Email
 
 Send a voting email in the community requires at least three `+1` and no `-1`.
 
@@ -525,9 +529,9 @@ One item of the email content is `Vote thread`, and the link is obtained here: <
 
 Wait a day to see if the tutor has any other comments, if not, send the following announcement email
 
-## 4. Complete the final publishing steps
+## 5. Complete the final publishing steps
 
-#### 4.1 Migrating source and binary packages
+### 5.1 Migrating source and binary packages
 
 ```shell
 svn mv https://dist.apache.org/repos/dist/dev/incubator/hertzbeat/1.6.0-RC1 https://dist.apache.org/repos/dist/release/incubator/hertzbeat/1.6.0  -m "transfer packages for 1.6.0-RC1"

diff --git a/home/docs/help/flink_on_yarn.md b/home/docs/help/flink_on_yarn.md
@@ -2,7 +2,7 @@
 
 > Measurement and monitoring of general metrics for Flink stream engine in Yarn running mode.
 
-### Configuration Parameters
+## Configuration Parameters
 
 |   Parameter Name    |                                             Parameter Help Description                                              |
 |---------------------|---------------------------------------------------------------------------------------------------------------------|

diff --git a/home/docs/help/greenplum.md b/home/docs/help/greenplum.md
@@ -53,4 +53,3 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo
 | Metric name | Metric unit |       Metric help description        |
 |-------------|-------------|--------------------------------------|
 | running     | connections | Number of current client connections |
-
diff --git a/home/docs/help/kubernetes.md b/home/docs/help/kubernetes.md
@@ -13,7 +13,7 @@ If you want to monitor the information in 'Kubernetes', you need to obtain an au
 
 Refer to the steps to obtain token
 
-#### method one
+### method one
 
 1. Create a service account and bind the default cluster-admin administrator cluster role
 
@@ -27,7 +27,7 @@ kubectl -n kube-system get secret | grep dashboard-admin | awk '{print $1}'
 kubectl describe secret {secret} -n kube-system
 ```
 
-#### method two
+### method two
 
 ```shell
 kubectl create serviceaccount cluster-admin

diff --git a/home/docs/help/status.md b/home/docs/help/status.md
@@ -1,7 +1,4 @@
-Here is the English translation of the provided text:
-
 ---
-
 id: status  
 title: Status Page  
 sidebar_label: Status Page  

diff --git a/home/docs/help/vastbase.md b/home/docs/help/vastbase.md
@@ -53,4 +53,3 @@ keywords: [open source monitoring tool, open source database monitoring tool, mo
 | Metric name | Metric unit |       Metric help description        |
 |-------------|-------------|--------------------------------------|
 | running     | connections | Number of current client connections |
-
diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md
@@ -8,7 +8,7 @@ sidebar_label: Quick Start
 
 - If you wish to deploy Apache HertzBeat (incubating) locally, please refer to the following Deployment Documentation for instructions.
 
-### 🍞 Install HertzBeat
+#### 🍞 Install HertzBeat
 
 > Apache HertzBeat (incubating) supports installation through source code, docker or package, cpu support X86/ARM64.
 

diff --git a/home/i18n/en/docusaurus-plugin-content-docs/version-v1.4.x.json b/home/i18n/en/docusaurus-plugin-content-docs/version-v1.4.x.json
diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md b/home/i18n/zh-cn/docusaurus-plugin-content-blog/2022-09-04-hertzbeat-v1.1.3.md
@@ -70,4 +70,4 @@ Bugfix.
 
 Online <https://console.tancloud.cn>.
 
-Have Fun
+Have Fun
diff --git a/...i18n/zh-cn/docusaurus-plugin-content-blog/2024-06-11-hertzbeat-v1.6.0-update.md b/...i18n/zh-cn/docusaurus-plugin-content-blog/2024-06-11-hertzbeat-v1.6.0-update.md
@@ -1,10 +1,10 @@
 # HertzBeat 1.6.0 升级指南
 
-### 注意：该指南适用于1.5.0向1.6.0版本升级
+## 注意：该指南适用于1.5.0向1.6.0版本升级
 
-### 如果你使用更老的版本，建议使用导出功能重新安装，或先升级到1.5.0再按本指南升级到1.6.0
+## 如果你使用更老的版本，建议使用导出功能重新安装，或先升级到1.5.0再按本指南升级到1.6.0
 
-### 二进制安装包升级
+## 二进制安装包升级
 
 1. 升级Java环境