Merge branch 'master' into fix-memory

Signed-off-by: tomsun28 <tomsun28@outlook.com>

.all-contributorsrc

@@ -267,9 +267,7 @@
       "contributions": [
         "code",
         "bug",
-        "design",
-        "test",
-        "blog"
+        "design"
       ]
     },
     {
@@ -363,9 +361,7 @@
       "contributions": [
         "bug",
         "code",
-        "doc",
-        "test",
-        "design"
+        "doc"
       ]
     },
     {
@@ -687,8 +683,7 @@
       "contributions": [
         "code",
         "test",
-        "doc",
-        "design"
+        "doc"
       ]
     },
     {
@@ -802,11 +797,7 @@
       "profile": "https://github.com/zqr10159",
       "contributions": [
         "doc",
-        "code",
-        "blog",
-        "bug",
-        "test",
-        "design"
+        "code"
       ]
     },
     {
@@ -898,8 +889,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/50475131?v=4",
       "profile": "https://github.com/l646505418",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -908,8 +898,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/78642589?v=4",
       "profile": "http://www.carpewang.com",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1274,11 +1263,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/105542329?v=4",
       "profile": "https://github.com/a-little-fool",
       "contributions": [
-        "code",
-        "doc",
-        "blog",
-        "bug",
-        "design"
+        "code"
       ]
     },
     {
@@ -1341,8 +1326,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/67301054?v=4",
       "profile": "http://www.jimmyqiao.top",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1435,8 +1419,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/28394742?v=4",
       "profile": "https://github.com/Clownsw",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1447,9 +1430,7 @@
       "contributions": [
         "doc",
         "code",
-        "design",
-        "bug",
-        "test"
+        "design"
       ]
     },
     {
@@ -1488,8 +1469,7 @@
       "contributions": [
         "code",
         "design",
-        "doc",
-        "bug"
+        "doc"
       ]
     },
     {
@@ -1561,9 +1541,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/42080876?v=4",
       "profile": "https://github.com/yqxxgh",
       "contributions": [
-        "doc",
-        "code",
-        "bug"
+        "doc"
       ]
     },
     {
@@ -1608,8 +1586,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/55646681?v=4",
       "profile": "https://github.com/starmilkxin",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1628,11 +1605,7 @@
       "profile": "https://github.com/LiuTianyou",
       "contributions": [
         "code",
-        "doc",
-        "bug",
-        "test",
-        "blog",
-        "design"
+        "doc"
       ]
     },
     {
@@ -1678,11 +1651,9 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/71874373?v=4",
       "profile": "https://github.com/gjjjj0101",
       "contributions": [
-        "test",
         "code",
-        "doc",
         "design",
-        "bug"
+        "test"
       ]
     },
     {
@@ -1691,8 +1662,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/37864182?v=4",
       "profile": "https://jangto.tistory.com/",
       "contributions": [
-        "code",
-        "doc"
+        "code"
       ]
     },
     {
@@ -1702,10 +1672,7 @@
       "profile": "https://crossoverjie.top/",
       "contributions": [
         "code",
-        "doc",
-        "blog",
-        "test",
-        "design"
+        "doc"
       ]
     },
     {
@@ -1741,9 +1708,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/8465969?v=4",
       "profile": "https://github.com/xuziyang",
       "contributions": [
-        "code",
-        "doc",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1797,13 +1762,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/29418975?v=4",
       "profile": "http://www.hadoop.wiki/",
       "contributions": [
-        "code",
-        "ideas",
-        "doc",
-        "blog",
-        "bug",
-        "test",
-        "design"
+        "code"
       ]
     },
     {
@@ -1812,11 +1771,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/61108539?v=4",
       "profile": "https://github.com/zuobiao-zhou",
       "contributions": [
-        "code",
-        "doc",
-        "bug",
-        "blog",
-        "test"
+        "code"
       ]
     },
     {
@@ -1852,11 +1807,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/25810623?v=4",
       "profile": "https://github.com/Aias00",
       "contributions": [
-        "code",
-        "doc",
-        "bug",
-        "ideas",
-        "test"
+        "code"
       ]
     },
     {
@@ -1874,10 +1825,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/77964041?v=4",
       "profile": "https://blog.csdn.net/qq_52397471",
       "contributions": [
-        "code",
-        "bug",
-        "test",
-        "blog"
+        "code"
       ]
     },
     {
@@ -1886,9 +1834,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/118667222?v=4",
       "profile": "https://github.com/Yanshuming1",
       "contributions": [
-        "code",
-        "doc",
-        "bug"
+        "code"
       ]
     },
     {
@@ -1988,10 +1934,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/3371163?v=4",
       "profile": "https://github.com/kerwin612",
       "contributions": [
-        "design",
         "code",
-        "doc",
-        "bug"
+        "design"
       ]
     },
     {
@@ -2018,9 +1962,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/69385076?v=4",
       "profile": "https://github.com/pwallk",
       "contributions": [
-        "code",
-        "doc",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2065,8 +2007,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/83876361?v=4",
       "profile": "https://github.com/keaifafafa",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2201,9 +2142,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/59016860?v=4",
       "profile": "https://github.com/Rancho-7",
       "contributions": [
-        "doc",
-        "code",
-        "bug"
+        "doc"
       ]
     },
     {
@@ -2221,11 +2160,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/91836599?v=4",
       "profile": "https://zzrl.cc/",
       "contributions": [
-        "code",
-        "doc",
-        "bug",
-        "test",
-        "blog"
+        "code"
       ]
     },
     {
@@ -2243,8 +2178,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/14932913?v=4",
       "profile": "https://simonsigre.com/",
       "contributions": [
-        "doc",
-        "code"
+        "doc"
       ]
     },
     {
@@ -2307,9 +2241,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/11783444?v=4",
       "profile": "https://medium.com/@pjfanning",
       "contributions": [
-        "code",
-        "bug",
-        "test"
+        "code"
       ]
     },
     {
@@ -2327,9 +2259,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/22274133?v=4",
       "profile": "https://github.com/MasamiYui",
       "contributions": [
-        "code",
-        "doc",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2384,8 +2314,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/147966331?v=4",
       "profile": "https://github.com/notbugggg",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2396,95 +2325,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "JuJinPark",
-      "name": "jujin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/44892459?v=4",
-      "profile": "https://github.com/JuJinPark",
-      "contributions": [
-        "code",
-        "doc",
-        "ideas",
-        "blog"
-      ]
-    },
-    {
-      "login": "LL-LIN",
-      "name": "LL-LIN",
-      "avatar_url": "https://avatars.githubusercontent.com/u/43002118?v=4",
-      "profile": "https://github.com/LL-LIN",
-      "contributions": [
-        "code",
-        "bug"
-      ]
-    },
-    {
-      "login": "bigcyy",
-      "name": "Yang Chen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/73413979?v=4",
-      "profile": "https://bigcyy.github.io/",
-      "contributions": [
-        "code",
-        "doc",
-        "bug"
-      ]
-    },
-    {
-      "login": "sarthakeash",
-      "name": "Sarthak Arora",
-      "avatar_url": "https://avatars.githubusercontent.com/u/74091160?v=4",
-      "profile": "https://github.com/sarthakeash",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "PengJingzhao",
-      "name": "彭镜肇",
-      "avatar_url": "https://avatars.githubusercontent.com/u/97368949?v=4",
-      "profile": "https://github.com/PengJingzhao",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "gagaradio",
-      "name": "Walter Jia",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18532370?v=4",
-      "profile": "https://github.com/gagaradio",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "boyucjz",
-      "name": "boyucjz",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18730041?v=4",
-      "profile": "https://github.com/boyucjz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "Cyanty",
-      "name": "Cyanty",
-      "avatar_url": "https://avatars.githubusercontent.com/u/153884653?v=4",
-      "profile": "https://github.com/Cyanty",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "KevinLLF",
-      "name": "Jay丿167",
-      "avatar_url": "https://avatars.githubusercontent.com/u/85452733?v=4",
-      "profile": "https://github.com/KevinLLF",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.gitattributes

@@ -17,9 +17,7 @@
 
 /home export-ignore
 /hip export-ignore
-/template-marketplace export-ignore
 /.github export-ignore
 /.idea export-ignore
-/.devcontainer export-ignore
 .gitattributes export-ignore  
 .gitignore export-ignore

.github/workflows/codeql-analysis.yml

@@ -31,8 +31,6 @@ name: "CodeQL"
 on:
   schedule:
     - cron: '21 13 * * 4'
-  push:
-    branches: [ action* ]
 
 jobs:
   analyze:

.github/workflows/doc-build-test.yml

@@ -19,7 +19,7 @@ name: DOC CI
 
 on:
   push:
-    branches: [ master, dev, action* ]
+    branches: [ master, dev ]
     paths:
       - 'home/**'
   pull_request:

.github/workflows/doc-pdf-builder.yml

@@ -17,8 +17,7 @@
 
 name: 'HertzBeat Doc Pdf Builder'
 on:
-  push:
-    branches: [ page_build* ]
+  page_build
 
 jobs:
   build:

.github/workflows/frontend-build-test.yml

@@ -22,7 +22,7 @@ name: Frontend CI
 
 on:
   push:
-    branches: [ master, dev, action* ]
+    branches: [ master, dev ]
     paths:
       - 'web-app/**'
   pull_request:

.github/workflows/license-checker.yml

@@ -22,7 +22,7 @@ name: License Checker
 
 on:
   push:
-    branches: [ master, dev, action* ]
+    branches: [ master, dev ]
   pull_request:
     branches: [ master, dev ]
 

.github/workflows/nightly-build.yml

@@ -42,7 +42,7 @@ jobs:
       run: |
         mvn clean install
         mvn clean package -Prelease -DskipTests
-        cd hertzbeat-collector
+        cd collector
         mvn clean package -Pcluster -DskipTests
 
     - uses: docker/setup-qemu-action@v3

.gitignore

@@ -7,11 +7,12 @@ build/
 out/
 micronaut-cli.yml
 .mvn/
+mvnw
+mvnw.bat
 *.log
 package-lock.json
 *.zip
 jdk/
-data/
 
 ### STS ###
 .apt_generated
@@ -53,5 +54,3 @@ node_modules
 application-dev.yml
 application-mysql.yml
 application-pg.yml
-/package.json
-/yarn.lock

.gitpod.Dockerfile

@@ -1,7 +0,0 @@
-FROM gitpod/workspace-full
-
-USER gitpod
-
-RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
-    sdk install java 17.0.3-ms && \
-    sdk default java 17.0.3-ms"

.gitpod.yml

@@ -1,6 +1,3 @@
-image:
-    file: .gitpod.Dockerfile
-
 tasks:
 
     - name: Run backend
@@ -18,6 +15,8 @@ tasks:
 
     - name: Setup backend
       init: |
+          sdk install java 17.0.11.fx-zulu < /dev/null
+          sdk default java 17.0.11.fx-zulu < /dev/null
           mvn clean install -DskipTests
       command: |
           gp sync-done setup-backend

NOTICE

@@ -1,5 +1,5 @@
 Apache HertzBeat (incubating)
-Copyright 2024-2025 The Apache Software Foundation
+Copyright 2024 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

README.md

@@ -222,7 +222,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="http://mroldx.xyz/"><img src="https://avatars.githubusercontent.com/u/34847828?v=4?s=100" width="100px;" alt="mroldx"/><br /><sub><b>mroldx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mroldx" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/woshiniusange"><img src="https://avatars.githubusercontent.com/u/91513022?v=4?s=100" width="100px;" alt="woshiniusange"/><br /><sub><b>woshiniusange</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=woshiniusange" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://vampireachao.github.io/"><img src="https://avatars.githubusercontent.com/u/52746628?v=4?s=100" width="100px;" alt="VampireAchao"/><br /><sub><b>VampireAchao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=VampireAchao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ceilzcx"><img src="https://avatars.githubusercontent.com/u/48920254?v=4?s=100" width="100px;" alt="zcx"/><br /><sub><b>zcx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACeilzcx" title="Bug reports">🐛</a> <a href="#design-Ceilzcx" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Tests">⚠️</a> <a href="#blog-Ceilzcx" title="Blogposts">📝</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ceilzcx"><img src="https://avatars.githubusercontent.com/u/48920254?v=4?s=100" width="100px;" alt="zcx"/><br /><sub><b>zcx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACeilzcx" title="Bug reports">🐛</a> <a href="#design-Ceilzcx" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/CharlieXCL"><img src="https://avatars.githubusercontent.com/u/91540487?v=4?s=100" width="100px;" alt="CharlieXCL"/><br /><sub><b>CharlieXCL</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=CharlieXCL" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Privauto"><img src="https://avatars.githubusercontent.com/u/36581456?v=4?s=100" width="100px;" alt="Privauto"/><br /><sub><b>Privauto</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Privauto" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Privauto" title="Documentation">📖</a></td>
     </tr>
@@ -236,7 +236,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://www.zhihu.com/people/kevinbauer"><img src="https://avatars.githubusercontent.com/u/28581579?v=4?s=100" width="100px;" alt="Kevin Huang"/><br /><sub><b>Kevin Huang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=kevinhuangwl" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TJxiaobao"><img src="https://avatars.githubusercontent.com/u/85919258?v=4?s=100" width="100px;" alt="铁甲小宝"/><br /><sub><b>铁甲小宝</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3ATJxiaobao" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Tests">⚠️</a> <a href="#design-TJxiaobao" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TJxiaobao"><img src="https://avatars.githubusercontent.com/u/85919258?v=4?s=100" width="100px;" alt="铁甲小宝"/><br /><sub><b>铁甲小宝</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3ATJxiaobao" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jack-123-power"><img src="https://avatars.githubusercontent.com/u/84333501?v=4?s=100" width="100px;" alt="Captain Jack"/><br /><sub><b>Captain Jack</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jack-123-power" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/haibo-duan"><img src="https://avatars.githubusercontent.com/u/7974845?v=4?s=100" width="100px;" alt="haibo.duan"/><br /><sub><b>haibo.duan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=haibo-duan" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=haibo-duan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/assassinfym"><img src="https://avatars.githubusercontent.com/u/15188754?v=4?s=100" width="100px;" alt="assassin"/><br /><sub><b>assassin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3Aassassinfym" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=assassinfym" title="Code">💻</a></td>
@@ -278,7 +278,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://wjl110.xyz/"><img src="https://avatars.githubusercontent.com/u/53851034?v=4?s=100" width="100px;" alt="wjl110"/><br /><sub><b>wjl110</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wjl110" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ngyhd"><img src="https://avatars.githubusercontent.com/u/29095207?v=4?s=100" width="100px;" alt="Sean"/><br /><sub><b>Sean</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ngyhd" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Daydreamer-ia"><img src="https://avatars.githubusercontent.com/u/83362909?v=4?s=100" width="100px;" alt="chenyiqin"/><br /><sub><b>chenyiqin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Daydreamer-ia" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Daydreamer-ia" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hudongdong129"><img src="https://avatars.githubusercontent.com/u/34374227?v=4?s=100" width="100px;" alt="hudongdong129"/><br /><sub><b>hudongdong129</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Documentation">📖</a> <a href="#design-hudongdong129" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hudongdong129"><img src="https://avatars.githubusercontent.com/u/34374227?v=4?s=100" width="100px;" alt="hudongdong129"/><br /><sub><b>hudongdong129</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/TherChenYang"><img src="https://avatars.githubusercontent.com/u/124348939?v=4?s=100" width="100px;" alt="TherChenYang"/><br /><sub><b>TherChenYang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=TherChenYang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TherChenYang" title="Tests">⚠️</a></td>
@@ -294,7 +294,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/baiban114"><img src="https://avatars.githubusercontent.com/u/59152619?v=4?s=100" width="100px;" alt="TableRow"/><br /><sub><b>TableRow</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=baiban114" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=baiban114" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ByteIDance"><img src="https://avatars.githubusercontent.com/u/100207562?v=4?s=100" width="100px;" alt="ByteIDance"/><br /><sub><b>ByteIDance</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ByteIDance" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mangel2002"><img src="https://avatars.githubusercontent.com/u/9348020?v=4?s=100" width="100px;" alt="Jangfe"/><br /><sub><b>Jangfe</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mangel2002" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zqr10159"><img src="https://avatars.githubusercontent.com/u/30048352?v=4?s=100" width="100px;" alt="zqr10159"/><br /><sub><b>zqr10159</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Code">💻</a> <a href="#blog-zqr10159" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azqr10159" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Tests">⚠️</a> <a href="#design-zqr10159" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zqr10159"><img src="https://avatars.githubusercontent.com/u/30048352?v=4?s=100" width="100px;" alt="zqr10159"/><br /><sub><b>zqr10159</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/vinci-897"><img src="https://avatars.githubusercontent.com/u/55838224?v=4?s=100" width="100px;" alt="vinci"/><br /><sub><b>vinci</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=vinci-897" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=vinci-897" title="Documentation">📖</a> <a href="#design-vinci-897" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/js110"><img src="https://avatars.githubusercontent.com/u/51191863?v=4?s=100" width="100px;" alt="js110"/><br /><sub><b>js110</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=js110" title="Code">💻</a></td>
     </tr>
@@ -308,8 +308,8 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZangJuxy"><img src="https://avatars.githubusercontent.com/u/71380295?v=4?s=100" width="100px;" alt="ZangJuxy"/><br /><sub><b>ZangJuxy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZangJuxy" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/l646505418"><img src="https://avatars.githubusercontent.com/u/50475131?v=4?s=100" width="100px;" alt="l646505418"/><br /><sub><b>l646505418</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=l646505418" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Al646505418" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.carpewang.com"><img src="https://avatars.githubusercontent.com/u/78642589?v=4?s=100" width="100px;" alt="Carpe-Wang"/><br /><sub><b>Carpe-Wang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Carpe-Wang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACarpe-Wang" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/l646505418"><img src="https://avatars.githubusercontent.com/u/50475131?v=4?s=100" width="100px;" alt="l646505418"/><br /><sub><b>l646505418</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=l646505418" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.carpewang.com"><img src="https://avatars.githubusercontent.com/u/78642589?v=4?s=100" width="100px;" alt="Carpe-Wang"/><br /><sub><b>Carpe-Wang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Carpe-Wang" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/moshu023"><img src="https://avatars.githubusercontent.com/u/48593205?v=4?s=100" width="100px;" alt="莫枢"/><br /><sub><b>莫枢</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=moshu023" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/huangcanda"><img src="https://avatars.githubusercontent.com/u/4470566?v=4?s=100" width="100px;" alt="huangcanda"/><br /><sub><b>huangcanda</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=huangcanda" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.zrkizzy.com"><img src="https://avatars.githubusercontent.com/u/85340613?v=4?s=100" width="100px;" alt="世纪末的架构师"/><br /><sub><b>世纪末的架构师</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Architect-Java" title="Code">💻</a></td>
@@ -359,7 +359,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lisongning"><img src="https://avatars.githubusercontent.com/u/93140178?v=4?s=100" width="100px;" alt="lisongning"/><br /><sub><b>lisongning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lisongning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/YutingNie"><img src="https://avatars.githubusercontent.com/u/104416402?v=4?s=100" width="100px;" alt="YutingNie"/><br /><sub><b>YutingNie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Documentation">📖</a> <a href="#design-YutingNie" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikezzb"><img src="https://avatars.githubusercontent.com/u/23418428?v=4?s=100" width="100px;" alt="Mike Zhou"/><br /><sub><b>Mike Zhou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Documentation">📖</a> <a href="#design-mikezzb" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Documentation">📖</a> <a href="#blog-a-little-fool" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aa-little-fool" title="Bug reports">🐛</a> <a href="#design-a-little-fool" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/littlezhongzer"><img src="https://avatars.githubusercontent.com/u/33685289?v=4?s=100" width="100px;" alt="littlezhongzer"/><br /><sub><b>littlezhongzer</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=littlezhongzer" title="Code">💻</a></td>
@@ -368,7 +368,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/XimfengYao"><img src="https://avatars.githubusercontent.com/u/17541537?v=4?s=100" width="100px;" alt="姚贤丰"/><br /><sub><b>姚贤丰</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=XimfengYao" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LINGLUOJUN"><img src="https://avatars.githubusercontent.com/u/16778977?v=4?s=100" width="100px;" alt="lingluojun"/><br /><sub><b>lingluojun</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LINGLUOJUN" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.luelueking.com"><img src="https://avatars.githubusercontent.com/u/93204032?v=4?s=100" width="100px;" alt="1ue"/><br /><sub><b>1ue</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=luelueking" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.jimmyqiao.top"><img src="https://avatars.githubusercontent.com/u/67301054?v=4?s=100" width="100px;" alt="qyaaaa"/><br /><sub><b>qyaaaa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=qyaaaa" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aqyaaaa" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.jimmyqiao.top"><img src="https://avatars.githubusercontent.com/u/67301054?v=4?s=100" width="100px;" alt="qyaaaa"/><br /><sub><b>qyaaaa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=qyaaaa" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://novohit.top"><img src="https://avatars.githubusercontent.com/u/101090395?v=4?s=100" width="100px;" alt="novohit"/><br /><sub><b>novohit</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=novohit" title="Code">💻</a></td>
@@ -382,14 +382,14 @@ Thanks to these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/1036664317"><img src="https://avatars.githubusercontent.com/u/7696697?v=4?s=100" width="100px;" alt="moghn"/><br /><sub><b>moghn</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=1036664317" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaoguolong"><img src="https://avatars.githubusercontent.com/u/33684988?v=4?s=100" width="100px;" alt="xiaoguolong"/><br /><sub><b>xiaoguolong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaoguolong" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AClownsw" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bbelide2"><img src="https://avatars.githubusercontent.com/u/26840796?v=4?s=100" width="100px;" alt="Bala Sukesh"/><br /><sub><b>Bala Sukesh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bbelide2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinyaoMa"><img src="https://avatars.githubusercontent.com/u/25066570?v=4?s=100" width="100px;" alt="Jinyao Ma"/><br /><sub><b>Jinyao Ma</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jinyaoMa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linuxsuren.github.io/open-source-best-practice/"><img src="https://avatars.githubusercontent.com/u/1450685?v=4?s=100" width="100px;" alt="Rick"/><br /><sub><b>Rick</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Tests">⚠️</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZY945"><img src="https://avatars.githubusercontent.com/u/74083801?v=4?s=100" width="100px;" alt="东风"/><br /><sub><b>东风</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Code">💻</a> <a href="#design-ZY945" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AZY945" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZY945"><img src="https://avatars.githubusercontent.com/u/74083801?v=4?s=100" width="100px;" alt="东风"/><br /><sub><b>东风</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Code">💻</a> <a href="#design-ZY945" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/prolevel1"><img src="https://avatars.githubusercontent.com/u/51995525?v=4?s=100" width="100px;" alt="sonam singh"/><br /><sub><b>sonam singh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=prolevel1" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZhangZixuan1994"><img src="https://avatars.githubusercontent.com/u/20011653?v=4?s=100" width="100px;" alt="ZhangZixuan1994"/><br /><sub><b>ZhangZixuan1994</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZhangZixuan1994" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hurenjie1"><img src="https://avatars.githubusercontent.com/u/40120355?v=4?s=100" width="100px;" alt="SHIG"/><br /><sub><b>SHIG</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hurenjie1" title="Code">💻</a></td>
@@ -399,29 +399,29 @@ Thanks to these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/avvCode"><img src="https://avatars.githubusercontent.com/u/113538532?v=4?s=100" width="100px;" alt="avv"/><br /><sub><b>avv</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=avvCode" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yqxxgh"><img src="https://avatars.githubusercontent.com/u/42080876?v=4?s=100" width="100px;" alt="yqxxgh"/><br /><sub><b>yqxxgh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayqxxgh" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yqxxgh"><img src="https://avatars.githubusercontent.com/u/42080876?v=4?s=100" width="100px;" alt="yqxxgh"/><br /><sub><b>yqxxgh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/CharlieShi46"><img src="https://avatars.githubusercontent.com/u/149798885?v=4?s=100" width="100px;" alt="CharlieShi46"/><br /><sub><b>CharlieShi46</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=CharlieShi46" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Nctllnty"><img src="https://avatars.githubusercontent.com/u/33241818?v=4?s=100" width="100px;" alt="Nctllnty"/><br /><sub><b>Nctllnty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Nctllnty" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Wang-Yonghao"><img src="https://avatars.githubusercontent.com/u/48146606?v=4?s=100" width="100px;" alt="Wang-Yonghao"/><br /><sub><b>Wang-Yonghao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Wang-Yonghao" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.yuque.com/dudiao/yy"><img src="https://avatars.githubusercontent.com/u/38355949?v=4?s=100" width="100px;" alt="读钓"/><br /><sub><b>读钓</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dudiao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/starmilkxin"><img src="https://avatars.githubusercontent.com/u/55646681?v=4?s=100" width="100px;" alt="Xin"/><br /><sub><b>Xin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starmilkxin" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Astarmilkxin" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/starmilkxin"><img src="https://avatars.githubusercontent.com/u/55646681?v=4?s=100" width="100px;" alt="Xin"/><br /><sub><b>Xin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starmilkxin" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/handy-git"><img src="https://avatars.githubusercontent.com/u/32837980?v=4?s=100" width="100px;" alt="handy"/><br /><sub><b>handy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=handy-git" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LiuTianyou"><img src="https://avatars.githubusercontent.com/u/30208283?v=4?s=100" width="100px;" alt="LiuTianyou"/><br /><sub><b>LiuTianyou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ALiuTianyou" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Tests">⚠️</a> <a href="#blog-LiuTianyou" title="Blogposts">📝</a> <a href="#design-LiuTianyou" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LiuTianyou"><img src="https://avatars.githubusercontent.com/u/30208283?v=4?s=100" width="100px;" alt="LiuTianyou"/><br /><sub><b>LiuTianyou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/WinterKi1ler"><img src="https://avatars.githubusercontent.com/u/160592092?v=4?s=100" width="100px;" alt="WinterKi1ler"/><br /><sub><b>WinterKi1ler</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=WinterKi1ler" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://sharehoo.cn/"><img src="https://avatars.githubusercontent.com/u/45377370?v=4?s=100" width="100px;" alt="miki"/><br /><sub><b>miki</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=miki-hmt" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://codeflex.substack.com/"><img src="https://avatars.githubusercontent.com/u/85513042?v=4?s=100" width="100px;" alt="Keshav Carpenter"/><br /><sub><b>Keshav Carpenter</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=alpha951" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=alpha951" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/makechoicenow"><img src="https://avatars.githubusercontent.com/u/9911918?v=4?s=100" width="100px;" alt="makechoicenow"/><br /><sub><b>makechoicenow</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=makechoicenow" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gjjjj0101"><img src="https://avatars.githubusercontent.com/u/71874373?v=4?s=100" width="100px;" alt="Gao Jian"/><br /><sub><b>Gao Jian</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Documentation">📖</a> <a href="#design-gjjjj0101" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Agjjjj0101" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gjjjj0101"><img src="https://avatars.githubusercontent.com/u/71874373?v=4?s=100" width="100px;" alt="Gao Jian"/><br /><sub><b>Gao Jian</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Code">💻</a> <a href="#design-gjjjj0101" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Tests">⚠️</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://jangto.tistory.com/"><img src="https://avatars.githubusercontent.com/u/37864182?v=4?s=100" width="100px;" alt="Hyeon Sung"/><br /><sub><b>Hyeon Sung</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://crossoverjie.top/"><img src="https://avatars.githubusercontent.com/u/15684156?v=4?s=100" width="100px;" alt="crossoverJie"/><br /><sub><b>crossoverJie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Documentation">📖</a> <a href="#blog-crossoverJie" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Tests">⚠️</a> <a href="#design-crossoverJie" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jangto.tistory.com/"><img src="https://avatars.githubusercontent.com/u/37864182?v=4?s=100" width="100px;" alt="Hyeon Sung"/><br /><sub><b>Hyeon Sung</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://crossoverjie.top/"><img src="https://avatars.githubusercontent.com/u/15684156?v=4?s=100" width="100px;" alt="crossoverJie"/><br /><sub><b>crossoverJie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/PeixyJ"><img src="https://avatars.githubusercontent.com/u/45998593?v=4?s=100" width="100px;" alt="PeixyJ"/><br /><sub><b>PeixyJ</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PeixyJ" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hi-Mr-Wind"><img src="https://avatars.githubusercontent.com/u/85803831?v=4?s=100" width="100px;" alt="风如歌"/><br /><sub><b>风如歌</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Hi-Mr-Wind" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MananPoojara"><img src="https://avatars.githubusercontent.com/u/104253184?v=4?s=100" width="100px;" alt="Manan Pujara"/><br /><sub><b>Manan Pujara</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MananPoojara" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xuziyang"><img src="https://avatars.githubusercontent.com/u/8465969?v=4?s=100" width="100px;" alt="xuziyang"/><br /><sub><b>xuziyang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Axuziyang" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xuziyang"><img src="https://avatars.githubusercontent.com/u/8465969?v=4?s=100" width="100px;" alt="xuziyang"/><br /><sub><b>xuziyang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lwqzz"><img src="https://avatars.githubusercontent.com/u/62584513?v=4?s=100" width="100px;" alt="lwqzz"/><br /><sub><b>lwqzz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lwqzz" title="Code">💻</a></td>
     </tr>
     <tr>
@@ -429,17 +429,17 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tomorrowshipyltm"><img src="https://avatars.githubusercontent.com/u/61336903?v=4?s=100" width="100px;" alt="tomorrowshipyltm"/><br /><sub><b>tomorrowshipyltm</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=tomorrowshipyltm" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/15613060203"><img src="https://avatars.githubusercontent.com/u/41351615?v=4?s=100" width="100px;" alt="栗磊"/><br /><sub><b>栗磊</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=15613060203" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Alanxtl"><img src="https://avatars.githubusercontent.com/u/25652981?v=4?s=100" width="100px;" alt="Alan"/><br /><sub><b>Alan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Alanxtl" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.hadoop.wiki/"><img src="https://avatars.githubusercontent.com/u/29418975?v=4?s=100" width="100px;" alt="Jast"/><br /><sub><b>Jast</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Code">💻</a> <a href="#ideas-zhangshenghang" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Documentation">📖</a> <a href="#blog-zhangshenghang" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azhangshenghang" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Tests">⚠️</a> <a href="#design-zhangshenghang" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zuobiao-zhou"><img src="https://avatars.githubusercontent.com/u/61108539?v=4?s=100" width="100px;" alt="Zhang Yuxuan"/><br /><sub><b>Zhang Yuxuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azuobiao-zhou" title="Bug reports">🐛</a> <a href="#blog-zuobiao-zhou" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.hadoop.wiki/"><img src="https://avatars.githubusercontent.com/u/29418975?v=4?s=100" width="100px;" alt="Jast"/><br /><sub><b>Jast</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zuobiao-zhou"><img src="https://avatars.githubusercontent.com/u/61108539?v=4?s=100" width="100px;" alt="Zhang Yuxuan"/><br /><sub><b>Zhang Yuxuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pzz-2021"><img src="https://avatars.githubusercontent.com/u/118056735?v=4?s=100" width="100px;" alt="P.P."/><br /><sub><b>P.P.</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Pzz-2021" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LLP2333"><img src="https://avatars.githubusercontent.com/u/61670545?v=4?s=100" width="100px;" alt="llp2333"/><br /><sub><b>llp2333</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LLP2333" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HeartLinked"><img src="https://avatars.githubusercontent.com/u/78212101?v=4?s=100" width="100px;" alt="feiyang li"/><br /><sub><b>feiyang li</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=HeartLinked" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Aias00"><img src="https://avatars.githubusercontent.com/u/25810623?v=4?s=100" width="100px;" alt="aias00"/><br /><sub><b>aias00</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AAias00" title="Bug reports">🐛</a> <a href="#ideas-Aias00" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Aias00"><img src="https://avatars.githubusercontent.com/u/25810623?v=4?s=100" width="100px;" alt="aias00"/><br /><sub><b>aias00</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/westboy"><img src="https://avatars.githubusercontent.com/u/6385565?v=4?s=100" width="100px;" alt="Jin"/><br /><sub><b>Jin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=westboy" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://blog.csdn.net/qq_52397471"><img src="https://avatars.githubusercontent.com/u/77964041?v=4?s=100" width="100px;" alt="YuLuo"/><br /><sub><b>YuLuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayuluo-yx" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Tests">⚠️</a> <a href="#blog-yuluo-yx" title="Blogposts">📝</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Yanshuming1"><img src="https://avatars.githubusercontent.com/u/118667222?v=4?s=100" width="100px;" alt="linDong"/><br /><sub><b>linDong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AYanshuming1" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.csdn.net/qq_52397471"><img src="https://avatars.githubusercontent.com/u/77964041?v=4?s=100" width="100px;" alt="YuLuo"/><br /><sub><b>YuLuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Yanshuming1"><img src="https://avatars.githubusercontent.com/u/118667222?v=4?s=100" width="100px;" alt="linDong"/><br /><sub><b>linDong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lwjxy"><img src="https://avatars.githubusercontent.com/u/52726400?v=4?s=100" width="100px;" alt="lwjxy"/><br /><sub><b>lwjxy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lwjxy" title="Code">💻</a></td>
     </tr>
     <tr>
@@ -454,17 +454,17 @@ Thanks to these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ileonli"><img src="https://avatars.githubusercontent.com/u/45332412?v=4?s=100" width="100px;" alt="Leon Li"/><br /><sub><b>Leon Li</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ileonli" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://fnil.net/"><img src="https://avatars.githubusercontent.com/u/14142?v=4?s=100" width="100px;" alt="dennis zhuang"/><br /><sub><b>dennis zhuang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=killme2008" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kerwin612"><img src="https://avatars.githubusercontent.com/u/3371163?v=4?s=100" width="100px;" alt="Kerwin Bryant"/><br /><sub><b>Kerwin Bryant</b></sub></a><br /><a href="#design-kerwin612" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Akerwin612" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kerwin612"><img src="https://avatars.githubusercontent.com/u/3371163?v=4?s=100" width="100px;" alt="Kerwin Bryant"/><br /><sub><b>Kerwin Bryant</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Code">💻</a> <a href="#design-kerwin612" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShineDevelopment"><img src="https://avatars.githubusercontent.com/u/59306780?v=4?s=100" width="100px;" alt="daixianglong"/><br /><sub><b>daixianglong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ShineDevelopment" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mchgood"><img src="https://avatars.githubusercontent.com/u/38482005?v=4?s=100" width="100px;" alt="mchgood"/><br /><sub><b>mchgood</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mchgood" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pwallk"><img src="https://avatars.githubusercontent.com/u/69385076?v=4?s=100" width="100px;" alt="kangli"/><br /><sub><b>kangli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Apwallk" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pwallk"><img src="https://avatars.githubusercontent.com/u/69385076?v=4?s=100" width="100px;" alt="kangli"/><br /><sub><b>kangli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cdphantom"><img src="https://avatars.githubusercontent.com/u/12674795?v=4?s=100" width="100px;" alt="cdphantom"/><br /><sub><b>cdphantom</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cdphantom" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/asd108908382"><img src="https://avatars.githubusercontent.com/u/77717999?v=4?s=100" width="100px;" alt="jiawei.guo"/><br /><sub><b>jiawei.guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=asd108908382" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Akeaifafafa" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
@@ -483,13 +483,13 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/starryCoder"><img src="https://avatars.githubusercontent.com/u/46510059?v=4?s=100" width="100px;" alt="starryCoder"/><br /><sub><b>starryCoder</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starryCoder" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hasimmollah"><img src="https://avatars.githubusercontent.com/u/32538599?v=4?s=100" width="100px;" alt="hasimmollah"/><br /><sub><b>hasimmollah</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hasimmollah" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ayu-v0"><img src="https://avatars.githubusercontent.com/u/127600988?v=4?s=100" width="100px;" alt="Ayu"/><br /><sub><b>Ayu</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ayu-v0" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rancho-7"><img src="https://avatars.githubusercontent.com/u/59016860?v=4?s=100" width="100px;" alt="Nick Guo"/><br /><sub><b>Nick Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ARancho-7" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rancho-7"><img src="https://avatars.githubusercontent.com/u/59016860?v=4?s=100" width="100px;" alt="Nick Guo"/><br /><sub><b>Nick Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/doveLin0818"><img src="https://avatars.githubusercontent.com/u/190927907?v=4?s=100" width="100px;" alt="doveLin"/><br /><sub><b>doveLin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=doveLin0818" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://zzrl.cc/"><img src="https://avatars.githubusercontent.com/u/91836599?v=4?s=100" width="100px;" alt="yunfan24"/><br /><sub><b>yunfan24</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayunfan24" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Tests">⚠️</a> <a href="#blog-yunfan24" title="Blogposts">📝</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zzrl.cc/"><img src="https://avatars.githubusercontent.com/u/91836599?v=4?s=100" width="100px;" alt="yunfan24"/><br /><sub><b>yunfan24</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lctking"><img src="https://avatars.githubusercontent.com/u/168249998?v=4?s=100" width="100px;" alt="nullwli"/><br /><sub><b>nullwli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lctking" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://simonsigre.com/"><img src="https://avatars.githubusercontent.com/u/14932913?v=4?s=100" width="100px;" alt="Simon Sigré"/><br /><sub><b>Simon Sigré</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://simonsigre.com/"><img src="https://avatars.githubusercontent.com/u/14932913?v=4?s=100" width="100px;" alt="Simon Sigré"/><br /><sub><b>Simon Sigré</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.ponfee.cn/"><img src="https://avatars.githubusercontent.com/u/46117331?v=4?s=100" width="100px;" alt="ponfee"/><br /><sub><b>ponfee</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ponfee" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Vedant7789"><img src="https://avatars.githubusercontent.com/u/147625492?v=4?s=100" width="100px;" alt="Vedant7789"/><br /><sub><b>Vedant7789</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Vedant7789" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Craaaaazy77"><img src="https://avatars.githubusercontent.com/u/23025522?v=4?s=100" width="100px;" alt="Craaaaazy77"/><br /><sub><b>Craaaaazy77</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Craaaaazy77" title="Documentation">📖</a></td>
@@ -498,9 +498,9 @@ Thanks to these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/helei1030"><img src="https://avatars.githubusercontent.com/u/11839080?v=4?s=100" width="100px;" alt="helei1030"/><br /><sub><b>helei1030</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=helei1030" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Apjfanning" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MonsterChenzhuo"><img src="https://avatars.githubusercontent.com/u/60029759?v=4?s=100" width="100px;" alt="monster"/><br /><sub><b>monster</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MonsterChenzhuo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AMasamiYui" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wanhao23"><img src="https://avatars.githubusercontent.com/u/29560961?v=4?s=100" width="100px;" alt="wanhao"/><br /><sub><b>wanhao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jonasHanhan"><img src="https://avatars.githubusercontent.com/u/130035609?v=4?s=100" width="100px;" alt="jonasHanhan"/><br /><sub><b>jonasHanhan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jonasHanhan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/NikhilMurugesan"><img src="https://avatars.githubusercontent.com/u/49281792?v=4?s=100" width="100px;" alt="NikhilMurugesan"/><br /><sub><b>NikhilMurugesan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=NikhilMurugesan" title="Code">💻</a></td>
@@ -508,19 +508,8 @@ Thanks to these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/myangle1120"><img src="https://avatars.githubusercontent.com/u/19237013?v=4?s=100" width="100px;" alt="myangle1120"/><br /><sub><b>myangle1120</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=myangle1120" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yasminvo"><img src="https://avatars.githubusercontent.com/u/107528848?v=4?s=100" width="100px;" alt="yasminvo"/><br /><sub><b>yasminvo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yasminvo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Anotbugggg" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yyahang"><img src="https://avatars.githubusercontent.com/u/90464876?v=4?s=100" width="100px;" alt="yyahang"/><br /><sub><b>yyahang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yyahang" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JuJinPark"><img src="https://avatars.githubusercontent.com/u/44892459?v=4?s=100" width="100px;" alt="jujin"/><br /><sub><b>jujin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Documentation">📖</a> <a href="#ideas-JuJinPark" title="Ideas, Planning, & Feedback">🤔</a> <a href="#blog-JuJinPark" title="Blogposts">📝</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LL-LIN"><img src="https://avatars.githubusercontent.com/u/43002118?v=4?s=100" width="100px;" alt="LL-LIN"/><br /><sub><b>LL-LIN</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LL-LIN" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ALL-LIN" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://bigcyy.github.io/"><img src="https://avatars.githubusercontent.com/u/73413979?v=4?s=100" width="100px;" alt="Yang Chen"/><br /><sub><b>Yang Chen</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Abigcyy" title="Bug reports">🐛</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sarthakeash"><img src="https://avatars.githubusercontent.com/u/74091160?v=4?s=100" width="100px;" alt="Sarthak Arora"/><br /><sub><b>Sarthak Arora</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PengJingzhao"><img src="https://avatars.githubusercontent.com/u/97368949?v=4?s=100" width="100px;" alt="彭镜肇"/><br /><sub><b>彭镜肇</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PengJingzhao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gagaradio"><img src="https://avatars.githubusercontent.com/u/18532370?v=4?s=100" width="100px;" alt="Walter Jia"/><br /><sub><b>Walter Jia</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gagaradio" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_CN.md

@@ -221,7 +221,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="http://mroldx.xyz/"><img src="https://avatars.githubusercontent.com/u/34847828?v=4?s=100" width="100px;" alt="mroldx"/><br /><sub><b>mroldx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mroldx" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/woshiniusange"><img src="https://avatars.githubusercontent.com/u/91513022?v=4?s=100" width="100px;" alt="woshiniusange"/><br /><sub><b>woshiniusange</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=woshiniusange" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://vampireachao.github.io/"><img src="https://avatars.githubusercontent.com/u/52746628?v=4?s=100" width="100px;" alt="VampireAchao"/><br /><sub><b>VampireAchao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=VampireAchao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ceilzcx"><img src="https://avatars.githubusercontent.com/u/48920254?v=4?s=100" width="100px;" alt="zcx"/><br /><sub><b>zcx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACeilzcx" title="Bug reports">🐛</a> <a href="#design-Ceilzcx" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Tests">⚠️</a> <a href="#blog-Ceilzcx" title="Blogposts">📝</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Ceilzcx"><img src="https://avatars.githubusercontent.com/u/48920254?v=4?s=100" width="100px;" alt="zcx"/><br /><sub><b>zcx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Ceilzcx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACeilzcx" title="Bug reports">🐛</a> <a href="#design-Ceilzcx" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/CharlieXCL"><img src="https://avatars.githubusercontent.com/u/91540487?v=4?s=100" width="100px;" alt="CharlieXCL"/><br /><sub><b>CharlieXCL</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=CharlieXCL" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Privauto"><img src="https://avatars.githubusercontent.com/u/36581456?v=4?s=100" width="100px;" alt="Privauto"/><br /><sub><b>Privauto</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Privauto" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Privauto" title="Documentation">📖</a></td>
     </tr>
@@ -235,7 +235,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://www.zhihu.com/people/kevinbauer"><img src="https://avatars.githubusercontent.com/u/28581579?v=4?s=100" width="100px;" alt="Kevin Huang"/><br /><sub><b>Kevin Huang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=kevinhuangwl" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TJxiaobao"><img src="https://avatars.githubusercontent.com/u/85919258?v=4?s=100" width="100px;" alt="铁甲小宝"/><br /><sub><b>铁甲小宝</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3ATJxiaobao" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Tests">⚠️</a> <a href="#design-TJxiaobao" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TJxiaobao"><img src="https://avatars.githubusercontent.com/u/85919258?v=4?s=100" width="100px;" alt="铁甲小宝"/><br /><sub><b>铁甲小宝</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3ATJxiaobao" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TJxiaobao" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jack-123-power"><img src="https://avatars.githubusercontent.com/u/84333501?v=4?s=100" width="100px;" alt="Captain Jack"/><br /><sub><b>Captain Jack</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jack-123-power" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/haibo-duan"><img src="https://avatars.githubusercontent.com/u/7974845?v=4?s=100" width="100px;" alt="haibo.duan"/><br /><sub><b>haibo.duan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=haibo-duan" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=haibo-duan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/assassinfym"><img src="https://avatars.githubusercontent.com/u/15188754?v=4?s=100" width="100px;" alt="assassin"/><br /><sub><b>assassin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3Aassassinfym" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=assassinfym" title="Code">💻</a></td>
@@ -277,7 +277,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://wjl110.xyz/"><img src="https://avatars.githubusercontent.com/u/53851034?v=4?s=100" width="100px;" alt="wjl110"/><br /><sub><b>wjl110</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wjl110" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ngyhd"><img src="https://avatars.githubusercontent.com/u/29095207?v=4?s=100" width="100px;" alt="Sean"/><br /><sub><b>Sean</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ngyhd" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Daydreamer-ia"><img src="https://avatars.githubusercontent.com/u/83362909?v=4?s=100" width="100px;" alt="chenyiqin"/><br /><sub><b>chenyiqin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Daydreamer-ia" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Daydreamer-ia" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hudongdong129"><img src="https://avatars.githubusercontent.com/u/34374227?v=4?s=100" width="100px;" alt="hudongdong129"/><br /><sub><b>hudongdong129</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Documentation">📖</a> <a href="#design-hudongdong129" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/hudongdong129"><img src="https://avatars.githubusercontent.com/u/34374227?v=4?s=100" width="100px;" alt="hudongdong129"/><br /><sub><b>hudongdong129</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=hudongdong129" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/TherChenYang"><img src="https://avatars.githubusercontent.com/u/124348939?v=4?s=100" width="100px;" alt="TherChenYang"/><br /><sub><b>TherChenYang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=TherChenYang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=TherChenYang" title="Tests">⚠️</a></td>
@@ -293,7 +293,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/baiban114"><img src="https://avatars.githubusercontent.com/u/59152619?v=4?s=100" width="100px;" alt="TableRow"/><br /><sub><b>TableRow</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=baiban114" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=baiban114" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ByteIDance"><img src="https://avatars.githubusercontent.com/u/100207562?v=4?s=100" width="100px;" alt="ByteIDance"/><br /><sub><b>ByteIDance</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ByteIDance" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mangel2002"><img src="https://avatars.githubusercontent.com/u/9348020?v=4?s=100" width="100px;" alt="Jangfe"/><br /><sub><b>Jangfe</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mangel2002" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zqr10159"><img src="https://avatars.githubusercontent.com/u/30048352?v=4?s=100" width="100px;" alt="zqr10159"/><br /><sub><b>zqr10159</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Code">💻</a> <a href="#blog-zqr10159" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azqr10159" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Tests">⚠️</a> <a href="#design-zqr10159" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zqr10159"><img src="https://avatars.githubusercontent.com/u/30048352?v=4?s=100" width="100px;" alt="zqr10159"/><br /><sub><b>zqr10159</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=zqr10159" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/vinci-897"><img src="https://avatars.githubusercontent.com/u/55838224?v=4?s=100" width="100px;" alt="vinci"/><br /><sub><b>vinci</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=vinci-897" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=vinci-897" title="Documentation">📖</a> <a href="#design-vinci-897" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/js110"><img src="https://avatars.githubusercontent.com/u/51191863?v=4?s=100" width="100px;" alt="js110"/><br /><sub><b>js110</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=js110" title="Code">💻</a></td>
     </tr>
@@ -307,8 +307,8 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZangJuxy"><img src="https://avatars.githubusercontent.com/u/71380295?v=4?s=100" width="100px;" alt="ZangJuxy"/><br /><sub><b>ZangJuxy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZangJuxy" title="Documentation">📖</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/l646505418"><img src="https://avatars.githubusercontent.com/u/50475131?v=4?s=100" width="100px;" alt="l646505418"/><br /><sub><b>l646505418</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=l646505418" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Al646505418" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.carpewang.com"><img src="https://avatars.githubusercontent.com/u/78642589?v=4?s=100" width="100px;" alt="Carpe-Wang"/><br /><sub><b>Carpe-Wang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Carpe-Wang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACarpe-Wang" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/l646505418"><img src="https://avatars.githubusercontent.com/u/50475131?v=4?s=100" width="100px;" alt="l646505418"/><br /><sub><b>l646505418</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=l646505418" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.carpewang.com"><img src="https://avatars.githubusercontent.com/u/78642589?v=4?s=100" width="100px;" alt="Carpe-Wang"/><br /><sub><b>Carpe-Wang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Carpe-Wang" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/moshu023"><img src="https://avatars.githubusercontent.com/u/48593205?v=4?s=100" width="100px;" alt="莫枢"/><br /><sub><b>莫枢</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=moshu023" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/huangcanda"><img src="https://avatars.githubusercontent.com/u/4470566?v=4?s=100" width="100px;" alt="huangcanda"/><br /><sub><b>huangcanda</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=huangcanda" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.zrkizzy.com"><img src="https://avatars.githubusercontent.com/u/85340613?v=4?s=100" width="100px;" alt="世纪末的架构师"/><br /><sub><b>世纪末的架构师</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Architect-Java" title="Code">💻</a></td>
@@ -358,7 +358,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lisongning"><img src="https://avatars.githubusercontent.com/u/93140178?v=4?s=100" width="100px;" alt="lisongning"/><br /><sub><b>lisongning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lisongning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/YutingNie"><img src="https://avatars.githubusercontent.com/u/104416402?v=4?s=100" width="100px;" alt="YutingNie"/><br /><sub><b>YutingNie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Documentation">📖</a> <a href="#design-YutingNie" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikezzb"><img src="https://avatars.githubusercontent.com/u/23418428?v=4?s=100" width="100px;" alt="Mike Zhou"/><br /><sub><b>Mike Zhou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Documentation">📖</a> <a href="#design-mikezzb" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Documentation">📖</a> <a href="#blog-a-little-fool" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aa-little-fool" title="Bug reports">🐛</a> <a href="#design-a-little-fool" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/littlezhongzer"><img src="https://avatars.githubusercontent.com/u/33685289?v=4?s=100" width="100px;" alt="littlezhongzer"/><br /><sub><b>littlezhongzer</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=littlezhongzer" title="Code">💻</a></td>
@@ -367,7 +367,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/XimfengYao"><img src="https://avatars.githubusercontent.com/u/17541537?v=4?s=100" width="100px;" alt="姚贤丰"/><br /><sub><b>姚贤丰</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=XimfengYao" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LINGLUOJUN"><img src="https://avatars.githubusercontent.com/u/16778977?v=4?s=100" width="100px;" alt="lingluojun"/><br /><sub><b>lingluojun</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LINGLUOJUN" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.luelueking.com"><img src="https://avatars.githubusercontent.com/u/93204032?v=4?s=100" width="100px;" alt="1ue"/><br /><sub><b>1ue</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=luelueking" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.jimmyqiao.top"><img src="https://avatars.githubusercontent.com/u/67301054?v=4?s=100" width="100px;" alt="qyaaaa"/><br /><sub><b>qyaaaa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=qyaaaa" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aqyaaaa" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.jimmyqiao.top"><img src="https://avatars.githubusercontent.com/u/67301054?v=4?s=100" width="100px;" alt="qyaaaa"/><br /><sub><b>qyaaaa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=qyaaaa" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://novohit.top"><img src="https://avatars.githubusercontent.com/u/101090395?v=4?s=100" width="100px;" alt="novohit"/><br /><sub><b>novohit</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=novohit" title="Code">💻</a></td>
@@ -381,14 +381,14 @@ Thanks these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/1036664317"><img src="https://avatars.githubusercontent.com/u/7696697?v=4?s=100" width="100px;" alt="moghn"/><br /><sub><b>moghn</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=1036664317" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaoguolong"><img src="https://avatars.githubusercontent.com/u/33684988?v=4?s=100" width="100px;" alt="xiaoguolong"/><br /><sub><b>xiaoguolong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaoguolong" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AClownsw" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bbelide2"><img src="https://avatars.githubusercontent.com/u/26840796?v=4?s=100" width="100px;" alt="Bala Sukesh"/><br /><sub><b>Bala Sukesh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bbelide2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinyaoMa"><img src="https://avatars.githubusercontent.com/u/25066570?v=4?s=100" width="100px;" alt="Jinyao Ma"/><br /><sub><b>Jinyao Ma</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jinyaoMa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linuxsuren.github.io/open-source-best-practice/"><img src="https://avatars.githubusercontent.com/u/1450685?v=4?s=100" width="100px;" alt="Rick"/><br /><sub><b>Rick</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Tests">⚠️</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZY945"><img src="https://avatars.githubusercontent.com/u/74083801?v=4?s=100" width="100px;" alt="东风"/><br /><sub><b>东风</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Code">💻</a> <a href="#design-ZY945" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AZY945" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZY945"><img src="https://avatars.githubusercontent.com/u/74083801?v=4?s=100" width="100px;" alt="东风"/><br /><sub><b>东风</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Code">💻</a> <a href="#design-ZY945" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=ZY945" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/prolevel1"><img src="https://avatars.githubusercontent.com/u/51995525?v=4?s=100" width="100px;" alt="sonam singh"/><br /><sub><b>sonam singh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=prolevel1" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZhangZixuan1994"><img src="https://avatars.githubusercontent.com/u/20011653?v=4?s=100" width="100px;" alt="ZhangZixuan1994"/><br /><sub><b>ZhangZixuan1994</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ZhangZixuan1994" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hurenjie1"><img src="https://avatars.githubusercontent.com/u/40120355?v=4?s=100" width="100px;" alt="SHIG"/><br /><sub><b>SHIG</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hurenjie1" title="Code">💻</a></td>
@@ -398,29 +398,29 @@ Thanks these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/avvCode"><img src="https://avatars.githubusercontent.com/u/113538532?v=4?s=100" width="100px;" alt="avv"/><br /><sub><b>avv</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=avvCode" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yqxxgh"><img src="https://avatars.githubusercontent.com/u/42080876?v=4?s=100" width="100px;" alt="yqxxgh"/><br /><sub><b>yqxxgh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayqxxgh" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yqxxgh"><img src="https://avatars.githubusercontent.com/u/42080876?v=4?s=100" width="100px;" alt="yqxxgh"/><br /><sub><b>yqxxgh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yqxxgh" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/CharlieShi46"><img src="https://avatars.githubusercontent.com/u/149798885?v=4?s=100" width="100px;" alt="CharlieShi46"/><br /><sub><b>CharlieShi46</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=CharlieShi46" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Nctllnty"><img src="https://avatars.githubusercontent.com/u/33241818?v=4?s=100" width="100px;" alt="Nctllnty"/><br /><sub><b>Nctllnty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Nctllnty" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Wang-Yonghao"><img src="https://avatars.githubusercontent.com/u/48146606?v=4?s=100" width="100px;" alt="Wang-Yonghao"/><br /><sub><b>Wang-Yonghao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Wang-Yonghao" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.yuque.com/dudiao/yy"><img src="https://avatars.githubusercontent.com/u/38355949?v=4?s=100" width="100px;" alt="读钓"/><br /><sub><b>读钓</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dudiao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/starmilkxin"><img src="https://avatars.githubusercontent.com/u/55646681?v=4?s=100" width="100px;" alt="Xin"/><br /><sub><b>Xin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starmilkxin" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Astarmilkxin" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/starmilkxin"><img src="https://avatars.githubusercontent.com/u/55646681?v=4?s=100" width="100px;" alt="Xin"/><br /><sub><b>Xin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starmilkxin" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/handy-git"><img src="https://avatars.githubusercontent.com/u/32837980?v=4?s=100" width="100px;" alt="handy"/><br /><sub><b>handy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=handy-git" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LiuTianyou"><img src="https://avatars.githubusercontent.com/u/30208283?v=4?s=100" width="100px;" alt="LiuTianyou"/><br /><sub><b>LiuTianyou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ALiuTianyou" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Tests">⚠️</a> <a href="#blog-LiuTianyou" title="Blogposts">📝</a> <a href="#design-LiuTianyou" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LiuTianyou"><img src="https://avatars.githubusercontent.com/u/30208283?v=4?s=100" width="100px;" alt="LiuTianyou"/><br /><sub><b>LiuTianyou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LiuTianyou" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/WinterKi1ler"><img src="https://avatars.githubusercontent.com/u/160592092?v=4?s=100" width="100px;" alt="WinterKi1ler"/><br /><sub><b>WinterKi1ler</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=WinterKi1ler" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://sharehoo.cn/"><img src="https://avatars.githubusercontent.com/u/45377370?v=4?s=100" width="100px;" alt="miki"/><br /><sub><b>miki</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=miki-hmt" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://codeflex.substack.com/"><img src="https://avatars.githubusercontent.com/u/85513042?v=4?s=100" width="100px;" alt="Keshav Carpenter"/><br /><sub><b>Keshav Carpenter</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=alpha951" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=alpha951" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/makechoicenow"><img src="https://avatars.githubusercontent.com/u/9911918?v=4?s=100" width="100px;" alt="makechoicenow"/><br /><sub><b>makechoicenow</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=makechoicenow" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gjjjj0101"><img src="https://avatars.githubusercontent.com/u/71874373?v=4?s=100" width="100px;" alt="Gao Jian"/><br /><sub><b>Gao Jian</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Documentation">📖</a> <a href="#design-gjjjj0101" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Agjjjj0101" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gjjjj0101"><img src="https://avatars.githubusercontent.com/u/71874373?v=4?s=100" width="100px;" alt="Gao Jian"/><br /><sub><b>Gao Jian</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Code">💻</a> <a href="#design-gjjjj0101" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=gjjjj0101" title="Tests">⚠️</a></td>
     </tr>
     <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://jangto.tistory.com/"><img src="https://avatars.githubusercontent.com/u/37864182?v=4?s=100" width="100px;" alt="Hyeon Sung"/><br /><sub><b>Hyeon Sung</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://crossoverjie.top/"><img src="https://avatars.githubusercontent.com/u/15684156?v=4?s=100" width="100px;" alt="crossoverJie"/><br /><sub><b>crossoverJie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Documentation">📖</a> <a href="#blog-crossoverJie" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Tests">⚠️</a> <a href="#design-crossoverJie" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jangto.tistory.com/"><img src="https://avatars.githubusercontent.com/u/37864182?v=4?s=100" width="100px;" alt="Hyeon Sung"/><br /><sub><b>Hyeon Sung</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dukbong" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://crossoverjie.top/"><img src="https://avatars.githubusercontent.com/u/15684156?v=4?s=100" width="100px;" alt="crossoverJie"/><br /><sub><b>crossoverJie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=crossoverJie" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/PeixyJ"><img src="https://avatars.githubusercontent.com/u/45998593?v=4?s=100" width="100px;" alt="PeixyJ"/><br /><sub><b>PeixyJ</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PeixyJ" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Hi-Mr-Wind"><img src="https://avatars.githubusercontent.com/u/85803831?v=4?s=100" width="100px;" alt="风如歌"/><br /><sub><b>风如歌</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Hi-Mr-Wind" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MananPoojara"><img src="https://avatars.githubusercontent.com/u/104253184?v=4?s=100" width="100px;" alt="Manan Pujara"/><br /><sub><b>Manan Pujara</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MananPoojara" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xuziyang"><img src="https://avatars.githubusercontent.com/u/8465969?v=4?s=100" width="100px;" alt="xuziyang"/><br /><sub><b>xuziyang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Axuziyang" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xuziyang"><img src="https://avatars.githubusercontent.com/u/8465969?v=4?s=100" width="100px;" alt="xuziyang"/><br /><sub><b>xuziyang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xuziyang" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lwqzz"><img src="https://avatars.githubusercontent.com/u/62584513?v=4?s=100" width="100px;" alt="lwqzz"/><br /><sub><b>lwqzz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lwqzz" title="Code">💻</a></td>
     </tr>
     <tr>
@@ -428,17 +428,17 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tomorrowshipyltm"><img src="https://avatars.githubusercontent.com/u/61336903?v=4?s=100" width="100px;" alt="tomorrowshipyltm"/><br /><sub><b>tomorrowshipyltm</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=tomorrowshipyltm" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/15613060203"><img src="https://avatars.githubusercontent.com/u/41351615?v=4?s=100" width="100px;" alt="栗磊"/><br /><sub><b>栗磊</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=15613060203" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Alanxtl"><img src="https://avatars.githubusercontent.com/u/25652981?v=4?s=100" width="100px;" alt="Alan"/><br /><sub><b>Alan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Alanxtl" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.hadoop.wiki/"><img src="https://avatars.githubusercontent.com/u/29418975?v=4?s=100" width="100px;" alt="Jast"/><br /><sub><b>Jast</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Code">💻</a> <a href="#ideas-zhangshenghang" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Documentation">📖</a> <a href="#blog-zhangshenghang" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azhangshenghang" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Tests">⚠️</a> <a href="#design-zhangshenghang" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zuobiao-zhou"><img src="https://avatars.githubusercontent.com/u/61108539?v=4?s=100" width="100px;" alt="Zhang Yuxuan"/><br /><sub><b>Zhang Yuxuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Azuobiao-zhou" title="Bug reports">🐛</a> <a href="#blog-zuobiao-zhou" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.hadoop.wiki/"><img src="https://avatars.githubusercontent.com/u/29418975?v=4?s=100" width="100px;" alt="Jast"/><br /><sub><b>Jast</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zhangshenghang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zuobiao-zhou"><img src="https://avatars.githubusercontent.com/u/61108539?v=4?s=100" width="100px;" alt="Zhang Yuxuan"/><br /><sub><b>Zhang Yuxuan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=zuobiao-zhou" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pzz-2021"><img src="https://avatars.githubusercontent.com/u/118056735?v=4?s=100" width="100px;" alt="P.P."/><br /><sub><b>P.P.</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Pzz-2021" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/LLP2333"><img src="https://avatars.githubusercontent.com/u/61670545?v=4?s=100" width="100px;" alt="llp2333"/><br /><sub><b>llp2333</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LLP2333" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HeartLinked"><img src="https://avatars.githubusercontent.com/u/78212101?v=4?s=100" width="100px;" alt="feiyang li"/><br /><sub><b>feiyang li</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=HeartLinked" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Aias00"><img src="https://avatars.githubusercontent.com/u/25810623?v=4?s=100" width="100px;" alt="aias00"/><br /><sub><b>aias00</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AAias00" title="Bug reports">🐛</a> <a href="#ideas-Aias00" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Aias00"><img src="https://avatars.githubusercontent.com/u/25810623?v=4?s=100" width="100px;" alt="aias00"/><br /><sub><b>aias00</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Aias00" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/westboy"><img src="https://avatars.githubusercontent.com/u/6385565?v=4?s=100" width="100px;" alt="Jin"/><br /><sub><b>Jin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=westboy" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://blog.csdn.net/qq_52397471"><img src="https://avatars.githubusercontent.com/u/77964041?v=4?s=100" width="100px;" alt="YuLuo"/><br /><sub><b>YuLuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayuluo-yx" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Tests">⚠️</a> <a href="#blog-yuluo-yx" title="Blogposts">📝</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Yanshuming1"><img src="https://avatars.githubusercontent.com/u/118667222?v=4?s=100" width="100px;" alt="linDong"/><br /><sub><b>linDong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AYanshuming1" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.csdn.net/qq_52397471"><img src="https://avatars.githubusercontent.com/u/77964041?v=4?s=100" width="100px;" alt="YuLuo"/><br /><sub><b>YuLuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yuluo-yx" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Yanshuming1"><img src="https://avatars.githubusercontent.com/u/118667222?v=4?s=100" width="100px;" alt="linDong"/><br /><sub><b>linDong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Yanshuming1" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lwjxy"><img src="https://avatars.githubusercontent.com/u/52726400?v=4?s=100" width="100px;" alt="lwjxy"/><br /><sub><b>lwjxy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lwjxy" title="Code">💻</a></td>
     </tr>
     <tr>
@@ -453,17 +453,17 @@ Thanks these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ileonli"><img src="https://avatars.githubusercontent.com/u/45332412?v=4?s=100" width="100px;" alt="Leon Li"/><br /><sub><b>Leon Li</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ileonli" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://fnil.net/"><img src="https://avatars.githubusercontent.com/u/14142?v=4?s=100" width="100px;" alt="dennis zhuang"/><br /><sub><b>dennis zhuang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=killme2008" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kerwin612"><img src="https://avatars.githubusercontent.com/u/3371163?v=4?s=100" width="100px;" alt="Kerwin Bryant"/><br /><sub><b>Kerwin Bryant</b></sub></a><br /><a href="#design-kerwin612" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Akerwin612" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/kerwin612"><img src="https://avatars.githubusercontent.com/u/3371163?v=4?s=100" width="100px;" alt="Kerwin Bryant"/><br /><sub><b>Kerwin Bryant</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=kerwin612" title="Code">💻</a> <a href="#design-kerwin612" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShineDevelopment"><img src="https://avatars.githubusercontent.com/u/59306780?v=4?s=100" width="100px;" alt="daixianglong"/><br /><sub><b>daixianglong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ShineDevelopment" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mchgood"><img src="https://avatars.githubusercontent.com/u/38482005?v=4?s=100" width="100px;" alt="mchgood"/><br /><sub><b>mchgood</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mchgood" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pwallk"><img src="https://avatars.githubusercontent.com/u/69385076?v=4?s=100" width="100px;" alt="kangli"/><br /><sub><b>kangli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Apwallk" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/pwallk"><img src="https://avatars.githubusercontent.com/u/69385076?v=4?s=100" width="100px;" alt="kangli"/><br /><sub><b>kangli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pwallk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cdphantom"><img src="https://avatars.githubusercontent.com/u/12674795?v=4?s=100" width="100px;" alt="cdphantom"/><br /><sub><b>cdphantom</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cdphantom" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/asd108908382"><img src="https://avatars.githubusercontent.com/u/77717999?v=4?s=100" width="100px;" alt="jiawei.guo"/><br /><sub><b>jiawei.guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=asd108908382" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/QBH-insist"><img src="https://avatars.githubusercontent.com/u/39401478?v=4?s=100" width="100px;" alt="QBH-insist"/><br /><sub><b>QBH-insist</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=QBH-insist" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jiangsh-ui"><img src="https://avatars.githubusercontent.com/u/86990361?v=4?s=100" width="100px;" alt="jiangsh"/><br /><sub><b>jiangsh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jiangsh-ui" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Akeaifafafa" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/keaifafafa"><img src="https://avatars.githubusercontent.com/u/83876361?v=4?s=100" width="100px;" alt="Keaifa"/><br /><sub><b>Keaifa</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=keaifafafa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/loong95"><img src="https://avatars.githubusercontent.com/u/16333958?v=4?s=100" width="100px;" alt="Loong"/><br /><sub><b>Loong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=loong95" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ceekay47"><img src="https://avatars.githubusercontent.com/u/104664857?v=4?s=100" width="100px;" alt="Chandrakant Vankayalapati"/><br /><sub><b>Chandrakant Vankayalapati</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ceekay47" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MRgenial"><img src="https://avatars.githubusercontent.com/u/49973336?v=4?s=100" width="100px;" alt="b_mountain"/><br /><sub><b>b_mountain</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MRgenial" title="Code">💻</a></td>
@@ -482,13 +482,13 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/starryCoder"><img src="https://avatars.githubusercontent.com/u/46510059?v=4?s=100" width="100px;" alt="starryCoder"/><br /><sub><b>starryCoder</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=starryCoder" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hasimmollah"><img src="https://avatars.githubusercontent.com/u/32538599?v=4?s=100" width="100px;" alt="hasimmollah"/><br /><sub><b>hasimmollah</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=hasimmollah" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ayu-v0"><img src="https://avatars.githubusercontent.com/u/127600988?v=4?s=100" width="100px;" alt="Ayu"/><br /><sub><b>Ayu</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ayu-v0" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rancho-7"><img src="https://avatars.githubusercontent.com/u/59016860?v=4?s=100" width="100px;" alt="Nick Guo"/><br /><sub><b>Nick Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ARancho-7" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Rancho-7"><img src="https://avatars.githubusercontent.com/u/59016860?v=4?s=100" width="100px;" alt="Nick Guo"/><br /><sub><b>Nick Guo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Rancho-7" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/doveLin0818"><img src="https://avatars.githubusercontent.com/u/190927907?v=4?s=100" width="100px;" alt="doveLin"/><br /><sub><b>doveLin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=doveLin0818" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://zzrl.cc/"><img src="https://avatars.githubusercontent.com/u/91836599?v=4?s=100" width="100px;" alt="yunfan24"/><br /><sub><b>yunfan24</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Ayunfan24" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Tests">⚠️</a> <a href="#blog-yunfan24" title="Blogposts">📝</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://zzrl.cc/"><img src="https://avatars.githubusercontent.com/u/91836599?v=4?s=100" width="100px;" alt="yunfan24"/><br /><sub><b>yunfan24</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yunfan24" title="Code">💻</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lctking"><img src="https://avatars.githubusercontent.com/u/168249998?v=4?s=100" width="100px;" alt="nullwli"/><br /><sub><b>nullwli</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lctking" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://simonsigre.com/"><img src="https://avatars.githubusercontent.com/u/14932913?v=4?s=100" width="100px;" alt="Simon Sigré"/><br /><sub><b>Simon Sigré</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://simonsigre.com/"><img src="https://avatars.githubusercontent.com/u/14932913?v=4?s=100" width="100px;" alt="Simon Sigré"/><br /><sub><b>Simon Sigré</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=simonsigre" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.ponfee.cn/"><img src="https://avatars.githubusercontent.com/u/46117331?v=4?s=100" width="100px;" alt="ponfee"/><br /><sub><b>ponfee</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ponfee" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Vedant7789"><img src="https://avatars.githubusercontent.com/u/147625492?v=4?s=100" width="100px;" alt="Vedant7789"/><br /><sub><b>Vedant7789</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Vedant7789" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Craaaaazy77"><img src="https://avatars.githubusercontent.com/u/23025522?v=4?s=100" width="100px;" alt="Craaaaazy77"/><br /><sub><b>Craaaaazy77</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Craaaaazy77" title="Documentation">📖</a></td>
@@ -497,9 +497,9 @@ Thanks these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/helei1030"><img src="https://avatars.githubusercontent.com/u/11839080?v=4?s=100" width="100px;" alt="helei1030"/><br /><sub><b>helei1030</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=helei1030" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Apjfanning" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/MonsterChenzhuo"><img src="https://avatars.githubusercontent.com/u/60029759?v=4?s=100" width="100px;" alt="monster"/><br /><sub><b>monster</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MonsterChenzhuo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AMasamiYui" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/wanhao23"><img src="https://avatars.githubusercontent.com/u/29560961?v=4?s=100" width="100px;" alt="wanhao"/><br /><sub><b>wanhao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jonasHanhan"><img src="https://avatars.githubusercontent.com/u/130035609?v=4?s=100" width="100px;" alt="jonasHanhan"/><br /><sub><b>jonasHanhan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jonasHanhan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/NikhilMurugesan"><img src="https://avatars.githubusercontent.com/u/49281792?v=4?s=100" width="100px;" alt="NikhilMurugesan"/><br /><sub><b>NikhilMurugesan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=NikhilMurugesan" title="Code">💻</a></td>
@@ -507,19 +507,8 @@ Thanks these wonderful people, welcome to join us:
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/myangle1120"><img src="https://avatars.githubusercontent.com/u/19237013?v=4?s=100" width="100px;" alt="myangle1120"/><br /><sub><b>myangle1120</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=myangle1120" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yasminvo"><img src="https://avatars.githubusercontent.com/u/107528848?v=4?s=100" width="100px;" alt="yasminvo"/><br /><sub><b>yasminvo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yasminvo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Anotbugggg" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yyahang"><img src="https://avatars.githubusercontent.com/u/90464876?v=4?s=100" width="100px;" alt="yyahang"/><br /><sub><b>yyahang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yyahang" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JuJinPark"><img src="https://avatars.githubusercontent.com/u/44892459?v=4?s=100" width="100px;" alt="jujin"/><br /><sub><b>jujin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Documentation">📖</a> <a href="#ideas-JuJinPark" title="Ideas, Planning, & Feedback">🤔</a> <a href="#blog-JuJinPark" title="Blogposts">📝</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LL-LIN"><img src="https://avatars.githubusercontent.com/u/43002118?v=4?s=100" width="100px;" alt="LL-LIN"/><br /><sub><b>LL-LIN</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LL-LIN" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ALL-LIN" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://bigcyy.github.io/"><img src="https://avatars.githubusercontent.com/u/73413979?v=4?s=100" width="100px;" alt="Yang Chen"/><br /><sub><b>Yang Chen</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Abigcyy" title="Bug reports">🐛</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sarthakeash"><img src="https://avatars.githubusercontent.com/u/74091160?v=4?s=100" width="100px;" alt="Sarthak Arora"/><br /><sub><b>Sarthak Arora</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PengJingzhao"><img src="https://avatars.githubusercontent.com/u/97368949?v=4?s=100" width="100px;" alt="彭镜肇"/><br /><sub><b>彭镜肇</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PengJingzhao" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gagaradio"><img src="https://avatars.githubusercontent.com/u/18532370?v=4?s=100" width="100px;" alt="Walter Jia"/><br /><sub><b>Walter Jia</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gagaradio" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

e2e/data/monitor-http.json

@@ -73,11 +73,6 @@
       "field": "successCode",
       "type": 4,
       "paramValue": "200, 201"
-    },
-    {
-      "field": "enableUrlEncoding",
-      "type": 1,
-      "paramValue": true
     }
   ]
 }

e2e/testsuite.yaml

@@ -29,7 +29,7 @@ param:
   monitorUDP: "{{randAlpha 6}}"
   monitorWebsite: "{{randAlpha 6}}"
   monitorFTP: "{{randAlpha 6}}"
-  labelName: "{{randAlpha 3}}"
+  tagName: "{{randAlpha 3}}"
 items:
 - name: login
   request:
@@ -342,35 +342,39 @@ items:
     header:
       Authorization: Bearer {{.login.data.token}}
 
-## Label
-- name: createLabel
+## Tag
+- name: createTag
   request:
-    api: /api/label
+    api: /api/tag
     method: POST
     header:
       Authorization: Bearer {{.login.data.token}}
       Content-type: application/json
     body: |
-      {
-        "name": "{{.param.labelName}}"
-      }
-- name: listLabels
+      [
+        {
+          "color": "#ff4081",
+          "name": "{{.param.tagName}}"
+        }
+      ]
+- name: listTags
   request:
-    api: /api/label?pageIndex=0&pageSize=8&type=1
+    api: /api/tag?pageIndex=0&pageSize=8&type=1
     header:
       Authorization: Bearer {{.login.data.token}}
-- name: updateLabel
+- name: updateTag
   request:
-    api: /api/label
+    api: /api/tag
     method: PUT
     header:
       Authorization: Bearer {{.login.data.token}}
       Content-type: application/json
     body: |
       {
-        "id": {{(index .listLabels.data.content 0).id | int64}},
+        "id": {{(index .listTags.data.content 0).id | int64}},
         "name": "{{randAlpha 3}}",
         "tagValue": "{{randAlpha 3}}",
+        "color": "#ff4081",
         "type": 1,
         "creator": "admin",
         "modifier": "admin"
@@ -378,9 +382,9 @@ items:
   expect:
     bodyFieldsExpect:
       code: "0"
-- name: deleteLabel
+- name: deleteTag
   request:
-    api: /api/label?ids={{(index .listLabels.data.content 0).id | int64}}
+    api: /api/tag?ids={{(index .listTags.data.content 0).id | int64}}
     method: DELETE
     header:
       Authorization: Bearer {{.login.data.token}}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/AlarmCacheManager.java

@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * alert cache manager
- */
-@Component
-public class AlarmCacheManager {
-
-    /**
-     * The alarm in the process is triggered
-     * key - labels fingerprint
-     */
-    private final Map<String, SingleAlert> pendingAlertMap;
-    /**
-     * The not recover alert
-     * key - labels fingerprint
-     */
-    private final Map<String, SingleAlert> firingAlertMap;
-
-    public AlarmCacheManager(SingleAlertDao singleAlertDao) {
-        this.pendingAlertMap = new ConcurrentHashMap<>(8);
-        this.firingAlertMap = new ConcurrentHashMap<>(8);
-        List<SingleAlert> singleAlerts = singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING);
-        for (SingleAlert singleAlert : singleAlerts) {
-            String fingerprint = AlertUtil.calculateFingerprint(singleAlert.getLabels());
-            singleAlert.setId(null);
-            this.firingAlertMap.put(fingerprint, singleAlert);
-        }
-    }
-
-    public void putPending(String fingerPrint, SingleAlert alert) {
-        this.pendingAlertMap.put(fingerPrint, alert);
-    }
-
-    public SingleAlert getPending(String fingerPrint) {
-        return this.pendingAlertMap.get(fingerPrint);
-    }
-
-    public SingleAlert removePending(String fingerPrint) {
-        return this.pendingAlertMap.remove(fingerPrint);
-    }
-
-    public void putFiring(String fingerPrint, SingleAlert alert) {
-        this.firingAlertMap.put(fingerPrint, alert);
-    }
-
-    public SingleAlert getFiring(String fingerPrint) {
-        return this.firingAlertMap.get(fingerPrint);
-    }
-
-    public SingleAlert removeFiring(String fingerPrint) {
-        return this.firingAlertMap.remove(fingerPrint);
-    }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CollectorAlertHandler.java

@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.dao.AlertCollectorDao;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.entity.manager.Collector;
-import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent;
-import org.apache.hertzbeat.common.util.ResourceBundleUtil;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-/**
- * handle collector alarm
- */
-@Component
-@Slf4j
-public class CollectorAlertHandler {
-
-    private static final String KEY_COLLECTOR_NAME = "collectorName";
-    private static final String KEY_COLLECTOR_VERSION = "collectorVersion";
-    private static final String KEY_COLLECTOR_HOST = "collectorHost";
-
-    private final AlertCollectorDao alertCollectorDao;
-
-    private final AlarmCommonReduce alarmCommonReduce;
-
-    private final AlarmCacheManager alarmCacheManager;
-
-    private ResourceBundle bundle;
-
-
-    public CollectorAlertHandler(AlarmCommonReduce alarmCommonReduce, AlertCollectorDao alertCollectorDao,
-                                 AlarmCacheManager alarmCacheManager) {
-        this.alarmCommonReduce = alarmCommonReduce;
-        this.alertCollectorDao = alertCollectorDao;
-        this.alarmCacheManager = alarmCacheManager;
-        this.bundle = ResourceBundleUtil.getBundle("alerter");
-    }
-
-    /**
-     * handle collector online
-     *
-     * @param identity collector name
-     */
-    public void online(final String identity) {
-        Collector collector = alertCollectorDao.findCollectorByName(identity);
-        if (collector == null) {
-            return;
-        }
-        Map<String, String> fingerPrints = new HashMap<>(8);
-        fingerPrints.put(KEY_COLLECTOR_NAME, collector.getName());
-        fingerPrints.put(KEY_COLLECTOR_VERSION, collector.getVersion());
-        fingerPrints.put(KEY_COLLECTOR_HOST, collector.getIp());
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert firingAlert = alarmCacheManager.getFiring(fingerprint);
-        if (firingAlert != null) {
-            firingAlert.setTriggerTimes(1);
-            firingAlert.setEndAt(System.currentTimeMillis());
-            firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
-            alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
-        }
-    }
-
-
-    /**
-     * handle collector offline
-     *
-     * @param identity collector name
-     */
-    public void offline(final String identity) {
-        Collector collector = alertCollectorDao.findCollectorByName(identity);
-        if (collector == null) {
-            return;
-        }
-        long currentTimeMill = System.currentTimeMillis();
-        Map<String, String> fingerPrints = new HashMap<>(8);
-        fingerPrints.put(KEY_COLLECTOR_NAME, collector.getName());
-        fingerPrints.put(KEY_COLLECTOR_VERSION, collector.getVersion());
-        fingerPrints.put(KEY_COLLECTOR_HOST, collector.getIp());
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getFiring(fingerprint);
-        if (existingAlert == null) {
-            SingleAlert newAlert = SingleAlert.builder()
-                    .labels(fingerPrints)
-                    .annotations(fingerPrints)
-                    .content(this.bundle.getString("alerter.availability.collector.offline"))
-                    .status(CommonConstants.ALERT_STATUS_FIRING)
-                    .triggerTimes(1)
-                    .startAt(currentTimeMill)
-                    .activeAt(currentTimeMill)
-                    .build();
-            alarmCacheManager.putFiring(fingerprint, newAlert);
-            alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
-        }
-
-    }
-
-
-    @EventListener(SystemConfigChangeEvent.class)
-    public void onSystemConfigChangeEvent(SystemConfigChangeEvent event) {
-        log.info("calculate alarm receive system config change event: {}.", event.getSource());
-        this.bundle = ResourceBundleUtil.getBundle("alerter");
-    }
-
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/PeriodicAlertCalculator.java

@@ -17,17 +17,19 @@
 
 package org.apache.hertzbeat.alert.calculate;
 
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
-import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
@@ -45,13 +47,22 @@ public class PeriodicAlertCalculator {
 
     private final DataSourceService dataSourceService;
     private final AlarmCommonReduce alarmCommonReduce;
-    private final AlarmCacheManager alarmCacheManager;
-
-    public PeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce,
-                                   AlarmCacheManager alarmCacheManager) {
+    /**
+     * The alarm in the process is triggered
+     * key - labels fingerprint
+     */
+    private final Map<String, SingleAlert> pendingAlertMap;
+    /**
+     * The not recover alert
+     * key - labels fingerprint
+     */
+    private final Map<String, SingleAlert> firingAlertMap;
+    
+    public PeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce) {
         this.dataSourceService = dataSourceService;
         this.alarmCommonReduce = alarmCommonReduce;
-        this.alarmCacheManager = alarmCacheManager;
+        this.pendingAlertMap = new ConcurrentHashMap<>(8);
+        this.firingAlertMap = new ConcurrentHashMap<>(8);
     }
     
     public void calculate(AlertDefine rule) {
@@ -111,8 +122,8 @@ public class PeriodicAlertCalculator {
 
     private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
                                          Map<String, Object> fieldValueMap, AlertDefine define) {
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
+        String fingerprint = calculateFingerprint(fingerPrints);
+        SingleAlert existingAlert = pendingAlertMap.get(fingerprint);
         Map<String, String> labels = new HashMap<>(8);
         fieldValueMap.putAll(define.getLabels());
         labels.putAll(fingerPrints);
@@ -133,11 +144,11 @@ public class PeriodicAlertCalculator {
             // If required trigger times is 1, set to firing status directly
             if (requiredTimes <= 1) {
                 newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(fingerprint, newAlert);
+                firingAlertMap.put(fingerprint, newAlert);
                 alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
             } else {
                 // Otherwise put into pending queue first
-                alarmCacheManager.putPending(fingerprint, newAlert);
+                pendingAlertMap.put(fingerprint, newAlert);
             }
         } else {
             // Update existing alert
@@ -147,17 +158,17 @@ public class PeriodicAlertCalculator {
             // Check if required trigger times reached
             if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                 // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(fingerprint);
+                pendingAlertMap.remove(fingerprint);
                 existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(fingerprint, existingAlert);
+                firingAlertMap.put(fingerprint, existingAlert);
                 alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
             }
         }
     }
 
     private void handleRecoveredAlert(Map<String, String> fingerprints) {
-        String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
+        String fingerprint = calculateFingerprint(fingerprints);
+        SingleAlert firingAlert = firingAlertMap.remove(fingerprint);
         if (firingAlert != null) {
             // todo consider multi times to tig for resolved alert
             firingAlert.setTriggerTimes(1);
@@ -165,7 +176,13 @@ public class PeriodicAlertCalculator {
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
-        alarmCacheManager.removePending(fingerprint);
+        pendingAlertMap.remove(fingerprint);
     }
 
+    private String calculateFingerprint(Map<String, String> fingerPrints) {
+        List<String> keyList = fingerPrints.keySet().stream().filter(Objects::nonNull).sorted().toList();
+        List<String> valueList = fingerPrints.values().stream().filter(Objects::nonNull).sorted().toList();
+        return Arrays.hashCode(keyList.toArray(new String[0])) + "-"
+                + Arrays.hashCode(valueList.toArray(new String[0]));
+    }
 } 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java

@@ -17,13 +17,12 @@
 
 package org.apache.hertzbeat.alert.calculate;
 
-
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -36,7 +35,6 @@ import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
-import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
@@ -44,7 +42,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.JexlExpressionRunner;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -58,62 +55,55 @@ public class RealTimeAlertCalculator {
     private static final int CALCULATE_THREADS = 3;
     
     private static final String KEY_INSTANCE = "__instance__";
-    private static final String KEY_INSTANCE_NAME = "__instancename__";
-    private static final String KEY_INSTANCE_HOST = "__instancehost__";
     private static final String KEY_APP = "__app__";
     private static final String KEY_METRICS = "__metrics__";
     private static final String KEY_PRIORITY = "__priority__";
     private static final String KEY_CODE = "__code__";
     private static final String KEY_AVAILABLE  = "__available__";
-    private static final String KEY_LABELS = "__labels__";
     private static final String UP = "up";
     private static final String DOWN = "down";
     private static final String KEY_ROW = "__row__";
 
     private static final Pattern APP_PATTERN = Pattern.compile("equals\\(__app__,\"([^\"]+)\"\\)");
     private static final Pattern AVAILABLE_PATTERN = Pattern.compile("equals\\(__available__,\"([^\"]+)\"\\)");
-    private static final Pattern LABEL_PATTERN = Pattern.compile("contains\\(__labels__,\\s*\"([^\"]+)\"\\)");
-    private static final Pattern INSTANCE_PATTERN = Pattern.compile("equals\\(__instance__,\\s*\"(\\d+)\"\\)");
+    private static final Pattern INSTANCE_PATTERN = Pattern.compile("equals\\(__instance__,\"(\\d+)\"\\)");
     private static final Pattern METRICS_PATTERN = Pattern.compile("equals\\(__metrics__,\"([^\"]+)\"\\)");
 
+    /**
+     * The alarm in the process is triggered
+     * key - labels fingerprint
+     */
+    private final Map<String, SingleAlert> pendingAlertMap;
+    /**
+     * The not recover alert
+     * key - labels fingerprint
+     */
+    private final Map<String, SingleAlert> firingAlertMap;
     private final AlerterWorkerPool workerPool;
     private final CommonDataQueue dataQueue;
     private final AlertDefineService alertDefineService;
     private final AlarmCommonReduce alarmCommonReduce;
-    private final AlarmCacheManager alarmCacheManager;
 
-    @Autowired
     public RealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
                                    AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
-                                   AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager) {
-        this(workerPool, dataQueue, alertDefineService, singleAlertDao, alarmCommonReduce, alarmCacheManager, true);
-    }
-
-    /**
-     * Constructor for RealTimeAlertCalculator with a toggle to control whether to start alert calculation threads.
-     *
-     * @param workerPool          The worker pool used for concurrent alert calculation.
-     * @param dataQueue           The queue from which metric data is pulled and pushed.
-     * @param alertDefineService  The service providing alert definition rules.
-     * @param singleAlertDao      The DAO for fetching persisted alert states from storage.
-     * @param alarmCommonReduce   The component responsible for reducing and sending alerts.
-     * @param start               If true, the alert calculation threads will start automatically;
-     *                            set to false to disable thread start (useful for unit testing).
-     */
-    public RealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
-                                   AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
-                                   AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager, boolean start) {
+                                   AlarmCommonReduce alarmCommonReduce) {
         this.workerPool = workerPool;
         this.dataQueue = dataQueue;
         this.alarmCommonReduce = alarmCommonReduce;
         this.alertDefineService = alertDefineService;
-        this.alarmCacheManager = alarmCacheManager;
-        if (start) {
-            startCalculate();
+        this.pendingAlertMap = new ConcurrentHashMap<>(8);
+        this.firingAlertMap = new ConcurrentHashMap<>(8);
+        // Initialize firing stateAlertMap
+        List<SingleAlert> singleAlerts = singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING);
+        for (SingleAlert singleAlert : singleAlerts) {
+            String fingerprint = calculateFingerprint(singleAlert.getLabels());
+            singleAlert.setId(null);
+            firingAlertMap.put(fingerprint, singleAlert);
         }
+        startCalculate();
     }
 
-    public void startCalculate() {
+    private void startCalculate() {
         Runnable runnable = () -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
@@ -135,35 +125,25 @@ public class RealTimeAlertCalculator {
     private void calculate(CollectRep.MetricsData metricsData) {
         long currentTimeMilli = System.currentTimeMillis();
         String instance = String.valueOf(metricsData.getId());
-        String instanceName = metricsData.getInstanceName();
-        String instanceHost = metricsData.getInstanceHost();
         String app = metricsData.getApp();
         String metrics = metricsData.getMetrics();
         int priority = metricsData.getPriority();
         int code = metricsData.getCode().getNumber();
-        Map<String, String> labels = metricsData.getLabels();
-        Map<String, String> annotations = metricsData.getAnnotations();
         List<AlertDefine> thresholds = this.alertDefineService.getRealTimeAlertDefines();
-        // Filter thresholds by app, metrics, labels and instance
-        thresholds = filterThresholdsByAppAndMetrics(thresholds, app, metrics, labels, instance, priority);
+        // Filter thresholds by app, metrics and instance
+        thresholds = filterThresholdsByAppAndMetrics(thresholds, app, metrics, instance, priority);
         if (thresholds.isEmpty()) {
             return;
         }
         Map<String, Object> commonContext = new HashMap<>(8);
         commonContext.put(KEY_INSTANCE, instance);
-        commonContext.put(KEY_INSTANCE_NAME, instanceName);
-        commonContext.put(KEY_INSTANCE_HOST, instanceHost);
         commonContext.put(KEY_APP, app);
         commonContext.put(KEY_PRIORITY, priority);
         commonContext.put(KEY_CODE, code);
         commonContext.put(KEY_METRICS, metrics);
-        commonContext.put(KEY_LABELS, String.join(",", kvLabelsToKvStringSet(labels)));
         if (priority == 0) {
             commonContext.put(KEY_AVAILABLE, metricsData.getCode() == CollectRep.Code.SUCCESS ? UP : DOWN);
         }
-        if (labels != null) {
-            commonContext.putAll(labels);
-        }
         List<CollectRep.Field> fields = metricsData.getFields();
         Map<String, Object> fieldValueMap = new HashMap<>(8);
         int valueRowCount = metricsData.getValuesCount();
@@ -180,26 +160,21 @@ public class RealTimeAlertCalculator {
             if (StringUtils.isBlank(expr)) {
                 continue;
             }
-            Map<String, String> commonFingerPrints = new HashMap<>(8);
-            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
-            // here use the alert name as finger, not care the alert name may be changed
-            commonFingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_NAME, instanceName);
-            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_HOST, instanceHost);
-            commonFingerPrints.putAll(define.getLabels());
-            if (labels != null) {
-                commonFingerPrints.putAll(labels);
-            }
             {
                 // trigger the expr before the metrics data, due the available up down or others
                 try {
                     boolean match = execAlertExpression(fieldValueMap, expr, true);
                     try {
+                        Map<String, String> fingerPrints = new HashMap<>(8);
+                        fingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
+                        // here use the alert name as finger, not care the alert name may be changed
+                        fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                        fingerPrints.putAll(define.getLabels());
                         if (match) {
                             // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
-                            afterThresholdRuleMatch(currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
                         } else {
-                            handleRecoveredAlert(commonFingerPrints);
+                            handleRecoveredAlert(fingerPrints);
                         }
                         // if this threshold pre compile success, ignore blew
                         continue;
@@ -217,7 +192,9 @@ public class RealTimeAlertCalculator {
                 fieldValueMap.put(KEY_ROW, valueRowCount);
                 fieldValueMap.putAll(commonContext);
                 fingerPrints.clear();
-                fingerPrints.putAll(commonFingerPrints);
+                fingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
+                fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                fingerPrints.putAll(define.getLabels());
                 for (int index = 0; index < valueRow.getColumnsList().size(); index++) {
                     String valueStr = valueRow.getColumns(index);
                     if (CommonConstants.NULL_VALUE.equals(valueStr)) {
@@ -251,7 +228,7 @@ public class RealTimeAlertCalculator {
                     boolean match = execAlertExpression(fieldValueMap, expr, false);
                     try {
                         if (match) {
-                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
                         } else {
                             handleRecoveredAlert(fingerPrints);
                         }
@@ -273,7 +250,7 @@ public class RealTimeAlertCalculator {
      * @param priority  Current priority
      * @return Filtered alert definitions
      */
-    public List<AlertDefine> filterThresholdsByAppAndMetrics(List<AlertDefine> thresholds, String app, String metrics, Map<String, String> labels, String instance, int priority) {
+    private List<AlertDefine> filterThresholdsByAppAndMetrics(List<AlertDefine> thresholds, String app, String metrics, String instance, int priority) {
         return thresholds.stream()
                 .filter(define -> {
                     if (StringUtils.isBlank(define.getExpr())) {
@@ -303,37 +280,27 @@ public class RealTimeAlertCalculator {
 
                     // Extract and check instance - optional with multiple values
                     Matcher instanceMatcher = INSTANCE_PATTERN.matcher(expr);
-                    Matcher labelMatcher = LABEL_PATTERN.matcher(expr);
-                    // If no instance and instance labels specified in expr, accept all instances
-                    if (!instanceMatcher.find() && !labelMatcher.find()) {
+                    // If no instance specified in expr, accept all instances
+                    if (!instanceMatcher.find()) {
                         return true;
                     }
                     
                     // Reset matcher to check all instances
                     instanceMatcher.reset();
-                    labelMatcher.reset();
                     // If instances specified, current instance must match one of them
                     while (instanceMatcher.find()) {
                         if (Objects.equals(instance, instanceMatcher.group(1))) {
                             return true;
                         }
                     }
-                    // If instance labels specified, current instance must match one of them
-                    Set<String> labelKvStringSet = kvLabelsToKvStringSet(labels);
-                    while (labelMatcher.find()) {
-                        String label = labelMatcher.group(1);
-                        if (labelKvStringSet.contains(label)) {
-                            return true;
-                        }
-                    }
                     return false;
                 })
                 .collect(Collectors.toList());
     }
 
     private void handleRecoveredAlert(Map<String, String> fingerprints) {
-        String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
+        String fingerprint = calculateFingerprint(fingerprints);
+        SingleAlert firingAlert = firingAlertMap.remove(fingerprint);
         if (firingAlert != null) {
             // todo consider multi times to tig for resolved alert
             firingAlert.setTriggerTimes(1);
@@ -341,34 +308,23 @@ public class RealTimeAlertCalculator {
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
-        alarmCacheManager.removePending(fingerprint);
+        pendingAlertMap.remove(fingerprint);
     }
 
-    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
-                                         Map<String, Object> fieldValueMap, AlertDefine define, Map<String, String> annotations) {
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
+    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints, 
+                                         Map<String, Object> fieldValueMap, AlertDefine define) {
+        String fingerprint = calculateFingerprint(fingerPrints);
+        SingleAlert existingAlert = pendingAlertMap.get(fingerprint);
+        Map<String, String> labels = new HashMap<>(8);
         fieldValueMap.putAll(define.getLabels());
+        labels.putAll(fingerPrints);
         int requiredTimes = define.getTimes() == null ? 1 : define.getTimes();
         if (existingAlert == null) {
             // First time triggering alert, create new alert and set to pending status
-            Map<String, String> alertLabels = new HashMap<>(8);
-            alertLabels.putAll(fingerPrints);
-            Map<String, String> alertAnnotations = new HashMap<>(8);
-            if (annotations != null) {
-                alertAnnotations.putAll(annotations);
-            }
-            if (define.getAnnotations() != null) {
-                alertAnnotations.putAll(define.getAnnotations());
-            }
-            // render var content in annotations
-            for (Map.Entry<String, String> entry : alertAnnotations.entrySet()) {
-                entry.setValue(AlertTemplateUtil.render(entry.getValue(), fieldValueMap));
-            }
             SingleAlert newAlert = SingleAlert.builder()
-                    .labels(alertLabels)
-                    .annotations(alertAnnotations)
-                    // render var content in content
+                    .labels(labels)
+                    // todo render var content in annotations
+                    .annotations(define.getAnnotations())
                     .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
                     .status(CommonConstants.ALERT_STATUS_PENDING)
                     .triggerTimes(1) 
@@ -379,11 +335,11 @@ public class RealTimeAlertCalculator {
             // If required trigger times is 1, set to firing status directly
             if (requiredTimes <= 1) {
                 newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(fingerprint, newAlert);
+                firingAlertMap.put(fingerprint, newAlert);
                 alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
             } else {
                 // Otherwise put into pending queue first
-                alarmCacheManager.putPending(fingerprint, newAlert);
+                pendingAlertMap.put(fingerprint, newAlert);
             }
         } else {
             // Update existing alert
@@ -393,9 +349,9 @@ public class RealTimeAlertCalculator {
             // Check if required trigger times reached
             if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                 // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(fingerprint);
+                pendingAlertMap.remove(fingerprint);
                 existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(fingerprint, existingAlert);
+                firingAlertMap.put(fingerprint, existingAlert);
                 alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
             }
         }
@@ -429,13 +385,11 @@ public class RealTimeAlertCalculator {
         }
         return match != null && match;
     }
-
-    private Set<String> kvLabelsToKvStringSet(Map<String, String> labels) {
-        if (labels == null || labels.isEmpty()) {
-            return Collections.singleton("");
-        }
-        return labels.entrySet().stream()
-                .map(item -> item.getKey() + ":" + item.getValue())
-                .collect(Collectors.toSet());
+    
+    private String calculateFingerprint(Map<String, String> fingerPrints) {
+        List<String> keyList = fingerPrints.keySet().stream().filter(Objects::nonNull).sorted().toList();
+        List<String> valueList = fingerPrints.values().stream().filter(Objects::nonNull).sorted().toList();
+        return Arrays.hashCode(keyList.toArray(new String[0])) + "-"
+                + Arrays.hashCode(valueList.toArray(new String[0]));
     }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/AlibabaSmsProperties.java

@@ -17,39 +17,30 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Alibaba Cloud SMS configuration properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class AlibabaSmsProperties {
     /**
      * Alibaba Cloud access key id
      */
-    @NotBlank(message = "AccessKeyId cannot be empty")
     private String accessKeyId;
     
     /**
      * Alibaba Cloud access key secret
      */
-    @NotBlank(message = "AccessKeySecret cannot be empty")
     private String accessKeySecret;
     
     /**
      * SMS signature
      */
-    @NotBlank(message = "SignName cannot be empty")
     private String signName;
     
     /**
      * SMS template Code
      */
-    @NotBlank(message = "TemplateCode cannot be null")
     private String templateCode;
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/SmsConfig.java

@@ -17,10 +17,7 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -28,8 +25,6 @@ import org.springframework.stereotype.Component;
  * SMS configuration
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Component
 @ConfigurationProperties(prefix = "alerter.sms")
 public class SmsConfig {
@@ -42,7 +37,6 @@ public class SmsConfig {
     /**
      * sms service provider
      */
-    @NotBlank(message = "Type cannot be empty")
     private String type;
 
     /**
@@ -60,16 +54,6 @@ public class SmsConfig {
      */
     private UniSmsProperties unisms;
 
-    /**
-     * Aws configuration
-     */
-    private AwsSmsProperties aws;
-
-    /**
-     * Twilio SMS configuration
-     */
-    private TwilioSmsProperties twilio;
-
     /**
      * Smslocal SMS configuration
      */

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/SmslocalSmsProperties.java

@@ -18,16 +18,12 @@
 package org.apache.hertzbeat.alert.config;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Smslocal SMS Properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class SmslocalSmsProperties {
     /**
      * SmsLocal account api key

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/TencentSmsProperties.java

@@ -17,45 +17,35 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Tencent Cloud SMS properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class TencentSmsProperties {
     /**
      * Tencent cloud account secret id
      */
-    @NotBlank(message = "SecretId cannot be empty")
     private String secretId;
 
     /**
      * Tencent cloud account secret key
      */
-    @NotBlank(message = "SecretKey cannot be empty")
     private String secretKey;
 
     /**
      * SMS app id
      */
-    @NotBlank(message = "AppId cannot be null")
     private String appId;
 
     /**
      * SMS signature
      */
-    @NotBlank(message = "SignName cannot be empty")
     private String signName;
 
     /**
      * SMS template ID
      */
-    @NotBlank(message = "templateId cannot be null")
     private String templateId;
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/UniSmsProperties.java

@@ -17,22 +17,16 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * UniSMS properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class UniSmsProperties {
     /**
      * UniSMS access key id
      */
-    @NotBlank(message = "accessKeyId cannot be empty")
     private String accessKeyId;
     
     /**
@@ -43,18 +37,15 @@ public class UniSmsProperties {
     /**
      * SMS signature
      */
-    @NotBlank(message = "signature cannot be null")
     private String signature;
     
     /**
      * SMS template ID
      */
-    @NotBlank(message = "templateId cannot be null")
     private String templateId;
     
     /**
      * Authentication mode: simple or hmac, default is simple
      */
-    @NotBlank(message = "authMode cannot be null")
     private String authMode = "simple";
 } 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/SkyWalkingExternAlert.java

@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-
-/**
- * SkyWalking Alert Content Entity
- * @see <a href="https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-alarm/">backend-alarm</a>
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class SkyWalkingExternAlert {
-
-    private Long scopeId;
-
-    private String scope;
-
-    private String name;
-
-    private String id0;
-
-    private String id1;
-
-    private String ruleName;
-
-    private String alarmMessage;
-
-    private Long startTime;
-
-    private List<Tag> tags;
-
-    /**
-     * SkyWalking Tag Entity
-     */
-    @Data
-    public static class Tag {
-
-        private String key;
-
-        private String value;
-    }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/TencentCloudExternAlert.java

@@ -118,11 +118,11 @@ public class TencentCloudExternAlert {
     /**
      * Transaction alarm
      */
-    public static final String EVENT = "event";
+    private static final String EVENT = "event";
 
     /**
      * Indicator alarm
      */
-    public static final String METRIC = "metric";
+    private static final String METRIC = "metric";
 
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionBaseVisitor.java

@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated from AlertExpression.g4 by ANTLR 4.13.2
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
-
-/**
- * This class provides an empty implementation of {@link AlertExpressionVisitor},
- * which can be extended to create a visitor which only needs to handle a subset
- * of the available methods.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-@SuppressWarnings("CheckReturnValue")
-public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements AlertExpressionVisitor<T> {
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitExpression(AlertExpressionParser.ExpressionContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-    @Override public T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-	 * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitIdentifier(AlertExpressionParser.IdentifierContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitNumber(AlertExpressionParser.NumberContext ctx) { return visitChildren(ctx); }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitor.java

@@ -1,305 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.apache.hertzbeat.warehouse.db.QueryExecutor;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Alert expression visitor implement
- */
-public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<Map<String, Object>>> {
-
-    private static final String THRESHOLD = "__threshold__";
-    private static final String VALUE = "__value__";
-
-    private final QueryExecutor executor;
-
-    public AlertExpressionEvalVisitor(QueryExecutor executor) {
-        this.executor = executor;
-    }
-
-    @Override
-    public List<Map<String, Object>> visitExpression(AlertExpressionParser.ExpressionContext ctx) {
-        return visit(ctx.expr());
-    }
-
-    @Override
-    public List<Map<String, Object>> visitParenExpr(AlertExpressionParser.ParenExprContext ctx) {
-        return visit(ctx.expr());
-    }
-
-    @Override
-    public List<Map<String, Object>> visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
-        List<Map<String, Object>> leftResult = visit(ctx.left);
-        List<Map<String, Object>> rightResult = visit(ctx.right);
-        if (rightResult.size() == 1 && rightResult.get(0).containsKey(THRESHOLD)) {
-            double threshold = (double) rightResult.get(0).get(THRESHOLD);
-            String operator = ctx.op.getText();
-
-            List<Map<String, Object>> result = new ArrayList<>();
-            for (Map<String, Object> item : leftResult) {
-                Object queryValues = item.get(VALUE);
-                if (queryValues == null) {
-                    // ignore the query result data is empty
-                    continue;
-                }
-                // queryValues may be a list of values, or a single value
-                Object matchValue = evaluateCondition(queryValues, operator, threshold);
-                item.put(VALUE, matchValue);
-                // if matchValue is null, mean not match the threshold
-                // if not null, mean match the threshold
-                result.add(new HashMap<>(item));
-            }
-            return result;
-        }
-        return new LinkedList<>();
-    }
-
-    @Override
-    public List<Map<String, Object>> visitAndExpr(AlertExpressionParser.AndExprContext ctx) {
-        List<Map<String, Object>> leftOperand = visit(ctx.left);
-        List<Map<String, Object>> rightOperand = visit(ctx.right);
-
-        Map<String, Object> leftMap = null;
-        boolean leftMatch = false;
-        Map<String, Object> rightMap = null;
-        boolean rightMatch = false;
-        for (Map<String, Object> item : leftOperand) {
-            if (leftMap == null) {
-                leftMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                leftMap = item;
-                leftMatch = true;
-                break;
-            }
-        }
-        for (Map<String, Object> item : rightOperand) {
-            if (rightMap == null) {
-                rightMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                rightMap = item;
-                rightMatch = true;
-                break;
-            }
-        }
-        if (leftMatch && rightMatch) {
-            rightMap.putAll(leftMap);
-            return new LinkedList<>(List.of(rightMap));
-        } else if (leftMap != null) {
-            leftMap.put(VALUE, null);
-            return new LinkedList<>(List.of(leftMap));
-        } else if (rightMap != null) {
-            rightMap.put(VALUE, null);
-            return new LinkedList<>(List.of(rightMap));
-        }
-        return new LinkedList<>();
-    }
-
-    @Override
-    public List<Map<String, Object>> visitOrExpr(AlertExpressionParser.OrExprContext ctx) {
-        List<Map<String, Object>> leftOperand = visit(ctx.left);
-        List<Map<String, Object>> rightOperand = visit(ctx.right);
-
-        Map<String, Object> leftMap = null;
-        boolean leftMatch = false;
-        Map<String, Object> rightMap = null;
-        boolean rightMatch = false;
-        for (Map<String, Object> item : leftOperand) {
-            if (leftMap == null) {
-                leftMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                leftMap = item;
-                leftMatch = true;
-                break;
-            }
-        }
-        for (Map<String, Object> item : rightOperand) {
-            if (rightMap == null) {
-                rightMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                rightMap = item;
-                rightMatch = true;
-                break;
-            }
-        }
-        if (leftMatch && rightMatch) {
-            rightMap.putAll(leftMap);
-            return new LinkedList<>(List.of(rightMap));
-        } else if (leftMatch) {
-            return new LinkedList<>(List.of(leftMap));
-        } else if (rightMatch) {
-            return new LinkedList<>(List.of(rightMap));
-        } else {
-            if (leftMap != null && rightMap != null) {
-                rightMap.putAll(leftMap);
-                return new LinkedList<>(List.of(rightMap));
-            } else if (leftMap != null) {
-                return new LinkedList<>(List.of(leftMap));
-            } else if (rightMap != null) {
-                return new LinkedList<>(List.of(rightMap));
-            }
-        }
-        return new LinkedList<>();
-    }
-
-    @Override
-    public List<Map<String, Object>> visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) {
-        List<Map<String, Object>> leftOperand = visit(ctx.left);
-        List<Map<String, Object>> rightOperand = visit(ctx.right);
-        Map<String, Object> leftMap = null;
-        boolean leftMatch = false;
-        Map<String, Object> rightMap = null;
-        boolean rightMatch = false;
-        for (Map<String, Object> item : leftOperand) {
-            if (leftMap == null) {
-                leftMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                leftMap = item;
-                leftMatch = true;
-                break;
-            }
-        }
-        for (Map<String, Object> item : rightOperand) {
-            if (rightMap == null) {
-                rightMap = item;
-            }
-            if (item.get(VALUE) != null) {
-                rightMap = item;
-                rightMatch = true;
-                break;
-            }
-        }
-        if (leftMatch && !rightMatch) {
-            return new LinkedList<>(List.of(leftMap));
-        } else {
-            if (leftMap != null) {
-                leftMap.put(VALUE, null);
-                return new LinkedList<>(List.of(leftMap));
-            } else {
-                if (rightMap != null) {
-                    rightMap.put(VALUE, null);
-                    return new LinkedList<>(List.of(rightMap));
-                }
-            }
-        }
-        return new LinkedList<>();
-    }
-
-    @Override
-    public List<Map<String, Object>> visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) {
-        String query = ctx.identifier().getText();
-        return executor.execute(query);
-    }
-
-    @Override
-    public List<Map<String, Object>> visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) {
-        double value = Double.parseDouble(ctx.number().getText());
-        List<Map<String, Object>> numAsList = new ArrayList<>();
-        Map<String, Object> valueMap = new HashMap<>();
-        valueMap.put(THRESHOLD, value);
-        numAsList.add(valueMap);
-        return numAsList;
-    }
-
-    private Object evaluateCondition(Object value, String operator, Double threshold) {
-        // value may be a list of values, or a single value
-        switch (operator) {
-            case ">":
-                // if value is list, return the max value
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue > threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) > threshold ? value : null;
-                }
-            case ">=":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue >= threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) >= threshold ? value : null;
-                }
-            case "<":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue < threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) < threshold ? value : null;
-                }
-            case "<=":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue <= threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) <= threshold ? value : null;
-                }
-            case "==":
-                if (value instanceof List<?> values) {
-                    for (Object v : values) {
-                        if (v.equals(threshold)) {
-                            return v;
-                        }
-                    }
-                    return null;
-                } else {
-                    return value.equals(threshold) ? value : null;
-                }
-            case "!=":
-                if (value instanceof List<?> values) {
-                    for (Object v : values) {
-                        if (v.equals(threshold)) {
-                            return null;
-                        }
-                    }
-                    return value;
-                } else {
-                    return value.equals(threshold) ? null : value;
-                }
-            default:
-                // unsupported operator todo add more operator
-                return null;
-        }
-    }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionLexer.java

@@ -1,193 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated from AlertExpression.g4 by ANTLR 4.13.2
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.antlr.v4.runtime.CharStream;
-import org.antlr.v4.runtime.Lexer;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.LexerATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
-import org.antlr.v4.runtime.dfa.DFA;
-
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
-public class AlertExpressionLexer extends Lexer {
-	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		AND=1, OR=2, UNLESS=3, GT=4, GE=5, LT=6, LE=7, EQ=8, NE=9, LPAREN=10, 
-		RPAREN=11, IDENTIFIER=12, NUMBER=13, WS=14;
-	public static String[] channelNames = {
-		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
-	};
-
-	public static String[] modeNames = {
-		"DEFAULT_MODE"
-	};
-
-	private static String[] makeRuleNames() {
-		return new String[] {
-			"AND", "OR", "UNLESS", "GT", "GE", "LT", "LE", "EQ", "NE", "LPAREN", 
-			"RPAREN", "IDENTIFIER", "NUMBER", "WS"
-		};
-	}
-	public static final String[] ruleNames = makeRuleNames();
-
-	private static String[] makeLiteralNames() {
-		return new String[] {
-			null, "'and'", "'or'", "'unless'", "'>'", "'>='", "'<'", "'<='", "'=='", 
-			"'!='", "'('", "')'"
-		};
-	}
-	private static final String[] _LITERAL_NAMES = makeLiteralNames();
-	private static String[] makeSymbolicNames() {
-		return new String[] {
-			null, "AND", "OR", "UNLESS", "GT", "GE", "LT", "LE", "EQ", "NE", "LPAREN", 
-			"RPAREN", "IDENTIFIER", "NUMBER", "WS"
-		};
-	}
-	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-	/**
-	 * @deprecated Use {@link #VOCABULARY} instead.
-	 */
-	@Deprecated
-	public static final String[] tokenNames;
-	static {
-		tokenNames = new String[_SYMBOLIC_NAMES.length];
-		for (int i = 0; i < tokenNames.length; i++) {
-			tokenNames[i] = VOCABULARY.getLiteralName(i);
-			if (tokenNames[i] == null) {
-				tokenNames[i] = VOCABULARY.getSymbolicName(i);
-			}
-
-			if (tokenNames[i] == null) {
-				tokenNames[i] = "<INVALID>";
-			}
-		}
-	}
-
-	@Override
-	@Deprecated
-	public String[] getTokenNames() {
-		return tokenNames;
-	}
-
-	@Override
-
-	public Vocabulary getVocabulary() {
-		return VOCABULARY;
-	}
-
-
-	public AlertExpressionLexer(CharStream input) {
-		super(input);
-		_interp = new LexerATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
-
-	@Override
-	public String getGrammarFileName() { return "AlertExpression.g4"; }
-
-	@Override
-	public String[] getRuleNames() { return ruleNames; }
-
-	@Override
-	public String getSerializedATN() { return _serializedATN; }
-
-	@Override
-	public String[] getChannelNames() { return channelNames; }
-
-	@Override
-	public String[] getModeNames() { return modeNames; }
-
-	@Override
-	public ATN getATN() { return _ATN; }
-
-	public static final String _serializedATN =
-		"\u0004\u0000\u000eZ\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
-		"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
-		"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
-		"\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+
-		"\u0007\u000b\u0002\f\u0007\f\u0002\r\u0007\r\u0001\u0000\u0001\u0000\u0001"+
-		"\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001"+
-		"\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001"+
-		"\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005\u0001"+
-		"\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001"+
-		"\u0007\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0001\n\u0001\u000b"+
-		"\u0001\u000b\u0005\u000bB\b\u000b\n\u000b\f\u000bE\t\u000b\u0001\f\u0004"+
-		"\fH\b\f\u000b\f\f\fI\u0001\f\u0001\f\u0004\fN\b\f\u000b\f\f\fO\u0003\f"+
-		"R\b\f\u0001\r\u0004\rU\b\r\u000b\r\f\rV\u0001\r\u0001\r\u0000\u0000\u000e"+
-		"\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r"+
-		"\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e"+
-		"\u0001\u0000\u0004\u0003\u0000AZ__az\n\u0000\"\"..09==A[]]__a{}}\u8000"+
-		"\uff5e\u8000\uff5e\u0001\u000009\u0003\u0000\t\n\r\r  ^\u0000\u0001\u0001"+
-		"\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001"+
-		"\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000"+
-		"\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000"+
-		"\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000"+
-		"\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000"+
-		"\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000"+
-		"\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0001\u001d\u0001\u0000\u0000"+
-		"\u0000\u0003!\u0001\u0000\u0000\u0000\u0005$\u0001\u0000\u0000\u0000\u0007"+
-		"+\u0001\u0000\u0000\u0000\t-\u0001\u0000\u0000\u0000\u000b0\u0001\u0000"+
-		"\u0000\u0000\r2\u0001\u0000\u0000\u0000\u000f5\u0001\u0000\u0000\u0000"+
-		"\u00118\u0001\u0000\u0000\u0000\u0013;\u0001\u0000\u0000\u0000\u0015="+
-		"\u0001\u0000\u0000\u0000\u0017?\u0001\u0000\u0000\u0000\u0019G\u0001\u0000"+
-		"\u0000\u0000\u001bT\u0001\u0000\u0000\u0000\u001d\u001e\u0005a\u0000\u0000"+
-		"\u001e\u001f\u0005n\u0000\u0000\u001f \u0005d\u0000\u0000 \u0002\u0001"+
-		"\u0000\u0000\u0000!\"\u0005o\u0000\u0000\"#\u0005r\u0000\u0000#\u0004"+
-		"\u0001\u0000\u0000\u0000$%\u0005u\u0000\u0000%&\u0005n\u0000\u0000&\'"+
-		"\u0005l\u0000\u0000\'(\u0005e\u0000\u0000()\u0005s\u0000\u0000)*\u0005"+
-		"s\u0000\u0000*\u0006\u0001\u0000\u0000\u0000+,\u0005>\u0000\u0000,\b\u0001"+
-		"\u0000\u0000\u0000-.\u0005>\u0000\u0000./\u0005=\u0000\u0000/\n\u0001"+
-		"\u0000\u0000\u000001\u0005<\u0000\u00001\f\u0001\u0000\u0000\u000023\u0005"+
-		"<\u0000\u000034\u0005=\u0000\u00004\u000e\u0001\u0000\u0000\u000056\u0005"+
-		"=\u0000\u000067\u0005=\u0000\u00007\u0010\u0001\u0000\u0000\u000089\u0005"+
-		"!\u0000\u00009:\u0005=\u0000\u0000:\u0012\u0001\u0000\u0000\u0000;<\u0005"+
-		"(\u0000\u0000<\u0014\u0001\u0000\u0000\u0000=>\u0005)\u0000\u0000>\u0016"+
-		"\u0001\u0000\u0000\u0000?C\u0007\u0000\u0000\u0000@B\u0007\u0001\u0000"+
-		"\u0000A@\u0001\u0000\u0000\u0000BE\u0001\u0000\u0000\u0000CA\u0001\u0000"+
-		"\u0000\u0000CD\u0001\u0000\u0000\u0000D\u0018\u0001\u0000\u0000\u0000"+
-		"EC\u0001\u0000\u0000\u0000FH\u0007\u0002\u0000\u0000GF\u0001\u0000\u0000"+
-		"\u0000HI\u0001\u0000\u0000\u0000IG\u0001\u0000\u0000\u0000IJ\u0001\u0000"+
-		"\u0000\u0000JQ\u0001\u0000\u0000\u0000KM\u0005.\u0000\u0000LN\u0007\u0002"+
-		"\u0000\u0000ML\u0001\u0000\u0000\u0000NO\u0001\u0000\u0000\u0000OM\u0001"+
-		"\u0000\u0000\u0000OP\u0001\u0000\u0000\u0000PR\u0001\u0000\u0000\u0000"+
-		"QK\u0001\u0000\u0000\u0000QR\u0001\u0000\u0000\u0000R\u001a\u0001\u0000"+
-		"\u0000\u0000SU\u0007\u0003\u0000\u0000TS\u0001\u0000\u0000\u0000UV\u0001"+
-		"\u0000\u0000\u0000VT\u0001\u0000\u0000\u0000VW\u0001\u0000\u0000\u0000"+
-		"WX\u0001\u0000\u0000\u0000XY\u0006\r\u0000\u0000Y\u001c\u0001\u0000\u0000"+
-		"\u0000\u0006\u0000CIOQV\u0001\u0006\u0000\u0000";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionParser.java

@@ -1,570 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated from AlertExpression.g4 by ANTLR 4.13.2
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.antlr.v4.runtime.FailedPredicateException;
-import org.antlr.v4.runtime.NoViableAltException;
-import org.antlr.v4.runtime.Parser;
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.RuleContext;
-import org.antlr.v4.runtime.RuntimeMetaData;
-import org.antlr.v4.runtime.Token;
-import org.antlr.v4.runtime.TokenStream;
-import org.antlr.v4.runtime.Vocabulary;
-import org.antlr.v4.runtime.VocabularyImpl;
-import org.antlr.v4.runtime.atn.ATN;
-import org.antlr.v4.runtime.atn.ATNDeserializer;
-import org.antlr.v4.runtime.atn.ParserATNSimulator;
-import org.antlr.v4.runtime.atn.PredictionContextCache;
-import org.antlr.v4.runtime.dfa.DFA;
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import java.util.List;
-
-@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast", "CheckReturnValue", "this-escape"})
-public class AlertExpressionParser extends Parser {
-	static { RuntimeMetaData.checkVersion("4.13.2", RuntimeMetaData.VERSION); }
-
-	protected static final DFA[] _decisionToDFA;
-	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
-	public static final int
-		AND=1, OR=2, UNLESS=3, GT=4, GE=5, LT=6, LE=7, EQ=8, NE=9, LPAREN=10, 
-		RPAREN=11, IDENTIFIER=12, NUMBER=13, WS=14;
-	public static final int
-		RULE_expression = 0, RULE_expr = 1, RULE_identifier = 2, RULE_number = 3;
-	private static String[] makeRuleNames() {
-		return new String[] {
-			"expression", "expr", "identifier", "number"
-		};
-	}
-	public static final String[] ruleNames = makeRuleNames();
-
-	private static String[] makeLiteralNames() {
-		return new String[] {
-			null, "'and'", "'or'", "'unless'", "'>'", "'>='", "'<'", "'<='", "'=='", 
-			"'!='", "'('", "')'"
-		};
-	}
-	private static final String[] _LITERAL_NAMES = makeLiteralNames();
-	private static String[] makeSymbolicNames() {
-		return new String[] {
-			null, "AND", "OR", "UNLESS", "GT", "GE", "LT", "LE", "EQ", "NE", "LPAREN", 
-			"RPAREN", "IDENTIFIER", "NUMBER", "WS"
-		};
-	}
-	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
-	public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
-
-	/**
-	 * @deprecated Use {@link #VOCABULARY} instead.
-	 */
-	@Deprecated
-	public static final String[] tokenNames;
-	static {
-		tokenNames = new String[_SYMBOLIC_NAMES.length];
-		for (int i = 0; i < tokenNames.length; i++) {
-			tokenNames[i] = VOCABULARY.getLiteralName(i);
-			if (tokenNames[i] == null) {
-				tokenNames[i] = VOCABULARY.getSymbolicName(i);
-			}
-
-			if (tokenNames[i] == null) {
-				tokenNames[i] = "<INVALID>";
-			}
-		}
-	}
-
-	@Override
-	@Deprecated
-	public String[] getTokenNames() {
-		return tokenNames;
-	}
-
-	@Override
-
-	public Vocabulary getVocabulary() {
-		return VOCABULARY;
-	}
-
-	@Override
-	public String getGrammarFileName() { return "AlertExpression.g4"; }
-
-	@Override
-	public String[] getRuleNames() { return ruleNames; }
-
-	@Override
-	public String getSerializedATN() { return _serializedATN; }
-
-	@Override
-	public ATN getATN() { return _ATN; }
-
-	public AlertExpressionParser(TokenStream input) {
-		super(input);
-		_interp = new ParserATNSimulator(this,_ATN,_decisionToDFA,_sharedContextCache);
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExpressionContext extends ParserRuleContext {
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
-		}
-		public TerminalNode EOF() { return getToken(AlertExpressionParser.EOF, 0); }
-		public ExpressionContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_expression; }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitExpression(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExpressionContext expression() throws RecognitionException {
-		ExpressionContext _localctx = new ExpressionContext(_ctx, getState());
-		enterRule(_localctx, 0, RULE_expression);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(8);
-			expr(0);
-			setState(9);
-			match(EOF);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class ExprContext extends ParserRuleContext {
-		public ExprContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_expr; }
-	 
-		public ExprContext() { }
-		public void copyFrom(ExprContext ctx) {
-			super.copyFrom(ctx);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class AndExprContext extends ExprContext {
-		public ExprContext left;
-		public ExprContext right;
-		public TerminalNode AND() { return getToken(AlertExpressionParser.AND, 0); }
-		public List<ExprContext> expr() {
-			return getRuleContexts(ExprContext.class);
-		}
-		public ExprContext expr(int i) {
-			return getRuleContext(ExprContext.class,i);
-		}
-		public AndExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitAndExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class QueryExprContext extends ExprContext {
-		public IdentifierContext identifier() {
-			return getRuleContext(IdentifierContext.class,0);
-		}
-		public QueryExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitQueryExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class ComparisonExprContext extends ExprContext {
-		public ExprContext left;
-		public Token op;
-		public ExprContext right;
-		public List<ExprContext> expr() {
-			return getRuleContexts(ExprContext.class);
-		}
-		public ExprContext expr(int i) {
-			return getRuleContext(ExprContext.class,i);
-		}
-		public TerminalNode GE() { return getToken(AlertExpressionParser.GE, 0); }
-		public TerminalNode LE() { return getToken(AlertExpressionParser.LE, 0); }
-		public TerminalNode GT() { return getToken(AlertExpressionParser.GT, 0); }
-		public TerminalNode LT() { return getToken(AlertExpressionParser.LT, 0); }
-		public TerminalNode EQ() { return getToken(AlertExpressionParser.EQ, 0); }
-		public TerminalNode NE() { return getToken(AlertExpressionParser.NE, 0); }
-		public ComparisonExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitComparisonExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class UnlessExprContext extends ExprContext {
-		public ExprContext left;
-		public ExprContext right;
-		public TerminalNode UNLESS() { return getToken(AlertExpressionParser.UNLESS, 0); }
-		public List<ExprContext> expr() {
-			return getRuleContexts(ExprContext.class);
-		}
-		public ExprContext expr(int i) {
-			return getRuleContext(ExprContext.class,i);
-		}
-		public UnlessExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitUnlessExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class LiteralExprContext extends ExprContext {
-		public NumberContext number() {
-			return getRuleContext(NumberContext.class,0);
-		}
-		public LiteralExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitLiteralExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class ParenExprContext extends ExprContext {
-		public TerminalNode LPAREN() { return getToken(AlertExpressionParser.LPAREN, 0); }
-		public ExprContext expr() {
-			return getRuleContext(ExprContext.class,0);
-		}
-		public TerminalNode RPAREN() { return getToken(AlertExpressionParser.RPAREN, 0); }
-		public ParenExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitParenExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-	@SuppressWarnings("CheckReturnValue")
-	public static class OrExprContext extends ExprContext {
-		public ExprContext left;
-		public ExprContext right;
-		public TerminalNode OR() { return getToken(AlertExpressionParser.OR, 0); }
-		public List<ExprContext> expr() {
-			return getRuleContexts(ExprContext.class);
-		}
-		public ExprContext expr(int i) {
-			return getRuleContext(ExprContext.class,i);
-		}
-		public OrExprContext(ExprContext ctx) { copyFrom(ctx); }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitOrExpr(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final ExprContext expr() throws RecognitionException {
-		return expr(0);
-	}
-
-	private ExprContext expr(int _p) throws RecognitionException {
-		ParserRuleContext _parentctx = _ctx;
-		int _parentState = getState();
-		ExprContext _localctx = new ExprContext(_ctx, _parentState);
-		ExprContext _prevctx = _localctx;
-		int _startState = 2;
-		enterRecursionRule(_localctx, 2, RULE_expr, _p);
-		int _la;
-		try {
-			int _alt;
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(18);
-			_errHandler.sync(this);
-			switch (_input.LA(1)) {
-			case LPAREN:
-				{
-				_localctx = new ParenExprContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-
-				setState(12);
-				match(LPAREN);
-				setState(13);
-				expr(0);
-				setState(14);
-				match(RPAREN);
-				}
-				break;
-			case IDENTIFIER:
-				{
-				_localctx = new QueryExprContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(16);
-				identifier();
-				}
-				break;
-			case NUMBER:
-				{
-				_localctx = new LiteralExprContext(_localctx);
-				_ctx = _localctx;
-				_prevctx = _localctx;
-				setState(17);
-				number();
-				}
-				break;
-			default:
-				throw new NoViableAltException(this);
-			}
-			_ctx.stop = _input.LT(-1);
-			setState(34);
-			_errHandler.sync(this);
-			_alt = getInterpreter().adaptivePredict(_input,2,_ctx);
-			while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
-				if ( _alt==1 ) {
-					if ( _parseListeners!=null ) triggerExitRuleEvent();
-					_prevctx = _localctx;
-					{
-					setState(32);
-					_errHandler.sync(this);
-					switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
-					case 1:
-						{
-						_localctx = new ComparisonExprContext(new ExprContext(_parentctx, _parentState));
-						((ComparisonExprContext)_localctx).left = _prevctx;
-						pushNewRecursionContext(_localctx, _startState, RULE_expr);
-						setState(20);
-						if (!(precpred(_ctx, 6))) throw new FailedPredicateException(this, "precpred(_ctx, 6)");
-						setState(21);
-						((ComparisonExprContext)_localctx).op = _input.LT(1);
-						_la = _input.LA(1);
-						if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & 1008L) != 0)) ) {
-							((ComparisonExprContext)_localctx).op = (Token)_errHandler.recoverInline(this);
-						}
-						else {
-							if ( _input.LA(1)==Token.EOF ) matchedEOF = true;
-							_errHandler.reportMatch(this);
-							consume();
-						}
-						setState(22);
-						((ComparisonExprContext)_localctx).right = expr(7);
-						}
-						break;
-					case 2:
-						{
-						_localctx = new AndExprContext(new ExprContext(_parentctx, _parentState));
-						((AndExprContext)_localctx).left = _prevctx;
-						pushNewRecursionContext(_localctx, _startState, RULE_expr);
-						setState(23);
-						if (!(precpred(_ctx, 5))) throw new FailedPredicateException(this, "precpred(_ctx, 5)");
-						setState(24);
-						match(AND);
-						setState(25);
-						((AndExprContext)_localctx).right = expr(6);
-						}
-						break;
-					case 3:
-						{
-						_localctx = new UnlessExprContext(new ExprContext(_parentctx, _parentState));
-						((UnlessExprContext)_localctx).left = _prevctx;
-						pushNewRecursionContext(_localctx, _startState, RULE_expr);
-						setState(26);
-						if (!(precpred(_ctx, 4))) throw new FailedPredicateException(this, "precpred(_ctx, 4)");
-						setState(27);
-						match(UNLESS);
-						setState(28);
-						((UnlessExprContext)_localctx).right = expr(5);
-						}
-						break;
-					case 4:
-						{
-						_localctx = new OrExprContext(new ExprContext(_parentctx, _parentState));
-						((OrExprContext)_localctx).left = _prevctx;
-						pushNewRecursionContext(_localctx, _startState, RULE_expr);
-						setState(29);
-						if (!(precpred(_ctx, 3))) throw new FailedPredicateException(this, "precpred(_ctx, 3)");
-						setState(30);
-						match(OR);
-						setState(31);
-						((OrExprContext)_localctx).right = expr(4);
-						}
-						break;
-					}
-					} 
-				}
-				setState(36);
-				_errHandler.sync(this);
-				_alt = getInterpreter().adaptivePredict(_input,2,_ctx);
-			}
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			unrollRecursionContexts(_parentctx);
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class IdentifierContext extends ParserRuleContext {
-		public TerminalNode IDENTIFIER() { return getToken(AlertExpressionParser.IDENTIFIER, 0); }
-		public IdentifierContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_identifier; }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitIdentifier(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final IdentifierContext identifier() throws RecognitionException {
-		IdentifierContext _localctx = new IdentifierContext(_ctx, getState());
-		enterRule(_localctx, 4, RULE_identifier);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(37);
-			match(IDENTIFIER);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	@SuppressWarnings("CheckReturnValue")
-	public static class NumberContext extends ParserRuleContext {
-		public TerminalNode NUMBER() { return getToken(AlertExpressionParser.NUMBER, 0); }
-		public NumberContext(ParserRuleContext parent, int invokingState) {
-			super(parent, invokingState);
-		}
-		@Override public int getRuleIndex() { return RULE_number; }
-		@Override
-		public <T> T accept(ParseTreeVisitor<? extends T> visitor) {
-			if ( visitor instanceof AlertExpressionVisitor ) return ((AlertExpressionVisitor<? extends T>)visitor).visitNumber(this);
-			else return visitor.visitChildren(this);
-		}
-	}
-
-	public final NumberContext number() throws RecognitionException {
-		NumberContext _localctx = new NumberContext(_ctx, getState());
-		enterRule(_localctx, 6, RULE_number);
-		try {
-			enterOuterAlt(_localctx, 1);
-			{
-			setState(39);
-			match(NUMBER);
-			}
-		}
-		catch (RecognitionException re) {
-			_localctx.exception = re;
-			_errHandler.reportError(this, re);
-			_errHandler.recover(this, re);
-		}
-		finally {
-			exitRule();
-		}
-		return _localctx;
-	}
-
-	public boolean sempred(RuleContext _localctx, int ruleIndex, int predIndex) {
-		switch (ruleIndex) {
-		case 1:
-			return expr_sempred((ExprContext)_localctx, predIndex);
-		}
-		return true;
-	}
-	private boolean expr_sempred(ExprContext _localctx, int predIndex) {
-		switch (predIndex) {
-		case 0:
-			return precpred(_ctx, 6);
-		case 1:
-			return precpred(_ctx, 5);
-		case 2:
-			return precpred(_ctx, 4);
-		case 3:
-			return precpred(_ctx, 3);
-		}
-		return true;
-	}
-
-	public static final String _serializedATN =
-		"\u0004\u0001\u000e*\u0002\u0000\u0007\u0000\u0002\u0001\u0007\u0001\u0002"+
-		"\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0001\u0000\u0001\u0000\u0001"+
-		"\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0003\u0001\u0013\b\u0001\u0001\u0001\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0001"+
-		"\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0005\u0001!\b\u0001\n\u0001"+
-		"\f\u0001$\t\u0001\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001"+
-		"\u0003\u0000\u0001\u0002\u0004\u0000\u0002\u0004\u0006\u0000\u0001\u0001"+
-		"\u0000\u0004\t+\u0000\b\u0001\u0000\u0000\u0000\u0002\u0012\u0001\u0000"+
-		"\u0000\u0000\u0004%\u0001\u0000\u0000\u0000\u0006\'\u0001\u0000\u0000"+
-		"\u0000\b\t\u0003\u0002\u0001\u0000\t\n\u0005\u0000\u0000\u0001\n\u0001"+
-		"\u0001\u0000\u0000\u0000\u000b\f\u0006\u0001\uffff\uffff\u0000\f\r\u0005"+
-		"\n\u0000\u0000\r\u000e\u0003\u0002\u0001\u0000\u000e\u000f\u0005\u000b"+
-		"\u0000\u0000\u000f\u0013\u0001\u0000\u0000\u0000\u0010\u0013\u0003\u0004"+
-		"\u0002\u0000\u0011\u0013\u0003\u0006\u0003\u0000\u0012\u000b\u0001\u0000"+
-		"\u0000\u0000\u0012\u0010\u0001\u0000\u0000\u0000\u0012\u0011\u0001\u0000"+
-		"\u0000\u0000\u0013\"\u0001\u0000\u0000\u0000\u0014\u0015\n\u0006\u0000"+
-		"\u0000\u0015\u0016\u0007\u0000\u0000\u0000\u0016!\u0003\u0002\u0001\u0007"+
-		"\u0017\u0018\n\u0005\u0000\u0000\u0018\u0019\u0005\u0001\u0000\u0000\u0019"+
-		"!\u0003\u0002\u0001\u0006\u001a\u001b\n\u0004\u0000\u0000\u001b\u001c"+
-		"\u0005\u0003\u0000\u0000\u001c!\u0003\u0002\u0001\u0005\u001d\u001e\n"+
-		"\u0003\u0000\u0000\u001e\u001f\u0005\u0002\u0000\u0000\u001f!\u0003\u0002"+
-		"\u0001\u0004 \u0014\u0001\u0000\u0000\u0000 \u0017\u0001\u0000\u0000\u0000"+
-		" \u001a\u0001\u0000\u0000\u0000 \u001d\u0001\u0000\u0000\u0000!$\u0001"+
-		"\u0000\u0000\u0000\" \u0001\u0000\u0000\u0000\"#\u0001\u0000\u0000\u0000"+
-		"#\u0003\u0001\u0000\u0000\u0000$\"\u0001\u0000\u0000\u0000%&\u0005\f\u0000"+
-		"\u0000&\u0005\u0001\u0000\u0000\u0000\'(\u0005\r\u0000\u0000(\u0007\u0001"+
-		"\u0000\u0000\u0000\u0003\u0012 \"";
-	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
-	static {
-		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
-		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {
-			_decisionToDFA[i] = new DFA(_ATN.getDecisionState(i), i);
-		}
-	}
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionVisitor.java

@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Generated from AlertExpression.g4 by ANTLR 4.13.2
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.antlr.v4.runtime.tree.ParseTreeVisitor;
-
-/**
- * This interface defines a complete generic visitor for a parse tree produced
- * by {@link AlertExpressionParser}.
- *
- * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
- */
-public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#expression}.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitExpression(AlertExpressionParser.ExpressionContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code AndExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitAndExpr(AlertExpressionParser.AndExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code QueryExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code ComparisonExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code UnlessExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code LiteralExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code ParenExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitParenExpr(AlertExpressionParser.ParenExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code OrExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitOrExpr(AlertExpressionParser.OrExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#identifier}.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitIdentifier(AlertExpressionParser.IdentifierContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#number}.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitNumber(AlertExpressionParser.NumberContext ctx);
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/TelegramBotAlertNotifyHandlerImpl.java

@@ -48,7 +48,6 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
             TelegramBotNotifyDTO notifyBody = TelegramBotNotifyDTO.builder()
                     .chatId(receiver.getTgUserId())
                     .text(renderContent(noticeTemplate, alert))
-                    .messageThreadId(receiver.getTgMessageThreadId())
                     .disableWebPagePreview(true)
                     .build();
             HttpHeaders headers = new HttpHeaders();
@@ -85,8 +84,6 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
         private String text;
         @JsonProperty("disable_web_page_preview")
         private Boolean disableWebPagePreview;
-        @JsonProperty("message_thread_id")
-        private String messageThreadId;
     }
 
     @NoArgsConstructor

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/SmsClientFactory.java

@@ -21,9 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.config.SmsConfig;
 import org.apache.hertzbeat.alert.service.impl.SmsLocalSmsClientImpl;
-import org.apache.hertzbeat.alert.service.impl.AwsSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.TencentSmsClientImpl;
-import org.apache.hertzbeat.alert.service.impl.TwilioSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.UniSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.AlibabaSmsClientImpl;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
@@ -34,9 +32,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
 
 import static org.apache.hertzbeat.common.constants.SmsConstants.ALIBABA;
-import static org.apache.hertzbeat.common.constants.SmsConstants.AWS;
 import static org.apache.hertzbeat.common.constants.SmsConstants.TENCENT;
-import static org.apache.hertzbeat.common.constants.SmsConstants.TWILIO;
 import static org.apache.hertzbeat.common.constants.SmsConstants.UNISMS;
 import static org.apache.hertzbeat.common.constants.SmsConstants.SMSLOCAL;
 
@@ -140,15 +136,9 @@ public class SmsClientFactory {
             case SMSLOCAL:
                 currentSmsClient = new SmsLocalSmsClientImpl(smsConfig.getSmslocal());
                 break;
-            case AWS:
-                currentSmsClient = new AwsSmsClientImpl(smsConfig.getAws());
-                break;
-            case TWILIO:
-                currentSmsClient = new TwilioSmsClientImpl(smsConfig.getTwilio());
-                break;
             default:
                 log.warn("[SmsClientFactory] Unsupported SMS provider type: {}", smsConfig.getType());
                 break;
         }
     }
-}
+} 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AwsSmsClientImpl.java

@@ -1,287 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.service.impl;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.config.AwsSmsProperties;
-import org.apache.hertzbeat.alert.service.SmsClient;
-import org.apache.hertzbeat.alert.util.CryptoUtils;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
-import org.apache.hertzbeat.common.support.exception.SendMessageException;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-
-import java.net.URI;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import static org.apache.hertzbeat.common.constants.SmsConstants.AWS;
-
-/**
- * AWS Cloud SMS Client Implementation<br>
- * API doc:<a href="https://docs.aws.amazon.com/pinpoint/latest/apireference_smsvoicev2/API_SendTextMessage.html">https://docs.aws.amazon.com/pinpoint/latest/apireference_smsvoicev2/API_SendTextMessage.html</a><br>
- * Signature doc:<a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html"</a>https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html</a>
- */
-@Slf4j
-public class AwsSmsClientImpl implements SmsClient {
-
-
-    private static final String SERVICE = "sms-voice";
-    private static final String MESSAGE_TEMPLATE = "Instance: %s, Priority: %s, Content: %s";
-
-    private final String accessKey;
-    private final String secretKey;
-    private final String region;
-
-    public AwsSmsClientImpl(AwsSmsProperties config) {
-        if (config != null) {
-            this.accessKey = config.getAccessKeyId();
-            this.secretKey = config.getAccessKeySecret();
-            this.region = config.getRegion();
-        } else {
-            this.accessKey = "";
-            this.secretKey = "";
-            this.region = "";
-        }
-    }
-
-    @Override
-    public void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
-        // Extract alert info
-        String instance = null;
-        String priority = null;
-        String content = null;
-        if (alert.getCommonLabels() != null) {
-            instance = alert.getCommonLabels().get("instance") == null ? alert.getGroupKey() : alert.getCommonLabels().get("instance");
-            priority = alert.getCommonLabels().get("priority") == null ? "unknown" : alert.getCommonLabels().get("priority");
-            content = alert.getCommonAnnotations().get("summary");
-            content = content == null ? alert.getCommonAnnotations().get("description") : content;
-            if (content == null) {
-                content = alert.getCommonAnnotations().values().stream().findFirst().orElse(null);
-            }
-        }
-        this.send(receiver.getPhone(), createMessage(instance, priority, content));
-    }
-
-    private String createMessage(String instance, String priority, String content) {
-        return String.format(MESSAGE_TEMPLATE, instance, priority, content);
-    }
-
-    private void send(String phoneNumber, String message) {
-        Map<String, Object> payload = new HashMap<>();
-        payload.put("MessageBody", message);
-        payload.put("DestinationPhoneNumber", phoneNumber);
-        payload.put("MessageType", "TRANSACTIONAL");
-
-        Instant now = Instant.now();
-        String amzDate = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'").withZone(ZoneOffset.UTC).format(now);
-        String endpoint = "https://" + SERVICE + "." + region + ".amazonaws.com";
-
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            String payloadInString = new ObjectMapper().writeValueAsString(payload);
-            URI requestUri = new URI(endpoint);
-
-            HttpPost httpPost = createHttpPost(requestUri, amzDate, payloadInString);
-            log.info("Sending AWS SMS request to {}", requestUri + "," + "headers: " + Arrays.toString(httpPost.getAllHeaders()));
-            executeRequest(httpClient, httpPost, phoneNumber);
-        } catch (Exception e) {
-            log.warn("Failed to send SMS: {}", e.getMessage());
-            throw new SendMessageException(e.getMessage());
-        }
-    }
-
-
-    private HttpPost createHttpPost(URI requestUri, String amzDate, String payloadInString) throws Exception {
-        // Define headers once to avoid repetition (Order of headers must be maintained)
-        Map<String, String> headers = new LinkedHashMap<>();
-        headers.put("content-type", "application/x-amz-json-1.0");
-        headers.put("host", SERVICE + "." + this.region + ".amazonaws.com");
-        headers.put("x-amz-date", amzDate);
-        headers.put("x-amz-target", "PinpointSMSVoiceV2.SendTextMessage");
-
-        // Build authorization header using the same headers
-        AwsAuthenticationBuilder authBuilder = new AwsAuthenticationBuilder()
-                .credential(this.accessKey, this.secretKey)
-                .region(this.region);
-        headers.forEach(authBuilder::header);
-        String authorizationHeader = authBuilder.build(requestUri, "POST", SERVICE, payloadInString);
-
-        // Create HTTP post and set all headers
-        HttpPost httpPost = new HttpPost(requestUri);
-        httpPost.setHeader("Authorization", authorizationHeader);
-        headers.forEach(httpPost::setHeader);
-
-        httpPost.setEntity(new StringEntity(payloadInString, ContentType.APPLICATION_JSON));
-        return httpPost;
-    }
-
-    private void executeRequest(CloseableHttpClient httpClient, HttpPost httpPost, String phoneNumber) throws Exception {
-        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
-            int statusCode = response.getStatusLine().getStatusCode();
-            String responseBody = EntityUtils.toString(response.getEntity());
-            log.info("SMS response status: {}, body: {}", statusCode, responseBody);
-
-            if (statusCode != 200) {
-                throw new SendMessageException("HTTP request failed with status code: " + statusCode + ", response: " + responseBody);
-            }
-
-            JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
-            if (jsonResponse == null) {
-                throw new SendMessageException(statusCode + ":" + responseBody);
-            }
-
-            JsonNode responseNode = jsonResponse.get("MessageId");
-            if (responseNode == null) {
-                throw new SendMessageException(statusCode + ":" + responseBody);
-            }
-
-            String messageId = responseNode.asText();
-            log.info("Successfully sent SMS to phone: {}, messageId: {}", phoneNumber, messageId);
-        }
-    }
-
-    @Override
-    public String getType() {
-        return AWS;
-    }
-
-    @Override
-    public boolean checkConfig() {
-        return !(accessKey.isBlank() || secretKey.isBlank() || region.isBlank());
-    }
-
-
-    private static class AwsAuthenticationBuilder {
-        private String accessKey;
-        private String secretKey;
-        private String region;
-        private String service;
-        private URI requestUri;
-        private String method;
-        private String payload;
-        private final Map<String, String> headers = new LinkedHashMap<>();
-
-        public AwsAuthenticationBuilder region(String region) {
-            this.region = region;
-            return this;
-        }
-
-        public AwsAuthenticationBuilder credential(String accessKey, String secretKey) {
-            this.accessKey = accessKey;
-            this.secretKey = secretKey;
-            return this;
-        }
-
-        public AwsAuthenticationBuilder header(String header, String value) {
-            this.headers.put(header, value);
-            return this;
-        }
-
-        public String build(URI requestUri, String method, String service, String payload) throws Exception {
-            this.requestUri = requestUri;
-            this.method = method;
-            this.service = service;
-            this.payload = payload;
-            return "%s Credential=%s/%s, SignedHeaders=%s, Signature=%s".formatted(
-                    getAlgorithm(),
-                    this.accessKey,
-                    getCredentialScope(),
-                    getSignedHeaders(),
-                    getSignature()
-            );
-        }
-
-        private String getCredentialScope() {
-            return getDateStamp() + "/" + region + "/" + service + "/aws4_request";
-        }
-
-        private String getSignedHeaders() {
-            return String.join(";", headers.keySet());
-        }
-
-        private String getDateTime() {
-            return headers.get("x-amz-date");
-        }
-
-        private String getDateStamp() {
-            return getDateTime().substring(0, 8);
-        }
-
-        private String getSignature() {
-            String canonicalRequest = getCanonicalRequest();
-            String stringToSign = String.join("\n",
-                    getAlgorithm(),
-                    getDateTime(),
-                    getCredentialScope(),
-                    CryptoUtils.sha256Hex(canonicalRequest));
-
-            byte[] signingKey = getSignatureKey(secretKey, getDateStamp(), region, service);
-            return CryptoUtils.hmacSha256Hex(signingKey, stringToSign);
-        }
-
-        private String getCanonicalRequest() {
-            return String.join("\n",
-                    method,
-                    requestUri.getPath().isEmpty() ? "/" : requestUri.getPath(),
-                    requestUri.getQuery() != null ? requestUri.getQuery() : "",
-                    getCanonicalHeaders(),
-                    getSignedHeaders(),
-                    CryptoUtils.sha256Hex(payload)
-            );
-        }
-
-        private String getCanonicalHeaders() {
-            return headers.entrySet().stream()
-                    .map(entry -> entry.getKey() + ":" + entry.getValue())
-                    .collect(Collectors.joining("\n")) + "\n";
-        }
-
-        private String getAlgorithm() {
-            return "AWS4-HMAC-SHA256";
-        }
-
-        private byte[] getSignatureKey(String key, String dateStamp, String regionName, String serviceName) {
-            byte[] secret = ("AWS4" + key).getBytes(StandardCharsets.UTF_8);
-            byte[] date = CryptoUtils.hmac256(secret, dateStamp);
-            byte[] region = CryptoUtils.hmac256(date, regionName);
-            byte[] service = CryptoUtils.hmac256(region, serviceName);
-            return CryptoUtils.hmac256(service, "aws4_request");
-        }
-
-
-    }
-}
-
-

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/DataSourceServiceImpl.java

@@ -17,26 +17,21 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import lombok.Getter;
-import lombok.Setter;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Stack;
 import lombok.extern.slf4j.Slf4j;
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
-import org.apache.hertzbeat.alert.expr.AlertExpressionEvalVisitor;
-import org.apache.hertzbeat.alert.expr.AlertExpressionLexer;
-import org.apache.hertzbeat.alert.expr.AlertExpressionParser;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.springframework.util.StringUtils;
 
 /**
  * datasource service
@@ -44,25 +39,14 @@ import java.util.concurrent.TimeUnit;
 @Service
 @Slf4j
 public class DataSourceServiceImpl implements DataSourceService {
-
-    @Setter
+    
     @Autowired(required = false)
     private List<QueryExecutor> executors;
-
-    @Getter
-    private final Cache<String, ParseTree> expressionCache = Caffeine.newBuilder()
-            .maximumSize(256)
-            .expireAfterAccess(1, TimeUnit.HOURS)
-            .recordStats()
-            .build();
-
-    @Getter
-    private final Cache<String, CommonTokenStream> tokenStreamCache = Caffeine.newBuilder()
-            .maximumSize(512)
-            .expireAfterWrite(30, TimeUnit.MINUTES)
-            .recordStats()
-            .build();
-
+    
+    private static final Pattern EXPR_TOKEN = Pattern.compile("\\(|\\)|[a-zA-Z_][a-zA-Z0-9_=～{}\\[\\]\".]*|\\d+(\\.\\d+)?|>=|<=|==|!=|>|<|and|or|unless");
+    private static final String THRESHOLD = "__threshold__";
+    private static final String VALUE = "__value__";
+    
     @Override
     public List<Map<String, Object>> calculate(String datasource, String expr) {
         if (!StringUtils.hasText(expr)) {
@@ -72,7 +56,6 @@ public class DataSourceServiceImpl implements DataSourceService {
             throw new IllegalArgumentException("No query executor found");
         }
         QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);
-
         if (executor == null) {
             throw new IllegalArgumentException("Unsupported datasource: " + datasource);
         }
@@ -87,18 +70,278 @@ public class DataSourceServiceImpl implements DataSourceService {
     }
 
     private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
-        ParseTree tree = expressionCache.get(expr, e -> {
-            CommonTokenStream tokens = tokenStreamCache.get(e, this::createTokenStream);
-            AlertExpressionParser parser = new AlertExpressionParser(tokens);
-            return parser.expr();
-        });
-        AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor);
-        return visitor.visit(tree);
-
+        Stack<List<Map<String, Object>>> values = new Stack<>();
+        Stack<String> operators = new Stack<>();
+        Matcher matcher = EXPR_TOKEN.matcher(expr);
+        List<String> tokens = new ArrayList<>();
+        while (matcher.find()) {
+            tokens.add(matcher.group());
+        }
+        for (String token : tokens) {
+            if (token.equals("(")) {
+                operators.push(token);
+            } else if (token.equals(")")) {
+                while (!operators.isEmpty() && !operators.peek().equals("(")) {
+                    applyOperator(values, operators.pop());
+                }
+                // remove the left parenthesis
+                operators.pop();
+            } else if (token.matches(">=|<=|==|!=|>|<")) {
+                operators.push(token);
+            } else if (token.equals("and") || token.equals("or") || token.equals("unless")) {
+                while (!operators.isEmpty() && precedence(operators.peek()) >= precedence(token)) {
+                    applyOperator(values, operators.pop());
+                }
+                operators.push(token);
+            } else if (token.matches("\\d+(\\.\\d+)?")) { 
+                double value = Double.parseDouble(token);
+                List<Map<String, Object>> numAsList = new ArrayList<>();
+                numAsList.add(Map.of(THRESHOLD, value));
+                values.push(numAsList);
+            } else if (token.matches("[a-zA-Z_][a-zA-Z0-9_=～{}\\[\\]\".]*")) {
+                List<Map<String, Object>> results = executor.execute(token);
+                values.push(results);
+            }
+        }
+        while (!operators.isEmpty()) {
+            applyOperator(values, operators.pop());
+        }
+        return values.isEmpty() ? new LinkedList<>() : values.pop();
     }
 
-    private CommonTokenStream createTokenStream(String expr) {
-        AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expr));
-        return new CommonTokenStream(lexer);
+    private int precedence(String op) {
+        return switch (op) {
+            case "or" -> 1;
+            case "unless" -> 2;
+            case "and" -> 3;
+            case ">", "<", ">=", "<=", "==", "!=" -> 4;
+            default -> 0;
+        };
     }
-}
+
+    private void applyOperator(Stack<List<Map<String, Object>>> values, String op) {
+        if (values.size() < 2) {
+            return;
+        };
+        List<Map<String, Object>> rightOperand = values.pop();
+        List<Map<String, Object>> leftOperand = values.pop();
+        if (rightOperand.size() == 1 && rightOperand.get(0).containsKey(THRESHOLD)) {
+            double threshold = (double) rightOperand.get(0).get(THRESHOLD);
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map<String, Object> item : leftOperand) {
+                Object queryValues = item.get(VALUE);
+                if (queryValues == null) {
+                    // ignore the query result data is empty
+                    continue;
+                }
+                // queryValues may be a list of values, or a single value
+                Object matchValue = evaluateCondition(queryValues, op, threshold);
+                item.put(VALUE, matchValue);
+                // if matchValue is null, mean not match the threshold
+                // if not null, mean match the threshold
+                result.add(new HashMap<>(item));
+            }
+            if (!result.isEmpty()) {
+                values.push(result);    
+            }
+            return;
+        }
+        Map<String, Object> leftMap = null;
+        boolean leftMatch = false;
+        Map<String, Object> rightMap = null;
+        boolean rightMatch = false;
+        switch (op) {
+            case "and" -> {
+                for (Map<String, Object> item : leftOperand) {
+                    if (leftMap == null) {
+                        leftMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        leftMap = item;
+                        leftMatch = true;
+                        break;
+                    }
+                }
+                for (Map<String, Object> item : rightOperand) {
+                    if (rightMap == null) {
+                        rightMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        rightMap = item;
+                        rightMatch = true;
+                        break;
+                    }
+                }
+                if (leftMatch && rightMatch) {
+                    rightMap.putAll(leftMap);
+                    values.push(new LinkedList<>(List.of(rightMap)));
+                } else if (leftMap != null) {
+                    leftMap.put(VALUE, null);
+                    values.push(new LinkedList<>(List.of(leftMap)));
+                } else if (rightMap != null) {
+                    rightMap.put(VALUE, null);
+                    values.push(new LinkedList<>(List.of(rightMap)));
+                } 
+            }
+            case "or" -> {
+                for (Map<String, Object> item : leftOperand) {
+                    if (leftMap == null) {
+                        leftMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        leftMap = item;
+                        leftMatch = true;
+                        break;
+                    }
+                }
+                for (Map<String, Object> item : rightOperand) {
+                    if (rightMap == null) {
+                        rightMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        rightMap = item;
+                        rightMatch = true;
+                        break;
+                    }
+                }
+                if (leftMatch && rightMatch) {
+                    rightMap.putAll(leftMap);
+                    values.push(new LinkedList<>(List.of(rightMap)));
+                } else if (leftMatch) {
+                    values.push(new LinkedList<>(List.of(leftMap)));
+                } else if (rightMatch) {
+                    values.push(new LinkedList<>(List.of(rightMap)));
+                } else {
+                    if (leftMap != null && rightMap != null) {
+                        rightMap.putAll(leftMap);
+                        values.push(new LinkedList<>(List.of(rightMap)));
+                    } else if (leftMap != null) {
+                        values.push(new LinkedList<>(List.of(leftMap)));
+                    } else if (rightMap != null){
+                        values.push(new LinkedList<>(List.of(rightMap)));
+                    }
+                }
+            }
+            case "unless" -> {
+                for (Map<String, Object> item : leftOperand) {
+                    if (leftMap == null) {
+                        leftMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        leftMap = item;
+                        leftMatch = true;
+                        break;
+                    }
+                }
+                for (Map<String, Object> item : rightOperand) {
+                    if (rightMap == null) {
+                        rightMap = item;
+                    }
+                    if (item.get(VALUE) != null) {
+                        rightMap = item;
+                        rightMatch = true;
+                        break;
+                    }
+                }
+                if (leftMatch && !rightMatch) {
+                    values.push(new LinkedList<>(List.of(leftMap)));
+                } else {
+                    if (leftMap != null) {
+                        leftMap.put(VALUE, null);
+                        values.push(new LinkedList<>(List.of(leftMap)));
+                    } else {
+                        if (rightMap != null) {
+                            rightMap.put(VALUE, null);
+                            values.push(new LinkedList<>(List.of(rightMap)));
+                        } 
+                    }
+                }
+            }
+            default -> throw new IllegalArgumentException("Unsupported operator: " + op);
+        }
+    }
+    
+    private Object evaluateCondition(Object value, String operator, Double threshold) {
+        // value may be a list of values, or a single value
+        switch (operator) {
+            case ">":
+                // if value is list, return the max value
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString()))
+                            .max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue > threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) > threshold ? value : null;
+                }
+            case ">=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString()))
+                            .max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue >= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) >= threshold ? value : null;
+                }
+            case "<":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString()))
+                            .min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue < threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) < threshold ? value : null;
+                }
+            case "<=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString()))
+                            .min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue <= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) <= threshold ? value : null;
+                }
+            case "==":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return v;
+                        }
+                    }
+                    return null;
+                } else {
+                    return value.equals(threshold) ? value : null;
+                }
+            case "!=":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return null;
+                        }
+                    }
+                    return value;
+                } else {
+                    return value.equals(threshold) ? null : value;
+                }
+            default:
+                // unsupported operator todo add more operator
+                return null;
+        }
+    }
+
+    public void setExecutors(List<QueryExecutor> mockExecutor) {
+        this.executors = mockExecutor;
+    }
+} 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/NoticeConfigServiceImpl.java

@@ -305,7 +305,7 @@ public class NoticeConfigServiceImpl implements NoticeConfigService, CommandLine
         Map<String, String> labels = new HashMap<>(8);
         labels.put(CommonConstants.LABEL_INSTANCE, "1000000");
         labels.put(CommonConstants.LABEL_ALERT_NAME, "CPU Usage Alert");
-        labels.put(CommonConstants.LABEL_INSTANCE_HOST, "127.0.0.1");
+        labels.put(CommonConstants.LABEL_HOST, "127.0.0.1");
         Map<String, String> annotations = new HashMap<>(8);
         annotations.put("suggest", "Please check the CPU usage of the server");
         SingleAlert singleAlert1 = SingleAlert.builder()

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SkyWalkingExternAlertService.java

@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.service.impl;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.dto.SkyWalkingExternAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.ExternAlertService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * SkyWalking external alarm service impl
- */
-@Slf4j
-@Service
-public class SkyWalkingExternAlertService implements ExternAlertService {
-
-    @Autowired
-    private AlarmCommonReduce alarmCommonReduce;
-
-
-    @Override
-    public void addExternAlert(String content) {
-        TypeReference<List<SkyWalkingExternAlert>> typeReference = new TypeReference<>() {};
-        List<SkyWalkingExternAlert> alerts = JsonUtil.fromJson(content, typeReference);
-        if (alerts == null || alerts.isEmpty()) {
-            log.warn("Parse SkyWalking extern alert content failed! content: {}", content);
-            return;
-        }
-        for (SkyWalkingExternAlert alert : alerts) {
-            SingleAlert singleAlert = SingleAlert.builder()
-                    .content(alert.getAlarmMessage())
-                    .status(CommonConstants.ALERT_STATUS_FIRING)
-                    .activeAt(Instant.now().toEpochMilli())
-                    .startAt(alert.getStartTime() != null ? alert.getStartTime() : Instant.now().toEpochMilli())
-                    .labels(acquireAlertLabels(alert))
-                    .annotations(acquireAlertAnnotations(alert))
-                    .triggerTimes(1)
-                    .build();
-            alarmCommonReduce.reduceAndSendAlarm(singleAlert);   
-        }
-    }
-
-    @Override
-    public String supportSource() {
-        return "skywalking";
-    }
-
-    private Map<String, String> acquireAlertLabels(SkyWalkingExternAlert externAlert){
-        Map<String, String> labels = new HashMap<>(8);
-        labels.put("__source__", "skywalking");
-        List<SkyWalkingExternAlert.Tag> tags = externAlert.getTags();
-        if (tags == null || tags.isEmpty()){
-            return labels;
-        }
-        tags.forEach(tag -> labels.put(tag.getKey(), tag.getValue()));
-        return labels;
-    }
-
-    private Map<String, String> acquireAlertAnnotations(SkyWalkingExternAlert externAlert){
-        Map<String, String> annotations = new HashMap<>(8);
-        annotations.putIfAbsent("scope", externAlert.getScope());
-        annotations.putIfAbsent("name", externAlert.getName());
-        annotations.putIfAbsent("id0", externAlert.getId0());
-        annotations.putIfAbsent("id1", externAlert.getId1());
-        annotations.putIfAbsent("ruleName", externAlert.getRuleName());
-        return annotations;
-    }
-
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentExternAlertService.java

@@ -18,22 +18,14 @@
 package org.apache.hertzbeat.alert.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.dto.TencentCloudExternAlert;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.ExternAlertService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
 /**
  * Default external alarm service impl
  */
@@ -51,7 +43,8 @@ public class TencentExternAlertService implements ExternAlertService {
             log.warn("parse extern alert content failed! content: {}", content);
             return;
         }
-        SingleAlert alert = new TencentCloudAlertConverter().convert(report);
+        // todo convert TenCloudAlertReport to SingleAlert
+        SingleAlert alert = new SingleAlert();
         alarmCommonReduce.reduceAndSendAlarm(alert);
     }
 
@@ -59,169 +52,4 @@ public class TencentExternAlertService implements ExternAlertService {
     public String supportSource() {
         return "tencent";
     }
-
-    /**
-     * Converter: TencentCloud alert to SingleAlert
-     */
-    public static class TencentCloudAlertConverter {
-
-        /**
-         * Metric alert content template
-         */
-        private final String metricTemplate = "Tencent Cloud Metric Alert: {metricShowName} {calcType} {calcValue}{calcUnit}, Current: {currentValue}{unit}";
-
-        /**
-         * Event alert content template
-         */
-        private final String eventTemplate = "Tencent Cloud Event Alert: {productShowName} - {eventShowName}";
-
-
-        /**
-         * Convert TencentCloud alert to SingleAlert
-         */
-        public SingleAlert convert(TencentCloudExternAlert tencentAlert) {
-            // Building basic information
-            SingleAlert.SingleAlertBuilder builder = SingleAlert.builder()
-                    .status(convertStatus(tencentAlert.getAlarmStatus()))
-                    .startAt(parseTime(tencentAlert.getFirstOccurTime()))
-                    .activeAt(parseTime(tencentAlert.getFirstOccurTime()))
-                    .triggerTimes(1);
-            // If it is a recovery state, set the end time.
-            if ("0".equals(tencentAlert.getAlarmStatus())) {
-                builder.endAt(parseTime(tencentAlert.getRecoverTime()));
-            }
-
-            // Build labels
-            Map<String, String> labels = new HashMap<>();
-            buildLabels(labels, tencentAlert);
-
-            // Build annotations
-            Map<String, String> annotations = new HashMap<>();
-            buildAnnotations(annotations, tencentAlert);
-
-            // Build content
-            String content = generateContent(tencentAlert);
-
-            return builder
-                    .labels(labels)
-                    .annotations(annotations)
-                    .content(content)
-                    .build();
-        }
-
-        private void buildLabels(Map<String, String> labels, TencentCloudExternAlert alert) {
-            labels.put("__source__", "tencent_cloud");
-            labels.put("alert_type", alert.getAlarmType());
-            if (TencentCloudExternAlert.METRIC.equals(alert.getAlarmType())) {
-                labels.put("metric_name", alert.getAlarmPolicyInfo().getConditions().getMetricName());
-                labels.put("namespace", alert.getAlarmObjInfo().getNamespace());
-            } else {
-                labels.put("event_name", alert.getAlarmPolicyInfo().getConditions().getEventName());
-                labels.put("product_name", alert.getAlarmPolicyInfo().getConditions().getProductName());
-            }
-        }
-
-        private void buildAnnotations(Map<String, String> annotations, TencentCloudExternAlert alert) {
-            TencentCloudExternAlert.AlarmPolicyInfo alarmPolicyInfo = alert.getAlarmPolicyInfo();
-            TencentCloudExternAlert.AlarmObjInfo alarmObjInfo = alert.getAlarmObjInfo();
-            TencentCloudExternAlert.Dimensions dimensions = alert.getAlarmObjInfo().getDimensions();
-
-            putIfNotNull(annotations, "policy_id", alarmPolicyInfo.getPolicyId());
-            putIfNotNull(annotations, "policy_type", alarmPolicyInfo.getPolicyType());
-            putIfNotNull(annotations, "policy_name", alarmPolicyInfo.getPolicyName());
-            putIfNotNull(annotations, "policy_type_cname", alarmPolicyInfo.getPolicyTypeCname());
-
-            putIfNotNull(annotations, "namespace", alarmObjInfo.getNamespace());
-            putIfNotNull(annotations, "region", alarmObjInfo.getRegion());
-            putIfNotNull(annotations, "app_id", alarmObjInfo.getAppId());
-            putIfNotNull(annotations, "uin", alarmObjInfo.getUin());
-
-            putIfNotNull(annotations, "instance_id", dimensions.getUnInstanceId());
-            putIfNotNull(annotations, "obj_id", dimensions.getObjId());
-
-        }
-
-        /**
-         * Generate alert content with template
-         */
-        private String generateContent(TencentCloudExternAlert alert) {
-            if (TencentCloudExternAlert.METRIC.equals(alert.getAlarmType())) {
-                return generateMetricContent(alert);
-            } else {
-                return generateEventContent(alert);
-            }
-        }
-
-        /**
-         * Generate metric alert content
-         */
-        private String generateMetricContent(TencentCloudExternAlert alert) {
-            TencentCloudExternAlert.Conditions conditions = alert.getAlarmPolicyInfo().getConditions();
-            Map<String, String> params = new HashMap<>();
-
-            params.put("metricShowName", conditions.getMetricShowName());
-
-            if (StringUtils.isNotEmpty(conditions.getCalcType())
-                    && StringUtils.isNotEmpty(conditions.getCalcValue())) {
-                params.put("calcType", conditions.getCalcType());
-                params.put("calcValue", conditions.getCalcValue());
-                params.put("calcUnit", Objects.toString(conditions.getCalcUnit(), ""));
-            } else {
-                params.put("calcType", "");
-                params.put("calcValue", "N/A");
-                params.put("calcUnit", "");
-            }
-
-            if (StringUtils.isNotEmpty(conditions.getCurrentValue())) {
-                params.put("currentValue", conditions.getCurrentValue());
-                params.put("unit", Objects.toString(conditions.getUnit(), ""));
-            } else {
-                params.put("currentValue", "N/A");
-                params.put("unit", "");
-            }
-            return replacePlaceholders(metricTemplate, params);
-        }
-
-        /**
-         * Generate event alert content
-         */
-        private String generateEventContent(TencentCloudExternAlert alert) {
-            TencentCloudExternAlert.Conditions conditions = alert.getAlarmPolicyInfo().getConditions();
-            Map<String, String> params = new HashMap<>();
-            params.put("productShowName", conditions.getProductShowName());
-            params.put("eventShowName", conditions.getEventShowName());
-            return replacePlaceholders(eventTemplate, params);
-        }
-
-        /**
-         * Replace placeholders in template with actual values
-         */
-        private String replacePlaceholders(String template, Map<String, String> params) {
-            String result = template;
-            for (Map.Entry<String, String> entry : params.entrySet()) {
-                result = result.replace("{" + entry.getKey() + "}", Objects.toString(entry.getValue(), "NULL"));
-            }
-            return result;
-        }
-
-        private String convertStatus(String alarmStatus) {
-            return "1".equals(alarmStatus) ? CommonConstants.ALERT_STATUS_FIRING : CommonConstants.ALERT_STATUS_RESOLVED;
-        }
-
-        private Long parseTime(String timeStr) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                return sdf.parse(timeStr).getTime();
-            } catch (ParseException e) {
-                log.error("Failed to parse time: {}", timeStr);
-                throw new IllegalArgumentException("Failed to parse time: " + timeStr, e);
-            }
-        }
-
-        private void putIfNotNull(Map<String, String> map, String key, String value){
-            if (StringUtils.isNotEmpty(value)){
-                map.put(key, value);
-            }
-        }
-    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentSmsClientImpl.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
-import jakarta.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.config.TencentSmsProperties;
 import org.apache.hertzbeat.alert.service.SmsClient;
@@ -35,6 +34,7 @@ import org.apache.http.util.EntityUtils;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import com.fasterxml.jackson.databind.JsonNode;
 
+import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TwilioSmsClientImpl.java

@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.service.impl;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.config.TwilioSmsProperties;
-import org.apache.hertzbeat.alert.service.SmsClient;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
-import org.apache.hertzbeat.common.support.exception.SendMessageException;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-
-import static org.apache.hertzbeat.common.constants.SmsConstants.TWILIO;
-
-/**
- * Twilio SMS Client Implementation<br>
- * API doc: <a href=
- * "https://www.twilio.com/docs/sms/api">https://www.twilio.com/docs/sms/api</a>
- */
-@Slf4j
-public class TwilioSmsClientImpl implements SmsClient {
-
-    private static final String API_URL_FORMAT = "https://api.twilio.com/2010-04-01/Accounts/%s/Messages.json";
-    private static final String MESSAGE_TEMPLATE = "Instance: %s, Priority: %s, Content: %s";
-
-    private final String accountSid;
-    private final String authToken;
-    private final String twilioPhoneNumber;
-
-    public TwilioSmsClientImpl(TwilioSmsProperties config) {
-        if (config != null) {
-            this.accountSid = config.getAccountSid();
-            this.authToken = config.getAuthToken();
-            this.twilioPhoneNumber = config.getTwilioPhoneNumber();
-        } else {
-            this.accountSid = "";
-            this.authToken = "";
-            this.twilioPhoneNumber = "";
-        }
-    }
-
-    @Override
-    public void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
-        String instance = null;
-        String priority = null;
-        String content = null;
-        if (alert.getCommonLabels() != null) {
-            instance = alert.getCommonLabels().get("instance") == null ? alert.getGroupKey()
-                    : alert.getCommonLabels().get("instance");
-            priority = alert.getCommonLabels().get("priority") == null ? "unknown"
-                    : alert.getCommonLabels().get("priority");
-            content = alert.getCommonAnnotations().get("summary");
-            content = content == null ? alert.getCommonAnnotations().get("description") : content;
-            if (content == null) {
-                content = alert.getCommonAnnotations().values().stream().findFirst().orElse(null);
-            }
-        }
-        this.send(receiver.getPhone(), createMessage(instance, priority, content));
-    }
-
-    private String createMessage(String instance, String priority, String content) {
-        return String.format(MESSAGE_TEMPLATE, instance, priority, content);
-    }
-
-    private void send(String phoneNumber, String message) {
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            String endpoint = String.format(API_URL_FORMAT, accountSid);
-            URI requestUri = new URI(endpoint);
-
-            HttpPost httpPost = createHttpPost(requestUri, phoneNumber, message);
-            log.info("Sending Twilio SMS request to {}", requestUri);
-            executeRequest(httpClient, httpPost, phoneNumber);
-        } catch (Exception e) {
-            log.warn("Failed to send SMS: {}", e.getMessage());
-            throw new SendMessageException(e.getMessage());
-        }
-    }
-
-    private HttpPost createHttpPost(URI requestUri, String toNumber, String message) {
-        HttpPost httpPost = new HttpPost(requestUri);
-
-        String auth = accountSid + ":" + authToken;
-        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
-        httpPost.setHeader("Authorization", "Basic " + encodedAuth);
-
-        List<BasicNameValuePair> parameters = new ArrayList<>();
-        parameters.add(new BasicNameValuePair("To", toNumber));
-        parameters.add(new BasicNameValuePair("From", twilioPhoneNumber));
-        parameters.add(new BasicNameValuePair("Body", message));
-
-        try {
-            httpPost.setEntity(new UrlEncodedFormEntity(parameters));
-            return httpPost;
-        } catch (Exception e) {
-            log.error("Failed to create HTTP request: {}", e.getMessage());
-            throw new SendMessageException(e.getMessage());
-        }
-    }
-
-    private void executeRequest(CloseableHttpClient httpClient, HttpPost httpPost, String phoneNumber)
-            throws Exception {
-        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
-            int statusCode = response.getStatusLine().getStatusCode();
-            String responseBody = EntityUtils.toString(response.getEntity());
-            log.info("SMS response status: {}, body: {}", statusCode, responseBody);
-
-            if (statusCode < 200 || statusCode >= 300) {
-
-                if (responseBody.contains("21608")) {
-                    throw new SendMessageException(
-                            "The Twilio trial account can only send SMS to verified phone numbers");
-                } else {
-                    throw new SendMessageException(
-                            "HTTP request failed with status code: " + statusCode + ", response: " + responseBody);
-                }
-            }
-
-            JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
-            if (jsonResponse == null) {
-                throw new SendMessageException(statusCode + ":" + responseBody);
-            }
-
-            JsonNode sidNode = jsonResponse.get("sid");
-            if (sidNode == null) {
-                throw new SendMessageException(statusCode + ":" + responseBody);
-            }
-
-            String sid = sidNode.asText();
-            log.info("Successfully sent SMS to phone: {}, sid: {}", phoneNumber, sid);
-        }
-    }
-
-    @Override
-    public String getType() {
-        return TWILIO;
-    }
-
-    @Override
-    public boolean checkConfig() {
-        return !(accountSid.isBlank() || authToken.isBlank() || twilioPhoneNumber.isBlank());
-    }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/util/AlertUtil.java

@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.util;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * alert util
- */
-public class AlertUtil {
-
-    /**
-     * calculate fingerprint
-     * @param fingerPrints finger prints
-     */
-    public static String calculateFingerprint(Map<String, String> fingerPrints) {
-        List<String> keyList = fingerPrints.keySet().stream().filter(Objects::nonNull).sorted().toList();
-        List<String> valueList = fingerPrints.values().stream().filter(Objects::nonNull).sorted().toList();
-        return Arrays.hashCode(keyList.toArray(new String[0])) + "-"
-                + Arrays.hashCode(valueList.toArray(new String[0]));
-    }
-}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/util/CryptoUtils.java

@@ -89,18 +89,7 @@ public class CryptoUtils {
      * @return lowercase hexadecimal string
      */
     public static String hmacSha256Hex(String key, String data) {
-        return hmacSha256Hex(hmac256(key.getBytes(UTF8), data), data);
-    }
-
-    /**
-     * Calculate HMAC-SHA256 signature and convert to lowercase hexadecimal string
-     * Note: This is necessary as, converting a String to byte[] and back may yield different results due to encoding differences or data loss.
-     * @param key secret key in byte array
-     * @param data data to be signed
-     * @return lowercase hexadecimal string
-     */
-    public static String hmacSha256Hex(byte[] key, String data) {
-        byte[] hmacResult = hmac256(key, data);
+        byte[] hmacResult = hmac256(key.getBytes(UTF8), data);
         return DatatypeConverter.printHexBinary(hmacResult).toLowerCase();
     }
 } 

hertzbeat-alerter/src/main/resources/alerter_en_US.properties

@@ -14,8 +14,6 @@
 # limitations under the License.
 
 alerter.availability.recover = Availability Alert Resolved, Monitor Status Normal Now
-alerter.availability.collector.recover = Collector Availability Alert Resolved, The collector is online
-alerter.availability.collector.offline = Collector Availability Alert Notify, The collector is offline
 alerter.alarm.recover = Alert Resolved Notice
 alerter.notify.title = HertzBeat Alert Notify
 alerter.notify.target = Monitor Target

hertzbeat-alerter/src/main/resources/alerter_zh_CN.properties

@@ -14,8 +14,6 @@
 # limitations under the License.
 
 alerter.availability.recover = 可用性告警恢复通知, 任务状态已恢复正常
-alerter.availability.collector.recover = 采集器可用性恢复通知，采集器已上线
-alerter.availability.collector.offline = 采集器可用性告警通知，采集器已下线
 alerter.alarm.recover = 告警恢复通知
 alerter.notify.title = HertzBeat告警通知
 alerter.notify.target = 告警目标对象

hertzbeat-alerter/src/main/resources/alerter_zh_TW.properties

@@ -15,8 +15,6 @@
 
 alerter.availability.recover = 可用性警報已解決，監視狀態現在正常
 alerter.alarm.recover = 警報解決通知
-alerter.availability.collector.recover = 采集器可用性恢復通知，采集器已上線
-alerter.availability.collector.offline = 采集器可用性告警通知，采集器已下線
 alerter.notify.title = HertzBeat 警報通知
 alerter.notify.target = 監視目標
 alerter.notify.monitorId = 監視 ID

hertzbeat-alerter/src/main/resources/expr/AlertExpression.g4

@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-grammar AlertExpression;
-
-expression
-    : expr EOF
-    ;
-
-expr
-    : '(' expr ')'                       # ParenExpr
-    | left=expr op=('>='|'<='|'>'|'<'|'=='|'!=') right=expr  # ComparisonExpr
-    | left=expr 'and' right=expr         # AndExpr
-    | left=expr 'unless' right=expr      # UnlessExpr
-    | left=expr 'or' right=expr          # OrExpr
-    | identifier                         # QueryExpr
-    | number                             # LiteralExpr
-    ;
-
-// Lexer rules
-AND     : 'and' ;
-OR      : 'or' ;
-UNLESS  : 'unless' ;
-GT      : '>' ;
-GE      : '>=' ;
-LT      : '<' ;
-LE      : '<=' ;
-EQ      : '==' ;
-NE      : '!=' ;
-LPAREN  : '(' ;
-RPAREN  : ')' ;
-
-identifier
-    : IDENTIFIER
-    ;
-
-number
-    : NUMBER
-    ;
-
-IDENTIFIER : [a-zA-Z_] [a-zA-Z0-9_=～{}[\]".]*;
-NUMBER     : [0-9]+ ('.' [0-9]+)? ;
-WS         : [ \t\r\n]+ -> skip ;

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculatorTest.java

@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import org.apache.hertzbeat.alert.AlerterWorkerPool;
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.AlertDefineService;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.queue.CommonDataQueue;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-
-class RealTimeAlertCalculatorTest {
-
-    private RealTimeAlertCalculator calculator;
-
-    @BeforeEach
-    void setUp() {
-        AlerterWorkerPool mockPool = Mockito.mock(AlerterWorkerPool.class);
-        CommonDataQueue mockQueue = Mockito.mock(CommonDataQueue.class);
-        AlertDefineService mockAlertDefineService = Mockito.mock(AlertDefineService.class);
-        SingleAlertDao mockDao = Mockito.mock(SingleAlertDao.class);
-        AlarmCommonReduce mockReduce = Mockito.mock(AlarmCommonReduce.class);
-        AlarmCacheManager alarmCacheManager = Mockito.mock(AlarmCacheManager.class);
-
-        Mockito.when(mockDao.querySingleAlertsByStatus(Mockito.anyString()))
-                .thenReturn(Collections.emptyList());
-
-        calculator = new RealTimeAlertCalculator(mockPool, mockQueue, mockAlertDefineService, mockDao, mockReduce, alarmCacheManager, false);
-    }
-
-    @Test
-    void testFilterThresholdsByAppAndMetrics_withInstanceExpr_HasSpace() {
-        String app = "redis";
-        String instanceId = "501045327364864";
-        int priority = 0;
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__, \"501045327364864\")");
-
-        AlertDefine unmatchDefine = new AlertDefine();
-        unmatchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__, \"999999999\")");
-
-        List<AlertDefine> allDefines = Arrays.asList(matchDefine, unmatchDefine);
-
-        List<AlertDefine> filtered = calculator.filterThresholdsByAppAndMetrics(allDefines, app, "", Map.of(), instanceId, priority);
-
-        // It should filter out 999999999.
-        assertEquals(1, filtered.size());
-        assertEquals("equals(__app__,\"redis\") && equals(__instance__, \"501045327364864\")",
-                filtered.get(0).getExpr());
-    }
-
-    @Test
-    void testFilterThresholdsByAppAndMetrics_withInstanceExpr_NoSpace() {
-        String app = "redis";
-        String instanceId = "501045327364864";
-        int priority = 0;
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__,\"501045327364864\")");
-
-        AlertDefine unmatchDefine = new AlertDefine();
-        unmatchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__,\"999999999\")");
-
-        List<AlertDefine> allDefines = Arrays.asList(matchDefine, unmatchDefine);
-
-        List<AlertDefine> filtered = calculator.filterThresholdsByAppAndMetrics(allDefines, app, "", Map.of(), instanceId, priority);
-
-        // It should filter out 999999999.
-        assertEquals(1, filtered.size());
-        assertEquals("equals(__app__,\"redis\") && equals(__instance__,\"501045327364864\")",
-                filtered.get(0).getExpr());
-    }
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertInhibitControllerTest.java

@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.controller;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
-
-import org.apache.hertzbeat.alert.service.AlertInhibitService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.AlertInhibit;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MockMvc;
-
-import java.util.HashMap;
-
-/**
- * test case for {@link AlertInhibitControllerTest}
- */
-@ExtendWith(MockitoExtension.class)
-public class AlertInhibitControllerTest {
-
-    private MockMvc mockMvc;
-
-    @Mock
-    private AlertInhibitService alertInhibitService;
-
-    @InjectMocks
-    private AlertInhibitController alertInhibitController;
-
-    private AlertInhibit alertInhibit;
-
-    @BeforeEach
-    void setUp() {
-        this.mockMvc = standaloneSetup(alertInhibitController).build();
-
-        HashMap<String, String> sourceLabels = new HashMap<>();
-        HashMap<String, String> targetLabels = new HashMap<>();
-
-        alertInhibit = AlertInhibit.builder()
-                .id(1L)
-                .name("test")
-                .sourceLabels(sourceLabels)
-                .targetLabels(targetLabels)
-                .creator("test")
-                .build();
-    }
-
-    @Test
-    void testAddNewAlertInhibit() throws Exception {
-
-        doNothing().when(alertInhibitService).validate(any(AlertInhibit.class), eq(false));
-        doNothing().when(alertInhibitService).addAlertInhibit(any(AlertInhibit.class));
-
-        mockMvc.perform(post("/api/alert/inhibit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(JsonUtil.toJson(alertInhibit)))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andExpect(jsonPath("$.msg").value("Add success"));
-
-    }
-
-    @Test
-    void testModifyAlertInhibit() throws Exception {
-
-        doNothing().when(alertInhibitService).validate(any(AlertInhibit.class), eq(true));
-        doNothing().when(alertInhibitService).modifyAlertInhibit(any(AlertInhibit.class));
-
-        mockMvc.perform(put("/api/alert/inhibit")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(JsonUtil.toJson(alertInhibit)))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andExpect(jsonPath("$.msg").value("Modify success"));
-
-
-    }
-
-    @Test
-    void testGetAlertInhibitExists() throws Exception {
-
-        when(alertInhibitService.getAlertInhibit(1L)).thenReturn(alertInhibit);
-
-        mockMvc.perform(get("/api/alert/inhibit/{id}", 1L)
-                        .accept(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.id").value(alertInhibit.getId()));
-    }
-
-    @Test
-    void testGetAlertInhibitNotExists() throws Exception {
-
-        when(alertInhibitService.getAlertInhibit(1L)).thenReturn(null);
-
-        mockMvc.perform(get("/api/alert/inhibit/{id}", 1L)
-                        .accept(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.MONITOR_NOT_EXIST_CODE))
-                .andExpect(jsonPath("$.msg").value("AlertInhibit not exist."));
-    }
-
-
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitorTest.java

@@ -1,181 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.expr;
-
-import org.antlr.v4.runtime.CharStreams;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.apache.hertzbeat.warehouse.db.QueryExecutor;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
-/**
- * test case for {@link AlertExpressionEvalVisitor}
- */
-class AlertExpressionEvalVisitorTest {
-
-    private QueryExecutor mockExecutor;
-    private AlertExpressionEvalVisitor visitor;
-
-    @BeforeEach
-    void setUp() {
-        mockExecutor = Mockito.mock(QueryExecutor.class);
-        visitor = new AlertExpressionEvalVisitor(mockExecutor);
-    }
-
-    @Test
-    void testGreaterThan() {
-        when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80.0))));
-        List<Map<String, Object>> result = evaluate("cpu > 70");
-        assertEquals(1, result.size());
-        assertEquals(80.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testGreaterThanWithInteger() {
-        when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80))));
-        List<Map<String, Object>> result = evaluate("cpu > 70");
-        assertEquals(1, result.size());
-        assertEquals(80, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testLessThan() {
-        when(mockExecutor.execute("memory")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 65.0))));
-        List<Map<String, Object>> result = evaluate("memory < 70");
-        assertEquals(1, result.size());
-        assertEquals(65.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testEqualWithTolerance() {
-        when(mockExecutor.execute("disk")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 99.999))));
-        List<Map<String, Object>> result = evaluate("disk == 100");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testNotEqual() {
-        when(mockExecutor.execute("network")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        List<Map<String, Object>> result = evaluate("network != 60");
-        assertEquals(1, result.size());
-        assertEquals(50.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testExactlyEqual() {
-        when(mockExecutor.execute("threshold")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 100.0))));
-        List<Map<String, Object>> result = evaluate("threshold == 100");
-        assertEquals(1, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testMaxValueBoundary() {
-        when(mockExecutor.execute("max_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MAX_VALUE))));
-        List<Map<String, Object>> result = evaluate("max_val > 100");
-        assertEquals(1, result.size());
-        assertEquals(Double.MAX_VALUE, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testMinValueBoundary() {
-        when(mockExecutor.execute("min_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MIN_VALUE))));
-        List<Map<String, Object>> result = evaluate("min_val > 0");
-        assertEquals(1, result.size());
-        assertEquals(Double.MIN_VALUE, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testEmptyMetricName() {
-        when(mockExecutor.execute("")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        List<Map<String, Object>> result = evaluate(" > 40");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testListValueWithMax() {
-        when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        List<Map<String, Object>> result = evaluate("multi_val > 25");
-        assertEquals(1, result.size());
-        assertEquals(30.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testListValueWithMin() {
-        when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        List<Map<String, Object>> result = evaluate("multi_val < 15");
-        assertEquals(1, result.size());
-        assertEquals(10.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testEmptyListValue() {
-        when(mockExecutor.execute("empty_list")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of()))));
-        List<Map<String, Object>> result = evaluate("empty_list > 50");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testNestedParentheses() {
-        when(mockExecutor.execute("a")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 10.0))));
-        when(mockExecutor.execute("b")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 20.0))));
-        when(mockExecutor.execute("c")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 30.0))));
-        List<Map<String, Object>> result = evaluate("(a > 5) and (b > 15 or c < 25)");
-        assertEquals(1, result.size());
-        assertEquals(10.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testMultipleUnlessConditions() {
-        when(mockExecutor.execute("metric1")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 40.0))));
-        when(mockExecutor.execute("metric2")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        when(mockExecutor.execute("metric3")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 60.0))));
-        List<Map<String, Object>> result = evaluate("metric1 > 30 unless metric2 > 45 unless metric3 < 70");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testComplexExpressionWithMixedOperators() {
-        when(mockExecutor.execute("cpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 75.0))));
-        when(mockExecutor.execute("gpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 85.0))));
-        when(mockExecutor.execute("fan_speed")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 2000.0))));
-
-        List<Map<String, Object>> result = evaluate("(cpu_temp > 70 and gpu_temp < 90) or fan_speed > 1500");
-        assertEquals(1, result.size());
-        assertEquals(75.0, result.get(0).get("__value__"));
-    }
-
-    private List<Map<String, Object>> evaluate(String expression) {
-        AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expression));
-        AlertExpressionParser parser = new AlertExpressionParser(new CommonTokenStream(lexer));
-        return visitor.visit(parser.expression());
-    }
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AwsSmsClientImplTest.java

@@ -1,69 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.service;
-
-import org.apache.hertzbeat.alert.config.AwsSmsProperties;
-import org.apache.hertzbeat.alert.service.impl.AwsSmsClientImpl;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * Test case for {@link AwsSmsClientImpl}
- */
-class AwsSmsClientImplTest {
-
-
-    @Test
-    void getType() {
-        AwsSmsProperties awsSmsProperties = new AwsSmsProperties();
-        awsSmsProperties.setAccessKeyId("accessKeyId");
-        awsSmsProperties.setAccessKeySecret("accessKeySecret");
-        awsSmsProperties.setRegion("region");
-        AwsSmsClientImpl awsSmsClient = new AwsSmsClientImpl(awsSmsProperties);
-
-        assertEquals("aws", awsSmsClient.getType());
-    }
-
-    @ParameterizedTest
-    @CsvSource({
-        "accessKeyId, accessKeySecret, region, true",
-        "accessKeyId, accessKeySecret, '', false",
-        "accessKeyId, '', region, false",
-        "accessKeyId, accessKeySecret, '', false",
-        "accessKeyId, '', '', false",
-        "'', accessKeySecret, region, false",
-        "'', accessKeySecret, '', false",
-        "'', '', region, false",
-        "'', accessKeySecret, '', false",
-    })
-    void checkConfig(String accessKeyId, String accessKeySecret, String region, boolean expected) {
-        AwsSmsProperties awsSmsProperties = new AwsSmsProperties();
-        awsSmsProperties.setAccessKeyId(accessKeyId);
-        awsSmsProperties.setAccessKeySecret(accessKeySecret);
-        awsSmsProperties.setRegion(region); 
-        AwsSmsClientImpl awsSmsClient = new AwsSmsClientImpl(awsSmsProperties);
-
-        assertEquals(expected, awsSmsClient.checkConfig());
-    }
-  
-
-
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/DataSourceServiceTest.java

@@ -15,23 +15,38 @@
  * limitations under the License.
  */
 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.apache.hertzbeat.alert.service;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import java.util.HashMap;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.hertzbeat.alert.service.impl.DataSourceServiceImpl;
-import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import java.util.List;
 import java.util.Map;
 import org.mockito.Mockito;
+import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 
 /**
  * test case for {@link DataSourceService}
@@ -529,91 +544,4 @@ class DataSourceServiceTest {
         assertEquals(1, result.size());
         assertEquals(200.0, result.get(0).get("__value__"));
     }
-
-    @Test
-    void expressionCacheShouldHitForSameExpression() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
-        );
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        String expr = "node_cpu_seconds_total > 50";
-        Cache<String, ParseTree> expressionCache = dataSourceService.getExpressionCache();
-        expressionCache.invalidateAll();
-        long beforeHits = expressionCache.stats().hitCount();
-        dataSourceService.calculate("promql", expr); //first execution miss cache
-        dataSourceService.calculate("promql", expr); //second execution hits cache
-        long actualHits = expressionCache.stats().hitCount() - beforeHits;
-        assertEquals(1, actualHits, "expression cache should hit but miss");
-    }
-
-    @Test
-    void tokenCacheShouldHitForSameExpression() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
-        );
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        String expr = "node_cpu_seconds_total > 50";
-        Cache<String, ParseTree> expressionCache = dataSourceService.getExpressionCache();
-        Cache<String, CommonTokenStream> tokenStreamCache = dataSourceService.getTokenStreamCache();
-        expressionCache.invalidateAll();
-        tokenStreamCache.invalidateAll();
-        long beforeHits = tokenStreamCache.stats().hitCount();
-        dataSourceService.calculate("promql", expr);
-        expressionCache.invalidateAll();
-        dataSourceService.calculate("promql", expr);
-        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
-        assertEquals(1, actualHits, "expression cache should hit but miss");
-    }
-
-    @Test
-    void expressCacheShouldNotHitForDifferentExpressions() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
-        );
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        dataSourceService.calculate("promql", "node_cpu_seconds_total > 50");
-        Cache<String, ParseTree> expressionCache = dataSourceService.getExpressionCache();
-        Cache<String, CommonTokenStream> tokenStreamCache = dataSourceService.getTokenStreamCache();
-        expressionCache.invalidateAll();
-        tokenStreamCache.invalidateAll();
-        String expr1 = "node_cpu_seconds_total > 30";
-        String expr2 = "node_cpu_seconds_total > 50";
-        long beforeHits = expressionCache.stats().hitCount();
-        dataSourceService.calculate("promql", expr1);
-        dataSourceService.calculate("promql", expr2);
-        long actualHits = expressionCache.stats().hitCount() - beforeHits;
-        assertEquals(0, actualHits, "expression cache should miss but hit");
-    }
-
-    @Test
-    void tokenCacheShouldNotHitForDifferentExpressions() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
-        );
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        dataSourceService.calculate("promql", "node_cpu_seconds_total > 50");
-        Cache<String, ParseTree> expressionCache = dataSourceService.getExpressionCache();
-        Cache<String, CommonTokenStream> tokenStreamCache = dataSourceService.getTokenStreamCache();
-        expressionCache.invalidateAll();
-        tokenStreamCache.invalidateAll();
-        String expr1 = "node_cpu_seconds_total > 30";
-        String expr2 = "node_cpu_seconds_total > 50";
-        long beforeHits = tokenStreamCache.stats().hitCount();
-        dataSourceService.calculate("promql", expr1);
-        dataSourceService.calculate("promql", expr2);
-        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
-        assertEquals(0, actualHits, "expression cache should miss but hit");
-    }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/TwilioSmsClientImplTest.java

@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.service;
-
-import org.apache.hertzbeat.alert.config.TwilioSmsProperties;
-import org.apache.hertzbeat.alert.service.impl.TwilioSmsClientImpl;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * Test case for {@link TwilioSmsClientImpl}
- */
-class TwilioSmsClientImplTest {
-
-    @Test
-    void getType() {
-        TwilioSmsProperties twilioSmsProperties = new TwilioSmsProperties();
-        twilioSmsProperties.setAccountSid("accountSid");
-        twilioSmsProperties.setAuthToken("authToken");
-        twilioSmsProperties.setTwilioPhoneNumber("twilioPhoneNumber");
-        TwilioSmsClientImpl twilioSmsClient = new TwilioSmsClientImpl(twilioSmsProperties);
-
-        assertEquals("twilio", twilioSmsClient.getType());
-    }
-
-    @ParameterizedTest
-    @CsvSource({
-            "accountSid, authToken, twilioPhoneNumber, true",
-            "accountSid, authToken, '', false",
-            "accountSid, '', twilioPhoneNumber, false",
-            "accountSid, '', '', false",
-            "'', authToken, twilioPhoneNumber, false",
-            "'', authToken, '', false",
-            "'', '', twilioPhoneNumber, false",
-            "'', '', '', false",
-    })
-    void checkConfig(String accountSid, String authToken, String twilioPhoneNumber, boolean expected) {
-        TwilioSmsProperties twilioSmsProperties = new TwilioSmsProperties();
-        twilioSmsProperties.setAccountSid(accountSid);
-        twilioSmsProperties.setAuthToken(authToken);
-        twilioSmsProperties.setTwilioPhoneNumber(twilioPhoneNumber);
-        TwilioSmsClientImpl twilioSmsClient = new TwilioSmsClientImpl(twilioSmsProperties);
-
-        assertEquals(expected, twilioSmsClient.checkConfig());
-    }
-}

hertzbeat-collector/hertzbeat-collector-basic/pom.xml

@@ -155,11 +155,6 @@
             <artifactId>plc4j-driver-modbus</artifactId>
             <version>0.12.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.plc4x</groupId>
-            <artifactId>plc4j-driver-s7</artifactId>
-            <version>0.12.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.sshd</groupId>
             <artifactId>sshd-sftp</artifactId>

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java

@@ -63,25 +63,6 @@ public class JdbcCommonCollect extends AbstractCollect {
 
     private static final String[] VULNERABLE_KEYWORDS = {"allowLoadLocalInfile", "allowLoadLocalInfileInPath", "useLocalInfile"};
 
-    private static final String[] BLACK_LIST = {
-            // dangerous SQL commands - may cause database structure damage or data leakage
-            "create trigger", "create alias", "runscript from", "shutdown", "drop table",
-            "drop database", "create function", "alter system", "grant all", "revoke all",
-
-            // file IO related - may cause server files to be read or written
-            "allowloadlocalinfile", "allowloadlocalinfileinpath", "uselocalinfile",
-
-            // code execution related - may result in remote code execution
-            "init=", "javaobjectserializer=", "runscript", "serverstatusdiffinterceptor",
-            "queryinterceptors=", "statementinterceptors=", "exceptioninterceptors=",
-
-            // multiple statement execution - may lead to SQL injection
-            "allowmultiqueries",
-
-            // deserialization related - may result in remote code execution
-            "autodeserialize", "detectcustomcollations",
-    };
-
     private final GlobalConnectionCache connectionCommonCache = GlobalConnectionCache.getInstance();
 
 
@@ -350,24 +331,17 @@ public class JdbcCommonCollect extends AbstractCollect {
         if (Objects.nonNull(jdbcProtocol.getUrl())
                 && !Objects.equals("", jdbcProtocol.getUrl())
                 && jdbcProtocol.getUrl().startsWith("jdbc")) {
-            // limit url length
-            if (jdbcProtocol.getUrl().length() > 2048) {
-                throw new IllegalArgumentException("JDBC URL length exceeds maximum limit of 2048 characters");
+            // convert the URL to lowercase for case-insensitive checking
+            String url = jdbcProtocol.getUrl().toLowerCase();
+            // check whether the parameter is valid
+            if (url.contains("create trigger") || url.contains("create alias") || url.contains("runscript from")
+                    || url.contains("allowloadlocalinfile") || url.contains("allowloadlocalinfileinpath")
+                    || url.contains("uselocalinfile") || url.contains("autodeserialize") || url.contains("detectcustomcollations")
+                    || url.contains("serverstatusdiffinterceptor")) {
+                throw new IllegalArgumentException("Invalid JDBC URL: contains malicious characters.");
             }
-            // remove special characters
-            String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F]", "");
-            String url = cleanedUrl.toLowerCase();
-            // backlist check
-            for (String keyword : BLACK_LIST) {
-                if (url.contains(keyword)) {
-                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
-                }
-            }
-            // url format check
-            if (!url.matches("^jdbc:[a-zA-Z0-9]+://[^\\s]+$")) {
-                throw new IllegalArgumentException("Invalid JDBC URL format");
-            }
-            return cleanedUrl;
+            // when has config jdbc url, use it 
+            return jdbcProtocol.getUrl();
         }
         return switch (jdbcProtocol.getPlatform()) {
             case "mysql", "mariadb" -> "jdbc:mysql://" + host + ":" + port

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java

@@ -18,14 +18,11 @@
 package org.apache.hertzbeat.collector.collect.http;
 
 import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
-
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.StringReader;
 import java.net.ConnectException;
@@ -37,22 +34,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.net.ssl.SSLException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
 import org.apache.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse;
 import org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreator;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.OnlineParser;
+import org.apache.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser;
+import org.apache.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
@@ -69,9 +63,11 @@ import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
@@ -81,6 +77,8 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.auth.DigestScheme;
+import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
@@ -88,30 +86,20 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.util.UriUtils;
 import org.xml.sax.InputSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.Collections;
 
 /**
  * http https collect
  */
 @Slf4j
 public class HttpCollectImpl extends AbstractCollect {
-    private final Set<Integer> defaultSuccessStatusCodes = Set.of(
-            HttpStatus.SC_OK,
-            HttpStatus.SC_CREATED,
-            HttpStatus.SC_ACCEPTED,
-            HttpStatus.SC_MULTIPLE_CHOICES,
-            HttpStatus.SC_MOVED_PERMANENTLY,
-            HttpStatus.SC_MOVED_TEMPORARILY);
+    private static final Map<Long, ExporterParser> EXPORTER_PARSER_TABLE = new ConcurrentHashMap<>();
+    private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
+            HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
+            HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
 
     @Override
     public void preCheck(Metrics metrics) throws IllegalArgumentException {
@@ -144,11 +132,10 @@ public class HttpCollectImpl extends AbstractCollect {
                 builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                 return;
             }
-            /*
-             this could create large objects, potentially impacting JVM memory space significantly.
-             Option 1: Parse using InputStream, but this requires significant code changes;
-             Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
-             */
+            // todo This code converts an InputStream directly to a String. For large data in Prometheus exporters,
+            // this could create large objects, potentially impacting JVM memory space significantly.
+            // Option 1: Parse using InputStream, but this requires significant code changes;
+            // Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
             String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
             if (!StringUtils.hasText(resp)) {
                 log.info("http response entity is empty, status: {}.", statusCode);
@@ -162,17 +149,15 @@ public class HttpCollectImpl extends AbstractCollect {
                     case DispatchConstants.PARSE_PROM_QL ->
                             parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
                     case DispatchConstants.PARSE_PROMETHEUS ->
-                            parseResponseByPrometheusExporter(response.getEntity().getContent(), metrics.getAliasFields(), builder);
+                            parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
                     case DispatchConstants.PARSE_XML_PATH ->
-                            parseResponseByXmlPath(resp, metrics, builder, responseTime);
+                            parseResponseByXmlPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
                     case DispatchConstants.PARSE_WEBSITE ->
                             parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime);
                     case DispatchConstants.PARSE_SITE_MAP ->
                             parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
                     case DispatchConstants.PARSE_HEADER ->
                             parseResponseByHeader(builder, metrics.getAliasFields(), response);
-                    case DispatchConstants.PARSE_CONFIG ->
-                            parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                     default ->
                             parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                 }
@@ -343,207 +328,8 @@ public class HttpCollectImpl extends AbstractCollect {
         }
     }
 
-    private void parseResponseByXmlPath(String resp, Metrics metrics,
-                                        CollectRep.MetricsData.Builder builder, Long responseTime) {
-        HttpProtocol http = metrics.getHttp();
-        List<String> aliasFields = metrics.getAliasFields();
-        String xpathExpression = http.getParseScript();
-        if (!StringUtils.hasText(xpathExpression)) {
-            log.warn("Http collect parse type is xmlPath, but the xpath expression is empty.");
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("XPath expression is empty");
-            return;
-        }
-        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
-
-        try {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-            dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
-            dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-            dbf.setXIncludeAware(false);
-            dbf.setExpandEntityReferences(false);
-
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document document = db.parse(new InputSource(new StringReader(resp)));
-
-            XPathFactory xpathFactory = XPathFactory.newInstance();
-            XPath xpath = xpathFactory.newXPath();
-
-            NodeList nodeList = (NodeList) xpath.evaluate(xpathExpression, document, XPathConstants.NODESET);
-
-            if (nodeList == null || nodeList.getLength() == 0) {
-                log.debug("XPath expression '{}' returned no nodes.", xpathExpression);
-                boolean requestedSummaryFields = aliasFields.stream()
-                        .anyMatch(alias -> NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)
-                                || CollectorConstants.KEYWORD.equalsIgnoreCase(alias));
-
-                if (requestedSummaryFields) {
-                    CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-                    for (String alias : aliasFields) {
-                        if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                            valueRowBuilder.addColumn(responseTime.toString());
-                        } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                            valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                        } else {
-                            valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
-                        }
-                    }
-                    builder.addValueRow(valueRowBuilder.build());
-                }
-                return;
-            }
-
-            for (int i = 0; i < nodeList.getLength(); i++) {
-                Node node = nodeList.item(i);
-                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-
-                for (String alias : aliasFields) {
-                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(responseTime.toString());
-                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                    } else {
-                        try {
-                            String value = (String) xpath.evaluate(alias, node, XPathConstants.STRING);
-                            valueRowBuilder.addColumn(StringUtils.hasText(value) ? value : CommonConstants.NULL_VALUE);
-                        } catch (XPathExpressionException e) {
-                            log.warn("Failed to evaluate XPath '{}' for node [{}]: {}", alias, node.getNodeName(), e.getMessage());
-                            valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
-                        }
-                    }
-                }
-                builder.addValueRow(valueRowBuilder.build());
-            }
-
-        } catch (Exception e) {
-            log.warn("Failed to parse XML response with XPath '{}': {}", xpathExpression, e.getMessage(), e);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("Failed to parse XML response: " + e.getMessage());
-        }
-    }
-
-
-
-    /**
-     * Parses the response body in Properties/Config format.
-     * Two modes are supported:
-     * 1. single-object mode: if http.parseScript is null, aliasFields are treated as indicator names.
-     * - If there is a locator in the indicator definition, use the locator as the key of the Properties.
-     * - Otherwise, use aliasField (metric name) as the key for Properties.
-     * Generate a single row of data.
-     * 2. array mode: if http.parseScript is not empty (e.g. “users”), treat it as an array base path.
-     * Treat aliasFields as the attribute name of an array element, and generate a single row of data for each array index. locator is invalid in this mode.
-     *
-     * @param resp Response body string
-     * @param aliasFields List of metrics aliases (i.e., the list of fields in metrics.fields).
-     * @param http http protocol configuration
-     * @param builder The metrics data builder.
-     * @param responseTime response time
-     */
-    private void parseResponseByConfig(String resp, List<String> aliasFields, HttpProtocol http,
-                                       CollectRep.MetricsData.Builder builder, Long responseTime) {
-        if (!StringUtils.hasText(resp)) {
-            log.warn("Http collect parse type is config, but response body is empty.");
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("Response body is empty");
-            return;
-        }
-
-        Properties properties = new Properties();
-        try (StringReader reader = new StringReader(resp)) {
-            properties.load(reader);
-        } catch (IOException e) {
-            log.warn("Failed to parse config response: {}", e.getMessage(), e);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("Failed to parse config response: " + e.getMessage());
-            return;
-        }
-        String arrayBasePath = http.getParseScript();
-        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
-
-        if (!StringUtils.hasText(arrayBasePath)) {
-            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-            for (String alias : aliasFields) {
-                if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                    valueRowBuilder.addColumn(responseTime.toString());
-                } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                    valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                } else {
-                    String value = properties.getProperty(alias);
-                    valueRowBuilder.addColumn(value != null ? value : CommonConstants.NULL_VALUE);
-                }
-            }
-            CollectRep.ValueRow valueRow = valueRowBuilder.build();
-            if (hasMeaningfulDataInRow(valueRow, aliasFields)) {
-                builder.addValueRow(valueRow);
-            } else {
-                log.warn("No meaningful data found in single config object response for aliasFields: {}", aliasFields);
-            }
-        } else {
-            Pattern pattern = Pattern.compile("^" + Pattern.quote(arrayBasePath) + "\\[(\\d+)]\\.");
-            Set<Integer> existingIndices = new HashSet<>();
-            for (String key : properties.stringPropertyNames()) {
-                Matcher matcher = pattern.matcher(key);
-                if (matcher.find()) {
-                    try {
-                        int index = Integer.parseInt(matcher.group(1));
-                        existingIndices.add(index);
-                    } catch (NumberFormatException e) {
-                        log.error("Could not parse index from key: {}", key);
-                    }
-                }
-            }
-            if (existingIndices.isEmpty()) {
-                log.warn("Could not find any array elements for base path '{}' in config response.", arrayBasePath);
-                return;
-            }
-            List<Integer> sortedIndices = new ArrayList<>(existingIndices);
-            Collections.sort(sortedIndices);
-            for (int i : sortedIndices) {
-                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-                for (String alias : aliasFields) {
-                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(responseTime.toString());
-                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                    } else {
-                        String currentKey = arrayBasePath + "[" + i + "]." + alias;
-                        String value = properties.getProperty(currentKey);
-                        valueRowBuilder.addColumn(value != null ? value : CommonConstants.NULL_VALUE);
-                    }
-                }
-                CollectRep.ValueRow valueRow = valueRowBuilder.build();
-                if (hasMeaningfulDataInRow(valueRow, aliasFields)) {
-                    builder.addValueRow(valueRowBuilder.build());
-                }
-            }
-        }
-    }
-
-    private boolean hasMeaningfulDataInRow(CollectRep.ValueRow valueRow, List<String> aliasFields) {
-        if (valueRow.getColumnsCount() == 0) {
-            return false;
-        }
-        if (valueRow.getColumnsCount() != aliasFields.size()) {
-            log.error("Column count ({}) mismatch with aliasFields size ({}) when checking meaningful data.",
-                    valueRow.getColumnsCount(), aliasFields.size());
-            return false;
-        }
-
-        boolean hasMeaningfulData = false;
-        for (int i = 0; i < valueRow.getColumnsCount(); i++) {
-            String columnValue = valueRow.getColumns(i);
-            String alias = aliasFields.get(i);
-            if (!CommonConstants.NULL_VALUE.equals(columnValue) && (!NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias) && !CollectorConstants.KEYWORD.equalsIgnoreCase(alias))) {
-                hasMeaningfulData = true;
-                break;
-            }
-            if ((NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias) || CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) && !CommonConstants.NULL_VALUE.equals(columnValue)) {
-                hasMeaningfulData = true;
-            }
-        }
-        return hasMeaningfulData;
+    private void parseResponseByXmlPath(String resp, List<String> aliasFields, HttpProtocol http,
+                                        CollectRep.MetricsData.Builder builder) {
     }
 
     private void parseResponseByJsonPath(String resp, List<String> aliasFields, HttpProtocol http,
@@ -600,22 +386,36 @@ public class HttpCollectImpl extends AbstractCollect {
         prometheusParser.handle(resp, aliasFields, http, builder);
     }
 
-    private void parseResponseByPrometheusExporter(InputStream content, List<String> aliasFields, CollectRep.MetricsData.Builder builder) throws IOException {
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(content);
-        if (metricFamilyMap == null || metricFamilyMap.isEmpty()) {
-            return;
+    private void parseResponseByPrometheusExporter(String resp, List<String> aliasFields,
+                                                   CollectRep.MetricsData.Builder builder) {
+        if (!EXPORTER_PARSER_TABLE.containsKey(builder.getId())) {
+            EXPORTER_PARSER_TABLE.put(builder.getId(), new ExporterParser());
         }
+        ExporterParser parser = EXPORTER_PARSER_TABLE.get(builder.getId());
+        Map<String, MetricFamily> metricFamilyMap = parser.textToMetric(resp);
         String metrics = builder.getMetrics();
         if (metricFamilyMap.containsKey(metrics)) {
             MetricFamily metricFamily = metricFamilyMap.get(metrics);
             for (MetricFamily.Metric metric : metricFamily.getMetricList()) {
-                Map<String, String> labelMap = metric.getLabels()
+                Map<String, String> labelMap = metric.getLabelPair()
                         .stream()
                         .collect(Collectors.toMap(MetricFamily.Label::getName, MetricFamily.Label::getValue));
                 CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                 for (String aliasField : aliasFields) {
                     if ("value".equals(aliasField)) {
-                        valueRowBuilder.addColumn(String.valueOf(metric.getValue()));
+                        if (metric.getCounter() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getCounter().getValue()));
+                        } else if (metric.getGauge() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getGauge().getValue()));
+                        } else if (metric.getUntyped() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getUntyped().getValue()));
+                        } else if (metric.getInfo() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getInfo().getValue()));
+                        } else if (metric.getSummary() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getSummary().getValue()));
+                        } else if (metric.getHistogram() != null) {
+                            valueRowBuilder.addColumn(String.valueOf(metric.getHistogram().getValue()));
+                        }
                     } else {
                         String columnValue = labelMap.get(aliasField);
                         valueRowBuilder.addColumn(columnValue == null ? CommonConstants.NULL_VALUE : columnValue);
@@ -672,10 +472,11 @@ public class HttpCollectImpl extends AbstractCollect {
                 CredentialsProvider provider = new BasicCredentialsProvider();
                 UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(auth.getDigestAuthUsername(),
                         auth.getDigestAuthPassword());
-                AuthScope authScope = new AuthScope(httpProtocol.getHost(), Integer.parseInt(httpProtocol.getPort()));
-                provider.setCredentials(authScope, credentials);
-
+                provider.setCredentials(AuthScope.ANY, credentials);
+                AuthCache authCache = new BasicAuthCache();
+                authCache.put(new HttpHost(httpProtocol.getHost(), Integer.parseInt(httpProtocol.getPort())), new DigestScheme());
                 clientContext.setCredentialsProvider(provider);
+                clientContext.setAuthCache(authCache);
                 return clientContext;
             }
         }
@@ -708,37 +509,13 @@ public class HttpCollectImpl extends AbstractCollect {
         }
         // params
         Map<String, String> params = httpProtocol.getParams();
-        boolean enableUrlEncoding = Boolean.parseBoolean(httpProtocol.getEnableUrlEncoding());
-        StringBuilder queryParams = new StringBuilder();
-
         if (params != null && !params.isEmpty()) {
             for (Map.Entry<String, String> param : params.entrySet()) {
-                String key = param.getKey();
-                String value = param.getValue();
-
-                if (!StringUtils.hasText(key)) {
-                    continue;
-                }
-
-                if (!queryParams.isEmpty()) {
-                    queryParams.append("&");
-                }
-
-                if (enableUrlEncoding) {
-                    key = UriUtils.encodeQueryParam(key, "UTF-8");
-                }
-                queryParams.append(key);
-
-                if (StringUtils.hasText(value)) {
-                    String calculatedValue = TimeExpressionUtil.calculate(value);
-                    if (enableUrlEncoding) {
-                        calculatedValue = UriUtils.encodeQueryParam(calculatedValue, "UTF-8");
-                    }
-                    queryParams.append("=").append(calculatedValue);
+                if (StringUtils.hasText(param.getValue())) {
+                    requestBuilder.addParameter(param.getKey(), TimeExpressionUtil.calculate(param.getValue()));
                 }
             }
         }
-
         // The default request header can be overridden if customized
         // keep-alive
         requestBuilder.addHeader(HttpHeaders.CONNECTION, NetworkConstants.KEEP_ALIVE);
@@ -748,7 +525,8 @@ public class HttpCollectImpl extends AbstractCollect {
         if (headers != null && !headers.isEmpty()) {
             for (Map.Entry<String, String> header : headers.entrySet()) {
                 if (StringUtils.hasText(header.getValue())) {
-                    requestBuilder.addHeader(header.getKey(), header.getValue());
+                    requestBuilder.addHeader(CollectUtil.replaceUriSpecialChar(header.getKey()),
+                            CollectUtil.replaceUriSpecialChar(header.getValue()));
                 }
             }
         }
@@ -779,32 +557,14 @@ public class HttpCollectImpl extends AbstractCollect {
 
         // if it has payload, would override post params
         if (StringUtils.hasLength(httpProtocol.getPayload()) && (HttpMethod.POST.matches(httpMethod) || HttpMethod.PUT.matches(httpMethod))) {
-            requestBuilder.setEntity(new StringEntity(TimeExpressionUtil.calculate(httpProtocol.getPayload()), StandardCharsets.UTF_8));
+            requestBuilder.setEntity(new StringEntity(httpProtocol.getPayload(), StandardCharsets.UTF_8));
         }
 
-        // uri encode
-        String uri;
-        if (enableUrlEncoding) {
-            // if the url contains parameters directly
-            if (httpProtocol.getUrl().contains("?")) {
-                String path = httpProtocol.getUrl().substring(0, httpProtocol.getUrl().indexOf("?"));
-                String query = httpProtocol.getUrl().substring(httpProtocol.getUrl().indexOf("?") + 1);
-                uri = UriUtils.encodePath(path, "UTF-8") + "?" + UriUtils.encodeQuery(query, "UTF-8");
-            } else {
-                uri = UriUtils.encodePath(httpProtocol.getUrl(), "UTF-8");
-            }
-        } else {
-            uri = httpProtocol.getUrl();
-        }
-
-        // append query params
-        if (!queryParams.isEmpty()) {
-            uri += (uri.contains("?") ? "&" : "?") + queryParams;
-        }
-
-        String finalUri;
+        // uri
+        String uri = CollectUtil.replaceUriSpecialChar(httpProtocol.getUrl());
         if (IpDomainUtil.isHasSchema(httpProtocol.getHost())) {
-            finalUri = httpProtocol.getHost() + ":" + httpProtocol.getPort() + uri;
+
+            requestBuilder.setUri(httpProtocol.getHost() + ":" + httpProtocol.getPort() + uri);
         } else {
             String ipAddressType = IpDomainUtil.checkIpAddressType(httpProtocol.getHost());
             String baseUri = NetworkConstants.IPV6.equals(ipAddressType)
@@ -812,19 +572,12 @@ public class HttpCollectImpl extends AbstractCollect {
                     : String.format("%s:%s%s", httpProtocol.getHost(), httpProtocol.getPort(), uri);
             boolean ssl = Boolean.parseBoolean(httpProtocol.getSsl());
             if (ssl) {
-                finalUri = NetworkConstants.HTTPS_HEADER + baseUri;
+                requestBuilder.setUri(NetworkConstants.HTTPS_HEADER + baseUri);
             } else {
-                finalUri = NetworkConstants.HTTP_HEADER + baseUri;
+                requestBuilder.setUri(NetworkConstants.HTTP_HEADER + baseUri);
             }
         }
 
-        try {
-            requestBuilder.setUri(finalUri);
-        } catch (IllegalArgumentException e) {
-            log.warn("Invalid URI with illegal characters: {}. User has disabled URL encoding, not applying any encoding.", finalUri);
-            throw e;
-        }
-
         // custom timeout
         int timeout = CollectUtil.getTimeout(httpProtocol.getTimeout(), 0);
         if (timeout > 0) {

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParser.java

@@ -0,0 +1,432 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.http.promethus.exporter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.collector.collect.http.promethus.ParseException;
+import org.apache.hertzbeat.common.util.StrBuffer;
+
+/**
+ * Resolves the data passed by prometheus's exporter interface http:xxx/metrics
+ * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies
+ */
+@Slf4j
+public class ExporterParser {
+    private static final String HELP = "HELP";
+    private static final String TYPE = "TYPE";
+    private static final String EOF = "EOF";
+    private static final String METRIC_NAME_LABEL = ".name";
+    private static final String QUANTILE_LABEL = "quantile";
+    private static final String BUCKET_LABEL = "le";
+    private static final String NAME_LABEL = "__name__";
+    private static final String SUM_SUFFIX = "_sum";
+    private static final String COUNT_SUFFIX = "_count";
+
+    private static final char LEFT_CURLY_BRACKET = '{';
+    private static final char RIGHT_CURLY_BRACKET = '}';
+    private static final char EQUALS = '=';
+    private static final char QUOTES = '"';
+    private static final char ENTER = '\n';
+    private static final char SPACE = ' ';
+    private static final char COMMA = ',';
+    private final Lock lock = new ReentrantLock();
+    private MetricFamily currentMetricFamily;
+    private String currentQuantile;
+    private String currentBucket;
+
+    public Map<String, MetricFamily> textToMetric(String resp) {
+        // key: metric name, value: metric family
+        Map<String, MetricFamily> metricMap = new ConcurrentHashMap<>(10);
+        lock.lock();
+        try {
+            String[] lines = resp.split("\n");
+            for (String line : lines) {
+                this.parseLine(metricMap, new StrBuffer(line));
+            }
+            return metricMap;
+        } catch (Exception e) {
+            log.error("parse prometheus exporter data error, msg: {}", e.getMessage());
+        } finally {
+            lock.unlock();
+        }
+        return metricMap;
+    }
+
+    private void parseLine(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        switch (buffer.charAt(0)) {
+            case '#' -> {
+                buffer.read();
+                this.currentMetricFamily = null;
+                this.parseComment(metricMap, buffer);
+            }
+            case ENTER -> {
+            }
+            default -> {
+                this.currentBucket = null;
+                this.currentQuantile = null;
+                this.parseMetric(buffer);
+            }
+        }
+    }
+
+    private void parseComment(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        String token = this.readTokenUnitWhitespace(buffer);
+        if (EOF.equals(token)) {
+            return;
+        }
+        if (!HELP.equals(token) && !TYPE.equals(token)) {
+            log.error("parse comment error {}, start without {} or {}", buffer.toStr(), HELP, TYPE);
+            return;
+        }
+        String metricName = this.readTokenAsMetricName(buffer);
+        this.currentMetricFamily = metricMap.computeIfAbsent(metricName, key -> new MetricFamily());
+        this.currentMetricFamily.setName(metricName);
+        switch (token) {
+            case HELP -> this.parseHelp(buffer);
+            case TYPE -> this.parseType(buffer);
+            default -> {
+            }
+        }
+    }
+
+    private void parseHelp(StrBuffer line) {
+        line.skipBlankTabs();
+        this.currentMetricFamily.setHelp(line.toStr());
+    }
+
+    private void parseType(StrBuffer line) {
+        line.skipBlankTabs();
+        String type = line.toStr().toLowerCase();
+        MetricType metricType = MetricType.getType(type);
+        if (metricType == null) {
+            throw new ParseException("pare type error");
+        }
+        this.currentMetricFamily.setMetricType(metricType);
+    }
+
+    private void parseMetric(StrBuffer buffer) {
+        String metricName = this.readTokenAsMetricName(buffer);
+        MetricFamily.Label label = new MetricFamily.Label();
+        label.setName(METRIC_NAME_LABEL);
+        label.setValue(metricName);
+
+        if (metricName.isEmpty()) {
+            log.error("error parse metric, metric name is null, line: {}", buffer.toStr());
+            return;
+        }
+
+        List<MetricFamily.Metric> metricList = this.currentMetricFamily.getMetricList();
+        if (metricList == null) {
+            metricList = new ArrayList<>();
+            this.currentMetricFamily.setMetricList(metricList);
+        }
+
+        // TODO For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
+        MetricFamily.Metric metric = new MetricFamily.Metric();
+        metricList.add(metric);
+
+        metric.setLabelPair(new ArrayList<>());
+        metric.getLabelPair().add(label);
+        this.readLabels(metric, buffer);
+    }
+
+    private void readLabels(MetricFamily.Metric metric, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        if (buffer.charAt(0) == LEFT_CURLY_BRACKET) {
+            buffer.read();
+            this.startReadLabelName(metric, buffer);
+        } else {
+            this.readLabelValue(metric, null, buffer);
+        }
+    }
+
+    private void startReadLabelName(MetricFamily.Metric metric, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        if (buffer.charAt(0) == RIGHT_CURLY_BRACKET) {
+            buffer.read();
+            buffer.skipBlankTabs();
+            if (buffer.isEmpty()) {
+                return;
+            }
+            this.readLabelValue(metric, new MetricFamily.Label(), buffer);
+            return;
+        }
+        String labelName = this.readTokenAsLabelName(buffer);
+        if (labelName.isEmpty() || labelName.equals(NAME_LABEL)) {
+            throw new ParseException("invalid label name" + labelName + ", label name size = 0 or label name equals " + NAME_LABEL);
+        }
+        MetricFamily.Label label = new MetricFamily.Label();
+        label.setName(labelName);
+        if (buffer.read() != EQUALS) {
+            throw new ParseException("parse error, not match the format of labelName=labelValue");
+        }
+        this.startReadLabelValue(metric, label, buffer);
+    }
+
+    private void startReadLabelValue(MetricFamily.Metric metric, MetricFamily.Label label, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        char c = buffer.read();
+        if (c != QUOTES) {
+            throw new ParseException("expected '\"' at start of label value, line: " + buffer.toStr());
+        }
+        String labelValue = this.readTokenAsLabelValue(buffer);
+        label.setValue(labelValue);
+        if (!this.isValidLabelValue(labelValue)) {
+            throw new ParseException("no valid label value: " + labelValue);
+        }
+        if (this.currentMetricFamily.getMetricType().equals(MetricType.SUMMARY) && label.getName().equals(QUANTILE_LABEL)) {
+            this.currentQuantile = labelValue;
+        } else if (this.currentMetricFamily.getMetricType().equals(MetricType.HISTOGRAM) && label.getName().equals(BUCKET_LABEL)) {
+            this.currentBucket = labelValue;
+        }
+        metric.getLabelPair().add(label);
+
+        if (buffer.isEmpty()) {
+            return;
+        }
+        c = buffer.read();
+        switch (c) {
+            case COMMA -> this.startReadLabelName(metric, buffer);
+            case RIGHT_CURLY_BRACKET -> this.readLabelValue(metric, label, buffer);
+            default -> throw new ParseException("expected '}' or ',' at end of label value, line: " + buffer.toStr());
+        }
+    }
+
+    private void readLabelValue(MetricFamily.Metric metric, MetricFamily.Label label, StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        if (buffer.isEmpty()) {
+            return;
+        }
+        switch (this.currentMetricFamily.getMetricType()) {
+            case INFO -> {
+                MetricFamily.Info info = new MetricFamily.Info();
+                info.setValue(buffer.toDouble());
+                metric.setInfo(info);
+            }
+            case COUNTER -> {
+                MetricFamily.Counter counter = new MetricFamily.Counter();
+                counter.setValue(buffer.toDouble());
+                metric.setCounter(counter);
+            }
+            case GAUGE -> {
+                MetricFamily.Gauge gauge = new MetricFamily.Gauge();
+                gauge.setValue(buffer.toDouble());
+                metric.setGauge(gauge);
+            }
+            case UNTYPED -> {
+                MetricFamily.Untyped untyped = new MetricFamily.Untyped();
+                untyped.setValue(buffer.toDouble());
+                metric.setUntyped(untyped);
+            }
+            case SUMMARY -> {
+                // For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
+                MetricFamily.Summary summary = new MetricFamily.Summary();
+                summary.setValue(buffer.toDouble());
+                metric.setSummary(summary);
+            }
+            case HISTOGRAM -> {
+                // For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
+                MetricFamily.Histogram histogram = new MetricFamily.Histogram();
+                histogram.setValue(buffer.toDouble());
+                metric.setHistogram(histogram);
+            }
+            default -> throw new ParseException("no such type in metricFamily");
+        }
+    }
+
+    /**
+     * Reads the token before the first whitespace
+     *
+     * @param buffer A line data object
+     * @return token unit
+     */
+    private String readTokenUnitWhitespace(StrBuffer buffer) {
+        StringBuilder builder = new StringBuilder();
+        while (!buffer.isEmpty()) {
+            char c = buffer.read();
+            if (c == SPACE) {
+                break;
+            }
+            builder.append(c);
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Gets the name of the metric
+     *
+     * @param buffer A line data object
+     * @return token name
+     */
+    private String readTokenAsMetricName(StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        StringBuilder builder = new StringBuilder();
+        if (this.isValidMetricNameStart(buffer.charAt(0))) {
+            while (!buffer.isEmpty()) {
+                char c = buffer.read();
+                if (!this.isValidMetricNameContinuation(c)) {
+                    buffer.rollback();
+                    break;
+                }
+                builder.append(c);
+            }
+            return builder.toString();
+        }
+        throw new ParseException("parse metric name error");
+    }
+
+    /**
+     * Gets the name of the label
+     *
+     * @param buffer A line data object
+     * @return label name
+     */
+    private String readTokenAsLabelName(StrBuffer buffer) {
+        buffer.skipBlankTabs();
+        StringBuilder builder = new StringBuilder();
+        char c = buffer.read();
+        if (this.isValidLabelNameStart(c)) {
+            builder.append(c);
+            while (!buffer.isEmpty()) {
+                c = buffer.read();
+                if (!this.isValidLabelNameContinuation(c)) {
+                    buffer.rollback();
+                    break;
+                }
+                builder.append(c);
+            }
+            return builder.toString();
+        }
+        throw new ParseException("parse label name error");
+    }
+
+    /**
+     * Gets the value of the label
+     *
+     * @param buffer A line data object
+     * @return label value
+     */
+    private String readTokenAsLabelValue(StrBuffer buffer) {
+        StringBuilder builder = new StringBuilder();
+        boolean escaped = false;
+        while (!buffer.isEmpty()) {
+            char c = buffer.read();
+            // Handle '\\' escape sequences
+            if (escaped) {
+                switch (c) {
+                    case QUOTES, '\\' -> builder.append(c);
+                    case 'n' -> builder.append('\n');
+                    default -> throw new ParseException("parse label value error");
+                }
+                escaped = false;
+            } else {
+                switch (c) {
+                    case QUOTES -> {
+                        return builder.toString();
+                    }
+                    case ENTER -> throw new ParseException("parse label value error, next line");
+                    case '\\' -> escaped = true;
+                    default -> builder.append(c);
+                }
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * Checks whether a character conforms to the first character rule for metric names
+     *
+     * @param c metric character
+     * @return true/false
+     */
+    private boolean isValidMetricNameStart(char c) {
+        return isValidLabelNameStart(c) || c == ':';
+    }
+
+    /**
+     * Checks whether a character conforms to rules for metric name characters other than the first
+     *
+     * @param c metric character
+     * @return true/false
+     */
+    private boolean isValidMetricNameContinuation(char c) {
+        return isValidLabelNameContinuation(c) || c == ':';
+    }
+
+    /**
+     * Checks whether a character conforms to the first character rule for label names
+     *
+     * @param c metric character
+     * @return true/false
+     */
+    private boolean isValidLabelNameStart(char c) {
+        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
+    }
+
+    /**
+     * Checks whether a character conforms to rules for label name characters other than the first
+     *
+     * @param c metric character
+     * @return true/false
+     */
+    private boolean isValidLabelNameContinuation(char c) {
+        return isValidLabelNameStart(c) || (c >= '0' && c <= '9');
+    }
+
+    /**
+     * Checks if a string is a valid UTF-8 encoded string
+     *
+     * @param s label value
+     * @return true/false
+     */
+    private boolean isValidLabelValue(String s) {
+        return s != null;
+    }
+
+    private boolean isSum(String s) {
+        return s != null && s.endsWith(SUM_SUFFIX);
+    }
+
+    private boolean isCount(String s) {
+        return s != null && s.endsWith(COUNT_SUFFIX);
+    }
+
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricFamily.java

@@ -0,0 +1,252 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.http.promethus.exporter;
+
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * MetricFamily.
+ */
+@Data
+@ToString
+public class MetricFamily {
+    /**
+     * metric name
+     */
+    private String name;
+
+    /**
+     * metric help
+     */
+    private String help;
+
+    /**
+     * metric type
+     */
+    private MetricType metricType;
+
+    /**
+     * Specific metric
+     */
+    private List<Metric> metricList;
+
+    /**
+     * Metric
+     */
+    @Data
+    public static class Metric {
+
+        /**
+         * Label data, mainly corresponding to the content within {}
+         */
+        private List<Label> labelPair;
+
+        /**
+         * info
+         */
+        private Info info;
+
+        /**
+         * gauge
+         */
+        private Gauge gauge;
+
+        /**
+         * counter
+         */
+        private Counter counter;
+
+        /**
+         * summary
+         */
+        private Summary summary;
+
+        /**
+         * untyped
+         */
+        private Untyped untyped;
+
+        /**
+         * histogram
+         */
+        private Histogram histogram;
+
+        /**
+         * timestampMs
+         */
+        private Long timestampMs;
+    }
+
+    /**
+     * Label
+     */
+    @Data
+    public static class Label {
+
+        /**
+         * name
+         */
+        private String name;
+
+        /**
+         * value
+         */
+        private String value;
+    }
+
+    /**
+     * Info
+     */
+    @Data
+    public static class Info {
+
+        /**
+         * value
+         */
+        private double value;
+
+    }
+
+    /**
+     * Counter
+     */
+    @Data
+    public static class Counter {
+
+        /**
+         * value
+         */
+        private double value;
+
+        // Exemplar
+    }
+
+    /**
+     * Gauge
+     */
+    @Data
+    public static class Gauge {
+
+        /**
+         * value
+         */
+        private double value;
+    }
+
+    /**
+     * untyped
+     */
+    @Data
+    public static class Untyped {
+
+        /**
+         * value
+         */
+        private double value;
+    }
+
+    /**
+     * Summary
+     */
+    @Data
+    public static class Summary {
+
+        /**
+         * value
+         */
+        private double value;
+
+        /**
+         * count
+         */
+        private long count;
+
+        /**
+         * sum
+         */
+        private double sum;
+
+        /**
+         * quantileList
+         */
+        private List<Quantile> quantileList = new ArrayList<>();
+    }
+
+    /**
+     * Quantile
+     */
+    @Data
+    public static class Quantile {
+        /**
+         * Corresponding to the quantile field in Prometheus
+         */
+        private double xLabel;
+
+        /**
+         * value
+         */
+        private double value;
+    }
+
+    /**
+     * Histogram
+     */
+    @Data
+    public static class Histogram {
+
+        /**
+         * value
+         */
+        private double value;
+
+        /**
+         * count
+         */
+        private long count;
+
+        /**
+         * sum
+         */
+        private double sum;
+
+        /**
+         * bucketList
+         */
+        private List<Bucket> bucketList = new ArrayList<>();
+    }
+
+    /**
+     * Bucket
+     */
+    @Data
+    public static class Bucket {
+
+        /**
+         * cumulativeCount
+         */
+        private long cumulativeCount;
+
+        /**
+         * upperBound
+         */
+        private double upperBound;
+    }
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/MetricType.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.http.promethus.exporter;
+
+/**
+ * prometheus metrics type
+ */
+public enum MetricType {
+    // for string metric info
+    INFO("info"),
+    // Represents a monotonically increasing counter, e.g., counting occurrences
+    COUNTER("counter"),
+    // A metric type that can fluctuate up and down, e.g., CPU usage rate
+    GAUGE("gauge"),
+    SUMMARY("summary"),
+    UNTYPED("untyped"),
+    HISTOGRAM("histogram");
+
+    private final String value;
+
+    MetricType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public static MetricType getType(String value) {
+        for (MetricType metricType : values()) {
+            if (metricType.getValue().equals(value)) {
+                return metricType;
+            }
+        }
+        return null;
+    }
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java

@@ -19,7 +19,6 @@ package org.apache.hertzbeat.collector.collect.prometheus;
 
 import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
@@ -35,6 +34,7 @@ import javax.net.ssl.SSLException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
 import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily;
+import org.apache.hertzbeat.collector.collect.prometheus.parser.TextParser;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -46,7 +46,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.OnlineParser;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
@@ -65,6 +64,7 @@ import org.apache.http.impl.auth.DigestScheme;
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;
 
@@ -99,12 +99,25 @@ public class PrometheusAutoCollectImpl {
                 builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                 return null;
             }
-            try {
-                return parseResponseByPrometheusExporter(response.getEntity().getContent(), builder);
-            } catch (Exception e) {
-                log.info("parse error: {}.", e.getMessage(), e);
+            // todo: The InputStream is directly converted to a String here
+            //       For large data in the Prometheus exporter, this can generate large objects, which could severely impact JVM memory space
+            // todo: Option one: Use InputStream for parsing, but this requires significant code changes
+            //       Option two: Manually trigger garbage collection, which can be referenced from Dubbo for long i
+            String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            long collectTime = System.currentTimeMillis();
+            builder.setTime(collectTime);
+            if (resp == null || !StringUtils.hasText(resp)) {
+                log.error("http response content is empty, status: {}.", statusCode);
                 builder.setCode(CollectRep.Code.FAIL);
-                builder.setMsg("parse response data error:" + e.getMessage());
+                builder.setMsg("http response content is empty");
+            } else {
+                try {
+                    return parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
+                } catch (Exception e) {
+                    log.info("parse error: {}.", e.getMessage(), e);
+                    builder.setCode(CollectRep.Code.FAIL);
+                    builder.setMsg("parse response data error:" + e.getMessage());
+                }   
             }
         } catch (ClientProtocolException e1) {
             String errorMsg = CommonUtil.getMessageFromThrowable(e1);
@@ -155,15 +168,12 @@ public class PrometheusAutoCollectImpl {
         }
     }
     
-    private List<CollectRep.MetricsData> parseResponseByPrometheusExporter(InputStream inputStream, CollectRep.MetricsData.Builder builder) throws IOException {
-        long endTime = System.currentTimeMillis();
-        builder.setTime(endTime);
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
+    private List<CollectRep.MetricsData> parseResponseByPrometheusExporter(String resp, List<String> aliasFields,
+                                                                           CollectRep.MetricsData.Builder builder) {
+        Map<String, MetricFamily> metricFamilyMap = TextParser.textToMetricFamilies(resp);
         List<CollectRep.MetricsData> metricsDataList = new LinkedList<>();
-        if (metricFamilyMap == null) {
-            return metricsDataList;
-        }
         for (Map.Entry<String, MetricFamily> entry : metricFamilyMap.entrySet()) {
+            builder.clearMetrics();
             builder.clearFields();
             builder.clearValues();
             String metricsName = entry.getKey();

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/OnlineParser.java

@@ -17,17 +17,16 @@
 
 package org.apache.hertzbeat.collector.collect.prometheus.parser;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 
@@ -37,50 +36,9 @@ import java.util.concurrent.ConcurrentHashMap;
 @Slf4j
 public class OnlineParser {
 
-    private static final Map<Integer, Integer> escapeMap = new HashMap<>(8);
-
-    private static final char RIGHT_BRACKET = '}';
-    private static final char LEFT_BRACKET = '{';
-
-    static {
-        escapeMap.put((int) 'n', (int) '\n');
-        escapeMap.put((int) 'b', (int) '\b');
-        escapeMap.put((int) 't', (int) '\t');
-        escapeMap.put((int) 'r', (int) '\r');
-        escapeMap.put((int) 'f', (int) '\f');
-        escapeMap.put((int) '\'', (int) '\'');
-        escapeMap.put((int) '\"', (int) '\"');
-        escapeMap.put((int) '\\', (int) '\\');
-    }
-
-    private OnlineParser() {
-    }
-
-    public static Map<String, MetricFamily> parseMetrics(InputStream inputStream) throws IOException {
-        Map<String, MetricFamily> metricFamilyMap = new ConcurrentHashMap<>(10);
-        try {
-            int i = getChar(inputStream);
-            while (i != -1) {
-                if (i == '#' || i == '\n') {
-                    skipToLineEnd(inputStream).maybeEol().maybeEof().noElse();
-                } else {
-                    StringBuilder stringBuilder = new StringBuilder();
-                    stringBuilder.append((char) i);
-                    parseMetric(inputStream, metricFamilyMap, stringBuilder);
-                }
-                i = getChar(inputStream);
-            }
-        } catch (FormatException e) {
-            log.error("prometheus parser failed because of wrong input format. {}", e.getMessage());
-            return null;
-        }
-        return metricFamilyMap;
-    }
-
     private static class FormatException extends Exception {
 
-        public FormatException() {
-        }
+        public FormatException() {}
 
         public FormatException(String message) {
             super(message);
@@ -97,14 +55,14 @@ public class OnlineParser {
         }
 
         private CharChecker maybeLeftBracket() {
-            if (i == LEFT_BRACKET) {
+            if (i == '{') {
                 satisfied = true;
             }
             return this;
         }
 
         private CharChecker maybeRightBracket() {
-            if (i == RIGHT_BRACKET) {
+            if (i == '}') {
                 satisfied = true;
             }
             return this;
@@ -159,92 +117,91 @@ public class OnlineParser {
             return this.i;
         }
 
-        private int getInt() {
+        private int getInt() throws FormatException {
             return this.i;
         }
 
     }
 
-    private static int getChar(InputStream inputStream) throws IOException, FormatException {
+    private static CharChecker parseOneChar(InputStream inputStream) throws IOException {
         int i = inputStream.read();
-        if (i == '\\') {
-            i = inputStream.read();
-            if (escapeMap.containsKey(i)) {
-                return escapeMap.get(i);
-            } else {
-                throw new FormatException("Escape character failed.");
-            }
-        } else {
-            return i;
-        }
+        return new CharChecker(i);
     }
 
-    private static CharChecker parseOneDouble(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = getChar(inputStream);
-        while (i >= '0' && i <= '9' || i >= 'a' && i <= 'z' || i >= 'A' && i <= 'Z' || i == '-' || i == '+' || i == '.') {
+    private static CharChecker parseOneDouble(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
+        int i = inputStream.read();
+        while ((i >= '0' && i <= '9') || (i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || i == '-' || i == '+' || i == 'e' || i == '.') {
             stringBuilder.append((char) i);
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
-    private static CharChecker skipOneLong(InputStream inputStream) throws IOException, FormatException {
-        int i = getChar(inputStream);
+    private static CharChecker skipOneLong(InputStream inputStream) throws IOException {
+        int i = inputStream.read();
         while (i >= '0' && i <= '9') {
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
-    private static CharChecker parseMetricName(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = getChar(inputStream);
+    private static CharChecker parseMetricName(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
+        int i = inputStream.read();
         while ((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_' || i == ':') {
             stringBuilder.append((char) i);
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
-    private static CharChecker parseLabelName(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = getChar(inputStream);
+    private static CharChecker parseLabelName(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
+        int i = inputStream.read();
         while ((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_') {
             stringBuilder.append((char) i);
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
     private static CharChecker parseLabelValue(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = getChar(inputStream);
+        int i = inputStream.read();
         while (i != '"' && i != -1) {
             if (i == '\\') {
-                i = getChar(inputStream);
+                i = inputStream.read();
                 switch (i) {
-                    case 'n' -> stringBuilder.append('\n');
-                    case '\\' -> stringBuilder.append('\\');
-                    case '\"' -> stringBuilder.append('\"');
-                    default -> throw new FormatException();
+                    case 'n':
+                        stringBuilder.append('\n');
+                        break;
+                    case '\\':
+                        stringBuilder.append('\\');
+                        break;
+                    case '\"':
+                        stringBuilder.append('\"');
+                        break;
+                    default:
+                        throw new FormatException();
                 }
-            } else {
+            }
+            else {
                 stringBuilder.append((char) i);
             }
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
-    private static CharChecker skipSpaces(InputStream inputStream) throws IOException, FormatException {
-        int i = getChar(inputStream);
+    private static CharChecker skipSpaces(InputStream inputStream) throws IOException {
+        int i = inputStream.read();
         while (i == ' ') {
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
 
-    private static CharChecker skipToLineEnd(InputStream inputStream) throws IOException, FormatException {
-        int i = getChar(inputStream);
+    private static CharChecker skipToLineEnd(InputStream inputStream) throws IOException {
+        int i = inputStream.read();
         while (i != '\n' && i != -1) {
-            i = getChar(inputStream);
+            i = inputStream.read();
         }
         return new CharChecker(i);
     }
@@ -267,56 +224,39 @@ public class OnlineParser {
         }
     }
 
-
-    /**
-     * parse single label like  label_name="label_value"
-     */
-    private static CharChecker parseLabel(InputStream inputStream, StringBuilder stringBuilder, List<MetricFamily.Label> labelList) throws IOException, FormatException {
+    private static CharChecker parseLabels(InputStream inputStream, StringBuilder stringBuilder, List<MetricFamily.Label> labelList) throws IOException, FormatException {
         int i;
-        MetricFamily.Label label = new MetricFamily.Label();
-        i = skipSpaces(inputStream).getInt();
-        if (i == RIGHT_BRACKET) {
-            return new CharChecker(i);
-        }
-        stringBuilder.append((char) i);
-        i = parseLabelName(inputStream, stringBuilder).maybeSpace().maybeEqualsSign().noElse();
-        label.setName(stringBuilder.toString());
-        stringBuilder.delete(0, stringBuilder.length());
-        if (i == ' ') {
-            skipSpaces(inputStream).maybeEqualsSign().noElse();
-        }
+        while (true) {
+            MetricFamily.Label label = new MetricFamily.Label();
+            i = skipSpaces(inputStream).getInt();
+            stringBuilder.append((char) i);
+            i = parseLabelName(inputStream, stringBuilder).maybeSpace().maybeEqualsSign().noElse();
+            label.setName(stringBuilder.toString());
+            stringBuilder.delete(0, stringBuilder.length());
+            if (i == ' ') {
+                skipSpaces(inputStream).maybeEqualsSign().noElse();
+            }
 
-        skipSpaces(inputStream).maybeQuotationMark().noElse();
-        parseLabelValue(inputStream, stringBuilder).maybeQuotationMark().noElse();
-        String labelValue = stringBuilder.toString();
-        if (!labelValue.equals(new String(labelValue.getBytes(StandardCharsets.UTF_8)))) {
-            throw new FormatException();
+            skipSpaces(inputStream).maybeQuotationMark().noElse();
+            parseLabelValue(inputStream, stringBuilder).maybeQuotationMark().noElse();
+            String labelValue = stringBuilder.toString();
+            if (!labelValue.equals(new String(labelValue.getBytes(StandardCharsets.UTF_8)))) {
+                throw new FormatException();
+            }
+            label.setValue(labelValue);
+            stringBuilder.delete(0, stringBuilder.length());
+
+            i = skipSpaces(inputStream).maybeSpace().maybeComma().maybeRightBracket().noElse();
+            labelList.add(label);
+            if (i == '}') {
+                break;
+            }
         }
-        label.setValue(labelValue);
-        stringBuilder.delete(0, stringBuilder.length());
-        labelList.add(label);
         return new CharChecker(i);
     }
 
-
-    private static void parseLabels(InputStream inputStream, StringBuilder stringBuilder, List<MetricFamily.Label> labelList) throws IOException, FormatException {
-        int i;
-        while (true) {
-            // deal with labels like {label1="aaa",label2=bbb",}
-            CharChecker charChecker = parseLabel(inputStream, stringBuilder, labelList);
-            if (charChecker.i == RIGHT_BRACKET) {
-                return;
-            }
-            //deal with labels like {label1="aaa",label2=bbb"}
-            i = skipSpaces(inputStream).maybeSpace().maybeComma().maybeRightBracket().noElse();
-            if (i == RIGHT_BRACKET) {
-                return;
-            }
-        }
-    }
-
     private static CharChecker parseMetric(InputStream inputStream, Map<String, MetricFamily> metricFamilyMap, StringBuilder stringBuilder) throws IOException, FormatException {
-        MetricFamily metricFamily;
+        MetricFamily metricFamily = null;
         MetricFamily.Metric metric = new MetricFamily.Metric();
         int i = parseMetricName(inputStream, stringBuilder).maybeSpace().maybeLeftBracket().noElse();
         String metricName = stringBuilder.toString();
@@ -327,18 +267,18 @@ public class OnlineParser {
             metricFamily.setMetricList(new ArrayList<>());
             metricFamily.setName(metricName);
             metricFamilyMap.put(metricName, metricFamily);
-        } else {
+        }
+        else {
             metricFamily = metricFamilyMap.get(metricName);
         }
 
         if (i == ' ') {
             i = skipSpaces(inputStream).getInt();
         }
-
-        List<MetricFamily.Label> labelList = new LinkedList<>();
-        metric.setLabels(labelList);
         if (i == '{') {
+            List<MetricFamily.Label> labelList = new LinkedList<>();
             parseLabels(inputStream, stringBuilder, labelList);
+            metric.setLabels(labelList);
             i = skipSpaces(inputStream).getInt();
         }
 
@@ -364,4 +304,26 @@ public class OnlineParser {
         metricFamily.getMetricList().add(metric);
         return new CharChecker(i);
     }
+
+    public static Map<String, MetricFamily> parseMetrics(InputStream inputStream) throws IOException {
+        Map<String, MetricFamily> metricFamilyMap = new ConcurrentHashMap<>(10);
+        int i = inputStream.read();
+        try {
+            while (i != -1) {
+                if (i == '#' || i == '\n') {
+                    skipToLineEnd(inputStream).maybeEol().maybeEof().noElse();
+                } else {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    stringBuilder.append((char) i);
+                    parseMetric(inputStream, metricFamilyMap, stringBuilder);
+                }
+                i = inputStream.read();
+            }
+        } catch (FormatException e) {
+            log.error("prometheus parser failed because of wrong input format. {}", e.getMessage());
+            return null;
+        }
+        return metricFamilyMap;
+    }
+
 }

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/parser/TextParser.java

@@ -29,10 +29,8 @@ import org.apache.hertzbeat.common.util.StrBuffer;
 /**
  * Resolves the data passed by prometheus's exporter interface http:xxx/metrics
  * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies
- * recommend use OnlineParser
  */
 @Slf4j
-@Deprecated(since = "1.7.0")
 public class TextParser {
     private static final String NAME_LABEL = "__name__";
     private static final char LEFT_CURLY_BRACKET = '{';
@@ -46,6 +44,7 @@ public class TextParser {
 
     /**
      * parser prometheus exporter text metrics data
+     * todo use inputStream bytebuffer instead of resp string
      * @param resp txt data
      * @return metrics family
      */

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java

@@ -58,13 +58,13 @@ public class PushCollectImpl extends AbstractCollect {
     private static final Map<Long, Long> timeMap = new ConcurrentHashMap<>();
 
     // ms
-    private static final Integer DEFAULT_TIMEOUT = 3000;
+    private static final Integer timeout = 3000;
 
     private static final Integer SUCCESS_CODE = 200;
 
     // It's hard to determine how long ago the first data collection was, because there's no way to know when the last collection occurred.
     // This makes it difficult to avoid re-collecting data after a restart. The default is 30 seconds
-    private static final Integer FIRST_COLLECT_INTERVAL = 30000;
+    private static final Integer firstCollectInterval = 30000;
 
     @Override
     public void preCheck(Metrics metrics) throws IllegalArgumentException {
@@ -80,7 +80,7 @@ public class PushCollectImpl extends AbstractCollect {
         long monitorId = builder.getId();
         PushProtocol pushProtocol = metrics.getPush();
 
-        Long time = timeMap.getOrDefault(monitorId, curTime - FIRST_COLLECT_INTERVAL);
+        Long time = timeMap.getOrDefault(monitorId, curTime - firstCollectInterval);
         timeMap.put(monitorId, curTime);
 
         HttpContext httpContext = createHttpContext(pushProtocol);
@@ -145,10 +145,10 @@ public class PushCollectImpl extends AbstractCollect {
 
         //requestBuilder.setUri(pushProtocol.getUri());
 
-        if (DEFAULT_TIMEOUT > 0) {
+        if (timeout > 0) {
             RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(DEFAULT_TIMEOUT)
-                    .setSocketTimeout(DEFAULT_TIMEOUT)
+                    .setConnectTimeout(timeout)
+                    .setSocketTimeout(timeout)
                     .setRedirectsEnabled(true)
                     .build();
             requestBuilder.setConfig(requestConfig);

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/s7/S7CollectImpl.java

@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.s7;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.plc.AbstractPlcCollectImpl;
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.PlcProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.S7Protocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.messages.PlcReadRequest;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-/**
- * plc collect
- */
-@Slf4j
-public class S7CollectImpl extends AbstractPlcCollectImpl {
-
-    @Override
-    public void preCheck(Metrics metrics) throws IllegalArgumentException {
-        S7Protocol s7 = metrics.getS7();
-        List<String> registerAddressList = s7.getRegisterAddresses();
-        // check RackId
-        if (!StringUtils.hasText(s7.getRackId())) {
-            s7.setRackId("0");
-        }
-        // check SlotId
-        if (!StringUtils.hasText(s7.getSlotId())) {
-            s7.setSlotId("0");
-        }
-        // check controllerType
-        if (!StringUtils.hasText(s7.getControllerType())) {
-            s7.setControllerType("S7_1500");
-        }
-        if (!StringUtils.hasText(s7.getTimeout())) {
-            s7.setTimeout("5000");
-        }
-        PlcProtocol plc = metrics.getPlc() == null ? new PlcProtocol() : metrics.getPlc();
-        plc.setRegisterAddresses(registerAddressList);
-        BeanUtils.copyProperties(s7, plc);
-        metrics.setPlc(plc);
-        super.preCheck(metrics);
-    }
-
-    @Override
-    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        super.collect(builder, metrics);
-    }
-
-    @Override
-    public String supportProtocol() {
-        return DispatchConstants.PROTOCOL_S7;
-    }
-
-    @Override
-    protected String getConnectionString(Metrics metrics) {
-        S7Protocol s7Protocol = metrics.getS7();
-        return "s7://" + s7Protocol.getHost() + ":" + s7Protocol.getPort() + "?remote-rack:" + s7Protocol.getRackId()
-                + "&remote-slot:" + s7Protocol.getSlotId() + "&controller-type=" + s7Protocol.getControllerType();
-    }
-
-    @Override
-    protected PlcReadRequest buildRequest(Metrics metrics, PlcConnection connection) {
-        S7Protocol s7Protocol = metrics.getS7();
-        List<String> registerAddressList = s7Protocol.getRegisterAddresses();
-        // Create a new read request:
-        PlcReadRequest.Builder requestBuilder = connection.readRequestBuilder();
-        for (int i = 0; i < registerAddressList.size(); i++) {
-            String s1 = registerAddressList.get(i);
-            requestBuilder.addTagAddress(metrics.getS7().getAddressSyntax() + ":" + i, s1);
-        }
-        return requestBuilder.build();
-    }
-}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/ssh/SshCollectImpl.java

@@ -79,12 +79,11 @@ public class SshCollectImpl extends AbstractCollect {
         long startTime = System.currentTimeMillis();
         SshProtocol sshProtocol = metrics.getSsh();
         boolean reuseConnection = Boolean.parseBoolean(sshProtocol.getReuseConnection());
-        boolean useProxy = Boolean.parseBoolean(sshProtocol.getUseProxy());
         int timeout = CollectUtil.getTimeout(sshProtocol.getTimeout(), DEFAULT_TIMEOUT);
         ClientChannel channel = null;
         ClientSession clientSession = null;
         try {
-            clientSession = getConnectSession(sshProtocol, timeout, reuseConnection, useProxy);
+            clientSession = getConnectSession(sshProtocol, timeout, reuseConnection);
             if (CommonSshBlacklist.isCommandBlacklisted(sshProtocol.getScript())) {
                 builder.setCode(CollectRep.Code.FAIL);
                 builder.setMsg("The command is blacklisted: " + sshProtocol.getScript());
@@ -157,7 +156,7 @@ public class SshCollectImpl extends AbstractCollect {
                     log.error(e.getMessage(), e);
                 }
             }
-            if (clientSession != null && !reuseConnection && !useProxy) {
+            if (clientSession != null && !reuseConnection) {
                 try {
                     clientSession.close();
                 } catch (Exception e) {
@@ -281,8 +280,11 @@ public class SshCollectImpl extends AbstractCollect {
         connectionCommonCache.removeCache(identifier);
     }
 
-    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection, boolean useProxy)
+    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection)
             throws IOException, GeneralSecurityException {
-        return SshHelper.getConnectSession(sshProtocol, timeout, reuseConnection, useProxy);
+        return SshHelper.getConnectSession(
+            sshProtocol.getHost(), sshProtocol.getPort(), sshProtocol.getUsername(), sshProtocol.getPassword(),
+            sshProtocol.getPrivateKey(), sshProtocol.getPrivateKeyPassphrase(), timeout, reuseConnection
+        );
     }
 }

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/dns/DnsCollectImplTest.java

@@ -47,28 +47,31 @@ public class DnsCollectImplTest {
                 .address("www.google.com")
                 .timeout("3000")
                 .port("53")
-                .tcp("tcp")
                 .build();
     }
 
     @Test
     public void testPreCheck() {
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        //metrics is null
-        dnsCollect.collect(builder, null);
-        assertEquals(CollectRep.Code.FAIL, builder.getCode());
+        assertThrows(IllegalArgumentException.class, () -> {
+            Metrics metrics = new Metrics();
+            metrics.setName("question");
+            metrics.setDns(dnsProtocol);
+            dnsCollect.preCheck(metrics);
+        });
 
-        //invalid DnsProtocol
-        Metrics metrics = new Metrics();
+        //query class is blank
         assertThrows(IllegalArgumentException.class, () -> {
             DnsProtocol dns = DnsProtocol.builder().build();
+
+            Metrics metrics = new Metrics();
             metrics.setDns(dns);
             dnsCollect.preCheck(metrics);
         });
 
-        //validated DnsProtocol
+        // no exception throws
         assertDoesNotThrow(() -> {
-            metrics.setName("question");
+            dnsProtocol.setTcp("tcp");
+            Metrics metrics = new Metrics();
             metrics.setDns(dnsProtocol);
             dnsCollect.preCheck(metrics);
         });
@@ -77,23 +80,28 @@ public class DnsCollectImplTest {
     @Test
     public void testCollect() {
         CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        Metrics metrics0 = Metrics.builder()
-                .name("question")
-                .dns(dnsProtocol)
-                .aliasFields(Collections.singletonList("section"))
-                .build();
-        dnsCollect.collect(builder, metrics0);
-        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
+        long monitorId = 666;
+        String app = "testDNS";
+        Metrics metrics = new Metrics();
+        metrics.setName("question");
+        metrics.setDns(dnsProtocol);
+        metrics.setAliasFields(Collections.singletonList("section"));
+        dnsCollect.collect(builder, metrics);
         assertNotNull(builder.getValues(0).getColumns(0));
 
+        // dns is null, no exception throws
+        assertDoesNotThrow(() -> {
+            dnsCollect.collect(builder, null);
+        });
+
         // metric name is header
-        Metrics metrics1 = Metrics.builder()
-                .name("header")
-                .dns(dnsProtocol)
-                .aliasFields(Collections.singletonList("section"))
-                .build();
-        dnsCollect.collect(builder, metrics1);
-        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
+        assertDoesNotThrow(() -> {
+            Metrics metrics1 = new Metrics();
+            metrics1.setName("header");
+            metrics1.setDns(dnsProtocol);
+            metrics1.setAliasFields(Collections.singletonList("section"));
+            dnsCollect.collect(builder, metrics1);
+        });
     }
 
     @Test

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java

@@ -18,14 +18,7 @@
 package org.apache.hertzbeat.collector.collect.http;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
@@ -48,7 +41,7 @@ class HttpCollectImplTest {
         assertThrows(IllegalArgumentException.class, () -> {
             httpCollectImpl.preCheck(null);
         });
-
+        
         assertThrows(IllegalArgumentException.class, () -> {
             Metrics metrics = Metrics.builder().build();
             httpCollectImpl.preCheck(metrics);
@@ -72,92 +65,4 @@ class HttpCollectImplTest {
         String protocol = httpCollectImpl.supportProtocol();
         assert "http".equals(protocol);
     }
-
-    @Test
-    void parseResponseByXmlPath() throws Exception {
-        // Create a sample XML response
-        String xmlResponse = """
-                <?xml version="1.0" encoding="UTF-8"?>
-                <root>
-                    <server>
-                        <name>Server1</name>
-                        <status>Running</status>
-                        <metrics>
-                            <cpu>75.5</cpu>
-                            <memory>1024</memory>
-                            <disk>500</disk>
-                        </metrics>
-                    </server>
-                    <server>
-                        <name>Server2</name>
-                        <status>Stopped</status>
-                        <metrics>
-                            <cpu>0.0</cpu>
-                            <memory>0</memory>
-                            <disk>500</disk>
-                        </metrics>
-                    </server>
-                </root>
-                """;
-    
-        // Set up HttpProtocol with XML path parsing
-        HttpProtocol http = HttpProtocol.builder()
-                .parseType(DispatchConstants.PARSE_XML_PATH)
-                .parseScript("//server")  // XPath to select all server nodes
-                .build();
-    
-        // Set up Metrics with fields that have XPath expressions
-        List<Metrics.Field> fields = new ArrayList<>();
-        fields.add(Metrics.Field.builder().field("name").build());
-        fields.add(Metrics.Field.builder().field("status").build());
-        fields.add(Metrics.Field.builder().field("metrics/cpu").build());
-        fields.add(Metrics.Field.builder().field("metrics/memory").build());
-    
-        Metrics metrics = Metrics.builder()
-                .http(http)
-                .fields(fields)
-                .aliasFields(Arrays.asList("name", "status", "metrics/cpu", "metrics/memory"))
-                .build();
-    
-        // Create a custom builder that captures added rows
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-        };
-    
-        // Use reflection to access the private parseResponseByXmlPath method
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByXmlPath", 
-                String.class, 
-                Metrics.class, 
-                CollectRep.MetricsData.Builder.class, 
-                Long.class);
-        parseMethod.setAccessible(true);
-    
-        // Call the method
-        parseMethod.invoke(httpCollectImpl, xmlResponse, metrics, builder, 100L);
-    
-        // Verify the results
-        assertEquals(2, capturedRows.size(), "Should have parsed 2 server nodes");
-    
-        // Check first server
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals(4, firstRow.getColumnsCount(), "First row should have 4 columns");
-        assertEquals("Server1", firstRow.getColumns(0), "First server name should be Server1");
-        assertEquals("Running", firstRow.getColumns(1), "First server status should be Running");
-        assertEquals("75.5", firstRow.getColumns(2), "First server CPU should be 75.5");
-        assertEquals("1024", firstRow.getColumns(3), "First server memory should be 1024");
-    
-        // Check second server
-        CollectRep.ValueRow secondRow = capturedRows.get(1);
-        assertEquals(4, secondRow.getColumnsCount(), "Second row should have 4 columns");
-        assertEquals("Server2", secondRow.getColumns(0), "Second server name should be Server2");
-        assertEquals("Stopped", secondRow.getColumns(1), "Second server status should be Stopped");
-        assertEquals("0.0", secondRow.getColumns(2), "Second server CPU should be 0.0");
-        assertEquals("0", secondRow.getColumns(3), "Second server memory should be 0");
-    }
 }

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/http/promethus/exporter/ExporterParserTest.java

@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.http.promethus.exporter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Test case for {@link ExporterParser}
+ */
+class ExporterParserTest {
+
+    @Test
+    void textToMetric() {
+        String resp = """
+                # HELP disk_total_bytes Total space for path
+                # TYPE disk_total_bytes gauge
+                disk_total_bytes{path="C:\\\\hertzbeat\\\\repo\\\\testpath",} 4.29496725504E11
+                # HELP go_gc_cycles_automatic_gc_cycles_total Count of completed GC cycles generated by the Go runtime.
+                # TYPE go_gc_cycles_automatic_gc_cycles_total counter
+                go_gc_cycles_automatic_gc_cycles_total 0
+                # HELP go_gc_cycles_forced_gc_cycles_total Count of completed GC cycles forced by the application.
+                # TYPE go_gc_cycles_forced_gc_cycles_total counter
+                go_gc_cycles_forced_gc_cycles_total 0
+                # HELP go_gc_cycles_total_gc_cycles_total Count of all completed GC cycles.
+                # TYPE go_gc_cycles_total_gc_cycles_total counter
+                go_gc_cycles_total_gc_cycles_total 0
+                # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.
+                # TYPE go_gc_duration_seconds summary
+                go_gc_duration_seconds{quantile="0"} 0
+                go_gc_duration_seconds{quantile="0.25"} 0
+                go_gc_duration_seconds{quantile="0.5"} 0
+                go_gc_duration_seconds{quantile="0.75"} 0
+                go_gc_duration_seconds{quantile="1"} 0
+                # TYPE jvm info
+                # HELP jvm VM version info
+                jvm_info{runtime="OpenJDK Runtime Environment",vendor="Azul Systems, Inc.",version="11.0.13+8-LTS"} 1.0
+                # TYPE jvm_gc_collection_seconds summary
+                # HELP jvm_gc_collection_seconds Time spent in a given JVM garbage collector in seconds.
+                jvm_gc_collection_seconds_count{gc="G1 Young Generation"} 10.0
+                jvm_gc_collection_seconds_sum{gc="G1 Young Generation"} 0.051
+                jvm_gc_collection_seconds_count{gc="G1 Old Generation"} 0.0
+                jvm_gc_collection_seconds_sum{gc="G1 Old Generation"} 0.0
+                # TYPE resource_group_aggregate_usage_secs summary
+                resource_group_aggregate_usage_secs{cluster="standalone",quantile="0.5"} 2.69245E-4
+                resource_group_aggregate_usage_secs{cluster="standalone",quantile="0.9"} 3.49601E-4
+                resource_group_aggregate_usage_secs_count{cluster="standalone"} 13.0
+                resource_group_aggregate_usage_secs_sum{cluster="standalone"} 0.004832498
+                resource_group_aggregate_usage_secs_created{cluster="standalone"} 1.715842140749E9
+                # TYPE metadata_store_ops_latency_ms histogram
+                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="1.0"} 59.0
+                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="3.0"} 61.0
+                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="5.0"} 61.0
+                # EOF""";
+
+        ExporterParser parser = new ExporterParser();
+        Map<String, MetricFamily> metricFamilyMap = parser.textToMetric(resp);
+        assertEquals(5, metricFamilyMap.get("resource_group_aggregate_usage_secs").getMetricList().size());
+        assertEquals(3, metricFamilyMap.get("metadata_store_ops_latency_ms").getMetricList().size());
+        assertEquals(5, metricFamilyMap.get("go_gc_duration_seconds").getMetricList().size());
+        assertEquals(9, metricFamilyMap.size());
+    }
+}

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/prometheus/parser/OnlineParserTest.java

@@ -25,12 +25,8 @@ import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.fail;
 
 class OnlineParserTest {
 
@@ -48,20 +44,13 @@ class OnlineParserTest {
         String str = """
                 # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.
                 # TYPE go_gc_duration_seconds summary
-                jvm_gc_pause_seconds_count{action="end of major GC",cause="Metadata GC Threshold",} 1.0
-                jvm_gc_pause_seconds_sum{action="end of major GC",cause="Metadata GC Threshold",} 0.139
-                jvm_gc_pause_seconds_count{action="end of minor GC",cause="Metadata GC Threshold",} 1.0
-                jvm_gc_pause_seconds_sum{action="end of minor GC",cause="Metadata GC Threshold",} 0.02
-                jvm_gc_pause_seconds_count{action="end of minor GC",cause="Allocation Failure",} 5.0
-                jvm_gc_pause_seconds_sum{action="end of minor GC",cause="Allocation Failure",} 0.082
-                go_gc_duration_seconds{quantile="0"} 2.0209e-05
-                go_gc_duration_seconds{quantile="0"} 2.0209e-05
-                go_gc_duration_seconds{quantile="0.25"} 6.6917e-05
+                go_gc_duration_seconds {  quantile="0"} 2.0209e-05 321312
+                go_gc_duration_seconds{  quantile = "0.25"  }   6.6917e-05
                 go_gc_duration_seconds{quantile="0.5"} -Inf
-                go_gc_duration_seconds{quantile="0.75"} +Inf
+                go_gc_duration_seconds{ quantile = "0.75"} +Inf
                 go_gc_duration_seconds{quantile="1"} NaN
-                go_gc_duration_seconds_sum 0.001134793
-                go_gc_duration_seconds_count 5
+                go_gc_duration_seconds_sum 0.001134793 321314
+                go_gc_duration_seconds_count 5 43
                 # HELP go_goroutines Number of goroutines that currently exist.
                 # TYPE go_goroutines gauge
                 go_goroutines 32
@@ -84,25 +73,7 @@ class OnlineParserTest {
                 # TYPE go_memstats_gc_sys_bytes gauge
                 go_memstats_gc_sys_bytes 4.614808e+06""";
         InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap1 = OnlineParser.parseMetrics(inputStream);
-        Map<String, MetricFamily> metricFamilyMap2 = TextParser.textToMetricFamilies(str);
-        assertNotNull(metricFamilyMap1);
-        assertNotNull(metricFamilyMap2);
-        assertEquals(metricFamilyMap1.size(), metricFamilyMap2.size());
-        metricFamilyMap2.forEach((metricFamilyName, metricFamily2) -> {
-            if (!metricFamilyMap1.containsKey(metricFamilyName)) {
-                fail("parse failed, different result from two parser.");
-            }
-            MetricFamily metricFamily1 = metricFamilyMap1.get(metricFamilyName);
-            Set<Double> metricValueSet = metricFamily2.getMetricList().stream().map(MetricFamily.Metric::getValue).collect(Collectors.toSet());
-            metricFamily1.getMetricList().forEach(metric -> {
-                // this is for something different between two algorithms above, and both of them is current on this parsing behavior.
-                if (!(metric.getValue() == Double.POSITIVE_INFINITY || metric.getValue() == Double.NEGATIVE_INFINITY)) {
-                    if (!metricValueSet.contains(metric.getValue())) {
-                        fail();
-                    }
-                }
-            });
-        });
+        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
+        assertNotNull(metricFamilyMap);
     }
-}
+}

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java

@@ -183,18 +183,21 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
         Job job = timerTask.getJob();
         job.constructPriorMetrics();
         Set<Metrics> metricsSet = job.getNextCollectMetrics(null, true);
-        metricsSet.forEach(metrics -> {
-            MetricsCollect metricsCollect = new MetricsCollect(metrics, timeout, this,
-                    collectorIdentity, unitConvertList);
-            jobRequestQueue.addJob(metricsCollect);
-            if (metrics.getPrometheus() != null) {
-                metricsTimeoutMonitorMap.put(String.valueOf(job.getId()),
-                        new MetricsTime(System.currentTimeMillis(), metrics, timeout));
-            } else {
-                metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(),
-                        new MetricsTime(System.currentTimeMillis(), metrics, timeout));
-            }
-        });
+        // Avoid NullPointerException
+        if (null != metricsSet){
+            metricsSet.forEach(metrics -> {
+                MetricsCollect metricsCollect = new MetricsCollect(metrics, timeout, this,
+                        collectorIdentity, unitConvertList);
+                jobRequestQueue.addJob(metricsCollect);
+                if (metrics.getPrometheus() != null) {
+                    metricsTimeoutMonitorMap.put(String.valueOf(job.getId()),
+                            new MetricsTime(System.currentTimeMillis(), metrics, timeout));
+                } else {
+                    metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(),
+                            new MetricsTime(System.currentTimeMillis(), metrics, timeout));
+                }
+            });
+        }
     }
 
     @Override
@@ -234,6 +237,8 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                     long spendTime = System.currentTimeMillis() - job.getDispatchTime();
                     long interval = job.getInterval() - spendTime / 1000;
                     interval = interval <= 0 ? 0 : interval;
+                    // Reset Construction Execution Metrics Task View 
+                    job.constructPriorMetrics();
                     timerDispatch.cyclicJob(timerJob, interval, TimeUnit.SECONDS);
                 }
             } else if (!metricsSet.isEmpty()) {
@@ -330,6 +335,8 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                 long spendTime = System.currentTimeMillis() - job.getDispatchTime();
                 long interval = job.getInterval() - spendTime / 1000;
                 interval = interval <= 0 ? 0 : interval;
+                // Reset Construction Execution Metrics Task View 
+                job.constructPriorMetrics();
                 timerDispatch.cyclicJob(timerJob, interval, TimeUnit.SECONDS);
             }
             // it is an asynchronous periodic cyclic task, directly response the collected data

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java

@@ -75,18 +75,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
      * metrics configuration
      */
     protected Metrics metrics;
-    /**
-     * metadata
-     */
-    protected Map<String, String> metadata;
-    /**
-     * labels
-     */
-    protected Map<String, String> labels;
-    /**
-     * annotations
-     */
-    protected Map<String, String> annotations;
     /**
      * time wheel timeout
      */
@@ -131,9 +119,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
         this.id = job.getMonitorId();
         this.tenantId = job.getTenantId();
         this.app = job.getApp();
-        this.metadata = job.getMetadata();
-        this.labels = job.getLabels();
-        this.annotations = job.getAnnotations();
         this.collectDataDispatch = collectDataDispatch;
         this.isCyclic = job.isCyclic();
         this.isSd = job.isSd();
@@ -151,8 +136,9 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
         this.startTime = System.currentTimeMillis();
         setNewThreadName(id, app, startTime, metrics);
         CollectRep.MetricsData.Builder response = CollectRep.MetricsData.newBuilder();
-        response.setApp(app).setId(id).setTenantId(tenantId)
-                .setLabels(labels).setAnnotations(annotations).addMetadataAll(metadata);
+        response.setApp(app);
+        response.setId(id);
+        response.setTenantId(tenantId);
         // for prometheus auto
         if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(metrics.getProtocol())) {
             List<CollectRep.MetricsData> metricsData = PrometheusAutoCollectImpl
@@ -302,7 +288,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
                             value = String.valueOf(objValue);
                         }
                     } catch (Exception e) {
-                        log.warn("[calculates execute warning, use original value.] {}", e.getMessage());
+                        log.info("[calculates execute warning] {}.", e.getMessage());
                         value = Optional.ofNullable(fieldValueMap.get(expression.getSourceText()))
                                 .map(String::valueOf)
                                 .orElse(null);

hertzbeat-collector/hertzbeat-collector-collector/src/main/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect

@@ -29,5 +29,4 @@ org.apache.hertzbeat.collector.collect.mqtt.MqttCollectImpl
 org.apache.hertzbeat.collector.collect.ipmi2.IpmiCollectImpl
 org.apache.hertzbeat.collector.collect.kafka.KafkaCollectImpl
 org.apache.hertzbeat.collector.collect.sd.HttpSdCollectImpl
-org.apache.hertzbeat.collector.collect.modbus.ModbusCollectImpl
-org.apache.hertzbeat.collector.collect.s7.S7CollectImpl
+org.apache.hertzbeat.collector.collect.modbus.ModbusCollectImpl

hertzbeat-collector/hertzbeat-collector-collector/src/main/resources/application.yml

@@ -39,7 +39,7 @@ spring:
 
 collector:
   info:
-    version: ${COLLECTOR_VERSION:1.7.0}
+    version: ${COLLECTOR_VERSION:1.6.1}
     ip: ${COLLECTOR_IP:}
   dispatch:
     entrance:

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/collect/common/ssh/SshHelper.java

@@ -17,18 +17,13 @@
 
 package org.apache.hertzbeat.collector.collect.common.ssh;
 
-import java.io.InputStream;
-import java.security.KeyPair;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.common.cache.AbstractConnection;
 import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier;
 import org.apache.hertzbeat.collector.collect.common.cache.GlobalConnectionCache;
 import org.apache.hertzbeat.collector.collect.common.cache.SshConnect;
 import org.apache.hertzbeat.collector.util.PrivateKeyUtils;
-import org.apache.hertzbeat.common.entity.job.protocol.SshProtocol;
 import org.apache.sshd.client.SshClient;
-import org.apache.sshd.client.config.hosts.HostConfigEntry;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.config.keys.FilePasswordProvider;
 import org.apache.sshd.common.util.security.SecurityUtils;
@@ -106,101 +101,4 @@ public class SshHelper {
         return clientSession;
     }
 
-    public static ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection, boolean useProxy)
-            throws IOException, GeneralSecurityException {
-        CacheIdentifier identifier = CacheIdentifier.builder()
-                                                    .ip(sshProtocol.getHost()).port(sshProtocol.getPort())
-                                                    .username(sshProtocol.getUsername()).password(sshProtocol.getPassword())
-                                                    .build();
-        ClientSession clientSession = null;
-        // When using ProxyJump, force connection reuse:
-        // Apache MINA SSHD will pass the proxy password error to the target host in proxy scenarios, causing the first connection to fail.
-        // Reusing connections can skip duplicate authentication and avoid this problem.
-        if (reuseConnection || useProxy) {
-            Optional<AbstractConnection<?>> cacheOption = CONNECTION_COMMON_CACHE.getCache(identifier, true);
-            if (cacheOption.isPresent()) {
-                SshConnect sshConnect = (SshConnect) cacheOption.get();
-                clientSession = sshConnect.getConnection();
-                try {
-                    if (clientSession == null || clientSession.isClosed() || clientSession.isClosing()) {
-                        clientSession = null;
-                        CONNECTION_COMMON_CACHE.removeCache(identifier);
-                    }
-                } catch (Exception e) {
-                    log.warn(e.getMessage());
-                    clientSession = null;
-                    CONNECTION_COMMON_CACHE.removeCache(identifier);
-                }
-            }
-            if (clientSession != null) {
-                return clientSession;
-            }
-        }
-        SshClient sshClient = CommonSshClient.getSshClient();
-        HostConfigEntry proxyConfig = new HostConfigEntry();
-        if (useProxy && StringUtils.hasText(sshProtocol.getProxyHost())) {
-            String proxySpec = String.format("%s@%s:%d", sshProtocol.getProxyUsername(), sshProtocol.getProxyHost(), Integer.parseInt(sshProtocol.getProxyPort()));
-            proxyConfig.setHostName(sshProtocol.getHost());
-            proxyConfig.setHost(sshProtocol.getHost());
-            proxyConfig.setPort(Integer.parseInt(sshProtocol.getPort()));
-            proxyConfig.setUsername(sshProtocol.getUsername());
-            proxyConfig.setProxyJump(proxySpec);
-
-            // Apache SSHD requires the password for the proxy to be preloaded into the sshClient instance before connecting
-            if (StringUtils.hasText(sshProtocol.getProxyPassword())) {
-                sshClient.addPasswordIdentity(sshProtocol.getProxyPassword());
-                log.debug("Loaded proxy server password authentication: {}@{}", sshProtocol.getProxyUsername(), sshProtocol.getProxyHost());
-            }
-            if (StringUtils.hasText(sshProtocol.getProxyPrivateKey())) {
-                proxyConfig.setIdentities(List.of(sshProtocol.getProxyPrivateKey()));
-                log.debug("Proxy private key loaded into HostConfigEntry");
-            }
-        }
-
-        if (useProxy && StringUtils.hasText(sshProtocol.getProxyHost())) {
-            try {
-                clientSession = sshClient.connect(proxyConfig)
-                                         .verify(timeout, TimeUnit.MILLISECONDS).getSession();
-            }
-            finally {
-                sshClient.removePasswordIdentity(sshProtocol.getProxyPassword());
-            }
-        } else {
-            clientSession = sshClient.connect(sshProtocol.getUsername(), sshProtocol.getHost(), Integer.parseInt(sshProtocol.getPort()))
-                                     .verify(timeout, TimeUnit.MILLISECONDS).getSession();
-        }
-
-        if (StringUtils.hasText(sshProtocol.getPassword())) {
-            clientSession.addPasswordIdentity(sshProtocol.getPassword());
-        } else if (StringUtils.hasText(sshProtocol.getPrivateKey())) {
-            var resourceKey = PrivateKeyUtils.writePrivateKey(sshProtocol.getHost(), sshProtocol.getPrivateKey());
-            try (InputStream keyStream = new FileInputStream(resourceKey)) {
-                FilePasswordProvider passwordProvider = (session, resource, index) -> {
-                    if (StringUtils.hasText(sshProtocol.getPrivateKeyPassphrase())) {
-                        return sshProtocol.getPrivateKeyPassphrase();
-                    }
-                    return null;
-                };
-                Iterable<KeyPair> keyPairs = SecurityUtils.loadKeyPairIdentities(null, () -> resourceKey, keyStream, passwordProvider);
-                if (keyPairs != null) {
-                    keyPairs.forEach(clientSession::addPublicKeyIdentity);
-                } else {
-                    log.error("Failed to load private key pairs from: {}", resourceKey);
-                }
-            } catch (IOException e) {
-                log.error("Error reading private key file: {}", e.getMessage());
-            }
-        }  // else auth with localhost private public key certificates
-
-        // auth
-        if (!clientSession.auth().verify(timeout, TimeUnit.MILLISECONDS).isSuccess()) {
-            clientSession.close();
-            throw new IllegalArgumentException("ssh auth failed.");
-        }
-        if (reuseConnection || useProxy) {
-            SshConnect sshConnect = new SshConnect(clientSession);
-            CONNECTION_COMMON_CACHE.addCache(identifier, sshConnect);
-        }
-        return clientSession;
-    }
 }

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchConstants.java

@@ -202,10 +202,6 @@ public interface DispatchConstants {
      * Parsing method prometheus exporter data
      */
     String PARSE_PROMETHEUS = "prometheus";
-    /**
-     * Parse response body as config/properties format
-     */
-    String PARSE_CONFIG = "config";
     /**
      * prometheus accept header
      */
@@ -231,9 +227,4 @@ public interface DispatchConstants {
      * protocol modbus
      */
     String PROTOCOL_MODBUS = "modbus";
-
-    /**
-     * protocol modbus
-     */
-    String PROTOCOL_S7 = "s7";
 }

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/HashedWheelTimer.java

@@ -613,8 +613,9 @@ public class HashedWheelTimer implements Timer {
             HashedWheelBucket bucket = this.bucket;
             if (bucket != null) {
                 bucket.remove(this);
+            } else {
+                timer.pendingTimeouts.decrementAndGet();
             }
-            timer.pendingTimeouts.decrementAndGet();
         }
 
         public boolean compareAndSetState(int expected, int state) {
@@ -641,7 +642,6 @@ public class HashedWheelTimer implements Timer {
             }
 
             try {
-                remove();
                 task.run(this);
             } catch (Throwable t) {
                 if (logger.isWarnEnabled()) {
@@ -718,6 +718,7 @@ public class HashedWheelTimer implements Timer {
             while (timeout != null) {
                 HashedWheelTimeout next = timeout.next;
                 if (timeout.remainingRounds <= 0) {
+                    next = remove(timeout);
                     if (timeout.deadline <= deadline) {
                         timeout.expire();
                     } else {
@@ -725,7 +726,9 @@ public class HashedWheelTimer implements Timer {
                         throw new IllegalStateException(String.format(
                                 "timeout.deadline (%d) > deadline (%d)", timeout.deadline, deadline));
                     }
-                } else if (!timeout.isCancelled()) {
+                } else if (timeout.isCancelled()) {
+                    next = remove(timeout);
+                } else {
                     timeout.remainingRounds--;
                 }
                 timeout = next;
@@ -758,6 +761,7 @@ public class HashedWheelTimer implements Timer {
             timeout.prev = null;
             timeout.next = null;
             timeout.bucket = null;
+            timeout.timer.pendingTimeouts.decrementAndGet();
             return next;
         }
 

hertzbeat-collector/hertzbeat-collector-kafka/src/main/java/org/apache/hertzbeat/collector/collect/kafka/KafkaCollectImpl.java

@@ -242,7 +242,6 @@ public class KafkaCollectImpl extends AbstractCollect {
             boolean isKafkaCommand = SupportedCommand.isKafkaCommand(command);
             if (!isKafkaCommand) {
                 log.error("Unsupported command: {}", command);
-                builder.setCode(CollectRep.Code.FAIL);
                 return;
             }
 
@@ -274,7 +273,7 @@ public class KafkaCollectImpl extends AbstractCollect {
         }
     }
 
-    protected AdminClient getAdminClient(KafkaProtocol kafkaProtocol) {
+    private AdminClient getAdminClient(KafkaProtocol kafkaProtocol) {
         CacheIdentifier kafkaAdminClientIdentifier = CacheIdentifier.builder()
                 .ip(kafkaProtocol.getHost()).port(kafkaProtocol.getPort())
                 .build();

hertzbeat-collector/hertzbeat-collector-kafka/src/test/java/org/apache/hertzbeat/collector/collect/kafka/KafkaCollectTest.java

@@ -17,24 +17,12 @@
 
 package org.apache.hertzbeat.collector.collect.kafka;
 
-import org.apache.hertzbeat.collector.collect.kafka.constants.SupportedCommand;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.KafkaProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.kafka.clients.admin.AdminClient;
-import org.apache.kafka.clients.admin.ListTopicsOptions;
-import org.apache.kafka.clients.admin.ListTopicsResult;
-import org.apache.kafka.common.KafkaFuture;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.HashSet;
-import java.util.Set;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -43,25 +31,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 /**
  * Test case for {@link KafkaCollectImpl}
  */
-@ExtendWith(MockitoExtension.class)
 public class KafkaCollectTest {
-
-    private static final String HOST = "127.0.0.1";
-    private static final String PORT = "9092";
-
     private KafkaCollectImpl collect;
 
-    @Mock
-    private AdminClient adminClient;
-
     @BeforeEach
     public void setUp() throws Exception {
-        collect = new KafkaCollectImpl(){
-            @Override
-            protected AdminClient getAdminClient(KafkaProtocol protocol) {
-                return adminClient;
-            }
-        };
+        collect = new KafkaCollectImpl();
     }
 
     @Test
@@ -84,51 +59,38 @@ public class KafkaCollectTest {
         });
         // kafka port is null
         assertThrows(IllegalArgumentException.class, () -> {
-            kafka.setHost(HOST);
+            kafka.setHost("127.0.0.1");
             collect.preCheck(metric);
         });
         // no exception throw
         assertDoesNotThrow(() -> {
-            kafka.setPort(PORT);
+            kafka.setPort("9092");
             collect.preCheck(metric);
         });
     }
 
     @Test
-    void testCollect() throws Exception {
-        Set<String> topicSet = new HashSet<>();
-        topicSet.add("test-topic");
-
-        ListTopicsResult listTopicsResult = Mockito.mock(ListTopicsResult.class);
-        KafkaFuture<Set<String>> future = Mockito.mock(KafkaFuture.class);
-
-        Mockito.when(adminClient.listTopics(Mockito.any(ListTopicsOptions.class))).thenReturn(listTopicsResult);
-        Mockito.when(listTopicsResult.names()).thenReturn(future);
-        Mockito.when(future.get()).thenReturn(topicSet);
-
-        KafkaProtocol kafka = KafkaProtocol.builder()
-                .host(HOST)
-                .port(PORT)
-                .build();
-
-        Metrics metrics = Metrics.builder()
-                .kclient(kafka)
-                .build();
-
-        // test if not kafka command
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        collect.collect(builder, metrics);
-        assertEquals(CollectRep.Code.FAIL, builder.getCode());
+    void collect() {
+        // metrics is null
+        assertThrows(NullPointerException.class, () -> {
+            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+            collect.collect(builder, null);
+        });
 
+        KafkaProtocol kafka = KafkaProtocol.builder().host("127.0.0.1").port("9092").build();
+        Metrics metrics = Metrics.builder().kclient(kafka).build();
+        //test if not kafka command
+        assertDoesNotThrow(() -> {
+            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+            collect.collect(builder, metrics);
+        });
         //test kafka command
-        kafka.setCommand(SupportedCommand.TOPIC_LIST.getCommand());
-        builder.setCode(CollectRep.Code.forNumber(6));
-        collect.collect(builder, metrics);
+        assertDoesNotThrow(() -> {
+            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+            metrics.getKclient().setCommand("topic-list");
+            collect.collect(builder, metrics);
+        });
 
-        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
-        assertEquals(1, builder.getValuesList().size());
-        assertEquals("test-topic", builder.getValues(0).getColumns(0));
-        Mockito.verify(adminClient).listTopics(Mockito.any(ListTopicsOptions.class));
     }
 
     @Test

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java

@@ -93,14 +93,9 @@ public interface CommonConstants {
     String LABEL_ALERT_NAME = "alertname";
 
     /**
-     * label key: instance host
+     * label key: host
      */
-    String LABEL_INSTANCE_HOST = "instancehost";
-
-    /**
-     * label key: instance name
-     */
-    String LABEL_INSTANCE_NAME = "instancename";
+    String LABEL_HOST = "host";
     
     /**
      * Alarm severity label key
@@ -455,19 +450,4 @@ public interface CommonConstants {
      * status page incident state resolved
      */
     byte STATUS_PAGE_INCIDENT_STATE_RESOLVED = 3;
-
-    /**
-     * status page incident state resolved
-     */
-    byte MONITOR_TYPE_NORMAL = 0;
-
-    /**
-     * status page incident state resolved
-     */
-    byte MONITOR_TYPE_PUSH_AUTO_CREATE = 1;
-
-    /**
-     * status page incident state resolved
-     */
-    byte MONITOR_TYPE_DISCOVERY_AUTO_CREATE = 2;
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/ConfigConstants.java

@@ -65,8 +65,6 @@ public interface ConfigConstants {
         String INFO = "info";
 
         String GRAFANA = "grafana";
-
-        String LOG = "log";
     }
 
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/MetricDataConstants.java

@@ -27,16 +27,12 @@ public interface MetricDataConstants {
     String UNIT = "unit";
 
     // key in Schema metadata
-    String ID = "id";
+    String MONITOR_ID = "id";
     String TENANT_ID = "tenantId";
     String APP = "app";
     String METRICS = "metrics";
-    String LABELS = "labels";
-    String ANNOTATIONS = "annotations";
     String PRIORITY = "priority";
     String TIME = "time";
     String CODE = "code";
     String MSG = "msg";
-    String INSTANCE_NAME = "instancename";
-    String INSTANCE_HOST = "instancehost";
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/SmsConstants.java

@@ -32,10 +32,4 @@ public interface SmsConstants {
 
     // Smslocal SMS
     String SMSLOCAL = "smslocal";
-
-    // Aws cloud SMS
-    String AWS = "aws";
-
-    // Twilio SMS
-    String TWILIO = "twilio";
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/NoticeReceiver.java

@@ -122,11 +122,6 @@ public class NoticeReceiver {
             example = "779294123", accessMode = READ_WRITE)
     private String tgUserId;
 
-    @Schema(title = "Telegram message thread id: The notification method is valid for Telegram Bot",
-            description = "TTelegram message thread id: The notification method is valid for Telegram Bot",
-            example = "779294123", accessMode = READ_WRITE)
-    private String tgMessageThreadId;
-
     @Schema(title = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
             description = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
             example = "779294123", accessMode = READ_WRITE)

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQuery.java

@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.entity.dto.query;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Metric History Range Query Data
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "Query Request Data")
-public class DatasourceQuery {
-    
-    @Schema(title = "Ref Id, unique id for the query")
-    private String refId;
-    
-    @Schema(title = "datasource name")
-    private String datasource;
-    
-    @Schema(title = "query expr, like prometheus query")
-    private String expr;
-    
-    @Schema(title = "query expr type, like promql or sql or influxql")
-    private String exprType;
-    
-    @Schema(title = "query range type, like range or instant")
-    private String timeType;
-
-    @Schema(title = "query range start time")
-    private Long start;
-
-    @Schema(title = "query range end time")
-    private Long end;
-    
-    @Schema(title = "query time step, like 5m or 1h")
-    private String step;
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/query/DatasourceQueryData.java

@@ -1,103 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.entity.dto.query;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.List;
-import java.util.Map;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Metric History Range Query Data
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "Metric Query Data")
-public class DatasourceQueryData {
-
-    @Schema(title = "Ref Id, unique id for the query")
-    private String refId;
-    
-    @Schema(title = "query status code, 200 for success, other for error")
-    private Integer status;
-    
-    @Schema(title = "query error message")
-    private String msg;
-    
-    @Schema(title = "query result data frames")
-    private List<SchemaData> frames;
-    
-    /**
-     * Schema Data
-     */
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Builder
-    public static final class SchemaData {
-
-        @Schema(title = "Metric Schema")
-        private MetricSchema schema;
-
-        @Schema(title = "metrics row values, first is the timestamp-ts", example = "[[29,32,44],[32,34,true]]")
-        private List<Object[]> data;
-    }
-    
-    /**
-     * Metric Schema
-     */
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Builder
-    public static final class MetricSchema {
-
-        @Schema(title = "Metrics Field")
-        private List<MetricField> fields;
-        
-        @Schema(title = "This frame labels")
-        private Map<String, String> labels;
-        
-        @Schema(title = "Meta Information")
-        private Map<String, String> meta;
-    }
-
-    /**
-     * Metric Field
-     */
-    @Data
-    @AllArgsConstructor
-    @NoArgsConstructor
-    @Builder
-    public static final class MetricField {
-
-        @Schema(title = "Metric Field Name")
-        private String name;
-
-        @Schema(title = "Field Type: number, string, time, bool")
-        private String type;
-
-        @Schema(title = "Field Unit: %, Mb, Kbps etc.")
-        private String unit;
-    }
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java

@@ -61,19 +61,6 @@ public class Job {
      * Monitoring Task ID
      */
     private long monitorId;
-    /**
-     * metadata info bind with this job
-     * eg: instancename, instancehost
-     */
-    private Map<String, String> metadata;
-    /**
-     * bind labels 
-     */
-    private Map<String, String> labels;
-    /**
-     * bind annotations
-     */
-    private Map<String, String> annotations;
     /**
      * Is hide this app in main menus layout, only for app type, default true.
      */
@@ -172,36 +159,23 @@ public class Job {
      * collector use - construct to initialize metrics execution view
      */
     public synchronized void constructPriorMetrics() {
-        long now = System.currentTimeMillis();
-        Map<Byte, List<Metrics>> currentCollectMetrics = metrics.stream()
-                .filter(metrics -> (now >= metrics.getCollectTime() + metrics.getInterval() * 1000))
-                .peek(metric -> {
-                    metric.setCollectTime(now);
-                    // Determine whether to configure aliasFields If not, configure the default
-                    if ((metric.getAliasFields() == null || metric.getAliasFields().isEmpty()) && metric.getFields() != null) {
-                        metric.setAliasFields(metric.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList()));
-                    }
-                    // Set the default metrics execution priority, if not filled, the default last priority
-                    if (metric.getPriority() == null) {
-                        metric.setPriority(Byte.MAX_VALUE);
-                    }
-                })
-                .collect(Collectors.groupingBy(Metrics::getPriority));
-        // the current collect metrics can not empty, if empty, add a default availability metrics
-        // due the metric collect is trigger by the previous metric collect
-        if (currentCollectMetrics.isEmpty()) {
-            Optional<Metrics> defaultMetricOption = metrics.stream().filter(metric -> metric.getPriority() == 0).findFirst();
-            if (defaultMetricOption.isPresent()) {
-                Metrics defaultMetric = defaultMetricOption.get();
-                defaultMetric.setCollectTime(now);
-                currentCollectMetrics.put((byte) 0, Collections.singletonList(defaultMetric));
-            } else {
-                log.error("metrics must has one priority 0 metrics at least.");
-            }
-        }
+        Map<Byte, List<Metrics>> map = metrics.stream()
+            .filter(metrics -> (System.currentTimeMillis() >= metrics.getCollectTime() + metrics.getInterval() * 1000))
+            .peek(metric -> {
+                metric.setCollectTime(System.currentTimeMillis());
+                // Determine whether to configure aliasFields If not, configure the default
+                if ((metric.getAliasFields() == null || metric.getAliasFields().isEmpty()) && metric.getFields() != null) {
+                    metric.setAliasFields(metric.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList()));
+                }
+                // Set the default metrics execution priority, if not filled, the default last priority
+                if (metric.getPriority() == null) {
+                    metric.setPriority(Byte.MAX_VALUE);
+                }
+            })
+            .collect(Collectors.groupingBy(Metrics::getPriority));
         // Construct a linked list of task execution order of the metrics
         priorMetrics = new LinkedList<>();
-        currentCollectMetrics.values().forEach(metric -> {
+        map.values().forEach(metric -> {
             Set<Metrics> metricsSet = Collections.synchronizedSet(new HashSet<>(metric));
             priorMetrics.add(metricsSet);
         });
@@ -286,7 +260,7 @@ public class Job {
     public void initIntervals() {
         List<Long> metricsIntervals = new LinkedList<>();
         for (Metrics metrics: getMetrics()) {
-            metrics.setCollectTime(0L);
+            metrics.setCollectTime(System.currentTimeMillis());
             if (metrics.getInterval() <= 0) {
                 metrics.setInterval(defaultInterval);
             }
@@ -313,10 +287,10 @@ public class Job {
      * The least common multiple
      */
     public static long lcm(List<Long> array) {
-        if (array != null && !array.isEmpty()) {
+        if (array != null) {
             long result = array.get(0);
             for (int i = 1; i < array.size(); i++) {
-                result = result / gcd(result, array.get(i)) * array.get(i);
+                result = (result * array.get(i)) / gcd(result, array.get(i));
             }
             return result;
         }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java

@@ -54,7 +54,6 @@ import org.apache.hertzbeat.common.entity.job.protocol.PushProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RedfishProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RocketmqProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.S7Protocol;
 import org.apache.hertzbeat.common.entity.job.protocol.ScriptProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.SmtpProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.SnmpProtocol;
@@ -271,10 +270,6 @@ public class Metrics {
      * Monitoring configuration information using the public modBus protocol
      */
     private ModbusProtocol modbus;
-    /**
-     * Monitoring configuration information using the public s7 protocol
-     */
-    private S7Protocol s7;
     /**
      * collector use - Temporarily store subTask metrics response data
      */

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/HttpProtocol.java

@@ -95,12 +95,6 @@ public class HttpProtocol implements CommonRequestProtocol, Protocol {
      */
     private List<String> successCodes;
 
-    /**
-     * Whether to enable URL encoding for the path. Default is true.
-     * When true, the URL path will be encoded. When false, the URL path will not be encoded.
-     */
-    private String enableUrlEncoding = "true";
-
     /**
      * authentication information
      */

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/SshProtocol.java

@@ -80,34 +80,4 @@ public class SshProtocol implements CommonRequestProtocol, Protocol {
      * Response data parsing mode：oneRow, multiRow
      */
     private String parseType;
-
-    /**
-     * IP ADDRESS OR DOMAIN NAME OF THE PEER PROXY HOST
-     */
-    private String proxyHost;
-
-    /**
-     * Peer proxy host port
-     */
-    private String proxyPort;
-
-    /**
-     * Proxy UserName
-     */
-    private String proxyUsername;
-
-    /**
-     * Proxy Password (optional)
-     */
-    private String proxyPassword;
-
-    /**
-     * flag of use proxy
-     */
-    private String useProxy = "false";
-
-    /**
-     * Proxy private key (optional)
-     */
-    private String proxyPrivateKey;
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java

@@ -91,9 +91,6 @@ public class Monitor {
     @Max(4)
     private byte status;
     
-    @Schema(title = "Task type 0: Normal, 1: push auto create, 2: discovery auto create")
-    private byte type;
-    
     @Schema(title = "task label", example = "{env:test}", accessMode = READ_WRITE)
     @Convert(converter = JsonMapAttributeConverter.class)
     @Column(length = 4096)

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Tag.java

@@ -43,7 +43,7 @@ import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
- * Label Entity
+ * Tag Entity
  */
 @Entity
 @Table(name = "hzb_tag")
@@ -51,27 +51,30 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Schema(description = "Label Entity")
+@Schema(description = "Tag Entity")
 @EntityListeners(AuditingEntityListener.class)
-public class Label {
+public class Tag {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Schema(title = "Primary key index ID", example = "87584674384", accessMode = READ_ONLY)
+    @Schema(title = "Tag Primary key index ID", example = "87584674384", accessMode = READ_ONLY)
     private Long id;
 
-    @Schema(title = "Label Field", example = "app", accessMode = READ_WRITE)
+    @Schema(title = "Tag Field", example = "app", accessMode = READ_WRITE)
     @NotBlank(message = "name can not null")
     private String name;
 
-    @Schema(title = "Label Value", example = "23", accessMode = READ_WRITE)
+    @Schema(title = "Tag Value", example = "23", accessMode = READ_WRITE)
     @Column(length = 2048)
     private String tagValue;
 
-    @Schema(title = "Label Description", example = "Used for monitoring mysql", accessMode = READ_WRITE)
+    @Schema(title = "Tag Color", example = "#ffff", accessMode = READ_WRITE)
+    private String color;
+
+    @Schema(title = "Tag Color", example = "Used for monitoring mysql", accessMode = READ_WRITE)
     private String description;
 
-    @Schema(title = "Tag type 0: Auto-generated 1: user-generated 2: system preset",
+    @Schema(title = "Tag type 0: Auto-generated monitor (monitorId,monitorName) 1: user-generated 2: system preset",
             accessMode = READ_WRITE)
     @Min(0)
     @Max(3)
@@ -101,7 +104,7 @@ public class Label {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        Label tag = (Label) o;
+        Tag tag = (Tag) o;
         return Objects.equals(name, tag.name) && Objects.equals(tagValue, tag.tagValue);
     }
 

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/message/CollectRep.java

@@ -43,7 +43,6 @@ import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.hertzbeat.common.constants.MetricDataConstants;
 import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
-import org.apache.hertzbeat.common.util.JsonUtil;
 
 @SuppressWarnings("all")
 @Slf4j
@@ -139,7 +138,17 @@ public final class CollectRep {
         
         public static Builder newBuilder(MetricsData metricsData) {
             Builder builder = new Builder();
-            builder.addMetadataAll(metricsData.getMetadata());
+            // get metadata from metricsData
+            Map<String, String> metadata = metricsData.getMetadata();
+            builder.setId(Long.parseLong(metadata.getOrDefault(MetricDataConstants.MONITOR_ID, "0")))
+                   .setTenantId(Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0")))
+                   .setApp(metadata.getOrDefault(MetricDataConstants.APP, ""))
+                   .setMetrics(metadata.getOrDefault(MetricDataConstants.METRICS, ""))
+                   .setPriority(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0")))
+                   .setTime(Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0")))
+                   .setCode(Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0"))))
+                   .setMsg(metadata.getOrDefault(MetricDataConstants.MSG, ""));
+            
             metricsData.getFields().forEach(builder::addField);
             metricsData.getValues().forEach(builder::addValueRow);
             return builder;
@@ -182,70 +191,42 @@ public final class CollectRep {
         
         public long getId() {
             Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.ID, "0"));
+            return Long.parseLong(metadata.getOrDefault("id", "0"));
         }
 
         public long getTenantId() {
             Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0"));
+            return Long.parseLong(metadata.getOrDefault("tenantId", "0"));
         }
 
         public String getApp() {
             Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.APP, "");
+            return metadata.getOrDefault("app", "");
         }
 
         public String getMetrics() {
             Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.METRICS, "");
+            return metadata.getOrDefault("metrics", "");
         }
 
         public int getPriority() {
             Map<String, String> metadata = getMetadata();
-            return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0"));
+            return Integer.parseInt(metadata.getOrDefault("priority", "0"));
         }
 
         public long getTime() {
             Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
+            return Long.parseLong(metadata.getOrDefault("time", "0"));
         }
 
         public Code getCode() {
             Map<String, String> metadata = getMetadata();
-            return Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0")));
+            return Code.forNumber(Integer.parseInt(metadata.getOrDefault("code", "0")));
         }
 
         public String getMsg() {
             Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.MSG, "");
-        }
-
-        public String getInstanceName() {
-            Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
-        }
-
-        public String getInstanceHost() {
-            Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
-        }
-
-        public Map<String, String> getLabels() {
-            Map<String, String> metadata = getMetadata();
-            String labelStr = metadata.getOrDefault(MetricDataConstants.LABELS, "");
-            if (labelStr == null || "".equals(labelStr)) {
-                return null;
-            }
-            return JsonUtil.fromJson(labelStr, Map.class);
-        }
-
-        public Map<String, String> getAnnotations() {
-            Map<String, String> metadata = getMetadata();
-            String annotationStr = metadata.getOrDefault(MetricDataConstants.ANNOTATIONS, "");
-            if (annotationStr == null || "".equals(annotationStr)) {
-                return null;
-            }
-            return JsonUtil.fromJson(annotationStr, Map.class);
+            return metadata.getOrDefault("msg", "");
         }
 
         private Map<String, String> getMetadata() {
@@ -317,82 +298,54 @@ public final class CollectRep {
 
         // Builder remains mostly the same, but build() method changes
         public static class Builder {
-            
-            private Map<String, String> metadata = new HashMap<>();
+            private long id;
+            private long tenantId;
+            private String app = "";
+            private String metrics = "";
+            private int priority;
+            private long time;
+            private Code code = Code.SUCCESS;
+            private String msg = "";
             private List<Field> fields = new ArrayList<>();
             private List<ValueRow> values = new ArrayList<>();
             
             public Builder setId(long id) {
-                metadata.put(MetricDataConstants.ID, String.valueOf(id));
+                this.id = id;
                 return this;
             }
 
             public Builder setTenantId(long tenantId) {
-                metadata.put(MetricDataConstants.TENANT_ID, String.valueOf(tenantId));
+                this.tenantId = tenantId;
                 return this;
             }
 
             public Builder setApp(String app) {
-                metadata.put(MetricDataConstants.APP, app != null ? app : "");
+                this.app = app;
                 return this;
             }
 
             public Builder setMetrics(String metrics) {
-                metadata.put(MetricDataConstants.METRICS, metrics != null ? metrics : "");
-                return this;
-            }
-            
-            public Builder setLabels(Map<String, String> labels) {
-                if (labels == null || labels.isEmpty()) {
-                    return this;
-                }
-                String labelStr = JsonUtil.toJson(labels);
-                metadata.put(MetricDataConstants.LABELS, labelStr);
-                return this;
-            }
-            
-            public Builder setAnnotations(Map<String, String> annotations) {
-                if (annotations == null || annotations.isEmpty()) {
-                    return this;
-                }
-                String annotationStr = JsonUtil.toJson(annotations);
-                metadata.put(MetricDataConstants.ANNOTATIONS, annotationStr);
+                this.metrics = metrics;
                 return this;
             }
 
             public Builder setPriority(int priority) {
-                metadata.put(MetricDataConstants.PRIORITY, String.valueOf(priority));
+                this.priority = priority;
                 return this;
             }
 
             public Builder setTime(long time) {
-                metadata.put(MetricDataConstants.TIME, String.valueOf(time));
+                this.time = time;
                 return this;
             }
 
             public Builder setCode(Code code) {
-                metadata.put(MetricDataConstants.CODE, String.valueOf(code != null ? code.value : 0));
+                this.code = code;
                 return this;
             }
 
             public Builder setMsg(String msg) {
-                metadata.put(MetricDataConstants.MSG, msg != null ? msg : "");
-                return this;
-            }
-            
-            public Builder addMetadata(String key, String value) {
-                if (key == null || "".equals(key)) {
-                    return this;
-                }
-                metadata.put(key, value);
-                return this;
-            }
-            
-            public Builder addMetadataAll(Map<String, String> meta) {
-                if (meta == null || meta.isEmpty()) {
-                    return this;
-                }
-                this.metadata.putAll(meta);
+                this.msg = msg;
                 return this;
             }
 
@@ -407,6 +360,17 @@ public final class CollectRep {
             }
 
             public MetricsData build() {
+                // Create metadata
+                Map<String, String> metadata = new HashMap<>();
+                metadata.put(MetricDataConstants.MONITOR_ID, String.valueOf(id));
+                metadata.put(MetricDataConstants.TENANT_ID, String.valueOf(tenantId));
+                metadata.put(MetricDataConstants.APP, app != null ? app : "");
+                metadata.put(MetricDataConstants.METRICS, metrics != null ? metrics : "");
+                metadata.put(MetricDataConstants.PRIORITY, String.valueOf(priority));
+                metadata.put(MetricDataConstants.TIME, String.valueOf(time));
+                metadata.put(MetricDataConstants.CODE, String.valueOf(code != null ? code.value : 0));
+                metadata.put(MetricDataConstants.MSG, msg != null ? msg : "");
+
                 BufferAllocator allocator = new RootAllocator();
                 try {
                     // Create Arrow fields with metadata
@@ -443,9 +407,7 @@ public final class CollectRep {
                                         fieldIndex < row.getColumnsList().size()) {
                                     String value = row.getColumns(fieldIndex);
                                     if (value != null) {
-                                        // Check byte array size, Arrow buffer size is 32768 bytes
-                                        byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
-                                        vector.setSafe(rowIndex, bytes);
+                                        vector.set(rowIndex, value.getBytes(StandardCharsets.UTF_8));
                                     }
                                 }
                             }
@@ -463,65 +425,38 @@ public final class CollectRep {
                     throw e;
                 }
             }
-            
+
+            // Add getter methods
             public long getId() {
-                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.ID, "0"));
+                return id;
             }
 
             public long getTenantId() {
-                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0"));
+                return tenantId;
             }
 
             public String getApp() {
-                return metadata.getOrDefault(MetricDataConstants.APP, "");
+                return app;
             }
 
             public String getMetrics() {
-                return metadata.getOrDefault(MetricDataConstants.METRICS, "");
+                return metrics;
             }
 
             public int getPriority() {
-                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0"));
+                return priority;
             }
 
             public long getTime() {
-                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
+                return time;
             }
 
             public Code getCode() {
-                return Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0")));
+                return code;
             }
 
             public String getMsg() {
-                return metadata.getOrDefault(MetricDataConstants.MSG, "");
-            }
-            
-            public String getInstanceName() {
-                return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
-            }
-            
-            public String getInstanceHost() {
-                return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
-            }
-            
-            public Map<String, String> getLabels() {
-                String labelStr = metadata.getOrDefault(MetricDataConstants.LABELS, "");
-                if (labelStr == null || "".equals(labelStr)) {
-                    return null;
-                }
-                return JsonUtil.fromJson(labelStr, Map.class);
-            }
-            
-            public Map<String, String> getAnnotations() {
-                String annotationStr = metadata.getOrDefault(MetricDataConstants.ANNOTATIONS, "");
-                if (annotationStr == null || "".equals(annotationStr)) {
-                    return null;
-                }
-                return JsonUtil.fromJson(annotationStr, Map.class);
-            }
-            
-            public Map<String, String> getMetadata() {
-                return metadata;
+                return msg;
             }
 
             public List<Field> getFieldsList() {
@@ -556,6 +491,10 @@ public final class CollectRep {
                 values = new LinkedList<>();
             }
 
+            public void clearMetrics() {
+                metrics = null;
+            }
+
             public void clearFields() {
                 fields = new LinkedList<>();
             }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/event/MonitorDeletedEvent.java

@@ -20,7 +20,7 @@ package org.apache.hertzbeat.common.support.event;
 import org.springframework.context.ApplicationEvent;
 
 /**
- * the event for monitor delete
+ * the event for system config change
  */
 public class MonitorDeletedEvent extends ApplicationEvent {
     

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/SdMonitorOperator.java

@@ -32,7 +32,7 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.manager.MonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.SdMonitorParam;
-import org.apache.hertzbeat.common.entity.manager.Label;
+import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.apache.hertzbeat.common.entity.sd.ServiceDiscoveryProtocol;
 
 /**
@@ -128,13 +128,13 @@ public class SdMonitorOperator {
         return sdJob;
     }
 
-    public static List<Label> addMainMonitorTag(List<Label> tagList, Param sdParam) {
+    public static List<Tag> addMainMonitorTag(List<Tag> tagList, Param sdParam) {
         tagList = tagList.stream()
                 .filter(tag -> !StringUtils.equals(tag.getName(), CommonConstants.TAG_SD_MAIN_MONITOR))
                 .filter(tag -> !StringUtils.equals(tag.getName(), CommonConstants.TAG_AUTO_CREATED))
                 .collect(Collectors.toList());
 
-        tagList.add(Label.builder().name(CommonConstants.TAG_SD_MAIN_MONITOR)
+        tagList.add(Tag.builder().name(CommonConstants.TAG_SD_MAIN_MONITOR)
                 .tagValue(ServiceDiscoveryProtocol.Type.getType(sdParam.getField()).name())
                 .type(CommonConstants.TAG_TYPE_AUTO_GENERATE)
                 .build());

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/TimePeriodUtil.java

@@ -49,46 +49,4 @@ public final class TimePeriodUtil {
             return Duration.parse("PT" + tokenTime);
         }
     }
-
-    /**
-     * transform any timestamp to milliseconds
-     * @param timestamp timestamp
-     * @return milliseconds
-     */
-    public static long normalizeToMilliseconds(Object timestamp) {
-        if (timestamp instanceof String timestampStr) {
-            // string type, may be second, millisecond or decimal second
-            // eg: "1672531199000", "1672531199", "1672531199.123"
-            if (timestampStr.contains(".")) {
-                // contains decimal point, parse as second timestamp
-                double seconds = Double.parseDouble(timestampStr);
-                return (long) (seconds * 1000);
-            } else {
-                // integer form, determine second or millisecond
-                long numericTimestamp = Long.parseLong(timestampStr);
-                return convertNumericTimestamp(numericTimestamp);
-            }
-        } else if (timestamp instanceof Number) {
-            // number eg Integer、Long、Double
-            if (timestamp instanceof Double || timestamp instanceof Float) {
-                // float type, treat as second timestamp
-                double seconds = ((Number) timestamp).doubleValue();
-                return (long) (seconds * 1000);
-            } else {
-                // integer type, directly determine second or millisecond
-                long numericTimestamp = ((Number) timestamp).longValue();
-                return convertNumericTimestamp(numericTimestamp);
-            }
-        } else {
-            throw new IllegalArgumentException("Not support this timestamp type: " + timestamp.getClass().getName());
-        }
-    }
-
-    private static long convertNumericTimestamp(long numericTimestamp) {
-        if (String.valueOf(numericTimestamp).length() <= 10) {
-            return numericTimestamp * 1000;
-        } else {
-            return numericTimestamp;
-        }
-    }
 }

hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java

@@ -72,7 +72,7 @@ public abstract class AbstractCollectE2eTest {
         metricsCollect = new MetricsCollect(mock(Metrics.class), timeout, mock(CollectDataDispatch.class), null, List.of());
 
         // Initialize services and components
-        appService.afterPropertiesSet();
+        appService.run();
         metrics = new Metrics();
     }
 

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java

@@ -40,7 +40,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import lombok.extern.slf4j.Slf4j;
 
@@ -72,11 +71,6 @@ public class DashboardService {
      */
     @Transactional(rollbackFor = Exception.class)
     public ResponseEntity<?> createOrUpdateDashboard(String dashboardJson, Long monitorId) {
-        if (!grafanaProperties.enabled()) {
-            log.info("HertzBeat Grafana config not enabled");
-            throw new RuntimeException("HertzBeat Grafana config not enabled");
-        }
-
         String token = serviceAccountService.getToken();
         String url = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + CREATE_DASHBOARD_API;
 
@@ -109,12 +103,6 @@ public class DashboardService {
                 log.error("create dashboard error: {}", response.getStatusCode());
                 throw new RuntimeException("create dashboard error");
             }
-        } catch (HttpClientErrorException.Forbidden ex) {
-            log.error("Grafana Access denied to save dashboard", ex);
-            throw new RuntimeException("Grafana Access denied to save dashboard", ex);
-        } catch (HttpClientErrorException.NotFound ex){
-            log.error("Grafana Dashboard not found", ex);
-            throw new RuntimeException("Grafana Dashboard not found", ex);
         } catch (Exception ex) {
             log.error("create dashboard error", ex);
             throw new RuntimeException("create dashboard error", ex);

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java

@@ -61,11 +61,6 @@ public class DatasourceService {
      * Create a new datasource in Grafana.
      */
     public void existOrCreateDatasource(String token) {
-        if (!warehouseProperties.enabled()) {
-            log.info("HertzBeat VictoriaMetrics config not enabled");
-            return;
-        }
-
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.setBearerAuth(token);

hertzbeat-log/pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.hertzbeat</groupId>
-        <artifactId>hertzbeat</artifactId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>hertzbeat-log</artifactId>
-    <name>${project.artifactId}</name>
-    <properties>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-    </properties>
-
-    <dependencies>
-        <!-- hertzbeat common -->
-        <dependency>
-            <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
-        </dependency>
-        <!-- hertzbeat warehouse -->
-        <dependency>
-            <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-warehouse</artifactId>
-        </dependency>
-        <!-- OpenTelemetry -->
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk-logs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry.instrumentation</groupId>
-            <artifactId>opentelemetry-logback-appender-1.0</artifactId>
-        </dependency>
-    </dependencies>
-</project>

hertzbeat-log/src/main/java/org/apache/hertzbeat/log/config/LogAutoConfiguration.java

@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.log.config;
-
-import org.apache.hertzbeat.common.constants.ConfigConstants;
-import org.apache.hertzbeat.common.constants.SignConstants;
-import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * Log auto configuration.
- */
-@ComponentScan(basePackages = ConfigConstants.PkgConstant.PKG
-		+ SignConstants.DOT
-		+ ConfigConstants.FunctionModuleConstants.LOG
-)
-@EnableConfigurationProperties(GreptimeProperties.class)
-public class LogAutoConfiguration {
-}