Merge branch 'master' into pushgateway

Signed-off-by: leo <1552443053@qq.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"
       ]
     },
     {
@@ -2403,10 +2332,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/44892459?v=4",
       "profile": "https://github.com/JuJinPark",
       "contributions": [
-        "code",
-        "doc",
-        "ideas",
-        "blog"
+        "code"
       ]
     },
     {
@@ -2415,8 +2341,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/43002118?v=4",
       "profile": "https://github.com/LL-LIN",
       "contributions": [
-        "code",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2425,9 +2350,7 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/73413979?v=4",
       "profile": "https://bigcyy.github.io/",
       "contributions": [
-        "code",
-        "doc",
-        "bug"
+        "code"
       ]
     },
     {
@@ -2435,53 +2358,6 @@
       "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"
       ]

.gitignore

@@ -7,6 +7,8 @@ build/
 out/
 micronaut-cli.yml
 .mvn/
+mvnw
+mvnw.bat
 *.log
 package-lock.json
 *.zip

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,14 @@ 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>
+      <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></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></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></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>
+      <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></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,14 @@ 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>
+      <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></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></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></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>
+      <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></td>
     </tr>
   </tbody>
 </table>

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;
 
@@ -65,55 +62,50 @@ public class RealTimeAlertCalculator {
     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 {
@@ -144,8 +136,8 @@ public class RealTimeAlertCalculator {
         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;
         }
@@ -157,7 +149,6 @@ public class RealTimeAlertCalculator {
         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);
         }
@@ -273,7 +264,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 +294,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,13 +322,13 @@ 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);
+        String fingerprint = calculateFingerprint(fingerPrints);
+        SingleAlert existingAlert = pendingAlertMap.get(fingerprint);
         fieldValueMap.putAll(define.getLabels());
         int requiredTimes = define.getTimes() == null ? 1 : define.getTimes();
         if (existingAlert == null) {
@@ -379,11 +360,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 +374,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 +410,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/dao/AlertCollectorDao.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.alert.dao;
-
-import org.apache.hertzbeat.common.entity.manager.Collector;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-
-/**
- * Alert Collector Dao
- */
-public interface AlertCollectorDao extends JpaRepository<Collector, Long>, JpaSpecificationExecutor<Collector> {
-
-    /**
-     * Query collector by name
-     * @param name collector name
-     * @return collector
-     */
-    Collector findCollectorByName(String name);
-}

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/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/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/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/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/DataSourceServiceTest.java

@@ -15,16 +15,31 @@
  * 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;
@@ -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-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
@@ -383,8 +357,6 @@ public class JdbcCommonCollect extends AbstractCollect {
             case "oracle" -> "jdbc:oracle:thin:@" + host + ":" + port
                     + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
             case "dm" -> "jdbc:dm://" + host + ":" + port;
-            case "testcontainers" -> "jdbc:tc:" + host + ":" + port
-                    + ":///" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase()) + "?user=root&password=root";
             default -> throw new IllegalArgumentException("Not support database platform: " + jdbcProtocol.getPlatform());
         };
     }

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,7 +34,9 @@ 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;
@@ -45,14 +44,13 @@ 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;
@@ -93,25 +91,18 @@ 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;
+import org.apache.hertzbeat.common.entity.job.Metrics.Field;
+import java.util.function.Function;
 
 /**
  * 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 {
@@ -132,7 +123,7 @@ public class HttpCollectImpl extends AbstractCollect {
         if (CollectionUtils.isEmpty(httpProtocol.getSuccessCodes())) {
             httpProtocol.setSuccessCodes(List.of(HttpStatus.SC_OK + ""));
         }
-
+        
         HttpContext httpContext = createHttpContext(metrics.getHttp());
         HttpUriRequest request = createHttpRequest(metrics.getHttp());
         try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)) {
@@ -144,11 +135,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,7 +152,7 @@ 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);
                     case DispatchConstants.PARSE_WEBSITE ->
@@ -171,8 +161,6 @@ public class HttpCollectImpl extends AbstractCollect {
                             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);
                 }
@@ -394,6 +382,9 @@ public class HttpCollectImpl extends AbstractCollect {
                 return;
             }
 
+            Map<String, Field> fieldMap = metrics.getFields().stream()
+                    .collect(Collectors.toMap(Field::getField, Function.identity(), (field1, field2) -> field1));
+
             for (int i = 0; i < nodeList.getLength(); i++) {
                 Node node = nodeList.item(i);
                 CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
@@ -404,11 +395,19 @@ public class HttpCollectImpl extends AbstractCollect {
                     } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
                         valueRowBuilder.addColumn(Integer.toString(keywordNum));
                     } else {
+                        Field field = fieldMap.get(alias);
+                        if (field == null || !StringUtils.hasText(field.getXpath())) {
+                            log.warn("No field definition or xpath found for alias '{}' in XML path parsing.", alias);
+                            valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
+                            continue;
+                        }
+
+                        String relativeXpath = field.getXpath();
                         try {
-                            String value = (String) xpath.evaluate(alias, node, XPathConstants.STRING);
+                            String value = (String) xpath.evaluate(relativeXpath, 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());
+                            log.warn("Failed to evaluate relative XPath '{}' (from field definition) for node [{}]: {}", relativeXpath, node.getNodeName(), e.getMessage());
                             valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
                         }
                     }
@@ -423,129 +422,6 @@ public class HttpCollectImpl extends AbstractCollect {
         }
     }
 
-
-
-    /**
-     * 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 parseResponseByJsonPath(String resp, List<String> aliasFields, HttpProtocol http,
                                          CollectRep.MetricsData.Builder builder, Long responseTime) {
         List<Object> results = JsonPathParser.parseContentWithJsonPath(resp, http.getParseScript());
@@ -600,22 +476,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);

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;
@@ -34,7 +33,8 @@ import java.util.stream.Stream;
 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.common.entity.dto.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,14 +168,10 @@ 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.clearFields();
             builder.clearValues();

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

@@ -24,15 +24,14 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.http.promethus.ParseException;
+import org.apache.hertzbeat.common.entity.dto.MetricFamily;
 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 +45,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/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java

@@ -99,26 +99,26 @@ class HttpCollectImplTest {
                     </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());
-    
+        fields.add(Metrics.Field.builder().field("name").xpath("name").build());
+        fields.add(Metrics.Field.builder().field("status").xpath("status").build());
+        fields.add(Metrics.Field.builder().field("cpu").xpath("metrics/cpu").build());
+        fields.add(Metrics.Field.builder().field("memory").xpath("metrics/memory").build());
+
         Metrics metrics = Metrics.builder()
                 .http(http)
                 .fields(fields)
-                .aliasFields(Arrays.asList("name", "status", "metrics/cpu", "metrics/memory"))
+                .aliasFields(Arrays.asList("name", "status", "cpu", "memory"))
                 .build();
-    
+
         // Create a custom builder that captures added rows
         List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
         CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
@@ -128,7 +128,7 @@ class HttpCollectImplTest {
                 return super.addValueRow(valueRow);
             }
         };
-    
+
         // Use reflection to access the private parseResponseByXmlPath method
         Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
                 "parseResponseByXmlPath", 
@@ -137,13 +137,13 @@ class HttpCollectImplTest {
                 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");
@@ -151,7 +151,7 @@ class HttpCollectImplTest {
         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");

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

@@ -17,6 +17,8 @@
 
 package org.apache.hertzbeat.collector.collect.prometheus.parser;
 
+import org.apache.hertzbeat.common.entity.dto.MetricFamily;
+import org.apache.hertzbeat.common.util.OnlineParser;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
@@ -25,12 +27,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 +46,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 +75,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/MetricsCollect.java

@@ -302,7 +302,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-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
      */

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-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/entity/dto/MetricFamily.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.collector.collect.prometheus.parser;
+package org.apache.hertzbeat.common.entity.dto;
 
 import java.util.List;
 import lombok.Data;

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/MetricQueryData.java

@@ -18,13 +18,14 @@
 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;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Metric History Range Query Data
  */
@@ -33,36 +34,14 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description = "Metric Query Data")
-public class DatasourceQueryData {
+public class MetricQueryData {
+    
+    @Schema(title = "Metric Schema")
+    private MetricSchema schema;
 
-    @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 = "metrics row values, first is the timestamp-ts", example = "[[29,32,44],[32,34,true]]")
+    private List<List<Object>> values;
 
-        @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
      */
@@ -75,9 +54,6 @@ public class DatasourceQueryData {
         @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;
     }
@@ -99,5 +75,8 @@ public class DatasourceQueryData {
 
         @Schema(title = "Field Unit: %, Mb, Kbps etc.")
         private String unit;
+
+        @Schema(title = "Whether is a label")
+        private Boolean label;
     }
 }

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

@@ -377,5 +377,10 @@ public class Metrics {
          * Metric unit
          */
         private String unit;
+
+        /**
+         * when parse type is xmlParse, use it, like NetPortStatusList/NetPortStatus[id='1']/workSpeed
+         */
+        private String xpath;
     }
 }

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/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/OnlineParser.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.collector.collect.prometheus.parser;
+package org.apache.hertzbeat.common.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,6 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.entity.dto.MetricFamily;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -37,11 +38,8 @@ 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 = '{';
-
+    private static final Map<Integer, Integer> escapeMap = new HashMap<>();
+    
     static {
         escapeMap.put((int) 'n', (int) '\n');
         escapeMap.put((int) 'b', (int) '\b');
@@ -53,30 +51,6 @@ public class OnlineParser {
         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() {
@@ -97,14 +71,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,7 +133,7 @@ public class OnlineParser {
             return this.i;
         }
 
-        private int getInt() {
+        private int getInt() throws FormatException {
             return this.i;
         }
 
@@ -179,9 +153,14 @@ public class OnlineParser {
         }
     }
 
+    private static CharChecker parseOneChar(InputStream inputStream) throws IOException, FormatException {
+        int i = getChar(inputStream);
+        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 == '.') {
+        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);
         }
@@ -220,10 +199,17 @@ public class OnlineParser {
             if (i == '\\') {
                 i = getChar(inputStream);
                 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 {
                 stringBuilder.append((char) i);
@@ -267,56 +253,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();
@@ -364,4 +333,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);
+        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;
+    }
+
 }

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-basic-e2e/pom.xml

@@ -31,8 +31,6 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mysql.version>8.0.30</mysql.version>
-        <postgresql.version>42.5.5</postgresql.version>
     </properties>
 
     <dependencies>
@@ -55,46 +53,10 @@
             <version>${hertzbeat.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <!-- Testcontainers Jupiter / JUnit 5 -->
         <dependency>
             <groupId>org.testcontainers</groupId>
-            <artifactId>junit-jupiter</artifactId>
+            <artifactId>testcontainers</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Testcontainers JDBC Support -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>jdbc</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- Testcontainers Database Modules -->
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>mysql</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>postgresql</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- JDBC Drivers -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>${postgresql.version}</version>
-            <scope>test</scope>
-            <optional>true</optional>
-        </dependency>
-
     </dependencies>
-</project>
+</project>

hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/database/DatabaseImagesEnum.java

@@ -1,72 +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.basic.database;
-
-/**
- * Database type (image mame) and image tag enumeration class
- */
-public enum DatabaseImagesEnum {
-    MYSQL("mysql", "8.0.36"),
-    POSTGRESQL("postgresql", "15");
-
-    private final String imageName;
-    private final String defaultTag;
-
-    DatabaseImagesEnum(String imageName, String defaultTag) {
-        this.imageName = imageName;
-        this.defaultTag = defaultTag;
-    }
-
-    public String getImageName() {
-        return imageName;
-    }
-
-    public String getDefaultTag() {
-        return defaultTag;
-    }
-
-    public String getFullImageName() {
-        return imageName + ":" + defaultTag;
-    }
-
-    public static DatabaseImagesEnum fromImageName(String imageName) {
-        for (DatabaseImagesEnum value : values()) {
-            if (value.getImageName().equalsIgnoreCase(imageName)) {
-                return value;
-            }
-        }
-        throw new IllegalArgumentException("Unknown database image name: " + imageName);
-    }
-
-    public static DatabaseImagesEnum fromFullImageName(String fullImageName) {
-        for (DatabaseImagesEnum value : values()) {
-            if (value.getFullImageName().equalsIgnoreCase(fullImageName)) {
-                return value;
-            }
-        }
-        throw new IllegalArgumentException("Unknown full database image name: " + fullImageName);
-    }
-
-    @Override
-    public String toString() {
-        return "DatabaseImagesEnum{"
-                + "imageName='" + imageName + '\''
-                + ", defaultTag='" + defaultTag + '\''
-                + '}';
-    }
-}

hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/database/JdbcCommonCollectE2eTest.java

@@ -1,99 +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.basic.database;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.AbstractCollectE2eTest;
-import org.apache.hertzbeat.collector.collect.database.JdbcCommonCollect;
-import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.entity.job.Configmap;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
-/**
- * E2e test monitored by Jdbc Common
- */
-@Slf4j
-@ExtendWith(MockitoExtension.class)
-public class JdbcCommonCollectE2eTest extends AbstractCollectE2eTest {
-    private static final DatabaseImagesEnum databaseImage = DatabaseImagesEnum.fromImageName("postgresql");
-
-    private static final String DATABASE_IMAGE_NAME = databaseImage.getImageName();
-
-    private static final String DATABASE_IMAGE_TAG = databaseImage.getDefaultTag();
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
-        collect = new JdbcCommonCollect();
-        metrics = new Metrics();
-    }
-
-    @Override
-    protected CollectRep.MetricsData.Builder collectMetrics(Metrics metricsDef) {
-        JdbcProtocol jdbcProtocol = (JdbcProtocol) buildProtocol(metricsDef);
-        metrics.setJdbc(jdbcProtocol);
-        CollectRep.MetricsData.Builder metricsData = CollectRep.MetricsData.newBuilder();
-        metricsData.setApp(DATABASE_IMAGE_NAME);
-        metrics.setAliasFields(metricsDef.getAliasFields());
-        return collectMetricsData(metrics, metricsDef, metricsData);
-    }
-
-    @Override
-    protected Protocol buildProtocol(Metrics metricsDef) {
-        JdbcProtocol jdbcProtocol = metricsDef.getJdbc();
-        jdbcProtocol.setHost(DATABASE_IMAGE_NAME);
-        jdbcProtocol.setPort(DATABASE_IMAGE_TAG);
-        jdbcProtocol.setDatabase("test");
-        jdbcProtocol.setPlatform("testcontainers");
-        return jdbcProtocol;
-    }
-
-    @Test
-    public void testWithJdbcTcUrl() {
-        Job dockerJob = appService.getAppDefine(DATABASE_IMAGE_NAME);
-        List<Map<String, Configmap>> configmapFromPreCollectData = new LinkedList<>();
-        for (Metrics metricsDef : dockerJob.getMetrics()) {
-            metricsDef = CollectUtil.replaceCryPlaceholderToMetrics(metricsDef, configmapFromPreCollectData.size() > 0 ? configmapFromPreCollectData.get(0) : new HashMap<>());
-            String metricName = metricsDef.getName();
-            if ("slow_sql".equals(metricName)) {
-                Metrics finalMetricsDef = metricsDef;
-                assertDoesNotThrow(() -> collectMetrics(finalMetricsDef),
-                        String.format("%s failed to collect metrics)", metricName));
-                log.info("{} metrics validation passed", metricName);
-                continue;  // skip slow_sql, extra extensions
-            }
-            CollectRep.MetricsData metricsData = validateMetricsCollection(metricsDef, metricName, true);
-            CollectUtil.getConfigmapFromPreCollectData(metricsData);
-        }
-    }
-}

hertzbeat-e2e/hertzbeat-collector-basic-e2e/src/test/java/org/apache/hertzbeat/collector/collect/basic/redis/RedisCommonCollectE2eTest.java

@@ -1,126 +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.basic.redis;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.AbstractCollectE2eTest;
-import org.apache.hertzbeat.collector.collect.redis.RedisCommonCollectImpl;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
-import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.Network;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.lifecycle.Startables;
-import org.testcontainers.utility.DockerImageName;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
-import java.util.stream.Stream;
-
-/**
- * End-to-end test class for redis collector
- */
-@Slf4j
-@ExtendWith(MockitoExtension.class)
-public class RedisCommonCollectE2eTest extends AbstractCollectE2eTest {
-    private static final String REDIS_IMAGE = "redis:7.4.2";
-    private static final String HOST = "127.0.0.1";
-    private static final int REDIS_PORT = 6379;
-    private static final String REDIS_PATTERN = "1";
-    private static final List<String> ALLOW_EMPTY_WHITE_LIST = Arrays.asList("server", "errorstats", "commandstats", "keyspace");
-
-    private static GenericContainer<?> redisContainer;
-
-    private Integer mappedPort;
-
-    @AfterAll
-    public static void tearDown() throws InterruptedException {
-        if (redisContainer != null) {
-            redisContainer.stop();
-        }
-    }
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
-        collect = new RedisCommonCollectImpl();
-
-        // Set up and start container
-        setupAndStartContainer();
-
-        mappedPort = redisContainer.getMappedPort(REDIS_PORT);
-        log.info("Container started successfully with mapped port: {}", mappedPort);
-    }
-
-    @Test
-    public void testRedisCollect() throws ExecutionException, InterruptedException, TimeoutException {
-        Assertions.assertTrue(redisContainer.isRunning(), "redis container should be running");
-
-        Job redisJob = appService.getAppDefine("redis");
-        redisJob.getMetrics().forEach(metricsDef -> {
-            if (ALLOW_EMPTY_WHITE_LIST.contains(metricsDef.getName())) {
-                validateMetricsCollection(metricsDef, metricsDef.getName(), true);
-            } else {
-                validateMetricsCollection(metricsDef, metricsDef.getName());
-            }
-        });
-    }
-
-    @Override
-    protected CollectRep.MetricsData.Builder collectMetrics(Metrics metricsDef) {
-        //Build redis protocol configuration
-        RedisProtocol redisProtocol = (RedisProtocol) buildProtocol(metricsDef);
-        metrics.setRedis(redisProtocol);
-        metrics.setName(metricsDef.getName());
-        metrics.setFields(metricsDef.getFields());
-        return collectMetricsData(metrics, metricsDef);
-    }
-
-    @Override
-    protected Protocol buildProtocol(Metrics metricsDef) {
-        RedisProtocol redisProtocol = new RedisProtocol();
-        redisProtocol.setHost(HOST);
-        redisProtocol.setPort(mappedPort.toString());
-        redisProtocol.setPattern(REDIS_PATTERN);
-        return redisProtocol;
-    }
-
-    public void setupAndStartContainer() {
-        Network network = Network.builder().build();
-        redisContainer = new GenericContainer<>(DockerImageName.parse(REDIS_IMAGE))
-                .withExposedPorts(REDIS_PORT)
-                .withNetwork(network)
-                .withNetworkAliases("redis")
-                .waitingFor(Wait.forListeningPort())
-                .withStartupTimeout(Duration.ofSeconds(30));
-
-        Startables.deepStart(Stream.of(redisContainer)).join();
-    }
-}

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

@@ -27,7 +27,6 @@ import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.manager.dao.DefineDao;
 import org.apache.hertzbeat.manager.service.impl.AppServiceImpl;
 import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl;
 import org.junit.jupiter.api.Assertions;
@@ -35,7 +34,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -65,13 +63,10 @@ public abstract class AbstractCollectE2eTest {
     private Timeout timeout;
     @Mock
     private Job job;
-    @Mock
-    private DefineDao defineDao;
 
     public void setUp() throws Exception {
         // Initialize mocks
         MockitoAnnotations.openMocks(this);
-        when(defineDao.findAll()).thenReturn(new ArrayList<>());
         when(timeout.task()).thenReturn(timerJob);
         when(timerJob.getJob()).thenReturn(job);
         metricsCollect = new MetricsCollect(mock(Metrics.class), timeout, mock(CollectDataDispatch.class), null, List.of());
@@ -83,7 +78,6 @@ public abstract class AbstractCollectE2eTest {
 
     /**
      * Validate metrics collection, check if the metrics values are not empty <br/>
-     *
      * @param metricsDef metrics definition
      * @param metricName metric name
      * @return metrics data

hertzbeat-e2e/pom.xml

@@ -74,17 +74,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>${testcontainers.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-  
-</project>
+</project>

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 {
-}

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

@@ -1,117 +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 static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
-import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.logs.SdkLoggerProvider;
-import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
-import io.opentelemetry.sdk.resources.Resource;
-
-import jakarta.annotation.PostConstruct;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * OpenTelemetryConfig is responsible for initializing OpenTelemetry with the specified service name and GrepTimeDB endpoint.
- * It ensures that the initialization is done in a thread-safe manner and includes authentication for GrepTimeDB.
- */
-@Configuration
-@Slf4j
-public class OpenTelemetryConfig {
-
-    @Autowired
-    private GreptimeProperties greptimeProperties;
-
-    /**
-     * Initializes OpenTelemetry with the given service name and GrepTimeDB endpoint.
-     * Includes authentication if configured in GreptimeProperties.
-     */
-    @PostConstruct
-    public void initializeOpenTelemetry() {
-        if (greptimeProperties == null || !greptimeProperties.enabled()) {
-            log.info("GrepTimeDB logging is disabled, skipping OpenTelemetry configuration.");
-            return;
-        }
-
-        try {
-            Resource resource = Resource.getDefault()
-                    .merge(Resource.builder()
-                            .put(SERVICE_NAME, "HertzBeat")
-                            .build());
-
-            Map<String, String> headers = new HashMap<>();
-
-            headers.put("X-Greptime-DB-Name", "public");
-            headers.put("X-Greptime-Log-Table-Name", "hzb_log");
-
-            addAuthenticationHeaders(headers);
-
-            OtlpHttpLogRecordExporter logExporter = OtlpHttpLogRecordExporter.builder()
-                    .setEndpoint(greptimeProperties.httpEndpoint() + "/v1/otlp/v1/logs")
-                    .setHeaders(()-> headers)
-                    .setTimeout(10, TimeUnit.SECONDS)
-                    .build();
-
-            SdkLoggerProvider loggerProvider = SdkLoggerProvider.builder()
-                    .setResource(resource)
-                    .addLogRecordProcessor(
-                            BatchLogRecordProcessor.builder(logExporter)
-                                    .setScheduleDelay(1000, TimeUnit.MILLISECONDS)
-                                    .setMaxExportBatchSize(512)
-                                    .build())
-                    .build();
-
-            OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
-                    .setLoggerProvider(loggerProvider)
-                    .build();
-
-            OpenTelemetryAppender.install(openTelemetry);
-            log.info("OpenTelemetry successfully configured with GrepTimeDB exporter.");
-        } catch (Exception e) {
-            log.error("Failed to initialize OpenTelemetry with GrepTimeDB", e);
-        }
-    }
-
-    /**
-     * Adds authentication headers to the provided map if username and password are configured.
-     *
-     * @param headers the map to which authentication headers will be added
-     */
-    private void addAuthenticationHeaders(Map<String, String> headers) {
-        if (StringUtils.isNotBlank(greptimeProperties.username())
-                && StringUtils.isNotBlank(greptimeProperties.password())) {
-            String credentials = greptimeProperties.username() + ":" + greptimeProperties.password();
-            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
-            headers.put("Authorization", "Basic " + encodedCredentials);
-        }
-
-    }
-}

hertzbeat-log/src/main/resources/META-INF/spring.factories

@@ -1,17 +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.
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.hertzbeat.log.config.LogAutoConfiguration

hertzbeat-manager/pom.xml

@@ -89,11 +89,6 @@
             <groupId>org.apache.hertzbeat</groupId>
             <artifactId>hertzbeat-grafana</artifactId>
         </dependency>
-        <!-- log -->
-        <dependency>
-            <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-log</artifactId>
-        </dependency>
         <!-- spring -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/controller/TagController.java

@@ -20,13 +20,12 @@ package org.apache.hertzbeat.manager.controller;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.HashSet;
 import java.util.List;
 import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.common.entity.manager.Label;
-import org.apache.hertzbeat.manager.service.LabelService;
+import org.apache.hertzbeat.common.entity.manager.Tag;
+import org.apache.hertzbeat.manager.service.TagService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
@@ -40,48 +39,48 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Label management API
+ * Tags management API
  */
-@Tag(name = "Label Manage API")
+@io.swagger.v3.oas.annotations.tags.Tag(name = "Tag Manage API")
 @RestController
-@RequestMapping(path = "/api/label", produces = {APPLICATION_JSON_VALUE})
-public class LabelController {
-    
+@RequestMapping(path = "/api/tag", produces = {APPLICATION_JSON_VALUE})
+public class TagController {
     @Autowired
-    private LabelService labelService;
+    private TagService tagService;
 
     @PostMapping
-    @Operation(summary = "Add Label", description = "Add Label")
-    public ResponseEntity<Message<Void>> addNewLabels(@Valid @RequestBody Label label) {
-        labelService.addLabel(label);
+    @Operation(summary = "Add Tag", description = "Add Tag")
+    public ResponseEntity<Message<Void>> addNewTags(@Valid @RequestBody List<Tag> tags) {
+        tagService.addTags(tags);
         return ResponseEntity.ok(Message.success("Add success"));
     }
 
     @PutMapping
-    @Operation(summary = "Modify an existing Label", description = "Modify an existing Label")
-    public ResponseEntity<Message<Void>> modifyLabel(@Valid @RequestBody Label label) {
-        if (label.getId() == null) {
+    @Operation(summary = "Modify an existing tag", description = "Modify an existing tag")
+    public ResponseEntity<Message<Void>> modifyMonitor(@Valid @RequestBody Tag tag) {
+        // Verify request data
+        if (tag.getId() == null) {
             throw new IllegalArgumentException("ID cannot be null.");
         }
-        labelService.modifyLabel(label);
+        tagService.modifyTag(tag);
         return ResponseEntity.ok(Message.success("Modify success"));
     }
 
     @GetMapping()
-    @Operation(summary = "Get labels information", description = "Obtain label information based on conditions")
-    public ResponseEntity<Message<Page<Label>>> getLabels(
-            @Parameter(description = "Label content search", example = "status") @RequestParam(required = false) String search,
-            @Parameter(description = "Label type", example = "0") @RequestParam(required = false) Byte type,
+    @Operation(summary = "Get tags information", description = "Obtain label information based on conditions")
+    public ResponseEntity<Message<Page<Tag>>> getTags(
+            @Parameter(description = "Tag content search", example = "status") @RequestParam(required = false) String search,
+            @Parameter(description = "Tag type", example = "0") @RequestParam(required = false) Byte type,
             @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
             @Parameter(description = "Number of list pagination", example = "8") @RequestParam(defaultValue = "8") int pageSize) {
-        return ResponseEntity.ok(Message.success(labelService.getLabels(search, type, pageIndex, pageSize)));
+        return ResponseEntity.ok(Message.success(tagService.getTags(search, type, pageIndex, pageSize)));
     }
 
     @DeleteMapping()
-    @Operation(summary = "Delete Label based on ID", description = "Delete Label based on ID")
-    public ResponseEntity<Message<Void>> deleteLabels(
-            @Parameter(description = "Label id ", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
-        labelService.deleteLabels(new HashSet<>(ids));
+    @Operation(summary = "Delete tags based on ID", description = "Delete tags based on ID")
+    public ResponseEntity<Message<Void>> deleteTags(
+            @Parameter(description = "TAG IDs ", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
+        tagService.deleteTags(new HashSet<>(ids));
         return ResponseEntity.ok(Message.success("Delete success"));
     }
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/dao/CollectorDao.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.manager.dao;
 
-import java.util.List;
 import java.util.Optional;
 import org.apache.hertzbeat.common.entity.manager.Collector;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -35,14 +34,7 @@ public interface CollectorDao extends JpaRepository<Collector, Long>, JpaSpecifi
      * @return collector
      */
     Optional<Collector> findCollectorByName(String name);
-
-    /**
-     * find collectors by names
-     * @param names collector name list
-     * @return collector list
-     */
-    List<Collector> findCollectorsByNameIn(List<String> names);
-
+    
     /**
      * delete collector by name
      * @param collector collector name

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/dao/TagDao.java

@@ -17,29 +17,37 @@
 
 package org.apache.hertzbeat.manager.dao;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import org.apache.hertzbeat.common.entity.manager.Label;
+import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
 /**
- * Label repository
+ * tag repository
  */
-public interface LabelDao extends JpaRepository<Label, Long>, JpaSpecificationExecutor<Label> {
+public interface TagDao extends JpaRepository<Tag, Long>, JpaSpecificationExecutor<Tag> {
 
     /**
-     * delete Label by Label id
+     * delete tags by tag id
      * @param ids id list
      */
-    void deleteLabelsByIdIn(Set<Long> ids);
+    void deleteTagsByIdIn(Set<Long> ids);
+
+    /**
+     * find tags by tag id
+     * @param ids id list
+     * @return tag list
+     */
+    List<Tag> findByIdIn(Set<Long> ids);
     
     /**
-     * find Label by name and value
-     * @param name Label name
-     * @param value Label value
-     * @return Label
+     * find tag by name and value
+     * @param name tag name
+     * @param value tag value
+     * @return tag
      */
-    Optional<Label> findLabelByNameAndTagValue(String name, String value);
+    Optional<Tag> findTagByNameAndTagValue(String name, String value);
     
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java

@@ -427,7 +427,6 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
         if (jobId == null) {
             return;
         }
-        jobContentCache.remove(jobId);
         for (ConsistentHash.Node node : consistentHash.getAllNodes().values()) {
             AssignJobs assignJobs = node.getAssignJobs();
             if (assignJobs.getPinnedJobs().remove(jobId)

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/ManageServer.java

@@ -24,7 +24,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.calculate.CollectorAlertHandler;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.CommonThreadPool;
 import org.apache.hertzbeat.manager.scheduler.CollectorJobScheduler;
@@ -57,8 +56,6 @@ public class ManageServer implements CommandLineRunner {
 
     private final CollectorJobScheduler collectorJobScheduler;
 
-    private final CollectorAlertHandler collectorAlertHandler;
-
     private ScheduledExecutorService channelSchedule;
 
     private RemotingServer remotingServer;
@@ -67,11 +64,9 @@ public class ManageServer implements CommandLineRunner {
 
     public ManageServer(final SchedulerProperties schedulerProperties,
                         final CollectorJobScheduler collectorJobScheduler,
-                        final CommonThreadPool threadPool,
-                        final CollectorAlertHandler collectorAlertHandler) {
+                        final CommonThreadPool threadPool) {
         this.collectorJobScheduler = collectorJobScheduler;
         this.collectorJobScheduler.setManageServer(this);
-        this.collectorAlertHandler = collectorAlertHandler;
         this.init(schedulerProperties, threadPool);
     }
 
@@ -103,7 +98,6 @@ public class ManageServer implements CommandLineRunner {
                         channel.closeFuture();
                         this.clientChannelTable.remove(collector);
                         this.collectorJobScheduler.collectorGoOffline(collector);
-                        this.collectorAlertHandler.offline(collector);
                     }
                 });   
             } catch (Exception e) {
@@ -137,7 +131,6 @@ public class ManageServer implements CommandLineRunner {
             preChannel.close();
         }
         this.clientChannelTable.put(identity, channel);
-        this.collectorAlertHandler.online(identity);
     }
 
     public void closeChannel(final String identity) {

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/TagService.java

@@ -18,39 +18,40 @@
 package org.apache.hertzbeat.manager.service;
 
 import java.util.HashSet;
-import org.apache.hertzbeat.common.entity.manager.Label;
+import java.util.List;
+import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.springframework.data.domain.Page;
 
 /**
- * Label service
+ * tag service
  */
-public interface LabelService {
+public interface TagService {
 
     /**
-     * new Label
-     * @param label label
+     * new tags
+     * @param tags tag
      */
-    void addLabel(Label label);
+    void addTags(List<Tag> tags);
 
     /**
-     * update label
-     * @param label label
+     * update tag
+     * @param tag Tag
      */
-    void modifyLabel(Label label);
+    void modifyTag(Tag tag);
 
     /**
-     * get label page list
-     * @param search        label content search
-     * @param type          label type
+     * get tag page list
+     * @param search        Tag content search
+     * @param type          Tag type
      * @param pageIndex     List current page
      * @param pageSize      Number of list pagination
-     * @return label
+     * @return Tags
      */
-    Page<Label> getLabels(String search, Byte type, int pageIndex, int pageSize);
+    Page<Tag> getTags(String search, Byte type, int pageIndex, int pageSize);
 
     /**
-     * delete labels
-     * @param ids label id list
+     * delete tags
+     * @param ids tag id list
      */
-    void deleteLabels(HashSet<Long> ids);
+    void deleteTags(HashSet<Long> ids);
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java

@@ -31,7 +31,7 @@ import org.apache.hertzbeat.manager.config.ManagerSseManager;
 import org.apache.hertzbeat.manager.pojo.dto.MonitorDto;
 import org.apache.hertzbeat.manager.service.ImExportService;
 import org.apache.hertzbeat.manager.service.MonitorService;
-import org.apache.hertzbeat.manager.service.LabelService;
+import org.apache.hertzbeat.manager.service.TagService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.util.CollectionUtils;
@@ -55,7 +55,7 @@ public abstract class AbstractImExportServiceImpl implements ImExportService {
     private MonitorService monitorService;
 
     @Resource
-    private LabelService tagService;
+    private TagService tagService;
 
     @Resource
     private ManagerSseManager managerSseManager;

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java

@@ -518,7 +518,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
      */
     private void refreshStore(ObjectStoreDTO<?> objectStoreConfig) {
         if (objectStoreConfig == null) {
-            appDefineStore = new DatabaseAppDefineStoreImpl();
+            appDefineStore = new LocalFileAppDefineStoreImpl();
         } else {
             if (objectStoreConfig.getType() == ObjectStoreDTO.Type.OBS) {
                 appDefineStore = new ObjectStoreAppDefineStoreImpl();

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/CollectorServiceImpl.java

@@ -61,7 +61,7 @@ public class CollectorServiceImpl implements CollectorService {
     
     @Autowired(required = false)
     private ManageServer manageServer;
-
+    
     @Override
     @Transactional(readOnly = true)
     public Page<CollectorSummary> getCollectors(String name, int pageIndex, Integer pageSize) {

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java

@@ -65,7 +65,7 @@ import org.apache.hertzbeat.manager.scheduler.CollectJobScheduling;
 import org.apache.hertzbeat.manager.service.AppService;
 import org.apache.hertzbeat.manager.service.ImExportService;
 import org.apache.hertzbeat.manager.service.MonitorService;
-import org.apache.hertzbeat.manager.service.LabelService;
+import org.apache.hertzbeat.manager.service.TagService;
 import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException;
 import org.apache.hertzbeat.manager.support.exception.MonitorDetectException;
 import org.apache.hertzbeat.warehouse.service.WarehouseService;
@@ -116,7 +116,7 @@ public class MonitorServiceImpl implements MonitorService {
     @Autowired
     private AppService appService;
     @Autowired
-    private LabelService tagService;
+    private TagService tagService;
     @Autowired
     private CollectJobScheduling collectJobScheduling;
     @Autowired

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TagServiceImpl.java

@@ -23,12 +23,13 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.common.entity.manager.Label;
-import org.apache.hertzbeat.manager.dao.LabelDao;
-import org.apache.hertzbeat.manager.service.LabelService;
+import org.apache.hertzbeat.common.entity.manager.Tag;
+import org.apache.hertzbeat.manager.dao.TagDao;
+import org.apache.hertzbeat.manager.service.TagService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -37,47 +38,50 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Label service implementation.
+ * Tag service implementation.
  */
 @Service
 @Transactional(rollbackFor = Exception.class)
 @Slf4j
-public class LabelServiceImpl implements LabelService {
+public class TagServiceImpl implements TagService {
 
     @Autowired
-    private LabelDao labelDao;
+    private TagDao tagDao;
 
     @Override
-    public void addLabel(Label label) {
+    public void addTags(List<Tag> tags) {
         // Verify request data
-        Optional<Label> optional = labelDao.findLabelByNameAndTagValue(label.getName(), label.getTagValue());
-        if (optional.isPresent()) {
-            throw new IllegalArgumentException("The label already exists.");
-        }
-        label.setType((byte) 1);
-        label.setId(null);
-        labelDao.save(label);
-    }
-
-    @Override
-    public void modifyLabel(Label label) {
-        Optional<Label> optional = labelDao.findById(label.getId());
-        if (optional.isPresent()) {
-            
-            Optional<Label> existOptional = labelDao.findLabelByNameAndTagValue(label.getName(), label.getTagValue());
-            if (existOptional.isPresent() && !existOptional.get().getId().equals(label.getId())) {
-                throw new IllegalArgumentException("The label with same key and value already exists.");
+        tags = tags.stream().peek(tag -> {
+            Optional<Tag> tagOptional = tagDao.findTagByNameAndTagValue(tag.getName(), tag.getTagValue());
+            if (tagOptional.isPresent()) {
+                throw new IllegalArgumentException("The tag already exists.");
             }
-            label.setTagValue(StringUtils.isEmpty(label.getTagValue()) ? null : label.getTagValue());
-            labelDao.save(label);
+            tag.setType((byte) 1);
+            tag.setId(null);
+        }).distinct().collect(Collectors.toList());
+        tagDao.saveAll(tags);
+    }
+
+    @Override
+    public void modifyTag(Tag tag) {
+        Optional<Tag> tagOptional = tagDao.findById(tag.getId());
+        if (tagOptional.isPresent()) {
+            
+            Optional<Tag> tagExistOptional = tagDao.findTagByNameAndTagValue(tag.getName(), tag.getTagValue());
+            if (tagExistOptional.isPresent() && !tagExistOptional.get().getId().equals(tag.getId())) {
+                throw new IllegalArgumentException("The tag with same key and value already exists.");
+            }
+            tag.setTagValue(StringUtils.isEmpty(tag.getTagValue()) ? null : tag.getTagValue());
+            tagDao.save(tag);
         } else {
-            throw new IllegalArgumentException("The label is not existed");
+            throw new IllegalArgumentException("The tag is not existed");
         }
     }
 
     @Override
-    public Page<Label> getLabels(String search, Byte type, int pageIndex, int pageSize) {
-        Specification<Label> specification = (root, query, criteriaBuilder) -> {
+    public Page<Tag> getTags(String search, Byte type, int pageIndex, int pageSize) {
+        // Get tag information
+        Specification<Tag> specification = (root, query, criteriaBuilder) -> {
             List<Predicate> andList = new ArrayList<>();
             if (type != null) {
                 Predicate predicateApp = criteriaBuilder.equal(root.get("type"), type);
@@ -107,14 +111,14 @@ public class LabelServiceImpl implements LabelService {
             }
         };
         PageRequest pageRequest = PageRequest.of(pageIndex, pageSize);
-        return labelDao.findAll(specification, pageRequest);
+        return tagDao.findAll(specification, pageRequest);
     }
 
     @Override
-    public void deleteLabels(HashSet<Long> ids) {
+    public void deleteTags(HashSet<Long> ids) {
         if (CollectionUtils.isEmpty(ids)){
             return;
         }
-        labelDao.deleteLabelsByIdIn(ids);
+        tagDao.deleteTagsByIdIn(ids);
     }
 }

hertzbeat-manager/src/main/resources/define/app-dahua.yml

@@ -1,247 +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.
-
-# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
-category: server
-# The monitoring type eg: linux windows tomcat mysql aws...
-app: dahua
-# The monitoring i18n name
-name:
-  zh-CN: 大华
-  en-US: Dahua
-# The description and help of this monitoring type
-help:
-  zh-CN: 通过http接口监控大华设备状态，获取设备健康数据。
-  en-US: Monitor Dahua devices through http interface to collect health data.
-
-# Input params define for monitoring(render web ui by the definition)
-params:
-  - field: host
-    name:
-      zh-CN: 主机Host
-      en-US: Host
-    type: host
-    required: true
-  - field: port
-    name:
-      zh-CN: 端口
-      en-US: Port
-    type: number
-    range: '[0,65535]'
-    required: true
-    defaultValue: 80
-  - field: timeout
-    name:
-      zh-CN: 超时时间(ms)
-      en-US: Timeout(ms)
-    type: number
-    range: '[1000,60000]'
-    required: true
-    defaultValue: 5000
-  - field: username
-    name:
-      zh-CN: 用户名
-      en-US: Username
-    type: text
-    required: true
-  - field: password
-    name:
-      zh-CN: 密码
-      en-US: Password
-    type: password
-    required: true
-  - field: ssl
-    name:
-      zh-CN: 启用HTTPS
-      en-US: SSL
-    type: boolean
-    required: false
-    defaultValue: false
-
-# collect metrics config list
-metrics:
-  - name: network_info # 指标集合名称
-    i18n:
-      zh-CN: 网络信息
-      en-US: Network Info
-    priority: 0
-    protocol: http
-    http:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      ssl: ^_^ssl^_^
-      url: /cgi-bin/configManager.cgi?action=getConfig&name=Network
-      method: GET
-      timeout: ^_^timeout^_^
-      authorization:
-        type: Digest Auth
-        digestAuthUsername: ^_^username^_^
-        digestAuthPassword: ^_^password^_^
-      parseType: config
-    fields:
-      - field: default_interface
-        type: 1
-        i18n:
-          zh-CN: 默认网卡
-          en-US: Default Interface
-      - field: domain_name
-        type: 1
-        i18n:
-          zh-CN: 域名
-          en-US: Domain Name
-      - field: hostname
-        type: 1
-        i18n:
-          zh-CN: 主机名
-          en-US: Hostname
-      - field: eth0_ip_address
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 IP地址
-          en-US: Interface eth0 IP Address
-      - field: eth0_gateway
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 默认网关
-          en-US: Interface eth0 Default Gateway
-      - field: eth0_mac_address
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 物理地址
-          en-US: Interface eth0 Physical Address
-      - field: eth0_subnet_mask
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 子网掩码
-          en-US: Interface eth0 Subnet Mask
-      - field: eth0_mtu
-        type: 0
-        i18n:
-          zh-CN: 网卡 eth0 MTU
-          en-US: Interface eth0 MTU
-      - field: eth0_dns1
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 DNS服务器1
-          en-US: Interface eth0 DNS Server 1
-      - field: eth0_dns2
-        type: 1
-        i18n:
-          zh-CN: 网卡 eth0 DNS服务器2
-          en-US: Interface eth0 DNS Server 2
-    aliasFields:
-      - table.Network.DefaultInterface
-      - table.Network.Domain
-      - table.Network.Hostname
-      - table.Network.eth0.IPAddress
-      - table.Network.eth0.DefaultGateway
-      - table.Network.eth0.PhysicalAddress
-      - table.Network.eth0.SubnetMask
-      - table.Network.eth0.MTU
-      - table.Network.eth0.DnsServers[0]
-      - table.Network.eth0.DnsServers[1]
-    calculates:
-      - default_interface=table.Network.DefaultInterface
-      - domain_name=table.Network.Domain
-      - hostname=table.Network.Hostname
-      - eth0_ip_address=table.Network.eth0.IPAddress
-      - eth0_gateway=table.Network.eth0.DefaultGateway
-      - eth0_mac_address=table.Network.eth0.PhysicalAddress
-      - eth0_subnet_mask=table.Network.eth0.SubnetMask
-      - eth0_mtu=table.Network.eth0.MTU
-      - eth0_dns1=table.Network.eth0.DnsServers[0]
-      - eth0_dns2=table.Network.eth0.DnsServers[1]
-  - name: user_info
-    i18n:
-      zh-CN: 用户信息
-      en-US: User Info
-    priority: 0
-    protocol: http
-    http:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      ssl: ^_^ssl^_^
-      url: /cgi-bin/userManager.cgi?action=getActiveUserInfoAll
-      method: GET
-      timeout: ^_^timeout^_^
-      authorization:
-        type: Digest Auth
-        digestAuthUsername: ^_^username^_^
-        digestAuthPassword: ^_^password^_^
-      parseType: config
-      parseScript: users
-    fields:
-      - field: ClientAddress
-        type: 1
-        i18n:
-          zh-CN: 客户端地址
-          en-US: ClientAddress
-      - field: Name
-        type: 1
-        i18n:
-          zh-CN: 客户端用户
-          en-US: Name
-      - field: ClientType
-        type: 1
-        i18n:
-          zh-CN: 客户端登录类型
-          en-US: ClientType
-      - field: LoginTime
-        type: 1
-        i18n:
-          zh-CN: 客户端登录时间
-          en-US: LoginTime
-  - name: ntp_info
-    i18n:
-      zh-CN: 校时信息
-      en-US: Ntp Info
-    priority: 0
-    protocol: http
-    http:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      ssl: ^_^ssl^_^
-      url: /cgi-bin/configManager.cgi?action=getConfig&name=NTP
-      method: GET
-      timeout: ^_^timeout^_^
-      authorization:
-        type: Digest Auth
-        digestAuthUsername: ^_^username^_^
-        digestAuthPassword: ^_^password^_^
-      parseType: config
-    fields:
-      - field: ntp_address
-        type: 1
-        i18n:
-          zh-CN: 校时服务器
-          en-US: Ntp Address
-      - field: ntp_port
-        type: 1
-        i18n:
-          zh-CN: 校时端口
-          en-US: Ntp Port
-      - field: ntp_update_period
-        type: 1
-        i18n:
-          zh-CN: 校时间隔
-          en-US: Ntp Update Period
-    aliasFields:
-      - table.NTP.Address
-      - table.NTP.Port
-      - table.NTP.UpdatePeriod
-    calculates:
-      - ntp_address=table.NTP.Address
-      - ntp_port=table.NTP.Port
-      - ntp_update_period=table.NTP.UpdatePeriod

hertzbeat-manager/src/main/resources/define/app-hikvision_isapi.yml

@@ -90,38 +90,39 @@ metrics:
         digestAuthUsername: ^_^username^_^
         digestAuthPassword: ^_^password^_^
       parseType: xmlPath
-      parseScript: //DeviceInfo
+      parseScript: 'DeviceInfo'
     fields:
       - field: deviceName
         type: 1
         i18n:
           zh-CN: 设备名称
           en-US: Device Name
+        xpath: deviceName
       - field: deviceID
         type: 1
         i18n:
           zh-CN: 设备ID
           en-US: Device ID
+        xpath: deviceID
       - field: firmwareVersion
         type: 1
         i18n:
           zh-CN: 固件版本
           en-US: Firmware Version
+        xpath: firmwareVersion
       - field: model
         type: 1
         i18n:
           zh-CN: 设备型号
           en-US: Device Model
+        xpath: model
       - field: macAddress
         type: 1
         i18n:
           zh-CN: mac地址
           en-US: Mac Address
+        xpath: macAddress
   - name: status
-    i18n:
-      zh-CN: 设备状态
-      en-US: Status
-    priority: 0
     protocol: http
     http:
       host: ^_^host^_^
@@ -135,134 +136,115 @@ metrics:
         digestAuthUsername: ^_^username^_^
         digestAuthPassword: ^_^password^_^
       parseType: xmlPath
-      parseScript: //DeviceStatus
+      parseScript: 'DeviceStatus'
     fields:
-      - field: CPU_utilization
+      - field: cpuUtilization
         i18n:
           zh-CN: CPU 利用率
           en-US: CPU Utilization
         type: 0
         unit: '%'
-      - field: memory_usage
+        xpath: CPUList/CPU/cpuUtilization
+      - field: memoryUsage
         i18n:
           zh-CN: 内存使用量
           en-US: Memory Usage
         type: 0
         unit: MB
-      - field: memory_available
+        xpath: MemoryList/Memory/memoryUsage
+      - field: memoryAvailable
         i18n:
           zh-CN: 可用内存
           en-US: Memory Available
         type: 0
         unit: MB
-      - field: cache_size
+        xpath: MemoryList/Memory/memoryAvailable
+      - field: cacheSize
         i18n:
           zh-CN: 缓存大小
           en-US: Cache Size
         type: 0
         unit: MB
-      - field: net_port_1_speed
+        xpath: MemoryList/Memory/cacheSize
+      - field: netPort1Speed
         i18n:
           zh-CN: 网口1速度
           en-US: Net Port 1 Speed
         type: 0
         unit: Mbps
-      - field: net_port_2_speed
+        xpath: NetPortStatusList/NetPortStatus[id='1']/workSpeed
+      - field: netPort2Speed
         i18n:
           zh-CN: 网口2速度
           en-US: Net Port 2 Speed
         type: 0
         unit: Mbps
-      - field: boot_time
+        xpath: NetPortStatusList/NetPortStatus[id='2']/workSpeed
+      - field: bootTime
         i18n:
           zh-CN: 启动时间
           en-US: Boot Time
         type: 1
-      - field: device_uptime
+        xpath: bootTime
+      - field: deviceUpTime
         i18n:
           zh-CN: 运行时长
           en-US: Device Uptime
         type: 1
-      - field: last_calibration_time
+        xpath: deviceUpTime
+      - field: lastCalibrationTime
         i18n:
           zh-CN: 上次校时时间
           en-US: Last Calibration Time
         type: 1
-      - field: last_calibration_time_diff
+        xpath: lastCalibrationTime
+      - field: lastCalibrationTimeDiff
         i18n:
           zh-CN: 上次校时时间差
           en-US: Last Calibration Time Diff
         type: 0
         unit: s
-      - field: avg_upload_time
+        xpath: lastCalibrationTimeDiff
+      - field: avgUploadTime
         i18n:
           zh-CN: 平均上传耗时
           en-US: Avg Upload Time
         type: 0
         unit: ms
-      - field: max_upload_time
+        xpath: uploadTimeConsumingList/avgTime
+      - field: maxUploadTime
         i18n:
           zh-CN: 最大上传耗时
           en-US: Max Upload Time
         type: 0
         unit: ms
-      - field: min_upload_time
+        xpath: uploadTimeConsumingList/maxTime
+      - field: minUploadTime
         i18n:
           zh-CN: 最小上传耗时
           en-US: Min Upload Time
         type: 0
         unit: ms
-      - field: last_calibration_mode
+        xpath: uploadTimeConsumingList/minTime
+      - field: lastCalibrationMode
         i18n:
           zh-CN: 上次校时模式
           en-US: Last Calibration Mode
         type: 1
-      - field: last_calibration_address
+        xpath: lastCalibrationTimeMode
+      - field: lastCalibrationAddress
         i18n:
           zh-CN: 上次校时地址
           en-US: Last Calibration Address
         type: 1
-      - field: response_time
+        xpath: lastCalibrationTimeAddress
+      - field: responseTime
         i18n:
           zh-CN: 响应时间
           en-US: Response Time
         type: 0
         unit: ms
-    aliasFields:
-      - CPUList/CPU/cpuUtilization
-      - MemoryList/Memory/memoryUsage
-      - MemoryList/Memory/memoryAvailable
-      - MemoryList/Memory/cacheSize
-      - NetPortStatusList/NetPortStatus[id='1']/workSpeed
-      - NetPortStatusList/NetPortStatus[id='2']/workSpeed
-      - bootTime
-      - deviceUpTime
-      - lastCalibrationTime
-      - lastCalibrationTimeDiff
-      - uploadTimeConsumingList/avgTime
-      - uploadTimeConsumingList/maxTime
-      - uploadTimeConsumingList/minTime
-      - lastCalibrationTimeMode
-      - lastCalibrationTimeAddress
-      - responseTime
-    calculates:
-      - CPU_utilization=CPUList/CPU/cpuUtilization
-      - memory_usage=MemoryList/Memory/memoryUsage
-      - memory_available=MemoryList/Memory/memoryAvailable
-      - cache_size=MemoryList/Memory/cacheSize
-      - net_port_1_speed=NetPortStatusList/NetPortStatus[id='1']/workSpeed
-      - net_port_2_speed=NetPortStatusList/NetPortStatus[id='2']/workSpeed
-      - boot_time=bootTime
-      - device_uptime=deviceUpTime
-      - last_calibration_time=lastCalibrationTime
-      - last_calibration_time_diff=lastCalibrationTimeDiff
-      - avg_upload_time=uploadTimeConsumingList/avgTime
-      - max_upload_time=uploadTimeConsumingList/maxTime
-      - min_upload_time=uploadTimeConsumingList/minTime
-      - last_calibration_mode=lastCalibrationTimeMode
-      - last_calibration_address=lastCalibrationTimeAddress
-      - response_time=responseTime
     units:
-      - memory_usage=KB->MB
-      - memory_available=KB->MB
-      - cache_size=KB->MB
+      - memoryUsage=KB->MB
+      - memoryAvailable=KB->MB
+      - cacheSize=KB->MB

hertzbeat-manager/src/main/resources/define/app-uniview.yml

@@ -1,154 +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.
-
-# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
-category: server
-# The monitoring type eg: linux windows tomcat mysql aws...
-app: uniview
-# The monitoring i18n name
-name:
-  zh-CN: 宇视
-  en-US: Uniview
-# The description and help of this monitoring type
-help:
-  zh-CN: 通过HTTP接口监控宇视设备状态，获取设备健康数据。
-  en-US: Monitor Uniview devices through HTTP interface to collect health data.
-
-# Input params define for monitoring(render web ui by the definition)
-params:
-  - field: host
-    name:
-      zh-CN: 主机Host
-      en-US: Host
-    type: host
-    required: true
-  - field: port
-    name:
-      zh-CN: 端口
-      en-US: Port
-    type: number
-    range: '[0,65535]'
-    required: true
-    defaultValue: 80
-  - field: timeout
-    name:
-      zh-CN: 超时时间(ms)
-      en-US: Timeout(ms)
-    type: number
-    range: '[1000,60000]'
-    required: true
-    defaultValue: 5000
-  - field: username
-    name:
-      zh-CN: 用户名
-      en-US: Username
-    type: text
-    required: true
-  - field: password
-    name:
-      zh-CN: 密码
-      en-US: Password
-    type: password
-    required: true
-  - field: ssl
-    name:
-      zh-CN: 启用HTTPS
-      en-US: SSL
-    type: boolean
-    required: false
-    defaultValue: false
-
-# collect metrics config list
-metrics:
-  - name: system_info
-    i18n:
-      zh-CN: 系统信息
-      en-US: System Info
-    priority: 0
-    protocol: http
-    http:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      ssl: ^_^ssl^_^
-      url: /LAPI/V1.0/System/DeviceInfo
-      method: GET
-      timeout: ^_^timeout^_^
-      authorization:
-        type: Digest Auth
-        digestAuthUsername: ^_^username^_^
-        digestAuthPassword: ^_^password^_^
-      parseType: jsonPath
-      parseScript: '$.Response.Data'
-    fields:
-      - field: DeviceName
-        type: 1
-        i18n:
-          zh-CN: 设备名称
-          en-US: Device Name
-      - field: SerialNumber
-        type: 1
-        i18n:
-          zh-CN: 序列号
-          en-US: SerialNumber
-      - field: FirmwareVersion
-        type: 1
-        i18n:
-          zh-CN: 固件版本
-          en-US: Firmware Version
-      - field: DeviceModel
-        type: 1
-        i18n:
-          zh-CN: 设备型号
-          en-US: Device Model
-  - name: ntp_info
-    i18n:
-      zh-CN: 校时信息
-      en-US: NTP Info
-    priority: 0
-    protocol: http
-    http:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      ssl: ^_^ssl^_^
-      url: /LAPI/V1.0/System/Time/NTP
-      method: GET
-      timeout: ^_^timeout^_^
-      authorization:
-        type: Digest Auth
-        digestAuthUsername: ^_^username^_^
-        digestAuthPassword: ^_^password^_^
-      parseType: jsonPath
-      parseScript: '$.Response.Data.NTPServerInfos[0]'
-    fields:
-      - field: IPAddress
-        type: 1
-        i18n:
-          zh-CN: IP地址
-          en-US: IPAddress
-      - field: Port
-        type: 1
-        i18n:
-          zh-CN: 端口号
-          en-US: Port
-      - field: SynchronizeInterval
-        type: 1
-        i18n:
-          zh-CN: 同步间隔
-          en-US: SynchronizeInterval
-      - field: Enabled
-        type: 1
-        i18n:
-          zh-CN: 是否启用
-          en-US: Enabled

hertzbeat-manager/src/main/resources/logback-spring.xml

@@ -76,26 +76,6 @@
         </filter>
     </appender>
 
-    <!-- OpenTelemetry Appender for shipping logs to GrepTimeDB -->
-    <appender name="OpenTelemetryAppender" class="io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender">
-        <!-- Capture source code information (class name, method name, line number) -->
-        <captureCodeAttributes>true</captureCodeAttributes>
-
-        <!-- Capture MDC context values -->
-        <captureMdcAttributes>
-            <pattern>.*</pattern>
-        </captureMdcAttributes>
-
-        <!-- Capture experimental attributes like exception details -->
-        <captureExperimentalAttributes>true</captureExperimentalAttributes>
-
-        <!-- Capture marker attributes -->
-        <captureMarkerAttribute>true</captureMarkerAttribute>
-
-        <!-- Capture logger context attributes -->
-        <captureLoggerContext>true</captureLoggerContext>
-    </appender>
-
     <!-- Settings for this logger: for example, all output logs under the org.springframework package must be at level info or above to be output! -->
     <!-- This can avoid outputting many common debug information of the spring framework! -->
     <logger name="org.springframework" level="info"/>
@@ -110,14 +90,12 @@
     <logger name="org.mongodb" level="warn"/>
     <logger name="io.greptime" level="warn"/>
     <logger name="org.apache.kafka" level="warn"/>
-    <logger name="io.opentelemetry" level="info"/>
 
     <!-- Production environment configuration -->
     <springProfile name="prod">
         <root level="INFO">
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
-            <appender-ref ref="OpenTelemetryAppender"/>
         </root>
         <!-- North log -->
         <Logger name="com.obs.services.AbstractClient" level="OFF"
@@ -140,7 +118,6 @@
             <appender-ref ref="ConsoleAppender"/>
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
-            <appender-ref ref="OpenTelemetryAppender"/>
         </root>
     </springProfile>
 
@@ -150,7 +127,6 @@
             <appender-ref ref="ConsoleAppender"/>
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
-            <appender-ref ref="OpenTelemetryAppender"/>
         </root>
     </springProfile>
 
@@ -160,8 +136,7 @@
             <appender-ref ref="ConsoleAppender"/>
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
-            <appender-ref ref="OpenTelemetryAppender"/>
         </root>
     </springProfile>
 
-</configuration>
+</configuration>

hertzbeat-manager/src/main/resources/templates/2-WebhookTemplate.txt

@@ -26,13 +26,13 @@
       </#if>
       "triggerTimes": ${alert.triggerTimes!0},
       "startAt": "${((alert.startAt!0)?number_to_datetime)?string('yyyy-MM-dd HH:mm:ss')}",
-      <#if alert.activeAt?? && alert.activeAt gt 0>
-      "activeAt": "${((alert.activeAt!0)?number_to_datetime)?string('yyyy-MM-dd HH:mm:ss')}",
+      <#if alert.activeAt?? && alert.activeAt gt 0>,
+      "activeAt": "${((alert.activeAt!0)?number_to_datetime)?string('yyyy-MM-dd HH:mm:ss')}"
       </#if>
-      <#if alert.endAt?? && alert.endAt gt 0>
-      "endAt": "${(alert.endAt?number_to_datetime)?string('yyyy-MM-dd HH:mm:ss')}"<#if alert.annotations?? && alert.annotations?size gt 0>,</#if>
+      <#if alert.endAt?? && alert.endAt gt 0>,
+      "endAt": "${(alert.endAt?number_to_datetime)?string('yyyy-MM-dd HH:mm:ss')}"
       </#if>
-      <#if alert.annotations?? && alert.annotations?size gt 0>
+      <#if alert.annotations?? && alert.annotations?size gt 0>,
       "annotations": {
         <#list alert.annotations?keys as key>
         "${key}": "${alert.annotations[key]?json_string}"<#if key?has_next>,</#if>

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/TagControllerTest.java

@@ -19,10 +19,12 @@ package org.apache.hertzbeat.manager.controller;
 
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.util.ArrayList;
+import java.util.List;
 import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.manager.Label;
+import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.manager.service.impl.LabelServiceImpl;
+import org.apache.hertzbeat.manager.service.impl.TagServiceImpl;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,38 +37,42 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 /**
- * Test case for {@link LabelController}
+ * Test case for {@link TagController}
  */
 @ExtendWith(MockitoExtension.class)
-class LabelControllerTest {
+class TagControllerTest {
 
     private MockMvc mockMvc;
 
     @Mock
-    private LabelServiceImpl labelService;
+    private TagServiceImpl tagService;
 
     @InjectMocks
-    private LabelController labelController;
+    private TagController tagController;
 
     @BeforeEach
     void setUp() {
-        this.mockMvc = MockMvcBuilders.standaloneSetup(labelController).build();
+        this.mockMvc = MockMvcBuilders.standaloneSetup(tagController).build();
     }
 
     @Test
-    void addNewLabel() throws Exception {
-        Label label = new Label();
-        label.setId(87584674384L);
-        label.setName("app");
-        label.setTagValue("23");
-        label.setType((byte) 1);
-        label.setCreator("tom");
-        label.setModifier("tom");
+    void addNewTags() throws Exception {
+        List<Tag> tags = new ArrayList<>();
+        Tag tag = new Tag();
+        tag.setId(87584674384L);
+        tag.setName("app");
+        tag.setTagValue("23");
+        tag.setColor("#ffff");
+        tag.setType((byte) 1);
+        tag.setCreator("tom");
+        tag.setModifier("tom");
+
+        tags.add(tag);
 
 
-        this.mockMvc.perform(MockMvcRequestBuilders.post("/api/label")
+        this.mockMvc.perform(MockMvcRequestBuilders.post("/api/tag")
                         .contentType(MediaType.APPLICATION_JSON)
-                        .content(JsonUtil.toJson(label)))
+                        .content(JsonUtil.toJson(tags)))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                 .andExpect(jsonPath("$.msg").value("Add success"))
@@ -74,16 +80,17 @@ class LabelControllerTest {
     }
 
     @Test
-    void modifyLabel() throws Exception {
-        Label tag = new Label();
+    void modifyMonitor() throws Exception {
+        Tag tag = new Tag();
         tag.setId(87584674384L);
         tag.setName("app");
         tag.setTagValue("23");
+        tag.setColor("#ffff");
         tag.setType((byte) 1);
         tag.setCreator("tom");
         tag.setModifier("tom");
 
-        this.mockMvc.perform(MockMvcRequestBuilders.put("/api/label")
+        this.mockMvc.perform(MockMvcRequestBuilders.put("/api/tag")
                         .contentType(MediaType.APPLICATION_JSON)
                         .content(JsonUtil.toJson(tag)))
                 .andExpect(status().isOk())
@@ -93,8 +100,8 @@ class LabelControllerTest {
     }
 
     @Test
-    void getLabels() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/label?type={type}&search={search}",
+    void getTags() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/tag?type={type}&search={search}",
                         (byte) 1, "status"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
@@ -102,8 +109,8 @@ class LabelControllerTest {
     }
 
     @Test
-    void deleteLabels() throws Exception {
-        this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/label")
+    void deleteTags() throws Exception {
+        this.mockMvc.perform(MockMvcRequestBuilders.delete("/api/tag")
                         .contentType(MediaType.MULTIPART_FORM_DATA)
                         .param("ids", "6565463543"))
                 .andExpect(status().isOk())

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java

@@ -19,7 +19,6 @@ package org.apache.hertzbeat.manager.dao;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import javax.annotation.Resource;
 import org.apache.hertzbeat.common.entity.manager.Collector;
 import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
@@ -28,8 +27,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 /**
  * Test case for {@link CollectorDao}
  */
@@ -69,8 +66,5 @@ public class CollectorDaoTest extends AbstractSpringIntegrationTest {
         assertTrue(collectorDao.findCollectorByName("test").isPresent());
     }
 
-    @Test
-    public void findCollectorsByNameIn(){
-        assertFalse(collectorDao.findCollectorsByNameIn(List.of("test")).isEmpty());
-    }
+
 }

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/TagDaoTest.java

@@ -26,7 +26,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.apache.hertzbeat.common.entity.manager.Label;
+import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -34,19 +34,20 @@ import org.junit.jupiter.api.Test;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
- * Test case for {@link LabelDao}
+ * Test case for {@link TagDao}
  */
 @Transactional
-class LabelDaoTest extends AbstractSpringIntegrationTest {
+class TagDaoTest extends AbstractSpringIntegrationTest {
 
     @Resource
-    private LabelDao labelDao;
+    private TagDao tagDao;
 
     @BeforeEach
     void setUp() {
-        Label tag = Label.builder()
+        Tag tag = Tag.builder()
                 .name("mock tag")
                 .tagValue("mock value")
+                .color("mock color")
                 .type((byte) 1)
                 .creator("mock creator")
                 .modifier("mock modifier")
@@ -54,26 +55,26 @@ class LabelDaoTest extends AbstractSpringIntegrationTest {
                 .gmtUpdate(LocalDateTime.now())
                 .build();
 
-        tag = labelDao.saveAndFlush(tag);
+        tag = tagDao.saveAndFlush(tag);
         assertNotNull(tag);
     }
 
     @AfterEach
     void tearDown() {
-        labelDao.deleteAll();
+        tagDao.deleteAll();
     }
 
     @Test
     void deleteTagsByIdIn() {
-        List<Label> tagList = labelDao.findAll();
+        List<Tag> tagList = tagDao.findAll();
 
         assertNotNull(tagList);
         assertFalse(tagList.isEmpty());
 
-        Set<Long> ids = tagList.stream().map(Label::getId).collect(Collectors.toSet());
-        assertDoesNotThrow(() -> labelDao.deleteLabelsByIdIn(ids));
+        Set<Long> ids = tagList.stream().map(Tag::getId).collect(Collectors.toSet());
+        assertDoesNotThrow(() -> tagDao.deleteTagsByIdIn(ids));
 
-        tagList = labelDao.findAll();
+        tagList = tagDao.findAll();
         assertNotNull(tagList);
         assertTrue(tagList.isEmpty());
     }

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AppServiceTest.java

@@ -17,8 +17,13 @@
 
 package org.apache.hertzbeat.manager.service;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+import java.util.Collections;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
-import org.apache.hertzbeat.manager.dao.DefineDao;
 import org.apache.hertzbeat.manager.dao.MonitorDao;
 import org.apache.hertzbeat.manager.service.impl.AppServiceImpl;
 import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl;
@@ -30,15 +35,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import java.util.ArrayList;
-import java.util.Collections;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
-
 /**
  * Test case for {@link AppService}
  */
@@ -51,9 +47,6 @@ class AppServiceTest {
     @Mock
     private MonitorDao monitorDao;
 
-    @Mock
-    private DefineDao defineDao;
-
     @Mock
     private WarehouseService warehouseService;
 
@@ -62,7 +55,6 @@ class AppServiceTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        when(defineDao.findAll()).thenReturn(new ArrayList<>());
         appService.afterPropertiesSet();
     }
 

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/CollectorServiceTest.java

@@ -41,7 +41,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
@@ -68,9 +67,6 @@ public class CollectorServiceTest {
     @Mock
     private ManageServer manageServer;
 
-    @Mock
-    private ApplicationContext applicationContext;
-
 
     @Test
     public void getCollectors() {

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MonitorServiceTest.java

@@ -83,7 +83,7 @@ import org.springframework.data.jpa.domain.Specification;
  * clickhouse client -h 127.0.0.1 -d default -m -u default --password 123456
  * Test case for {@link MonitorService}
  *
- * @see LabelServiceTest
+ * @see TagServiceTest
  */
 @ExtendWith(MockitoExtension.class)
 class MonitorServiceTest {
@@ -101,7 +101,7 @@ class MonitorServiceTest {
     private AppService appService;
 
     @Mock
-    private LabelService tagService;
+    private TagService tagService;
 
     @Mock
     private CollectJobScheduling collectJobScheduling;

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/TagServiceTest.java

@@ -26,12 +26,14 @@ import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
 
-import org.apache.hertzbeat.common.entity.manager.Label;
-import org.apache.hertzbeat.manager.dao.LabelDao;
-import org.apache.hertzbeat.manager.service.impl.LabelServiceImpl;
+import org.apache.hertzbeat.common.entity.manager.Tag;
+import org.apache.hertzbeat.manager.dao.TagDao;
+import org.apache.hertzbeat.manager.service.impl.TagServiceImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -42,48 +44,50 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 
 /**
- * Test case for {@link LabelService}
+ * Test case for {@link TagService}
  */
 @ExtendWith(MockitoExtension.class)
-class LabelServiceTest {
+class TagServiceTest {
     
     @InjectMocks
-    private LabelServiceImpl labelService;
+    private TagServiceImpl tagService;
     
     @Mock
-    private LabelDao labelDao;
+    private TagDao tagDao;
     
     @Test
-    void addLabel() {
+    void addTags() {
         // Prepare test data
-        Label label =  Label.builder().id(1L).name("tagname").tagValue("tagvalue").build();
-        when(labelDao.findLabelByNameAndTagValue(anyString(), anyString())).thenReturn(Optional.empty());
+        List<Tag> tags = Collections.singletonList(
+                Tag.builder().id(1L).name("tagname").tagValue("tagvalue").build()
+        );
+        when(tagDao.findTagByNameAndTagValue(anyString(), anyString())).thenReturn(Optional.empty());
         
-        labelService.addLabel(label);
+        tagService.addTags(tags);
         
-        verify(labelDao).save(label);
+        verify(tagDao).saveAll(tags);
         
     }
     
     @Test
-    void modifyLabel() {
-        Label tag = Label.builder().id(1L).build();
-        when(labelDao.findById(1L)).thenReturn(Optional.of(tag));
-        when(labelDao.save(tag)).thenReturn(tag);
-        assertDoesNotThrow(() -> labelService.modifyLabel(tag));
+    void modifyTag() {
+        Tag tag = Tag.builder().id(1L).build();
+        when(tagDao.findById(1L)).thenReturn(Optional.of(tag));
+        when(tagDao.save(tag)).thenReturn(tag);
+        assertDoesNotThrow(() -> tagService.modifyTag(tag));
         reset();
-        when(labelDao.findById(1L)).thenReturn(Optional.empty());
-        assertThrows(IllegalArgumentException.class, () -> labelService.modifyLabel(tag));
+        when(tagDao.findById(1L)).thenReturn(Optional.empty());
+        assertThrows(IllegalArgumentException.class, () -> tagService.modifyTag(tag));
     }
     
     @Test
-    void getLabels() {
-        when(labelDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(Page.empty());
-        assertNotNull(labelService.getLabels(null, null, 1, 10));
+    void getTags() {
+        when(tagDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(Page.empty());
+        assertNotNull(tagService.getTags(null, null, 1, 10));
     }
     
     @Test
-    void deleteLabels() {
-        assertDoesNotThrow(() -> labelService.deleteLabels(new HashSet<>(1)));
+    void deleteTags() {
+        assertDoesNotThrow(() -> tagService.deleteTags(new HashSet<>(1)));
     }
 }

hertzbeat-mcp/README.md

@@ -1,27 +0,0 @@
-# Hertzbeat-MCP
-
-## Hertzbeat-Log-MCP
-
-Log MCP Service Based on GreptimeDB.
-
-- GreptimeDB log writing needs to be enabled.
-
-## Claude Desktop Integration (stdio)
-
-```json
-{
-    "mcpServers": {
-        "hertzbeat-mcp": {
-            "command": "java",
-            "args": [
-                "-Dspring.ai.mcp.server.stdio=true",
-                "-Dspring.main.web-application-type=none",
-                "-Dlogging.pattern.console=",
-                "-Dgreptime.url=http://${IP}:4000",
-                "-jar",
-                "${PATH}/hertzbeat-mcp-2.0-SNAPSHOT.jar"
-            ]
-        }
-    }
-}
-```

hertzbeat-mcp/pom.xml

@@ -1,107 +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 http://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-mcp</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-ai.version>1.0.0-M6</spring-ai.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>3.4.2</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.ai</groupId>
-                <artifactId>spring-ai-bom</artifactId>
-                <version>${spring-ai.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-mcp-server-webflux-spring-boot-starter</artifactId>
-            <version>${spring-ai.version}</version>
-        </dependency>
-        <!-- json path parser-->
-        <dependency>
-            <groupId>com.jayway.jsonpath</groupId>
-            <artifactId>json-path</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <release>${java.version}</release>
-                    <compilerArgs>
-                        <compilerArg>-parameters</compilerArg>
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>

hertzbeat-mcp/src/main/java/org/apache/hertzbeat/mcp/server/McpServerApplication.java

@@ -1,44 +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.mcp.server;
-
-import org.apache.hertzbeat.mcp.server.service.LogService;
-import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.ai.tool.method.MethodToolCallbackProvider;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-
-/**
- * MCP Server Application
- */
-@SpringBootApplication
-public class McpServerApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(McpServerApplication.class, args);
-    }
-
-    @Bean
-    public ToolCallbackProvider tools(
-            LogService logService) {
-        return MethodToolCallbackProvider.builder()
-                .toolObjects(logService)
-                .build();
-    }
-}

hertzbeat-mcp/src/main/java/org/apache/hertzbeat/mcp/server/service/LogService.java

@@ -1,198 +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.mcp.server.service;
-
-import com.jayway.jsonpath.JsonPath;
-import com.jayway.jsonpath.ReadContext;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.ai.tool.annotation.Tool;
-import org.springframework.ai.tool.annotation.ToolParam;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.MediaType;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestClient;
-
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Log query service
- */
-@Service
-@Slf4j
-public class LogService {
-
-    private static final String TIMESTAMP_COLUMN = "timestamp";
-    private static final String SEVERITY_TEXT_COLUMN = "severity_text";
-    private static final String BODY_COLUMN = "body";
-    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-    
-    private final RestClient restClient;
-
-    public LogService(@Value("${greptime.url}") String greptimeUrl) {
-        this.restClient = RestClient.builder()
-                .baseUrl(greptimeUrl)
-                .defaultHeader("Accept", "application/json")
-                .defaultHeader("Content-Type", "application/x-www-form-urlencoded")
-                .build();
-    }
-
-    @Tool(description = "System log query tool that supports filtering by time, log level, and content")
-    public String getHertzbeatLog(
-            @ToolParam(description = """
-                Query system logs with support for filtering by time, log level, and content.
-                
-                Usage:
-                1. Table name: hzb_log
-                2. Common query examples:
-                   - Get latest 10 logs: SELECT * FROM hzb_log ORDER BY timestamp DESC LIMIT 10
-                   - Query ERROR level logs: SELECT * FROM hzb_log WHERE severity_number=17
-                   - Query specific time range: SELECT * FROM hzb_log WHERE timestamp > '2024-01-01 00:00:00'
-                   - Query last ten minutes: SELECT * FROM hzb_log WHERE  timestamp >= now() - Interval '10m' AND timestamp < now()
-                   - Query logs at or above the INFO level: SELECT * FROM hzb_log WHERE severity_number >= 9
-                
-                Field descriptions:
-                1. severity_number (log level):
-                   - 5: DEBUG
-                   - 9: INFO
-                   - 13: WARN
-                   - 17: ERROR
-                2. timestamp: log timestamp
-                3. body: log content
-                """) String querySql) {
-        
-        if (!isValidQuery(querySql)) {
-            return "Invalid query statement";
-        }
-
-        try {
-            String response = executeQuery(querySql);
-            return formatQueryResults(response);
-        } catch (Exception e) {
-            log.error("Failed to query logs", e);
-            return "Failed to query logs: " + e.getMessage();
-        }
-    }
-
-    private boolean isValidQuery(String sql) {
-        return sql != null && sql.toLowerCase().contains("hzb_log");
-    }
-
-    private String executeQuery(String sql) {
-        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
-        formData.add("sql", sql);
-        log.debug("Executing SQL query: {}", sql);
-        
-        return restClient.post()
-                .uri("/v1/sql?db=public")
-                .contentType(MediaType.APPLICATION_FORM_URLENCODED)
-                .body(formData)
-                .retrieve()
-                .body(String.class);
-    }
-
-    private String formatQueryResults(String response) {
-        ReadContext ctx = JsonPath.parse(response);
-        List<Map<String, Object>> columnSchemas = ctx.read("$.output[0].records.schema.column_schemas");
-        List<List<Object>> rows = ctx.read("$.output[0].records.rows");
-        int totalRows = ctx.read("$.output[0].records.total_rows");
-
-        ColumnIndices indices = findColumnIndices(columnSchemas);
-        StringBuilder result = new StringBuilder()
-                .append("Query Results:\n\n")
-                .append("Log Time\t\t\tLog Level\tLog Content\n")
-                .append("----------------------------------------------------\n");
-
-        if (rows != null && !rows.isEmpty()) {
-            formatRows(rows, indices, result);
-            result.append("\nTotal ").append(totalRows).append(" records");
-        } else {
-            result.append("No data");
-        }
-
-        return result.toString();
-    }
-
-    private record ColumnIndices(int timestamp, int severityText, int body) {}
-
-    private ColumnIndices findColumnIndices(List<Map<String, Object>> columnSchemas) {
-        int timestampIndex = -1;
-        int severityTextIndex = -1;
-        int bodyIndex = -1;
-
-        for (int i = 0; i < columnSchemas.size(); i++) {
-            String columnName = (String) columnSchemas.get(i).get("name");
-            switch (columnName) {
-                case TIMESTAMP_COLUMN -> timestampIndex = i;
-                case SEVERITY_TEXT_COLUMN -> severityTextIndex = i;
-                case BODY_COLUMN -> bodyIndex = i;
-                default -> {
-                    // Ignore other columns
-                }
-            }
-        }
-
-        return new ColumnIndices(timestampIndex, severityTextIndex, bodyIndex);
-    }
-
-    private void formatRows(List<List<Object>> rows, ColumnIndices indices, StringBuilder result) {
-        for (List<Object> row : rows) {
-            appendTimestamp(row, indices.timestamp(), result);
-            appendSeverity(row, indices.severityText(), result);
-            appendBody(row, indices.body(), result);
-            result.append("\n");
-        }
-    }
-
-    private void appendTimestamp(List<Object> row, int index, StringBuilder result) {
-        if (index >= 0 && index < row.size()) {
-            Object value = row.get(index);
-            if (value instanceof Number) {
-                long timestamp = ((Number) value).longValue();
-                LocalDateTime dateTime = LocalDateTime.ofInstant(
-                        Instant.ofEpochMilli(timestamp / 1_000_000),
-                        ZoneId.systemDefault());
-                result.append(DATE_FORMATTER.format(dateTime)).append("\t");
-                return;
-            }
-        }
-        result.append("Unknown time\t");
-    }
-
-    private void appendSeverity(List<Object> row, int index, StringBuilder result) {
-        if (index >= 0 && index < row.size()) {
-            result.append(row.get(index)).append("\t");
-        } else {
-            result.append("Unknown\t");
-        }
-    }
-
-    private void appendBody(List<Object> row, int index, StringBuilder result) {
-        if (index >= 0 && index < row.size()) {
-            result.append(row.get(index));
-        } else {
-            result.append("No content");
-        }
-    }
-}

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

@@ -1,28 +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.
-
-spring:
-  main:
-    banner-mode: off
-  ai:
-    mcp:
-      server:
-        name: hertzbeat-log-analysis-server
-        version: 0.1
-
-#
-#logging:
-#  file:
-#    name:

hertzbeat-push/pom.xml

@@ -29,11 +29,10 @@
     <name>${project.artifactId}</name>
 
     <dependencies>
-        <!-- collector basic -->
+        <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-collector-basic</artifactId>
-            <version>2.0-SNAPSHOT</version>
+            <artifactId>hertzbeat-common</artifactId>
         </dependency>
         <!-- spring -->
         <dependency>

hertzbeat-push/src/main/java/org/apache/hertzbeat/push/service/impl/PushGatewayServiceImpl.java

@@ -28,12 +28,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.OnlineParser;
 import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.dto.MetricFamily;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
+import org.apache.hertzbeat.common.util.OnlineParser;
 import org.apache.hertzbeat.common.util.SnowFlakeIdGenerator;
 import org.apache.hertzbeat.push.dao.PushMonitorDao;
 import org.apache.hertzbeat.push.service.PushGatewayService;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/constants/WarehouseConstants.java

@@ -60,8 +60,4 @@ public interface WarehouseConstants {
 
     String SQL = "sql";
 
-    String RANGE = "range";
-
-    String INSTANT = "instant";
-
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/DataQueryController.java

@@ -1,53 +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.warehouse.controller;
-
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
-import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQuery;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQueryData;
-import org.apache.hertzbeat.warehouse.service.DatasourceQueryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Metrics Data Query API
- */
-@RestController
-@RequestMapping(produces = {APPLICATION_JSON_VALUE})
-@Tag(name = "Metrics Data Query API")
-public class DataQueryController {
-    
-    @Autowired(required = false)
-    private DatasourceQueryService datasourceQueryService;
-
-    @PostMapping("/api/warehouse/query")
-    @Operation(summary = "Warehouse Query")
-    public ResponseEntity<Message<List<DatasourceQueryData>>> query(
-            @Parameter(description = "Query Expr") @RequestBody List<DatasourceQuery> queries) {
-        return ResponseEntity.ok(Message.success(datasourceQueryService.query(queries)));
-    }
-}

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataQueryController.java

@@ -0,0 +1,78 @@
+/*
+ * 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.warehouse.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.common.entity.dto.query.MetricQueryData;
+import org.apache.hertzbeat.warehouse.service.MetricsDataQueryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
+/**
+ * Metrics Data Query API
+ */
+@RestController
+@RequestMapping(produces = {APPLICATION_JSON_VALUE})
+@Tag(name = "Metrics Data Query API")
+public class MetricsDataQueryController {
+    
+
+    @Autowired
+    private MetricsDataQueryService queryService;
+    
+
+    @GetMapping("/api/warehouse/query")
+    @Operation(summary = "Query Real Time Metrics Data")
+    public ResponseEntity<Message<List<MetricQueryData>>> queryMetricsData(
+            @Parameter(description = "Query PromQL expr list", example = "cpu")
+            @RequestParam List<String> queries,
+            @Parameter(description = "Query type", example = "promql")
+            @RequestParam String type,
+            @Parameter(description = "Query timestamp", example = "1725854804451")
+            @RequestParam long time) {
+        return ResponseEntity.ok(Message.success(queryService.query(queries, type, time)));
+    }
+
+    @GetMapping("/api/warehouse/query/range")
+    @Operation(summary = "Query Range Metrics Data")
+    public ResponseEntity<Message<List<MetricQueryData>>> queryMetricsDataRange(
+            @Parameter(description = "Query PromQL expr list", example = "cpu")
+            @RequestParam List<String> queries,
+            @Parameter(description = "Query type", example = "promql")
+            @RequestParam String type,
+            @Parameter(description = "Query start timestamp", example = "1725854804451")
+            @RequestParam long start,
+            @Parameter(description = "Query end timestamp", example = "1733630804452")
+            @RequestParam long end,
+            @Parameter(description = "Query step", example = "4m")
+            @RequestParam String step
+    ) {
+        return ResponseEntity.ok(Message.success(queryService.queryRange(queries, type, start, end, step)));
+    }
+}

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimePromqlQueryExecutor.java

@@ -33,9 +33,7 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 public class GreptimePromqlQueryExecutor extends PromqlQueryExecutor {
 
-    private static final String QUERY_PATH = "/v1/prometheus";
-
-    private static final String Datasource = "Greptime";
+    private static final String QUERY_PATH = "/v1/prometheus/api/v1/query";
 
     private final GreptimeProperties greptimeProperties;
 
@@ -44,10 +42,4 @@ public class GreptimePromqlQueryExecutor extends PromqlQueryExecutor {
                 greptimeProperties.username(), greptimeProperties.password()));
         this.greptimeProperties = greptimeProperties;
     }
-
-    @Override
-    public String getDatasource() {
-        return Datasource;
-    }
-
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/PromqlQueryExecutor.java

@@ -20,16 +20,10 @@
 package org.apache.hertzbeat.warehouse.db;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
 import org.apache.hertzbeat.common.constants.NetworkConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQuery;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQueryData;
+import org.apache.hertzbeat.common.entity.dto.query.MetricQueryData;
 import org.apache.hertzbeat.common.util.Base64Util;
-import org.apache.hertzbeat.common.util.TimePeriodUtil;
-import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.INSTANT;
-import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.PROMQL;
-import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.RANGE;
 import org.apache.hertzbeat.warehouse.store.history.vm.PromQlQueryContent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpEntity;
@@ -41,12 +35,15 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.PROMQL;
+
 /**
  * abstract class for promql query executor
  */
@@ -54,15 +51,11 @@ import java.util.Map;
 public abstract class PromqlQueryExecutor implements QueryExecutor {
 
     private static final String supportQueryLanguage = PROMQL;
-    private static final String QUERY_RANGE_PATH = "/api/v1/query_range";
-    private static final String QUERY_PATH = "/api/v1/query";
     protected static final String HTTP_QUERY_PARAM = "query";
     protected static final String HTTP_TIME_PARAM = "time";
     protected static final String HTTP_START_PARAM = "start";
     protected static final String HTTP_END_PARAM = "end";
     protected static final String HTTP_STEP_PARAM = "step";
-    private static final String INNER_KEY_TIME = "__ts__";
-    private static final String INNER_KEY_VALUE = "__value__";
 
     private final RestTemplate restTemplate;
 
@@ -76,15 +69,14 @@ public abstract class PromqlQueryExecutor implements QueryExecutor {
     /**
      * record class for promql http connection
      */
-    protected record HttpPromqlProperties(
-            String url,
-            String username,
-            String password
-    ) {
-    }
+    protected record HttpPromqlProperties (
+        String url,
+        String username,
+        String password
+    ){}
 
-    @Override
-    public List<Map<String, Object>> execute(String queryString) {
+    protected List<Map<String, Object>> http_promql(Map<String, Object> params) {
+        // http run the promql query
         List<Map<String, Object>> results = new LinkedList<>();
         try {
             HttpHeaders headers = new HttpHeaders();
@@ -94,13 +86,14 @@ public abstract class PromqlQueryExecutor implements QueryExecutor {
                     && StringUtils.hasText(httpPromqlProperties.password())) {
                 String authStr = httpPromqlProperties.username() + ":" + httpPromqlProperties.password();
                 String encodedAuth = Base64Util.encode(authStr);
-                headers.add(HttpHeaders.AUTHORIZATION, NetworkConstants.BASIC + SignConstants.BLANK + encodedAuth);
+                headers.add(HttpHeaders.AUTHORIZATION,  NetworkConstants.BASIC + SignConstants.BLANK + encodedAuth);
             }
             HttpEntity<Void> httpEntity = new HttpEntity<>(headers);
-
-            UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromHttpUrl(httpPromqlProperties.url + QUERY_PATH);
-            uriComponentsBuilder.queryParam(HTTP_QUERY_PARAM, queryString);
-            URI uri = uriComponentsBuilder.build().toUri();
+            UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromHttpUrl(httpPromqlProperties.url);
+            for (Map.Entry<String, Object> entry : params.entrySet()) {
+                uriComponentsBuilder.queryParam(entry.getKey(), entry.getValue());
+            }
+            URI uri = uriComponentsBuilder.build(true).toUri();
             ResponseEntity<PromQlQueryContent> responseEntity = restTemplate.exchange(uri,
                     HttpMethod.GET, httpEntity, PromQlQueryContent.class);
             if (responseEntity.getStatusCode().is2xxSuccessful()) {
@@ -133,85 +126,41 @@ public abstract class PromqlQueryExecutor implements QueryExecutor {
         return results;
     }
 
-    @Override
-    public DatasourceQueryData query(DatasourceQuery datasourceQuery) {
-        DatasourceQueryData.DatasourceQueryDataBuilder queryDataBuilder = DatasourceQueryData.builder()
-                .refId(datasourceQuery.getRefId()).status(200);
+    public MetricQueryData convertToMetricQueryData(Object object) {
+        MetricQueryData metricQueryData = new MetricQueryData();
         try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.setAccept(List.of(MediaType.APPLICATION_JSON));
-            if (StringUtils.hasText(httpPromqlProperties.username())
-                    && StringUtils.hasText(httpPromqlProperties.password())) {
-                String authStr = httpPromqlProperties.username() + ":" + httpPromqlProperties.password();
-                String encodedAuth = new String(Base64.encodeBase64(authStr.getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8);
-                headers.add(HttpHeaders.AUTHORIZATION, NetworkConstants.BASIC + " " + encodedAuth);
-            }
-            HttpEntity<Void> httpEntity = new HttpEntity<>(headers);
-            URI uri;
-            if (datasourceQuery.getTimeType().equals(RANGE)) {
-                uri = UriComponentsBuilder.fromHttpUrl(httpPromqlProperties.url() + QUERY_RANGE_PATH)
-                        .queryParam(HTTP_QUERY_PARAM, datasourceQuery.getExpr())
-                        .queryParam(HTTP_START_PARAM, datasourceQuery.getStart())
-                        .queryParam(HTTP_END_PARAM, datasourceQuery.getEnd())
-                        .queryParam(HTTP_STEP_PARAM, datasourceQuery.getStep())
-                        .build().toUri();
-            } else if (datasourceQuery.getTimeType().equals(INSTANT)) {
-                uri = UriComponentsBuilder.fromHttpUrl(httpPromqlProperties.url() + QUERY_PATH)
-                        .queryParam(HTTP_QUERY_PARAM, datasourceQuery.getExpr())
-                        .build().toUri();
-            } else {
-                throw new IllegalArgumentException(String.format("no such time type for query id {}.", datasourceQuery.getRefId()));
-            }
-            ResponseEntity<PromQlQueryContent> responseEntity = restTemplate.exchange(uri, HttpMethod.GET, httpEntity,
-                    PromQlQueryContent.class);
-            if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                log.debug("query metrics data from promql http api success. {}", uri);
-                if (responseEntity.getBody() != null && responseEntity.getBody().getData() != null
-                        && responseEntity.getBody().getData().getResult() != null) {
-                    List<PromQlQueryContent.ContentData.Content> contents = responseEntity.getBody().getData().getResult();
-                    List<DatasourceQueryData.SchemaData> schemaDataList = new LinkedList<>();
-                    for (PromQlQueryContent.ContentData.Content content : contents) {
-                        DatasourceQueryData.MetricSchema.MetricSchemaBuilder schemaBuilder = DatasourceQueryData.MetricSchema
-                                .builder().fields(List.of(
-                                        // todo: unit?
-                                        DatasourceQueryData.MetricField.builder().name(INNER_KEY_TIME)
-                                                .type("time").build(),
-                                        DatasourceQueryData.MetricField.builder().name(INNER_KEY_VALUE)
-                                                .type("number").build()
-                                )).labels(content.getMetric());
-                        List<Object[]> values;
-                        if (datasourceQuery.getTimeType().equals(RANGE)) {
-                            values = content.getValues();
-                        }
-                        else {
-                            values = List.<Object[]>of(content.getValue());
-                        }
-                        values.forEach(objects -> {
-                            objects[0] = TimePeriodUtil.normalizeToMilliseconds(objects[0]);
-                        });
-                        DatasourceQueryData.SchemaData.SchemaDataBuilder schemaData = DatasourceQueryData.SchemaData.builder()
-                                .schema(schemaBuilder.build()).data(values);
-                        schemaDataList.add(schemaData.build());
-                    }
-                    queryDataBuilder.frames(schemaDataList);
-                }
-            } else {
-                log.error("query metrics data from victoria-metrics failed. {}", responseEntity);
-                queryDataBuilder.msg("query metrics data from victoria-metrics failed. ");
-                queryDataBuilder.status(responseEntity.getStatusCode().value());
-            }
+            List<Map<String, Object>> metrics = (List<Map<String, Object>>) object;
+            // todo
         } catch (Exception e) {
-            log.error("query metrics data from victoria-metrics error. {}.", e.getMessage(), e);
-            queryDataBuilder.msg("query metrics data from victoria-metrics error: " + e.getMessage());
-            queryDataBuilder.status(400);
+            log.error("converting to metric query data failed.");
         }
-        return queryDataBuilder.build();
+        return metricQueryData;
     }
-    
-    @Override
-    public boolean support(String queryLanguage) {
-        return StringUtils.hasText(queryLanguage) && queryLanguage.equalsIgnoreCase(supportQueryLanguage);
+
+    public List<Map<String, Object>> execute(String queryString) {
+        Map<String, Object> params = new HashMap<>();
+        params.put(HTTP_QUERY_PARAM, URLEncoder.encode(queryString, StandardCharsets.UTF_8));
+        return http_promql(params);
+    }
+
+    public List<Map<String, Object>> query(String queryString, long time) {
+        Map<String, Object> params = new HashMap<>();
+        params.put(HTTP_QUERY_PARAM, URLEncoder.encode(queryString, StandardCharsets.UTF_8));
+        params.put(HTTP_TIME_PARAM, time);
+        return http_promql(params);
+    }
+
+    public List<Map<String, Object>> query_range(String queryString, long start, long end, String step) {
+        Map<String, Object> params = new HashMap<>();
+        params.put(HTTP_QUERY_PARAM, URLEncoder.encode(queryString, StandardCharsets.UTF_8));
+        params.put(HTTP_START_PARAM, start);
+        params.put(HTTP_END_PARAM, end);
+        params.put(HTTP_STEP_PARAM, step);
+        return http_promql(params);
+    }
+
+    public boolean support(String datasource) {
+        return supportQueryLanguage.equals(datasource);
     }
 
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/QueryExecutor.java

@@ -17,8 +17,7 @@
 
 package org.apache.hertzbeat.warehouse.db;
 
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQuery;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQueryData;
+import org.apache.hertzbeat.common.entity.dto.query.MetricQueryData;
 
 import java.util.List;
 import java.util.Map;
@@ -28,11 +27,13 @@ import java.util.Map;
  */
 public interface QueryExecutor {
 
+    MetricQueryData convertToMetricQueryData(Object object);
+
     List<Map<String, Object>> execute(String query);
+
+    List<Map<String, Object>> query(String query, long time);
+
+    List<Map<String, Object>> query_range(String query, long start, long end, String step);
     
-    DatasourceQueryData query(DatasourceQuery datasourceQuery);
-
-    String getDatasource();
-
-    boolean support(String queryLanguage);
+    boolean support(String datasource);
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/SqlQueryExecutor.java

@@ -20,15 +20,13 @@
 package org.apache.hertzbeat.warehouse.db;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQuery;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQueryData;
-
-import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.SQL;
-import org.springframework.util.StringUtils;
+import org.apache.hertzbeat.common.entity.dto.query.MetricQueryData;
 
 import java.util.List;
 import java.util.Map;
 
+import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.SQL;
+
 /**
  * abstract class for sql query executor
  */
@@ -42,19 +40,28 @@ public abstract class SqlQueryExecutor implements QueryExecutor {
      */
     protected record ConnectorSqlProperties () {}
 
-    @Override
-    public List<Map<String, Object>> execute(String query) {
-        return null;
+    protected abstract List<Map<String, Object>> do_sql(Map<String, Object> params);
+
+    public MetricQueryData convertToMetricQueryData(Object object) {
+        MetricQueryData metricQueryData = new MetricQueryData();
+        try {
+            List<Map<String, Object>> metrics = (List<Map<String, Object>>) object;
+            // todo
+        } catch (Exception e) {
+            log.error("converting to metric query data failed.");
+        }
+        return metricQueryData;
     }
 
-    @Override
-    public DatasourceQueryData query(DatasourceQuery datasourceQuery) {
-        return null;
+    public abstract List<Map<String, Object>> execute(String query);
+
+    public abstract List<Map<String, Object>> query(String query, long time);
+
+    public abstract List<Map<String, Object>> query_range(String query, long start, long end, String step);
+
+
+    public boolean support(String datasource) {
+        return supportQueryLanguage.equals(datasource);
     }
 
-    @Override
-    public boolean support(String queryLanguage) {
-        return StringUtils.hasText(queryLanguage) && queryLanguage.equalsIgnoreCase(supportQueryLanguage);
-    }
-
-}
+}

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/VictoriaMetricsQueryExecutor.java

@@ -31,19 +31,15 @@ import org.springframework.web.client.RestTemplate;
 @ConditionalOnProperty(prefix = "warehouse.store.victoria-metrics", name = "enabled", havingValue = "true")
 @Slf4j
 public class VictoriaMetricsQueryExecutor extends PromqlQueryExecutor {
-    private static final String Datasource = "VictoriaMetrics";
+
+    private static final String QUERY_PATH = "/api/v1/query";
     
     private final VictoriaMetricsProperties victoriaMetricsProp;
 
     public VictoriaMetricsQueryExecutor(VictoriaMetricsProperties victoriaMetricsProp, RestTemplate restTemplate) {
-        super(restTemplate, new HttpPromqlProperties(victoriaMetricsProp.url(),
+        super(restTemplate, new HttpPromqlProperties(victoriaMetricsProp.url() + QUERY_PATH,
                 victoriaMetricsProp.username(), victoriaMetricsProp.password()));
         this.victoriaMetricsProp = victoriaMetricsProp;
     }
 
-    @Override
-    public String getDatasource() {
-        return Datasource;
-    }
-
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/MetricsDataQueryService.java

@@ -17,19 +17,30 @@
 
 package org.apache.hertzbeat.warehouse.service;
 
+import org.apache.hertzbeat.common.entity.dto.query.MetricQueryData;
+
 import java.util.List;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQuery;
-import org.apache.hertzbeat.common.entity.dto.query.DatasourceQueryData;
 
 /**
  * metrics data query service
  */
-public interface DatasourceQueryService {
-
+public interface MetricsDataQueryService {
+    
     /**
      * Query metrics data
      * @param queries query expr
+     * @param time time
      * @return data
      */
-    List<DatasourceQueryData> query(List<DatasourceQuery> queries);
+    List<MetricQueryData> query(List<String> queries, String queryType, long time);
+
+    /**
+     * Query metrics data range
+     * @param queries query expr
+     * @param start start
+     * @param end end
+     * @param step step
+     * @return data
+     */
+    List<MetricQueryData> queryRange(List<String> queries, String queryType, long start, long end, String step);
 }