fix: fix test

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

.all-contributorsrc

@@ -2545,7 +2545,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/176664901?v=4",
       "profile": "https://github.com/Saramanda9988",
       "contributions": [
-        "doc"
+        "doc",
+        "code"
       ]
     },
     {
@@ -2667,6 +2668,51 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "KOYR",
+      "name": "KOYR",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53216619?v=4",
+      "profile": "https://github.com/KOYR",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Lathika226",
+      "name": "LathikaBaddam",
+      "avatar_url": "https://avatars.githubusercontent.com/u/178710568?v=4",
+      "profile": "https://github.com/Lathika226",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Sahil-Shadwal",
+      "name": "Sahil Shadwal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119167601?v=4",
+      "profile": "https://shadwal.space/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BhanuNidumolu",
+      "name": "N.Bhanu Prasad",
+      "avatar_url": "https://avatars.githubusercontent.com/u/180380413?v=4",
+      "profile": "https://github.com/BhanuNidumolu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Prakash1185",
+      "name": "Prakash Kumar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/183058331?v=4",
+      "profile": "https://prakashh-portfolio.vercel.app/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.editorconfig

@@ -0,0 +1,55 @@
+# 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.
+#
+
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+# The line max length is 120, match checkstyle rules.
+max_line_length = 120
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.json]
+tab_width = 2
+indent_size = 2
+
+[*.{yml,yaml}]
+tab_width = 2
+indent_size = 2
+
+[*.xml]
+ij_xml_attribute_wrap = off
+ij_xml_text_wrap = off
+ij_xml_keep_blank_lines = 1
+
+[pom.xml]
+indent_size = 2
+
+[*.java]
+indent_size = 4
+tab_width = 4
+
+[*.js]
+indent_size = 2
+
+[*.ts]
+indent_size = 2

.github/labeler.yml

@@ -90,24 +90,24 @@ e2e:
 backend:
   - changed-files:
       - any-glob-to-any-file:
-          - "alerter/**/*"
-          - "collector/**/*"
-          - "common/**/*"
-          - "grafana/**/*"
-          - "manager/**/*"
-          - "push/**/*"
-          - "remoting/**/*"
-          - "warehouse/**/*"
+          - "hertzbeat-alerter/**/*"
+          - "hertzbeat-collector/**/*"
+          - "hertzbeat-common/**/*"
+          - "hertzbeat-grafana/**/*"
+          - "hertzbeat-manager/**/*"
+          - "hertzbeat-push/**/*"
+          - "hertzbeat-remoting/**/*"
+          - "hertzbeat-warehouse/**/*"
 
 collector:
   - changed-files:
       - any-glob-to-any-file:
-          - "collector/**/*"
+          - "hertzbeat-collector/**/*"
             
 monitoring-template:
   - changed-files:
       - any-glob-to-any-file:
-          - "manager/src/main/resources/define/**/*"
+          - "hertzbeat-manager/src/main/resources/define/**/*"
 
 HIP:
   - changed-files:

.github/workflows/doc-deploy.yml

@@ -0,0 +1,82 @@
+# 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.
+
+name: DOC Deploy
+
+on:
+  # Trigger on push to master branch when home directory files are changed
+  push:
+    branches: [ master ]
+    paths:
+      - 'home/**'
+
+  # Allow manual workflow trigger
+  workflow_dispatch:
+
+# Set permissions for deployment
+permissions:
+  contents: write
+
+jobs:
+  deploy:
+    name: Deploy Documentation to asf-site Branch
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the repository code
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup Node.js environment
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      # Install dependencies in home directory
+      - name: Install Dependencies
+        working-directory: home
+        run: npm ci
+
+      # Build the documentation site
+      - name: Build Documentation
+        working-directory: home
+        run: npm run build
+        env:
+          NODE_OPTIONS: --max-old-space-size=4096
+
+      # Deploy to asf-site branch using peaceiris/actions-gh-pages
+      - name: Deploy to asf-site Branch
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./home/build
+          publish_branch: asf-site
+          force_orphan: true
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: 'Deploy documentation to asf-site branch'
+
+      # Output deployment status
+      - name: Deployment Summary
+        run: |
+          echo "Documentation deployed successfully!"
+          echo "Deployment branch: asf-site"
+          echo "Source branch: ${{ github.ref_name }}"
+          echo "Commit SHA: ${{ github.sha }}"

.gitpod.yml

@@ -4,7 +4,7 @@ image:
 tasks:
 
     - name: Run backend
-      before: cd hertzbeat-manager
+      before: cd hertzbeat-startup
       command: |
           gp sync-await setup-backend
           mvn spring-boot:run
@@ -13,7 +13,7 @@ tasks:
       before: cd web-app
       command: |
           gp sync-await setup-frontend
-          yarn start --public-host "`gp url 4200`"
+          pnpm start --public-host "`gp url 4200`"
       openMode: split-right
 
     - name: Setup backend
@@ -25,7 +25,7 @@ tasks:
 
     - name: Setup frontend
       init: |
-          cd web-app && yarn install
+          cd web-app && pnpm install
       command: |
           gp sync-done setup-frontend
           exit 0

.licenserc.yaml

@@ -39,6 +39,7 @@ header:
     - '**/*.js'
     - '**/*.less'
     - '**/*.txt'
+    - '**/*.st'
     - '**/target/**'
     - '.gitattributes'
     - '**/.gitignore'

.markdownlint-cli2.jsonc

@@ -31,7 +31,7 @@
     "MD025": true,
     "MD029": true,
     "MD033": {
-      "allowed_elements": ["table", "tr", "td", "a", "img", "sub", "b", "br", "img", "tbody", "mark", "font"]
+      "allowed_elements": ["table", "tr", "td", "a", "img", "sub", "b", "br", "img", "tbody", "mark", "font", "Tabs", "TabItem"]
     },
     "MD036": false,
     "MD040": true,

.testcontainers.properties

@@ -0,0 +1,22 @@
+# 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.
+
+# Testcontainers configuration
+# Disable Ryuk container reuse to avoid issues in CI
+testcontainers.reuse.enable=false
+# Configure Docker host detection
+testcontainers.docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy

CONTRIBUTING.md

@@ -20,27 +20,27 @@
 
 - 💬**Suggestion**: You can also make some suggestions to the project or community to promote the healthy development of the community;
 
-More see [Contribution Types](https://allcontributors.org/docs/en/emoji-key)    
+More see [Contribution Types](https://allcontributors.org/emoji-key)    
 
 Even small corrections to typos are very welcome :)   
 
 ### Getting HertzBeat up and running   
 
 > To get HertzBeat code running on your development tools, and able to debug with breakpoints.
-> This is a front-end and back-end separation project. To start the local code, the back-end [manager](manager) and the front-end [web-app](web-app) must be started separately.  
+> This is a front-end and back-end separation project. To start the local code, the back-end [startup](hertzbeat-startup) and the front-end [web-app](web-app) must be started separately.  
 
 
 #### Backend start
 
 1. Requires `maven3+`, `java17` and `lombok` environments
 
-2. (Optional) Modify the configuration file: `manager/src/main/resources/application.yml`
+2. (Optional) Modify the configuration file: `hertzbeat-startup/src/main/resources/application.yml`
 
 3. Execute under the project root directory: `mvn clean install -DskipTests`
 
 4. Add VM Options: `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`
 
-5. Start `springboot manager` service: `manager/src/main/java/org/apache/hertzbeat/hertzbeat-manager/Manager.java`
+5. Start `springboot startup` service: `hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java`
 
 #### Frontend start
 
@@ -131,17 +131,6 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 ## 🥐 Architecture
 
-- **[manager](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager)** Provide monitoring management, system management basic services.
-> Provides monitoring management, monitoring configuration management, system user management, etc.
-- **[collector](https://github.com/apache/hertzbeat/tree/master/collector)** Provide metrics data collection services.
-> Use common protocols to remotely collect and obtain peer-to-peer metrics data.
-- **[warehouse](https://github.com/apache/hertzbeat/tree/master/warehouse)** Provide monitoring data warehousing services.
-> Metrics data management, data query, calculation and statistics.
-- **[alerter](https://github.com/apache/hertzbeat/tree/master/hertzbeat-alerter)** Provide alert service.
-> Alarm calculation trigger, monitoring status linkage, alarm configuration, and alarm notification.
-- **[web-app](https://github.com/apache/hertzbeat/tree/master/web-app)** Provide web ui.
-> Angular Web UI.
-
 ![hertzBeat](home/static/img/docs/hertzbeat-arch.png)
 
 <br>  
@@ -172,26 +161,26 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 - 💬**建议**：也可以对项目或者社区提出一些建议，促进社区的良性发展；  
 
-更多贡献方式参见 [Contribution Types](https://allcontributors.org/docs/en/emoji-key)
+更多贡献方式参见 [Contribution Types](https://allcontributors.org/emoji-key)
 
 即便是小到错别字的修正我们也都非常欢迎 :)   
 
 ### 让 HertzBeat 运行起来   
 
 > 让 HertzBeat 的代码在您的开发工具上运行起来，并且能够断点调试。   
-> 此为前后端分离项目，本地代码启动需将后端[manager](manager)和前端[web-app](web-app)分别启动生效。
+> 此为前后端分离项目，本地代码启动需将后端[hertzbeat-startup](hertzbeat-startup)和前端[web-app](web-app)分别启动生效。
 
 #### 后端启动
 
 1. 需要 `maven3+`, `java17` 和 `lombok` 环境
 
-2. (可选)修改配置文件配置信息-`manager/src/main/resources/application.yml`
+2. (可选)修改配置文件配置信息-`hertzbeat-startup/src/main/resources/application.yml`
 
 3. 在项目根目录运行编译: `mvn clean install -DskipTests`
 
 4. 在 `jvm` 加入参数 `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`
 
-5. 启动`springboot manager`服务 `manager/src/main/java/org/apache/hertzbeat/hertzbeat-manager/Manager.java`
+5. 启动`springboot startup`服务 `hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java`
 
 
 #### 前端启动
@@ -282,15 +271,4 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 ### 模块
 
-- **[manager](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager)** 提供监控管理,系统管理基础服务
-> 提供对监控的管理，监控应用配置的管理，系统用户租户后台管理等。
-- **[collector](https://github.com/apache/hertzbeat/tree/master/collector)** 提供监控数据采集服务
-> 使用通用协议远程采集获取对端指标数据。
-- **[warehouse](https://github.com/apache/hertzbeat/tree/master/warehouse)** 提供监控数据仓储服务
-> 采集指标结果数据管理，数据落盘，查询，计算统计。
-- **[alerter](https://github.com/apache/hertzbeat/tree/master/hertzbeat-alerter)** 提供告警服务
-> 告警计算触发，任务状态联动，告警配置，告警通知。
-- **[web-app](https://github.com/apache/hertzbeat/tree/master/web-app)** 提供可视化控制台页面
-> 监控告警系统可视化控制台前端
-
 ![hertzBeat](home/static/img/docs/hertzbeat-arch.png)     

README.md

@@ -155,8 +155,8 @@ Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apach
 
 ##### 3：Start via source code        
 
-1. Local source code debugging needs to start the back-end project `manager` and the front-end project `web-app`.  
-2. Backend：need `maven3+`, `java17`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `manager` service. 
+1. Local source code debugging needs to start the back-end project `hertzbeat-startup` and the front-end project `web-app`.  
+2. Backend：need `maven3+`, `java17`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `hertzbeat-startup` service. 
 3. Web：need `nodejs npm angular-cli` environment, Run `ng serve --open` in `web-app` directory after backend startup.  
 4. Access `http://localhost:4200` to start, default account: `admin/hertzbeat`  
 
@@ -525,7 +525,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
@@ -543,6 +543,13 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_CN.md

@@ -152,8 +152,8 @@
 
 ##### 方式三：本地代码启动
 
-1. 此为前后端分离项目，本地代码调试需要分别启动后端工程 `manager` 和前端工程 `web-app`
-2. 后端：需要 `maven3+`, `java17` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `manager` 服务即可。
+1. 此为前后端分离项目，本地代码调试需要分别启动后端工程 `hertzbeat-startup` 和前端工程 `web-app`
+2. 后端：需要 `maven3+`, `java17` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `hertzbeat-startup` 服务即可。
 3. 前端：需要 `nodejs npm angular-cli`环境，待本地后端启动后，在 `web-app` 目录下启动 `ng serve --open`
 4. 浏览器访问 `http://localhost:4200` 即可开始，默认账号密码 `admin/hertzbeat`
 
@@ -522,7 +522,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
@@ -540,6 +540,13 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_JP.md

@@ -155,8 +155,8 @@
 
 ##### 方式３：ローカルの実行
 
-1. ローカルの実行には、バックエンドのプロジェクト`manager`とフロントエンドのプロジェクト`web-app`を起動する必要があります。
-2. バックエンド：`maven3+`、`java17`と`lombok`の環境は必要です。`YML` 設定を修正し、Java仮想マシンパラメータに`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加し、`manager` を起動します。
+1. ローカルの実行には、バックエンドのプロジェクト`hertzbeat-startup`とフロントエンドのプロジェクト`web-app`を起動する必要があります。
+2. バックエンド：`maven3+`、`java17`と`lombok`の環境は必要です。`YML` 設定を修正し、Java仮想マシンパラメータに`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加し、`hertzbeat-startup` を起動します。
 3. フロントエンド：`nodejs npm angular-cli`の環境は必要です。ローカルのバックエンドが立ち上がったら、`web-app` ディレクトリで `ng serve --open` というコマンドを実行します。
 4. スタート：`http://localhost:4200`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`。
 
@@ -525,7 +525,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/yy549159265"><img src="https://avatars.githubusercontent.com/u/40821310?v=4?s=100" width="100px;" alt="yy549159265"/><br /><sub><b>yy549159265</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=yy549159265" title="Tests">⚠️</a> <a href="#design-yy549159265" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cto-huhang"><img src="https://avatars.githubusercontent.com/u/53338629?v=4?s=100" width="100px;" alt="cto-huhang"/><br /><sub><b>cto-huhang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cto-huhang" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Saramanda9988"><img src="https://avatars.githubusercontent.com/u/176664901?v=4?s=100" width="100px;" alt="LunaRain_079"/><br /><sub><b>LunaRain_079</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Saramanda9988" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/delei"><img src="https://avatars.githubusercontent.com/u/17263766?v=4?s=100" width="100px;" alt="DeleiGuo"/><br /><sub><b>DeleiGuo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=delei" title="Tests">⚠️</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Adelei" title="Bug reports">🐛</a></td>
     </tr>
     <tr>
@@ -543,6 +543,13 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Jetiaime"><img src="https://avatars.githubusercontent.com/u/93769000?v=4?s=100" width="100px;" alt="TeAmo"/><br /><sub><b>TeAmo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Jetiaime" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/pentium100"><img src="https://avatars.githubusercontent.com/u/27917?v=4?s=100" width="100px;" alt="pentium100"/><br /><sub><b>pentium100</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pentium100" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/dedyks"><img src="https://avatars.githubusercontent.com/u/23741665?v=4?s=100" width="100px;" alt="Dedy Kurniawan Santoso"/><br /><sub><b>Dedy Kurniawan Santoso</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=dedyks" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KOYR"><img src="https://avatars.githubusercontent.com/u/53216619?v=4?s=100" width="100px;" alt="KOYR"/><br /><sub><b>KOYR</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KOYR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lathika226"><img src="https://avatars.githubusercontent.com/u/178710568?v=4?s=100" width="100px;" alt="LathikaBaddam"/><br /><sub><b>LathikaBaddam</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Lathika226" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://shadwal.space/"><img src="https://avatars.githubusercontent.com/u/119167601?v=4?s=100" width="100px;" alt="Sahil Shadwal"/><br /><sub><b>Sahil Shadwal</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Sahil-Shadwal" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BhanuNidumolu"><img src="https://avatars.githubusercontent.com/u/180380413?v=4?s=100" width="100px;" alt="N.Bhanu Prasad"/><br /><sub><b>N.Bhanu Prasad</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=BhanuNidumolu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://prakashh-portfolio.vercel.app/"><img src="https://avatars.githubusercontent.com/u/183058331?v=4?s=100" width="100px;" alt="Prakash Kumar"/><br /><sub><b>Prakash Kumar</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Prakash1185" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

e2e/data/monitor-ftp.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "ftp",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorFTP}}"
     },
     "params": [

e2e/data/monitor-http.json

@@ -5,7 +5,7 @@
     "intervals": 60,
     "tags": [],
     "app": "api",
-    "host": "127.0.0.1",
+    "instance": "127.0.0.1",
       "name": "{{.param.monitorHTTP}}"
   },
   "params": [

e2e/data/monitor-ping.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "ping",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorPing}}"
     },
     "params": [

e2e/data/monitor-port.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "port",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorPort}}"
     },
     "params": [

e2e/data/monitor-sitemap.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "fullsite",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorSiteMap}}"
     },
     "params": [

e2e/data/monitor-ssl.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "ssl_cert",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorSSL}}"
     },
     "params": [

e2e/data/monitor-udp.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "udp_port",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorUDP}}"
     },
     "params": [

e2e/data/monitor-website.json

@@ -5,7 +5,7 @@
       "intervals": 60,
       "tags": [],
       "app": "website",
-      "host": "127.0.0.1",
+      "instance": "127.0.0.1",
       "name": "{{.param.monitorWebsite}}"
     },
     "params": [

e2e/k8s/data/create_k8s_monitor_data.json

@@ -4,7 +4,7 @@
     "intervals": 10,
     "tags": [],
     "app": "kubernetes",
-    "host": "172.29.0.11",
+    "instance": "172.29.0.11",
     "name": "Brave_Stingray_55yR"
   },
   "collector": "",

hertzbeat-ai/pom.xml

@@ -26,7 +26,7 @@
 	<artifactId>hertzbeat-ai</artifactId>
 	<version>${hertzbeat.version}</version>
 	<properties>
-		<spring-ai.version>1.0.3</spring-ai.version>
+		<spring-ai.version>1.1.1</spring-ai.version>
 		<java.version>17</java.version>
 	</properties>
 

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/CustomSseServerTransport.java

@@ -1,246 +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.ai.config;
-
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.usthe.sureness.mgt.SurenessSecurityManager;
-import com.usthe.sureness.subject.SubjectSum;
-import io.modelcontextprotocol.spec.McpError;
-import io.modelcontextprotocol.spec.McpSchema;
-import io.modelcontextprotocol.spec.McpServerSession;
-import io.modelcontextprotocol.spec.McpServerTransport;
-import io.modelcontextprotocol.spec.McpServerTransportProvider;
-import io.modelcontextprotocol.util.Assert;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.RouterFunctions;
-import org.springframework.web.servlet.function.ServerRequest;
-import org.springframework.web.servlet.function.ServerResponse;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-/**
- * Custom Server-Sent Events transport provider for Model Context Protocol.
- */
-@Slf4j
-public class CustomSseServerTransport implements McpServerTransportProvider {
-    private final ObjectMapper objectMapper;
-    private final String messageEndpoint;
-    private final String sseEndpoint;
-    private final String baseUrl;
-    @Getter
-    private final RouterFunction<ServerResponse> routerFunction;
-    @Setter
-    private McpServerSession.Factory sessionFactory;
-    private final Map<String, Object> sessionRequest = new HashMap<>();
-    private final ConcurrentHashMap<String, McpServerSession> sessions;
-    private volatile boolean isClosing;
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String messageEndpoint) {
-        this(objectMapper, messageEndpoint, "/sse");
-    }
-
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String messageEndpoint, String sseEndpoint) {
-        this(objectMapper, "", messageEndpoint, sseEndpoint);
-    }
-
-    public CustomSseServerTransport(ObjectMapper objectMapper, String baseUrl, String messageEndpoint, String sseEndpoint) {
-        this.sessions = new ConcurrentHashMap();
-        this.isClosing = false;
-        Assert.notNull(objectMapper, "ObjectMapper must not be null");
-        Assert.notNull(baseUrl, "Message base URL must not be null");
-        Assert.notNull(messageEndpoint, "Message endpoint must not be null");
-        Assert.notNull(sseEndpoint, "SSE endpoint must not be null");
-        this.objectMapper = objectMapper;
-        this.baseUrl = baseUrl;
-        this.messageEndpoint = messageEndpoint;
-        this.sseEndpoint = sseEndpoint;
-        this.routerFunction = RouterFunctions.route().GET(this.sseEndpoint, this::handleSseConnection).POST(this.messageEndpoint, this::handleMessage).build();
-    }
-
-    public Mono<Void> notifyClients(String method, Object params) {
-        if (this.sessions.isEmpty()) {
-            log.debug("No active sessions to broadcast message to");
-            return Mono.empty();
-        } else {
-            log.debug("Attempting to broadcast message to {} active sessions", this.sessions.size());
-            return Flux.fromIterable(this.sessions.values())
-                    .flatMap((session) -> session.sendNotification(method, params)
-                            .doOnError((e) -> log.error("Failed to send message to session {}: {}", session.getId(), e.getMessage()))
-                            .onErrorComplete())
-                    .then();
-        }
-    }
-
-    public Mono<Void> closeGracefully() {
-        return Flux.fromIterable(this.sessions.values()).doFirst(() -> {
-            this.isClosing = true;
-            log.debug("Initiating graceful shutdown with {} active sessions", this.sessions.size());
-        }).flatMap(McpServerSession::closeGracefully).then().doOnSuccess((v) -> log.debug("Graceful shutdown completed"));
-    }
-
-    private ServerResponse handleSseConnection(ServerRequest request) {
-        log.debug("Handling SSE connection for request: {}", request);
-        HttpServletRequest servletRequest = request.servletRequest();
-
-        try {
-
-            log.debug("Processing SSE connection for servlet request: {}", servletRequest);
-            log.debug("Authorization header: {}", servletRequest.getHeader("Authorization"));
-
-
-        } catch (Exception e) {
-            log.error("Authentication failed for SSE connection: {}", e.getMessage());
-            return ServerResponse.status(HttpStatus.UNAUTHORIZED).body("Unauthorized: " + e.getMessage());
-        }
-
-
-
-        if (this.isClosing) {
-            return ServerResponse.status(HttpStatus.SERVICE_UNAVAILABLE).body("Server is shutting down");
-        } else {
-            String sessionId = UUID.randomUUID().toString();
-            log.debug("Generated session ID for SSE connection: {}", sessionId);
-            log.debug("Creating new SSE connection for session: {}", sessionId);
-
-
-            return ServerResponse.sse((sseBuilder) -> {
-                sseBuilder.onComplete(() -> {
-                    log.debug("SSE connection completed for session: {}", sessionId);
-                    this.sessions.remove(sessionId);
-                });
-                sseBuilder.onTimeout(() -> {
-                    log.debug("SSE connection timed out for session: {}", sessionId);
-                    this.sessions.remove(sessionId);
-                });
-                CustomSseServerTransport.WebMvcMcpSessionTransport sessionTransport = new CustomSseServerTransport.WebMvcMcpSessionTransport(sessionId, sseBuilder);
-                McpServerSession session = this.sessionFactory.create(sessionTransport);
-                this.sessionRequest.put(sessionId, request.servletRequest());
-                this.sessions.put(sessionId, session);
-
-                try {
-                    sseBuilder.id(sessionId).event("endpoint").data(this.baseUrl + this.messageEndpoint + "?sessionId=" + sessionId);
-                } catch (Exception e) {
-                    log.error("Failed to send initial endpoint event: {}", e.getMessage());
-                    sseBuilder.error(e);
-                }
-
-            }, Duration.ZERO);
-
-        }
-    }
-
-    private ServerResponse handleMessage(ServerRequest request) {
-        if (this.isClosing) {
-            return ServerResponse.status(HttpStatus.SERVICE_UNAVAILABLE).body("Server is shutting down");
-        } else if (request.param("sessionId").isEmpty()) {
-            return ServerResponse.badRequest().body(new McpError("Session ID missing in message endpoint"));
-        } else {
-            String sessionId = (String) request.param("sessionId").get();
-            McpServerSession session = (McpServerSession) this.sessions.get(sessionId);
-            log.debug("Authorization header for message request: {}", request.servletRequest().getHeader("Authorization"));
-            SubjectSum subject = SurenessSecurityManager.getInstance().checkIn(sessionRequest.get(sessionId));
-            McpContextHolder.setSubject(subject);
-
-
-            if (session == null) {
-                return ServerResponse.status(HttpStatus.NOT_FOUND).body(new McpError("Session not found: " + sessionId));
-            } else {
-                try {
-                    String body = request.body(String.class);
-                    McpSchema.JSONRPCMessage message = McpSchema.deserializeJsonRpcMessage(this.objectMapper, body);
-                    session.handle(message).block();
-                    return ServerResponse.ok().build();
-                } catch (IOException | IllegalArgumentException e) {
-                    log.error("Failed to deserialize message: {}", ((Exception) e).getMessage());
-                    return ServerResponse.badRequest().body(new McpError("Invalid message format"));
-                } catch (Exception e) {
-                    log.error("Error handling message: {}", e.getMessage());
-                    return ServerResponse.status(HttpStatus.INTERNAL_SERVER_ERROR).body(new McpError(e.getMessage()));
-                }
-            }
-        }
-    }
-
-    private class WebMvcMcpSessionTransport implements McpServerTransport {
-        private final String sessionId;
-        private final ServerResponse.SseBuilder sseBuilder;
-
-        WebMvcMcpSessionTransport(String sessionId, ServerResponse.SseBuilder sseBuilder) {
-            this.sessionId = sessionId;
-            this.sseBuilder = sseBuilder;
-            log.debug("Session transport {} initialized with SSE builder", sessionId);
-        }
-
-        public Mono<Void> sendMessage(McpSchema.JSONRPCMessage message) {
-            return Mono.fromRunnable(() -> {
-                try {
-                    String jsonText = CustomSseServerTransport.this.objectMapper.writeValueAsString(message);
-                    this.sseBuilder.id(this.sessionId).event("message").data(jsonText);
-                    log.debug("Message sent to session {}", this.sessionId);
-                } catch (Exception e) {
-                    log.error("Failed to send message to session {}: {}", this.sessionId, e.getMessage());
-                    this.sseBuilder.error(e);
-                }
-
-            });
-        }
-
-        public <T> T unmarshalFrom(Object data, TypeReference<T> typeRef) {
-            return (T) CustomSseServerTransport.this.objectMapper.convertValue(data, typeRef);
-        }
-
-        public Mono<Void> closeGracefully() {
-            return Mono.fromRunnable(() -> {
-                log.debug("Closing session transport: {}", this.sessionId);
-
-                try {
-                    this.sseBuilder.complete();
-                    log.debug("Successfully completed SSE builder for session {}", this.sessionId);
-                } catch (Exception e) {
-                    log.warn("Failed to complete SSE builder for session {}: {}", this.sessionId, e.getMessage());
-                }
-
-            });
-        }
-
-        public void close() {
-            try {
-                this.sseBuilder.complete();
-                log.debug("Successfully completed SSE builder for session {}", this.sessionId);
-            } catch (Exception e) {
-                log.warn("Failed to complete SSE builder for session {}: {}", this.sessionId, e.getMessage());
-            }
-
-        }
-    }
-}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/McpContextHolder.java

@@ -33,8 +33,8 @@ public final class McpContextHolder {
      * Attaches the user's context to the current thread.
      */
     public static void setSubject(SubjectSum subject) {
-        subjectHolder.set(subject);
 
+        subjectHolder.set(subject);
     }
 
     /**

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/PromptProvider.java

@@ -1,182 +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.ai.config;
-
-import org.springframework.stereotype.Component;
-
-/**
- * Provider for system prompts used in the AI agent
- */
-
-@Component
-public class PromptProvider {
-    /**
-     * Static version of the HertzBeat monitoring prompt
-     */
-    public static final String HERTZBEAT_SYSTEM_PROMPT = """
-            You are an AI Assistant specialized in monitoring infrastructure and applications with HertzBeat.
-            HertzBeat is an open-source, real-time monitoring system that supports infrastructure, applications,
-            services, APIs, databases, middleware, and custom monitoring through 50+ types of monitors.
-            Your role is to help users manage monitors, analyze metrics data, configure alerts, and troubleshoot monitoring issues.
-            *******
-            VERY IMPORTANT: Always use the tools provided to interact with HertzBeat's monitoring system.
-            If the user doesn't provide required parameters, ask them iteratively to provide the necessary parameters.
-            ********
-            
-            ## Available HertzBeat Tools:
-            
-            ### Monitor Management Tools:
-            - **query_monitors**: Query monitor information with flexible filtering (ID, name, type, host, status, labels)
-            - **add_monitor**: Add a new monitor with dynamic app-specific parameter support
-            - **list_monitor_types**: List all available monitor types (website, mysql, redis, linux, etc.)
-            - **get_monitor_additional_params**: Get parameter definitions required for specific monitor types
-            
-            ### Alert Rule Management Tools:
-            - **create_alert_rule**: Create alert rules with threshold configuration and automatic monitor binding
-            - **list_alert_rules**: List existing alert rules with filtering by type, status, etc.
-            - **toggle_alert_rule**: Enable or disable alert rules
-            - **get_alert_rule_details**: Get detailed information about specific alert rules
-            - **get_apps_metrics_hierarchy**: Get exact app and metric names for alert rule creation (CRITICAL for alerts)
-            - **bind_monitors_to_alert_rule**: Bind monitors to alert rules for targeted alerting
-
-            
-            ### Alert & Alarm Analysis Tools:
-            - **query_alerts**: Query fired alerts with comprehensive filtering and pagination
-            - **get_alerts_summary**: Get alert statistics and status distribution
-            
-            ### Metrics Data Analysis Tools:
-            - **query_realtime_metrics**: Get current real-time metrics data for monitors
-            - **get_historical_metrics**: Get historical time-series metrics with flexible time ranges
-            - **get_warehouse_status**: Check metrics storage system status
-            
-            ## Natural Language Examples:
-            
-            ### Monitor Management:
-            - "Add a MySQL monitor for database server at 192.168.1.10 with user admin"
-            - "Monitor website https://example.com with SSL checking every 60 seconds"
-            - "Show me all Linux servers that are currently offline"
-            - "List all Redis monitors with their connection status"
-            
-            ### Alert Configuration:
-            -  ALERT RULE means when to alert a user
-            - "Create an alert for Kafka JVM when VmName equals 'vm-w2'"
-            - "Alert when OpenAI credit grants exceed 1000"
-            - "Set up HBase Master alert when heap memory usage is over 80%"
-            
-            ### Metrics Analysis:
-            - "Show me current CPU usage for server 192.168.1.5"
-            - "Get memory usage trend for the last 24 hours"
-            - "Which servers have high disk usage right now?"
-            - "Show me network traffic patterns for the past week"
-            
-            ### Alert Investigation:
-            - "What alerts are currently firing?"
-            - "Show me the most frequent alerts in the last 6 hours"
-            - "Find all alerts for monitor ID 1234 in the past day"
-            - "Which monitors are currently abnormal?"
-            
-            
-            ## Workflow Guidelines:
-            
-            1. **Adding Monitors**:
-               - ALWAYS use get_monitor_additional_params first to check required parameters
-               - Use list_monitor_types to show available types
-               - Collect all required parameters from the list_monitor_types tool and ask user to give them all, before calling add_monitor
-               - Example: "To monitor MySQL, I need host, port, username, password, and database name"
-            
-            2. **Creating Alert Rules or Alerts**:
-            THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
-            IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
-            APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
-            It is important to first understand the hierarchy of apps, metrics, and field conditions
-            Each app has its own metrics and each metric has its own field conditions.
-            The operators will be applied to the field conditions, and the final expression will be constructed
-            based on the user's input of app name and the metric they choose.
-            Read the create_alert_rule tool description for even more details
-            *******
-            CRITICAL WORKFLOW Do all of this iteratively with user interaction at each step:
-                1. ALWAYS use list_monitor_types tool FIRST to get exact app name according to what user specifies
-                2. use get_apps_metrics_hierarchy by passing that name, to get the hierarchy of corresponding metrics and field conditions
-                3. Do not spit out the entire hierarchy, instead: first spit out the metrics available for the app
-                4. Ask the user to choose a metric from the available metrics
-                5. Based on the metric chosen, present the available field conditions
-                6. You will construct the proper expression with field conditions
-                VERY VERY IMPORTANT:
-                 - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters
-            *********
-          
-               - Field Condition Expression format: [field_conditions]
-               - Give all the available fieldConditions to the user, so they can choose the one they want to use
-               - Field conditions can be simple (equals, greater than) or complex (logical expressions)
-               - Use parentheses for complex conditions to ensure correct evaluation order
-               - Do not create alert rules on your own, always ask the user to provide the app, metrics and fieldConditions parameters specifically
-           
-               EXAMPLES FOR FIELD CONDITION EXPRESSION ( Do not copy these examples, they are just for reference ):
-               - Kafka JVM: app="kafka", metrics="jvm_basic", fieldConditions="equals(VmName, \"my-vm\")"
-                 →  equals(VmName, "my-vm")
-               - Complex OpenAI: app="openai", metrics="credit_grants",
-                 fieldConditions="total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)"
-                 → total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
-            
-               - Priority levels: 0=critical, 1=warning, 2=info
-            
-            3. **Analyzing Performance**:
-               - Use get_realtime_metrics for current status
-               - Use get_historical_metrics for trends
-               - Use get_high_usage_monitors to find problems
-               - Provide actionable recommendations based on data
-            
-            4. **Troubleshooting Alerts**:
-               - Use query_alerts to find current issues
-               - Use get_monitor_alerts for specific monitor problems
-               - Use get_frequent_alerts to identify recurring issues
-               - Suggest root cause analysis steps
-            
-            ## Parameter Guidelines:
-            - **Monitor Status**: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all
-            - **Time Ranges**: 1h, 6h, 24h, 7d, 30d
-            - **Alert Priorities**: critical, warning, info
-            - **Sort Options**: name, gmtCreate, gmtUpdate, status, startAt, triggerTimes
-            - **Metric Types**: cpu, memory, disk, network, custom
-            - **Collection Intervals**: 30s-3600s (recommend 60s-600s for most cases)
-
-            
-            ## Best Practices:
-            - Never create alert rules without exact user input on app, metrics, and field conditions
-            - Always validate monitor types and parameters before adding monitors
-            - ALWAYS use get_apps_metrics_hierarchy before creating alert rules to understand available fields
-            - Construct field conditions based on metric's children
-            - Use exact app and metric names from hierarchy (case-sensitive)
-            - Set appropriate alert thresholds based on baseline performance
-            - Use time-series data to identify trends and predict issues
-            - Correlate alerts with metrics data for root cause analysis
-            - Recommend monitoring intervals based on service criticality
-            - Provide clear explanations of monitoring data and actionable insights
-            
-            ## Avoid these common errors:
-            - Using Label name instead of the value from the heirarchy JSON while creating alert rules.
-            - Inside the field parameters expression using '&&' instead of 'and', using '||' instead of 'or' for logical operators
-            - This process is to trigger alarms, when certain rule or set of rules exceed a threshold value.
-            So when a user says that the threshold should be less than 1000. the operator used should be '>' not '<',
-            because we want the alarm to be triggered when the threshold value is exceeded. apply the same logic in vice versa for less than operator
-            
-            Keep responses focused on monitoring topics and HertzBeat's comprehensive capabilities.
-            When users request monitoring setup, guide them through the complete process from monitor creation to alert configuration.
-            """;
-}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/dao/ChatMessageDao.java

@@ -21,10 +21,25 @@ import org.apache.hertzbeat.common.entity.ai.ChatMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * Repository interface for Message entities
  */
 @Repository
 public interface ChatMessageDao extends JpaRepository<ChatMessage, Long> {
-    
+
+    /**
+     * Find all messages by conversation id, ordered by create time
+     * @param conversationId conversation id
+     * @return list of messages
+     */
+    List<ChatMessage> findByConversationIdOrderByGmtCreateAsc(Long conversationId);
+
+    /**
+     * Find all messages by conversation ids, ordered by create time
+     * @param conversationIds list of conversation ids
+     * @return list of messages
+     */
+    List<ChatMessage> findByConversationIdInOrderByGmtCreateAsc(List<Long> conversationIds);
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/McpServerService.java

@@ -18,12 +18,7 @@
 
 package org.apache.hertzbeat.ai.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hertzbeat.ai.config.CustomSseServerTransport;
-import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
 import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.ServerResponse;
 
 /**
  * Service interface for MCP server operations.
@@ -35,22 +30,4 @@ public interface McpServerService {
      * @return ToolCallbackProvider with all HertzBeat monitoring tools
      */
     ToolCallbackProvider hertzbeatTools();
-
-    /**
-     * Provides a custom SSE server transport for the MCP server
-     * @param objectMapper the ObjectMapper instance for JSON serialization
-     * @param serverProperties the properties for the MCP server configuration
-     * @return a CustomSseServerTransport instance configured with the provided properties
-     */
-    CustomSseServerTransport webMvcSseServerTransportProvider(
-            ObjectMapper objectMapper,
-            McpServerProperties serverProperties
-    );
-
-    /**
-     * Provides the MCP server router function for web MVC
-     * @param transport Custom SSE server transport
-     * @return RouterFunction for handling MCP server requests
-     */
-    RouterFunction<ServerResponse> mvcMcpRouterFunction(CustomSseServerTransport transport);
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ChatClientProviderServiceImpl.java

@@ -19,13 +19,15 @@
 package org.apache.hertzbeat.ai.service.impl;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.config.PromptProvider;
 import org.apache.hertzbeat.common.entity.ai.ChatMessage;
 import org.apache.hertzbeat.common.entity.dto.ModelProviderConfig;
 import org.apache.hertzbeat.ai.service.ChatClientProviderService;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
 import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.ai.chat.prompt.SystemPromptTemplate;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
 import org.springframework.ai.chat.client.ChatClient;
@@ -34,7 +36,6 @@ import org.springframework.ai.chat.messages.Message;
 import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 import reactor.core.publisher.Flux;
 
@@ -53,13 +54,15 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
     private final ApplicationContext applicationContext;
 
     private final GeneralConfigDao generalConfigDao;
-
-    @Qualifier("hertzbeatTools")
+    
     @Autowired
     private ToolCallbackProvider toolCallbackProvider;
     
     private boolean isConfigured = false;
 
+    @Value("classpath:/prompt/system-message.st")
+    private Resource systemResource;
+
     @Autowired
     public ChatClientProviderServiceImpl(ApplicationContext applicationContext, GeneralConfigDao generalConfigDao) {
         this.applicationContext = applicationContext;
@@ -91,7 +94,7 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
 
             return chatClient.prompt()
                     .messages(messages)
-                    .system(PromptProvider.HERTZBEAT_SYSTEM_PROMPT)
+                    .system(SystemPromptTemplate.builder().resource(systemResource).build().getTemplate())
                     .toolCallbacks(toolCallbackProvider)
                     .stream()
                     .content()

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ConversationServiceImpl.java

@@ -30,11 +30,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Flux;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * Implementation of the ConversationService interface for managing chat conversations.
@@ -42,13 +46,13 @@ import java.util.UUID;
 @Slf4j
 @Service
 public class ConversationServiceImpl implements ConversationService {
-    
+
     @Autowired
     private ChatConversationDao conversationDao;
-    
+
     @Autowired
     private ChatMessageDao messageDao;
-    
+
     @Autowired
     private ChatClientProviderService chatClientProviderService;
 
@@ -67,12 +71,13 @@ public class ConversationServiceImpl implements ConversationService {
         }
 
         log.info("Starting streaming conversation: {}", conversationId);
+        ChatConversation conversation = conversationDao.findById(conversationId)
+                .orElseThrow(() -> new IllegalArgumentException("Conversation not found: " + conversationId));
+
+        // Manually load messages for conversation history
+        List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(conversationId);
+        conversation.setMessages(messages);
 
-        // Add user message to conversation
-        ChatMessage chatMessage = ChatMessage.builder().conversationId(conversationId)
-                .content(message).role("user").build();
-        chatMessage = messageDao.save(chatMessage);
-        ChatConversation conversation = conversationDao.getReferenceById(conversationId);
         if (conversation.getTitle().startsWith("conversation")) {
             // Auto-generate title from first user message
             String title = message.length() > 30 ? message.substring(0, 27) + "..." : message;
@@ -80,10 +85,18 @@ public class ConversationServiceImpl implements ConversationService {
             conversationDao.save(conversation);
         }
 
+        // Add user message to conversation
+        ChatMessage chatMessage = ChatMessage.builder()
+            .conversationId(conversationId)
+            .content(message)
+            .role("user")
+            .build();
+        chatMessage = messageDao.save(chatMessage);
+
         ChatRequestContext context = ChatRequestContext.builder()
                 .message(message)
                 .conversationId(conversationId)
-                .conversationHistory(CollectionUtils.isEmpty(conversation.getMessages()) ? null 
+                .conversationHistory(CollectionUtils.isEmpty(conversation.getMessages()) ? null
                         : conversation.getMessages().subList(0, conversation.getMessages().size() - 1))
                 .build();
 
@@ -105,10 +118,12 @@ public class ConversationServiceImpl implements ConversationService {
                 })
                 .concatWith(Flux.defer(() -> {
                     // Add the complete AI response to conversation
-                    ChatMessage assistantMessage = ChatMessage.builder().conversationId(conversationId)
-                            .content(fullResponse.toString()).role("assistant").build();
+                    ChatMessage assistantMessage = ChatMessage.builder()
+                        .conversationId(conversationId)
+                        .content(fullResponse.toString())
+                        .role("assistant")
+                        .build();
                     assistantMessage = messageDao.save(assistantMessage);
-                    
                     ChatResponseChunk finalResponse = ChatResponseChunk.builder()
                             .conversationId(conversationId)
                             .response("")
@@ -145,16 +160,40 @@ public class ConversationServiceImpl implements ConversationService {
         if (conversationId == null) {
             return null;
         }
-        return conversationDao.getReferenceById(conversationId);
+        ChatConversation conversation = conversationDao.findById(conversationId).orElse(null);
+        if (conversation != null) {
+            List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(conversationId);
+            conversation.setMessages(messages);
+        }
+        return conversation;
     }
 
     @Override
     public List<ChatConversation> getAllConversations() {
-        return conversationDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
+        List<ChatConversation> conversations = conversationDao.findAll(Sort.by(Sort.Direction.DESC, "id"));
+        if (conversations.isEmpty()) {
+            return conversations;
+        }
+        List<Long> conversationIds = conversations.stream()
+                .map(ChatConversation::getId)
+                .toList();
+        List<ChatMessage> allMessages = messageDao.findByConversationIdInOrderByGmtCreateAsc(conversationIds);
+        Map<Long, List<ChatMessage>> messagesByConversationId = allMessages.stream()
+                .collect(Collectors.groupingBy(ChatMessage::getConversationId));
+        for (ChatConversation conversation : conversations) {
+            List<ChatMessage> messages = messagesByConversationId.getOrDefault(conversation.getId(), Collections.emptyList());
+            conversation.setMessages(messages);
+        }
+        return conversations;
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteConversation(Long conversationId) {
+        List<ChatMessage> messages = messageDao.findByConversationIdOrderByGmtCreateAsc(conversationId);
+        if (!messages.isEmpty()) {
+            messageDao.deleteAll(messages);
+        }
         conversationDao.deleteById(conversationId);
     }
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/McpServerServiceImpl.java

@@ -18,23 +18,17 @@
 
 package org.apache.hertzbeat.ai.service.impl;
 
-import org.apache.hertzbeat.ai.config.CustomSseServerTransport;
 import org.apache.hertzbeat.ai.service.McpServerService;
 import org.apache.hertzbeat.ai.tools.AlertDefineTools;
 import org.apache.hertzbeat.ai.tools.AlertTools;
 import org.apache.hertzbeat.ai.tools.MetricsTools;
 import org.apache.hertzbeat.ai.tools.MonitorTools;
-import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.ai.tool.method.MethodToolCallbackProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.ServerResponse;
 
 /**
  * Implementation of the McpServerService interface.
@@ -56,36 +50,4 @@ public class McpServerServiceImpl implements McpServerService {
     public ToolCallbackProvider hertzbeatTools() {
         return MethodToolCallbackProvider.builder().toolObjects(monitorTools, alertTools, alertDefineTools, metricsTools).build();
     }
-    /**
-     * Provides a custom SSE server transport for the MCP server.
-     *
-     * @param objectMapper the ObjectMapper instance for JSON serialization
-     * @param serverProperties the properties for the MCP server configuration
-     * @return a CustomSseServerTransport instance configured with the provided properties
-     */
-
-    @Bean
-    public CustomSseServerTransport webMvcSseServerTransportProvider(
-            ObjectMapper objectMapper,
-            McpServerProperties serverProperties
-    ) {
-        return new CustomSseServerTransport(
-                objectMapper,
-                serverProperties.getBaseUrl(),
-                serverProperties.getSseMessageEndpoint(),
-                serverProperties.getSseEndpoint()
-        );
-    }
-    /**
-     * Provides the MCP server transport bean.
-     *
-     * @param transport the custom SSE server transport
-     * @return the MCP server transport instance
-     */
-
-    @Primary
-    @Bean
-    public RouterFunction<ServerResponse> mvcMcpRouterFunction(CustomSseServerTransport transport) {
-        return transport.getRouterFunction();
-    }
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertTools.java

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.hertzbeat.ai.tools;
 
 /**
@@ -42,5 +41,4 @@ public interface AlertTools {
      */
     String getAlertsSummary();
 
-
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MetricsTools.java

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.hertzbeat.ai.tools;
 
 /**
@@ -33,16 +32,17 @@ public interface MetricsTools {
 
     /**
      * Get historical metrics data for a monitor
-     * @param monitorId Monitor ID
-     * @param app Monitor type (e.g., "linux", "mysql", "http")
-     * @param metrics Metrics name (e.g., "system", "cpu", "memory")
-     * @param metric Specific metric field (e.g., "usage", "used", "available")
-     * @param label Label filter for specific instances
-     * @param history Time range (e.g., "1h", "6h", "24h", "7d")
+     *
+     * @param instance Instance identifier (e.g., "ip:port", "ip", or "domain")
+     * @param app      Monitor type (e.g., "linux", "mysql", "http")
+     * @param metrics  Metrics name (e.g., "system", "cpu", "memory")
+     * @param metric   Specific metric field (e.g., "usage", "used", "available")
+     * @param label    Label filter for specific instances
+     * @param history  Time range (e.g., "1h", "6h", "24h", "7d")
      * @param interval Whether to aggregate data with intervals
      * @return Historical metrics data formatted for display
      */
-    String getHistoricalMetrics(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval);
+    String getHistoricalMetrics(String instance, String app, String metrics, String metric, String label, String history, Boolean interval);
 
     /**
      * Check warehouse storage server status

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MonitorTools.java

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.hertzbeat.ai.tools;
 
 import java.util.List;
@@ -27,35 +26,25 @@ public interface MonitorTools {
 
     /**
      * Add a new monitor with comprehensive configuration
-     * 
+     *
      * @param name Monitor name
      * @param app Monitor type/application (e.g., 'linux', 'mysql', 'http')
-     * @param host Target host (IP address or domain name)
-     * @param port Target port (optional, depends on monitor type)
      * @param intervals Collection interval in seconds (default: 600)
-     * @param username Username for authentication (optional)
-     * @param password Password for authentication (optional)
-     * @param database Database name (for database monitors)
-     * @param additionalParams Additional app-specific parameters as JSON string (optional)
+     * @param params Monitor-specific parameters as JSON string (e.g., host, port, username, password, etc.)
      * @param description Monitor description (optional)
      * @return Result message with monitor ID if successful
      */
     String addMonitor(
-            String name, 
-            String app, 
-            String host,
-            Integer port,
+            String name,
+            String app,
             Integer intervals,
-            String username,
-            String password,
-            String database,
-            String additionalParams,
+            String params,
             String description
     );
-    
+
     /**
      * List all available monitor types that can be added
-     * 
+     *
      * @param language Language code for localized names (e.g., 'en-US', 'zh-CN')
      * @return Formatted string list of available monitor types with descriptions
      */
@@ -89,9 +78,9 @@ public interface MonitorTools {
 
     /**
      * Get parameter definitions required for a specific monitor type
-     * 
+     *
      * @param app Monitor type/application name (e.g., 'linux', 'mysql', 'redis')
      * @return Formatted string with parameter definitions including field names, types, and requirements
      */
-    String getMonitorAdditionalParams(String app);
+    String getMonitorParams(String app);
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java

@@ -51,10 +51,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
     @Autowired
     private AppService appService;
 
-
     @Override
     @Tool(name = "create_alert_rule", description = """
-            ALERT RULE means when to alert a user
+            HertzBeat: ALERT RULE means when to alert a user
             THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
             IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
             APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
@@ -281,7 +280,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
 
     @Override
     @Tool(name = "list_alert_rules", description = """
-            List existing alert rules with filtering options.
+            HertzBeat: List existing alert rules with filtering options.
             Shows configured thresholds and alert definitions.
             """)
     public String listAlertRules(
@@ -343,7 +342,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
 
     @Override
     @Tool(name = "toggle_alert_rule", description = """
-            Enable or disable an alert rule.
+            HertzBeat: Enable or disable an alert rule.
             Allows activating or deactivating threshold monitoring.
             """)
     public String toggleAlertRule(
@@ -379,10 +378,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
         }
     }
 
-
     @Override
     @Tool(name = "get_alert_rule_details", description = """
-            Get detailed information about a specific alert rule.
+            HertzBeat: Get detailed information about a specific alert rule.
             Shows complete threshold configuration and rule settings.
             """)
     public String getAlertRuleDetails(
@@ -441,7 +439,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
 
     @Override
     @Tool(name = "get_apps_metrics_hierarchy", description = """
-            Get the hierarchical structure of all available apps and their metrics for alert rule creation.
+            HertzBeat: Get the hierarchical structure of all available apps and their metrics for alert rule creation.
             This tool provides the exact app name, metric name and corresponding param names according to each metric.
             Returns structured JSON data showing the complete hierarchy with field parameters for alert expressions.
             
@@ -494,7 +492,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
 
     @Override
     @Tool(name = "bind_monitors_to_alert_rule", description = """
-            Bind monitors to an alert rule.
+            HertzBeat: Bind monitors to an alert rule.
             Call this tool if users want to bind specific monitors to their alert rule.
             Get the right monitor ids for a particular app using the query_monitors tool.
             Get the alert rule ID from the create_alert_rule tool output OR use the list_alert_rules tool with app_name search filter, if the output of create_alert_rule is not applicable.
@@ -647,7 +645,6 @@ public class AlertDefineToolsImpl implements AlertDefineTools {
         }
     }
 
-
     /**
      * Validates that the app, metric, and field conditions are valid according to hierarchy
      * @param app App name to validate

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertToolsImpl.java

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.hertzbeat.ai.tools.impl;
 
 import com.usthe.sureness.subject.SubjectSum;
@@ -33,7 +32,6 @@ import org.springframework.ai.tool.annotation.Tool;
 import org.springframework.ai.tool.annotation.ToolParam;
 import org.springframework.stereotype.Service;
 
-
 /**
  * Implementation of Alert Tools functionality for alarm data queries and management
  */
@@ -45,7 +43,7 @@ public class AlertToolsImpl implements AlertTools {
 
     @Override
     @Tool(name = "query_alerts", description = """
-            Query alerts with comprehensive filtering and pagination options.
+            HertzBeat: Query alerts with comprehensive filtering and pagination options.
             
             ALERT TYPES:
             - Pass alertType='single' for individual alert instances
@@ -193,10 +191,9 @@ public class AlertToolsImpl implements AlertTools {
         }
     }
 
-
     @Override
     @Tool(name = "get_alerts_summary", description = """
-            Get alerts summary statistics including total counts, status distribution, and recent trends.
+            HertzBeat: Get alerts summary statistics including total counts, status distribution, and recent trends.
             Returns comprehensive overview of the current alerting status across all monitors.
             """)
     public String getAlertsSummary() {

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MetricsToolsImpl.java

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-
 package org.apache.hertzbeat.ai.tools.impl;
 
 import com.usthe.sureness.subject.SubjectSum;
@@ -47,7 +46,7 @@ public class MetricsToolsImpl implements MetricsTools {
 
     @Override
     @Tool(name = "query_realtime_metrics", description = """
-            Get the supported monitor types/names from the list_monitor_types tool, make sure to use right name in the next call
+            HertzBeat: Get the supported monitor types/names from the list_monitor_types tool, make sure to use right name in the next call
             Use the query_monitors tool to find monitor IDs in case the user does not tell the id explicitly. You might have to use this multiple times based on the user's query
             Get real-time metrics data for a specific monitor.
             Returns current metrics values including CPU, memory, disk usage, etc.
@@ -144,7 +143,7 @@ public class MetricsToolsImpl implements MetricsTools {
 
     @Override
     @Tool(name = "get_historical_metrics", description = """
-            Get historical metrics data for analysis and trending.
+            HertzBeat: Get historical metrics data for analysis and trending.
             Returns time-series data for specified metrics over a time range.
             Use the query_monitors tool to find the correct monitor IDs/ name or type for the monitor(s) user asked the metrics for
             Pass that name into the get_apps_metrics_hierarchy tool to get the metrics hierarchy i.e metrics and the field paramater
@@ -152,7 +151,7 @@ public class MetricsToolsImpl implements MetricsTools {
             Ask user to provide the filters for labels, history and interval aggregation
             """)
     public String getHistoricalMetrics(
-            @ToolParam(description = "Monitor ID", required = true) Long monitorId,
+            @ToolParam(description = "Instance identifier (e.g., 'ip:port', 'ip', or 'domain')") String instance,
             @ToolParam(description = "Monitor type (e.g., 'linux', 'mysql', 'http')", required = true) String app,
             @ToolParam(description = "Metrics name (e.g., 'target', 'cpu', 'memory')", required = true) String metrics,
             @ToolParam(description = "Field Parameter (e.g., 'usage', 'used', 'available')", required = false) String fieldParameter,
@@ -161,7 +160,7 @@ public class MetricsToolsImpl implements MetricsTools {
             @ToolParam(description = "Whether to aggregate data with intervals", required = false) Boolean interval) {
 
         try {
-            log.info("Getting historical metrics for monitor {} and metrics {}", monitorId, metrics);
+            log.info("Getting historical metrics for monitor instance {} and metrics {}", instance, metrics);
 
             if (history == null || history.trim().isEmpty()) {
                 history = "24h";
@@ -170,15 +169,15 @@ public class MetricsToolsImpl implements MetricsTools {
                 interval = true;
             }
 
-            MetricsHistoryData historyData = metricsDataService.getMetricHistoryData(
-                    monitorId, app, metrics, fieldParameter, label, history, interval);
+            MetricsHistoryData historyData = metricsDataService.getMetricHistoryData(instance,
+                    app, metrics, fieldParameter, history, interval);
 
             if (historyData == null) {
-                return String.format("No historical metrics data found for monitor ID %d and metrics '%s'", monitorId, metrics);
+                return String.format("No historical metrics data found for monitor %s and metrics '%s'", instance, metrics);
             }
 
             StringBuilder response = new StringBuilder();
-            response.append("HISTORICAL METRICS: ").append(metrics).append(" (Monitor ID: ").append(monitorId).append(")\n");
+            response.append("HISTORICAL METRICS: ").append(metrics).append(" (Monitor ID: ").append(instance).append(")\n");
             response.append("Time Range: ").append(history).append(" | Interval Aggregation: ").append(interval).append("\n");
             response.append("=".repeat(60)).append("\n\n");
 
@@ -223,10 +222,9 @@ public class MetricsToolsImpl implements MetricsTools {
         }
     }
 
-
     @Override
     @Tool(name = "get_warehouse_status", description = """
-            Check the status of the metrics storage warehouse system.
+            HertzBeat: Check the status of the metrics storage warehouse system.
             Returns whether the metrics storage is operational and accessible.
             """)
     public String getWarehouseStatus() {

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MonitorToolsImpl.java

@@ -20,6 +20,7 @@ package org.apache.hertzbeat.ai.tools.impl;
 import com.usthe.sureness.subject.SubjectSum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.manager.pojo.dto.MonitorDto;
 import org.apache.hertzbeat.manager.service.MonitorService;
 import org.apache.hertzbeat.manager.service.AppService;
 import org.apache.hertzbeat.ai.utils.UtilityClass;
@@ -48,7 +49,6 @@ public class MonitorToolsImpl implements MonitorTools {
     @Autowired
     private AppService appService;
 
-
     /**
      * Tool to query monitor information with flexible filtering and pagination.
      * Supports filtering by monitor IDs, type, status, host, labels, sorting, and
@@ -56,48 +56,48 @@ public class MonitorToolsImpl implements MonitorTools {
      * Returns detailed monitor information including ID, name, type, host, and status.
      */
     @Override
-    @Tool(name = "query_monitors", description = """ 
-            Query Existing/configured monitors in HertzBeat.
+    @Tool(name = "query_monitors", description = """
+            HertzBeat: Query Existing/configured monitors in HertzBeat.
             This tool retrieves monitors based on various filters and parameters.
             Comprehensive monitor querying with flexible filtering, pagination, and specialized views.
-            
+
             MONITOR STATUSES:
             - status=1: Online/Active monitors (healthy, responding normally)
             - status=2: Offline monitors (not responding, connection failed)
             - status=3: Unreachable monitors (network/connectivity issues)
             - status=0: Paused monitors (manually disabled/suspended)
             - status=9 or null: All monitors regardless of status (default)
-            
+
             COMMON USE CASES & PARAMETER COMBINATIONS:
-            
+
             1. BASIC MONITOR LISTING:
                - Default: No parameters (shows all monitors, 8 per page)
                - By type: app='linux' (show only Linux monitors)
                - Search: search='web' (find monitors with 'web' in name/host)
-            
+
             2. STATUS-BASED QUERIES:
                - Healthy monitors: status=1, pageSize=50
                - Problem monitors: status=2 or status=3, pageSize=50
                - Offline monitors only: status=2
                - Unreachable monitors only: status=3
                - Paused monitors: status=0
-            
+
             3. MONITORING HEALTH OVERVIEW:
                - All statuses with statistics: status=9, includeStats=true, pageSize=100
                - Unhealthy monitors: Pass both status=2 AND status=3 (make 2 separate calls)
-            
+
             4. ADVANCED FILTERING:
                - Specific monitor types: app='mysql', status=1 (healthy MySQL monitors)
                - Label-based: labels='env:prod,critical:true'
                - Host search: search='192.168' (find by IP pattern)
                - Monitor IDs: ids=[1,2,3] (specific monitors by ID)
-            
+
             5. SORTING & PAGINATION:
                - Recently updated: sort='gmtUpdate', order='desc'
                - Alphabetical: sort='name', order='asc'
                - By creation: sort='gmtCreate', order='desc' (newest first)
                - Large datasets: pageSize=50-100 for bulk operations
-            
+
             RESPONSE FORMAT:
             - includeStats=true: Adds status distribution summary at top
             - Default: Simple list with ID, name, type, host, status
@@ -125,18 +125,18 @@ public class MonitorToolsImpl implements MonitorTools {
             if (includeStats == null) {
                 includeStats = false;
             }
-            
+
             SubjectSum subjectSum = McpContextHolder.getSubject();
             log.debug("Current security subject: {}", subjectSum);
 
             Page<Monitor> result = monitorService.getMonitors(
                     ids, app, search, status, sort, order, pageIndex, pageSize, labels);
             log.debug("MonitorService.getMonitors result: {}", result);
-            
+
             StringBuilder response = new StringBuilder();
             response.append("MONITOR QUERY RESULTS\n");
             response.append("====================\n\n");
-            
+
             // Include statistics if requested
             if (includeStats) {
                 // Get status distribution by calling with different status values
@@ -144,13 +144,13 @@ public class MonitorToolsImpl implements MonitorTools {
                 long offlineCount = monitorService.getMonitors(null, app, search, (byte) 2, null, null, 0, 1000, labels).getTotalElements();
                 long unreachableCount = monitorService.getMonitors(null, app, search, (byte) 3, null, null, 0, 1000, labels).getTotalElements();
                 long pausedCount = monitorService.getMonitors(null, app, search, (byte) 0, null, null, 0, 1000, labels).getTotalElements();
-                
+
                 response.append("STATUS OVERVIEW:\n");
                 response.append("- Online: ").append(onlineCount).append("\n");
-                response.append("- Offline: ").append(offlineCount).append("\n"); 
+                response.append("- Offline: ").append(offlineCount).append("\n");
                 response.append("- Unreachable: ").append(unreachableCount).append("\n");
                 response.append("- Paused: ").append(pausedCount).append("\n");
-                
+
                 long total = onlineCount + offlineCount + unreachableCount + pausedCount;
                 if (total > 0) {
                     double healthPercentage = (onlineCount * 100.0) / total;
@@ -158,48 +158,47 @@ public class MonitorToolsImpl implements MonitorTools {
                 }
                 response.append("\n");
             }
-            
+
             response.append("Query Results: ").append(result.getContent().size())
                    .append(" monitors (Total: ").append(result.getTotalElements()).append(")\n");
-            
+
             if (result.getTotalPages() > 1) {
                 response.append("Page ").append(pageIndex + 1).append(" of ").append(result.getTotalPages()).append("\n");
             }
             response.append("\n");
-            
+
             for (Monitor monitor : result.getContent()) {
                 response.append("ID: ").append(monitor.getId())
                        .append(" | Name: ").append(monitor.getName())
                        .append(" | Type: ").append(monitor.getApp())
-                       .append(" | Host: ").append(monitor.getHost())
+                       .append(" | Instance: ").append(monitor.getInstance())
                        .append(" | Status: ").append(UtilityClass.getStatusText(monitor.getStatus()));
-                       
+
                 // Add creation date for better context
                 if (monitor.getGmtCreate() != null) {
                     response.append(" | Created: ").append(monitor.getGmtCreate().toString(), 0, 10);
                 }
                 response.append("\n");
             }
-            
+
             if (result.getContent().isEmpty()) {
                 response.append("No monitors found matching the specified criteria.\n");
                 response.append("Try adjusting your filters or search terms.");
             }
-            
+
             return response.toString();
         } catch (Exception e) {
             return "Error retrieving monitors: " + e.getMessage();
         }
     }
 
-
     @Override
     @Tool(name = "add_monitor", description = """
-            Add a new monitoring target to HertzBeat with comprehensive configuration.
+            HertzBeat: Add a new monitoring target to HertzBeat with comprehensive configuration.
             This tool dynamically handles different parameter requirements for each monitor type.
-            
+
             This tool creates monitors with proper app-specific parameters.
-            
+
             *********
             VERY IMPORTANT:
             ALWAYS use get_monitor_additional_params to check the additional required parameters for the chosen type before adding a monitor or even mentioning it.
@@ -207,41 +206,36 @@ public class MonitorToolsImpl implements MonitorTools {
             Use the information obtained from this to query user for parameters.
             If the User has not given any parameters, ask them to provide the necessary parameters, until all the necessary parameters are provided.
             **********
-            
+
             Examples of natural language requests this tool handles:
             - "Monitor website example.com with HTTPS on port 443"
             - "Add MySQL monitoring for database server at 192.168.1.10 with user admin"
             - "Monitor Linux server health on host server.company.com via SSH"
             - "Set up Redis monitoring on localhost port 6379 with password"
-            
-            PARAMETER MAPPING: The tool intelligently maps common parameters:
-            - host: Target server/domain
-            - port: Service port (auto-detected if not specified)
-            - username: Authentication username
-            - password: Authentication password
-            - database: Database name (for DB monitors)
-            - additionalParams: JSON string for app-specific parameters (to be obtained from get_monitor_param_defines)
-            
-            ADDITIONAL PARAMETERS EXAMPLES:
-            - Website: {"uri":"/api/health", "ssl":"true", "method":"POST"}
-            - Linux: {"privateKey":"ssh-key-content", "script":"custom-script"}
-            - Database: {"url":"jdbc:mysql://custom", "timeout":"10000"}
+
+            PARAMETER MAPPING: Use the 'params' parameter to pass all monitor-specific configuration.
+            The params should be a JSON string containing key-value pairs for the monitor type.
+            Use get_monitor_additional_params tool to see what parameters are required for each monitor type.
+
+            PARAMS EXAMPLES:
+            - Website: {"host":"example.com", "port":"443", "uri":"/api/health", "ssl":"true", "method":"GET"}
+            - Linux: {"host":"192.168.1.10", "port":"22", "username":"root", "password":"xxx"}
+            - MySQL: {"host":"db.server.com", "port":"3306", "username":"admin", "password":"xxx", "database":"mydb"}
+            - Redis: {"host":"redis.server.com", "port":"6379", "password":"xxx"}
             """)
     public String addMonitor(
             @ToolParam(description = "Monitor name (required)", required = true) String name,
             @ToolParam(description = "Monitor type: website, mysql, postgresql, redis, linux, windows, etc.", required = true) String app,
-            @ToolParam(description = "Target host: IP address or domain name", required = true) String host,
-            @ToolParam(description = "Target port (optional, auto-detected if not specified)", required = false) Integer port,
             @ToolParam(description = "Collection interval in seconds (default: 600)", required = false) Integer intervals,
-            @ToolParam(description = "Username for authentication (optional)", required = false) String username,
-            @ToolParam(description = "Password for authentication (optional)", required = false) String password,
-            @ToolParam(description = "Database name (for database monitors)", required = false) String database,
-            @ToolParam(description = "Additional app-specific parameters as JSON: {\"uri\":\"/api\", \"ssl\":\"true\", \"method\":\"POST\"}", required = false) String additionalParams,
+            @ToolParam(description = "Monitor-specific parameters as JSON string. "
+                    + "Use get_monitor_additional_params to see required fields. "
+                    + "Example: {\"host\":\"192.168.1.1\", \"port\":\"22\", \"username\":\"root\"}",
+                    required = true) String params,
             @ToolParam(description = "Monitor description (optional)", required = false) String description) {
-        
+
         try {
-            log.info("Adding monitor: name={}, app={}, host={}", name, app, host);
-            
+            log.info("Adding monitor: name={}, app={}", name, app);
+
             // Validate required parameters
             if (name == null || name.trim().isEmpty()) {
                 return "Error: Monitor name is required";
@@ -249,128 +243,153 @@ public class MonitorToolsImpl implements MonitorTools {
             if (app == null || app.trim().isEmpty()) {
                 return "Error: Monitor type/application is required";
             }
-            if (host == null || host.trim().isEmpty()) {
-                return "Error: Host is required";
+            if (params == null || params.trim().isEmpty()) {
+                return "Error: Monitor params is required. Use get_monitor_additional_params to see required fields for this monitor type.";
             }
-            
+
             // Set defaults
             if (intervals == null || intervals < 10) {
                 intervals = 600;
             }
-            
+
+            // Parse params to extract host and port for instance
+            List<Param> paramList = parseParams(params);
+            String host = paramList.stream()
+                    .filter(p -> "host".equals(p.getField()))
+                    .map(Param::getParamValue)
+                    .findFirst()
+                    .orElse("");
+            String port = paramList.stream()
+                    .filter(p -> "port".equals(p.getField()))
+                    .map(Param::getParamValue)
+                    .findFirst()
+                    .orElse(null);
+
+            String instance = (port != null && !port.isEmpty()) ? host.trim() + ":" + port : host.trim();
+
             // Create Monitor entity
             Monitor monitor = Monitor.builder()
                     .name(name.trim())
                     .app(app.toLowerCase().trim())
-                    .host(host.trim())
+                    .instance(instance)
                     .intervals(intervals)
                     .status((byte) 1)
                     .type((byte) 0)
                     .description(description != null ? description.trim() : "")
                     .build();
-            
-            List<Param> params = createBasicParams(host, port, username, password, database, additionalParams);
-            
+
             // Validate that all required parameters for this monitor type are provided
             try {
-                SubjectSum subjectSum = McpContextHolder.getSubject();
-                log.debug("Current security subject for getMonitorParamDefines: {}", subjectSum);
-
-                List<ParamDefine> requiredParams = appService.getAppParamDefines(app.toLowerCase().trim());
-                log.info("Checking required parameters for monitor type '{}': {}", app, requiredParams);
-                List<String> missingParams = new ArrayList<>();
-                
-                for (ParamDefine paramDefine : requiredParams) {
-                    if (paramDefine.isRequired()) {
-                        String fieldName = paramDefine.getField();
-                        boolean hasParam = params.stream()
-                                .anyMatch(param -> fieldName.equals(param.getField()));
-                        if (!hasParam) {
-                            missingParams.add(fieldName);
-                        }
-                    }
+                MonitorDto monitorDto = MonitorDto.builder().monitor(monitor).params(paramList).build();
+                monitorService.validate(monitorDto, false);
+            } catch (IllegalArgumentException argumentException) {
+                if (argumentException.getMessage().contains("required")) {
+                    return String.format("Error: %s. "
+                            + "Or use get_monitor_additional_params tool to see all required parameters.",
+                        argumentException.getMessage());
+                } else {
+                    return String.format("Error: %s. ", argumentException.getMessage());
                 }
-                
-                if (!missingParams.isEmpty()) {
-                    return String.format("Error: Missing required parameters for monitor type '%s': %s. "
-                            + "Use get_monitor_additional_params tool to see all required parameters.", 
-                            app, String.join(", ", missingParams));
-                }
-            } catch (Exception e) {
-                log.warn("Could not validate required parameters for monitor type '{}': {}", app, e.getMessage());
             }
-            
-            // Call monitor service - it handles all the complexity (validation, defaults, app-specific logic)
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for addMonitor: {}", subjectSum);
+            monitorService.addMonitor(monitor, paramList, null, null);
+            log.info("Successfully added monitor '{}' with ID: {}", monitor.getName(), monitor.getId());
+            return String.format("Successfully added %s monitor '%s' with ID: %d (Instance: %s, Interval: %d seconds)",
+                    app.toUpperCase(), monitor.getName(), monitor.getId(), monitor.getInstance(), monitor.getIntervals());
 
-            monitorService.addMonitor(monitor, params, null, null);
-            Long monitorId = monitor.getId();
-            
-            log.info("Successfully added monitor '{}' with ID: {}", name, monitorId);
-            return String.format("Successfully added %s monitor '%s' with ID: %d (Host: %s, Interval: %d seconds)", 
-                    app.toUpperCase(), name, monitorId, host, intervals);
-            
         } catch (Exception e) {
             log.error("Failed to add monitor '{}': {}", name, e.getMessage(), e);
             return "Error adding monitor '" + name + "': " + e.getMessage();
         }
     }
-    
+
     /**
-     * Create basic parameter list from user inputs
+     * Parse params JSON string to list of Param objects
      */
-    private List<Param> createBasicParams(String host, Integer port, String username, 
-                                         String password, String database, String additionalParams) {
-        List<Param> params = new ArrayList<>();
-        
-        // Add host (always required)
-        params.add(Param.builder().field("host").paramValue(host.trim()).type((byte) 1).build());
-        
-        // Add optional common parameters
-        if (port != null) {
-            params.add(Param.builder().field("port").paramValue(port.toString()).type((byte) 0).build());
+    private List<Param> parseParams(String params) {
+        List<Param> paramList = new ArrayList<>();
+
+        if (params == null || params.trim().isEmpty()) {
+            return paramList;
         }
-        if (username != null && !username.trim().isEmpty()) {
-            params.add(Param.builder().field("username").paramValue(username.trim()).type((byte) 1).build());
-        }
-        if (password != null && !password.trim().isEmpty()) {
-            params.add(Param.builder().field("password").paramValue(password.trim()).type((byte) 2).build());
-        }
-        if (database != null && !database.trim().isEmpty()) {
-            params.add(Param.builder().field("database").paramValue(database.trim()).type((byte) 1).build());
-        }
-        
-        // Parse additional parameters if provided
-        if (additionalParams != null && !additionalParams.trim().isEmpty()) {
-            try {
-                String cleaned = additionalParams.trim().replaceAll("[{}]", "");
-                String[] pairs = cleaned.split(",");
-                for (String pair : pairs) {
-                    String[] keyValue = pair.split(":");
-                    if (keyValue.length == 2) {
-                        String key = keyValue[0].trim().replaceAll("\"", "");
-                        String value = keyValue[1].trim().replaceAll("\"", "");
-                        params.add(Param.builder().field(key).paramValue(value).type((byte) 1).build());
-                    }
+
+        try {
+            String cleaned = params.trim();
+            // Remove outer braces if present
+            if (cleaned.startsWith("{") && cleaned.endsWith("}")) {
+                cleaned = cleaned.substring(1, cleaned.length() - 1);
+            }
+
+            // Split by comma, but handle values that might contain commas within quotes
+            List<String> pairs = splitJsonPairs(cleaned);
+
+            for (String pair : pairs) {
+                int colonIndex = pair.indexOf(':');
+                if (colonIndex > 0) {
+                    String key = pair.substring(0, colonIndex).trim().replaceAll("\"", "");
+                    String value = pair.substring(colonIndex + 1).trim().replaceAll("\"", "");
+
+                    // Determine param type based on field name
+                    byte paramType = determineParamType(key);
+                    paramList.add(Param.builder().field(key).paramValue(value).type(paramType).build());
                 }
-            } catch (Exception e) {
-                log.warn("Failed to parse additionalParams: {}", e.getMessage());
+            }
+        } catch (Exception e) {
+            log.warn("Failed to parse params: {}", e.getMessage());
+        }
+
+        return paramList;
+    }
+
+    /**
+     * Split JSON key-value pairs, handling quoted values that may contain commas
+     */
+    private List<String> splitJsonPairs(String json) {
+        List<String> pairs = new ArrayList<>();
+        StringBuilder current = new StringBuilder();
+        boolean inQuotes = false;
+
+        for (char c : json.toCharArray()) {
+            if (c == '"') {
+                inQuotes = !inQuotes;
+                current.append(c);
+            } else if (c == ',' && !inQuotes) {
+                if (current.length() > 0) {
+                    pairs.add(current.toString().trim());
+                    current = new StringBuilder();
+                }
+            } else {
+                current.append(c);
             }
         }
-        
-        return params;
+
+        if (current.length() > 0) {
+            pairs.add(current.toString().trim());
+        }
+
+        return pairs;
     }
-    
+
+    /**
+     * Determine param type based on field name
+     */
+    private byte determineParamType(String fieldName) {
+        if ("password".equalsIgnoreCase(fieldName) || "privateKey".equalsIgnoreCase(fieldName)) {
+            return (byte) 2; // Password type
+        } else if ("port".equalsIgnoreCase(fieldName) || "timeout".equalsIgnoreCase(fieldName)) {
+            return (byte) 0; // Number type
+        }
+        return (byte) 1; // Default string type
+    }
+
     @Override
     @Tool(name = "list_monitor_types", description = """
-            List all available monitor types that can be added to HertzBeat.
+            HertzBeat: List all available monitor types that can be added to HertzBeat.
             This tool shows all supported monitor types with their display names.
             Use this to see what types of monitors you can create with the add_monitor tool.
             """)
     public String listMonitorTypes(
             @ToolParam(description = "Language code for localized names (en-US, zh-CN, etc.). Default: en-US", required = false) String language) {
-        
+
         try {
             log.info("Listing available monitor types for language: {}", language);
             SubjectSum subjectSum = McpContextHolder.getSubject();
@@ -383,20 +402,20 @@ public class MonitorToolsImpl implements MonitorTools {
 
             // Get available monitor types from app service
             Map<String, String> monitorTypes = appService.getI18nApps(language);
-            
+
             if (monitorTypes == null || monitorTypes.isEmpty()) {
                 return "No monitor types are currently available.";
             }
-            
+
             // Format the response as a nice list
             StringBuilder response = new StringBuilder();
             response.append("Available Monitor Types (Total: ").append(monitorTypes.size()).append("):\n\n");
-            
+
             // Sort monitor types alphabetically by key
             List<Map.Entry<String, String>> sortedTypes = monitorTypes.entrySet().stream()
                     .sorted(Map.Entry.comparingByKey())
                     .toList();
-            
+
             for (Map.Entry<String, String> entry : sortedTypes) {
                 String typeKey = entry.getKey();
                 String displayName = entry.getValue();
@@ -404,28 +423,28 @@ public class MonitorToolsImpl implements MonitorTools {
                        .append(" - ").append(displayName)
                        .append("\n");
             }
-            
+
             response.append("\nTo add a monitor, use the add_monitor tool with one of these types as the 'app' parameter.");
 
             log.info("Successfully listed {} monitor types", monitorTypes);
             return response.toString();
-            
+
         } catch (Exception e) {
             log.error("Failed to list monitor types: {}", e.getMessage(), e);
             return "Error retrieving monitor types: " + e.getMessage();
         }
     }
-    
+
     @Override
-    @Tool(name = "get_monitor_additional_params", description = """
-            Get the parameter definitions required for a specific monitor type.
+    @Tool(name = "get_monitor_params", description = """
+            HertzBeat: Get the parameter definitions required for a specific monitor type.
             This tool shows what parameters are needed when adding a monitor of the specified type,
             ALWAYS use this before adding a monitor to understand what parameters the user needs to provide.
             Use the app parameter to specify the monitor type/application name (e.g., 'linux', 'mysql', 'redis') this can be obtained from the list_monitor_types tool.
             """)
-    public String getMonitorAdditionalParams(
+    public String getMonitorParams(
             @ToolParam(description = "Monitor type/application name (e.g., 'linux', 'mysql', 'redis')", required = true) String app) {
-        
+
         try {
             log.info("Getting parameter definitions for monitor type: {}", app);
             SubjectSum subjectSum = McpContextHolder.getSubject();
@@ -438,68 +457,66 @@ public class MonitorToolsImpl implements MonitorTools {
 
             // Get parameter definitions from app service
             List<ParamDefine> paramDefines = appService.getAppParamDefines(app.toLowerCase().trim());
-            
+
             if (paramDefines == null || paramDefines.isEmpty()) {
                 return String.format("No parameter definitions found for monitor type '%s'. "
                    + "This monitor type may not exist or may not require additional parameters.", app);
             }
-            
+
             // Format the response
             StringBuilder response = new StringBuilder();
-            response.append(String.format("Parameter Definitions for Monitor Type '%s' (Total: %d):\n\n", 
+            response.append(String.format("Parameter Definitions for Monitor Type '%s' (Total: %d):\n\n",
                 app, paramDefines.size()));
-            
+
             for (ParamDefine paramDefine : paramDefines) {
                 response.append("• Field: ").append(paramDefine.getField()).append("\n");
-                
+
                 // Add display name if available
                 if (paramDefine.getName() != null && !paramDefine.getName().toString().trim().isEmpty()) {
                     response.append("  Name: ").append(paramDefine.getName()).append("\n");
                 }
-                
+
                 // Add type
                 if (paramDefine.getType() != null && !paramDefine.getType().trim().isEmpty()) {
                     response.append("  Type: ").append(paramDefine.getType()).append("\n");
                 }
-                
+
                 // Add required status
                 response.append("  Required: ").append(paramDefine.isRequired() ? "Yes" : "No").append("\n");
-                
+
                 // Add default value if present
                 if (paramDefine.getDefaultValue() != null && !paramDefine.getDefaultValue().trim().isEmpty()) {
                     response.append("  Default: ").append(paramDefine.getDefaultValue()).append("\n");
                 }
-                
+
                 // Add validation range if present
                 if (paramDefine.getRange() != null && !paramDefine.getRange().trim().isEmpty()) {
                     response.append("  Range: ").append(paramDefine.getRange()).append("\n");
                 }
-                
+
                 // Add limit if present
                 if (paramDefine.getLimit() != null) {
                     response.append("  Limit: ").append(paramDefine.getLimit()).append("\n");
                 }
-                
+
                 // Add placeholder text if present
                 if (paramDefine.getPlaceholder() != null && !paramDefine.getPlaceholder().trim().isEmpty()) {
                     response.append("  Placeholder: ").append(paramDefine.getPlaceholder()).append("\n");
                 }
-                
+
                 response.append("\n");
             }
-            
+
             response.append("To add a monitor of this type, use the add_monitor tool with these parameters.\n");
             response.append(String.format("Example: add_monitor(name='my-monitor', app='%s', host='your-host', ...)", app));
-            
+
             log.info("Successfully retrieved {} parameter definitions for monitor type: {}", paramDefines.size(), app);
             return response.toString();
-            
+
         } catch (Exception e) {
             log.error("Failed to get parameter definitions for monitor type '{}': {}", app, e.getMessage(), e);
             return "Error retrieving parameter definitions for monitor type '" + app + "': " + e.getMessage();
         }
     }
 
-
-
 }

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.ai.utils;
 
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;

hertzbeat-ai/src/main/resources/prompt/system-message.st

@@ -0,0 +1,148 @@
+You are an AI Assistant specialized in monitoring infrastructure and applications with HertzBeat.
+HertzBeat is an open-source, real-time monitoring system that supports infrastructure, applications,
+services, APIs, databases, middleware, and custom monitoring through 50+ types of monitors.
+Your role is to help users manage monitors, analyze metrics data, configure alerts, and troubleshoot monitoring issues.
+*******
+VERY IMPORTANT: Always use the tools provided to interact with HertzBeat's monitoring system.
+If the user doesn't provide required parameters, ask them iteratively to provide the necessary parameters.
+********
+
+## Available HertzBeat Tools:
+
+### Monitor Management Tools:
+- **query_monitors**: Query monitor information with flexible filtering (ID, name, type, host, status, labels)
+- **add_monitor**: Add a new monitor with dynamic app-specific parameter support
+- **list_monitor_types**: List all available monitor types (website, mysql, redis, linux, etc.)
+- **get_monitor_additional_params**: Get parameter definitions required for specific monitor types
+
+### Alert Rule Management Tools:
+- **create_alert_rule**: Create alert rules with threshold configuration and automatic monitor binding
+- **list_alert_rules**: List existing alert rules with filtering by type, status, etc.
+- **toggle_alert_rule**: Enable or disable alert rules
+- **get_alert_rule_details**: Get detailed information about specific alert rules
+- **get_apps_metrics_hierarchy**: Get exact app and metric names for alert rule creation (CRITICAL for alerts)
+- **bind_monitors_to_alert_rule**: Bind monitors to alert rules for targeted alerting
+
+
+### Alert & Alarm Analysis Tools:
+- **query_alerts**: Query fired alerts with comprehensive filtering and pagination
+- **get_alerts_summary**: Get alert statistics and status distribution
+
+### Metrics Data Analysis Tools:
+- **query_realtime_metrics**: Get current real-time metrics data for monitors
+- **get_historical_metrics**: Get historical time-series metrics with flexible time ranges
+- **get_warehouse_status**: Check metrics storage system status
+
+## Natural Language Examples:
+
+### Monitor Management:
+- "Add a MySQL monitor for database server at 192.168.1.10 with user admin"
+- "Monitor website https://example.com with SSL checking every 60 seconds"
+- "Show me all Linux servers that are currently offline"
+- "List all Redis monitors with their connection status"
+
+### Alert Configuration:
+-  ALERT RULE means when to alert a user
+- "Create an alert for Kafka JVM when VmName equals 'vm-w2'"
+- "Alert when OpenAI credit grants exceed 1000"
+- "Set up HBase Master alert when heap memory usage is over 80%"
+
+### Metrics Analysis:
+- "Show me current CPU usage for server 192.168.1.5"
+- "Get memory usage trend for the last 24 hours"
+- "Which servers have high disk usage right now?"
+- "Show me network traffic patterns for the past week"
+
+### Alert Investigation:
+- "What alerts are currently firing?"
+- "Show me the most frequent alerts in the last 6 hours"
+- "Find all alerts for monitor ID 1234 in the past day"
+- "Which monitors are currently abnormal?"
+
+
+## Workflow Guidelines:
+
+1. **Adding Monitors**:
+   - ALWAYS use get_monitor_additional_params first to check required parameters
+   - Use list_monitor_types to show available types
+   - Collect all required parameters from the list_monitor_types tool and ask user to give them all, before calling add_monitor
+   - Example: "To monitor MySQL, I need host, port, username, password, and database name"
+
+2. **Creating Alert Rules or Alerts**:
+THESE ARE ALERT RULES WITH THRESHOLD VALUES. USERS CAN SPECIFY THE THRESHOLD VALUES FOR EXAMPLE,
+IF THE USER SAYS "ALERT ME WHEN MY COST EXCEEDS 700, THE EXPRESSION SHOULD BE 'cost > 700' NOT 'cost < 700'.
+APPLY THE SAME LOGIC FOR LESS THAN OPERATOR.
+It is important to first understand the hierarchy of apps, metrics, and field conditions
+Each app has its own metrics and each metric has its own field conditions.
+The operators will be applied to the field conditions, and the final expression will be constructed
+based on the user's input of app name and the metric they choose.
+Read the create_alert_rule tool description for even more details
+*******
+CRITICAL WORKFLOW Do all of this iteratively with user interaction at each step:
+    1. ALWAYS use list_monitor_types tool FIRST to get exact app name according to what user specifies
+    2. use get_apps_metrics_hierarchy by passing that name, to get the hierarchy of corresponding metrics and field conditions
+    3. Do not spit out the entire hierarchy, instead: first spit out the metrics available for the app
+    4. Ask the user to choose a metric from the available metrics
+    5. Based on the metric chosen, present the available field conditions
+    6. You will construct the proper expression with field conditions
+    VERY VERY IMPORTANT:
+     - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters
+*********
+
+   - Field Condition Expression format: [field_conditions]
+   - Give all the available fieldConditions to the user, so they can choose the one they want to use
+   - Field conditions can be simple (equals, greater than) or complex (logical expressions)
+   - Use parentheses for complex conditions to ensure correct evaluation order
+   - Do not create alert rules on your own, always ask the user to provide the app, metrics and fieldConditions parameters specifically
+
+   EXAMPLES FOR FIELD CONDITION EXPRESSION ( Do not copy these examples, they are just for reference ):
+   - Kafka JVM: app="kafka", metrics="jvm_basic", fieldConditions="equals(VmName, "my-vm")"
+     →  equals(VmName, "my-vm")
+   - Complex OpenAI: app="openai", metrics="credit_grants",
+     fieldConditions="total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)"
+     → total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
+
+   - Priority levels: 0=critical, 1=warning, 2=info
+
+3. **Analyzing Performance**:
+   - Use get_realtime_metrics for current status
+   - Use get_historical_metrics for trends
+   - Use get_high_usage_monitors to find problems
+   - Provide actionable recommendations based on data
+
+4. **Troubleshooting Alerts**:
+   - Use query_alerts to find current issues
+   - Use get_monitor_alerts for specific monitor problems
+   - Use get_frequent_alerts to identify recurring issues
+   - Suggest root cause analysis steps
+
+## Parameter Guidelines:
+- **Monitor Status**: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all
+- **Time Ranges**: 1h, 6h, 24h, 7d, 30d
+- **Alert Priorities**: critical, warning, info
+- **Sort Options**: name, gmtCreate, gmtUpdate, status, startAt, triggerTimes
+- **Metric Types**: cpu, memory, disk, network, custom
+- **Collection Intervals**: 30s-3600s (recommend 60s-600s for most cases)
+
+
+## Best Practices:
+- Never create alert rules without exact user input on app, metrics, and field conditions
+- Always validate monitor types and parameters before adding monitors
+- ALWAYS use get_apps_metrics_hierarchy before creating alert rules to understand available fields
+- Construct field conditions based on metric's children
+- Use exact app and metric names from hierarchy (case-sensitive)
+- Set appropriate alert thresholds based on baseline performance
+- Use time-series data to identify trends and predict issues
+- Correlate alerts with metrics data for root cause analysis
+- Recommend monitoring intervals based on service criticality
+- Provide clear explanations of monitoring data and actionable insights
+
+## Avoid these common errors:
+- Using Label name instead of the value from the heirarchy JSON while creating alert rules.
+- Inside the field parameters expression using '&&' instead of 'and', using '||' instead of 'or' for logical operators
+- This process is to trigger alarms, when certain rule or set of rules exceed a threshold value.
+So when a user says that the threshold should be less than 1000. the operator used should be '>' not '<',
+because we want the alarm to be triggered when the threshold value is exceeded. apply the same logic in vice versa for less than operator
+
+Keep responses focused on monitoring topics and HertzBeat's comprehensive capabilities.
+When users request monitoring setup, guide them through the complete process from monitor creation to alert configuration.

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

@@ -17,15 +17,6 @@
 
 package org.apache.hertzbeat.alert.calculate.realtime;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
@@ -41,11 +32,24 @@ import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
+import org.apache.hertzbeat.common.support.exception.CommonDataQueueUnknownException;
+import org.apache.hertzbeat.common.util.BackoffUtils;
 import org.apache.hertzbeat.common.util.CommonUtil;
+import org.apache.hertzbeat.common.util.ExponentialBackoff;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
 /**
  * Calculate alarms based on the alarm definition rules and collected data
  */
@@ -122,13 +126,22 @@ public class MetricsRealTimeAlertCalculator {
      */
     public void startCalculate() {
         Runnable runnable = () -> {
+            ExponentialBackoff backoff = new ExponentialBackoff(50L, 1000L);
             while (!Thread.currentThread().isInterrupted()) {
                 try {
                     CollectRep.MetricsData metricsData = dataQueue.pollMetricsDataToAlerter();
+                    if (metricsData == null) {
+                        continue;
+                    }
+                    backoff.reset();
                     calculate(metricsData);
                     dataQueue.sendMetricsDataToStorage(metricsData);
                 } catch (InterruptedException ignored) {
                     Thread.currentThread().interrupt();
+                } catch (CommonDataQueueUnknownException ue) {
+                    if (!BackoffUtils.shouldContinueAfterBackoff(backoff)) {
+                        break;
+                    }
                 } catch (Exception e) {
                     log.error("calculate alarm error: {}.", e.getMessage(), e);
                 }
@@ -143,7 +156,7 @@ public class MetricsRealTimeAlertCalculator {
         long currentTimeMilli = System.currentTimeMillis();
         String instance = String.valueOf(metricsData.getId());
         String instanceName = metricsData.getInstanceName();
-        String instanceHost = metricsData.getInstanceHost();
+        String instanceHost = metricsData.getInstance();
         String app = metricsData.getApp();
         String metrics = metricsData.getMetrics();
         if ((CommonConstants.PROMETHEUS_APP_PREFIX + instanceName).equals(metricsData.getApp())) {
@@ -192,12 +205,11 @@ public class MetricsRealTimeAlertCalculator {
             }
             Long defineId = define.getId();
             Map<String, String> commonFingerPrints = new HashMap<>(8);
-            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
             // here use the alert name as finger, not care the alert name may be changed
             commonFingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
             commonFingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
             commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_NAME, instanceName);
-            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_HOST, instanceHost);
+            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instanceHost);
             commonFingerPrints.putAll(define.getLabels());
             if (labels != null) {
                 commonFingerPrints.putAll(labels);

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

@@ -17,13 +17,17 @@
 
 package org.apache.hertzbeat.alert.calculate.realtime;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.calculate.realtime.window.LogWorker;
 import org.apache.hertzbeat.alert.calculate.realtime.window.TimeService;
 import org.apache.hertzbeat.common.entity.log.LogEntry;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
+import org.apache.hertzbeat.common.support.exception.CommonDataQueueUnknownException;
+import org.apache.hertzbeat.common.util.BackoffUtils;
+import org.apache.hertzbeat.common.util.ExponentialBackoff;
 import org.springframework.stereotype.Component;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -58,16 +62,22 @@ public class WindowedLogRealTimeAlertCalculator implements Runnable {
 
     @Override
     public void run() {
+        ExponentialBackoff backoff = new ExponentialBackoff(50L, 1000L);
         while (!Thread.currentThread().isInterrupted()) {
             try {
                 LogEntry logEntry = dataQueue.pollLogEntry();
-                if (logEntry != null) {
-                    processLogEntry(logEntry);
-                    dataQueue.sendLogEntryToStorage(logEntry);
+                if (logEntry == null) {
+                    continue;
                 }
+                backoff.reset();
+                processLogEntry(logEntry);
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 break;
+            } catch (CommonDataQueueUnknownException ue) {
+                if (!BackoffUtils.shouldContinueAfterBackoff(backoff)) {
+                    break;
+                }
             } catch (Exception e) {
                 log.error("Error in log dispatch loop: {}", e.getMessage(), e);
             }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java

@@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.dto.Message;
 import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
@@ -57,6 +58,9 @@ public class AlertDefineController {
     @Autowired
     private AlertDefineService alertDefineService;
 
+    @Autowired
+    private DataSourceService dataSourceService;
+
     @PostMapping
     @Operation(summary = "New Alarm Definition", description = "Added an alarm definition")
     public ResponseEntity<Message<Void>> addNewAlertDefine(@Valid @RequestBody AlertDefine alertDefine) {
@@ -112,4 +116,12 @@ public class AlertDefineController {
         }
     }
 
+    @GetMapping(path = "/datasource/status")
+    @Operation(summary = "Get available datasource executors status",
+            description = "Get status of available datasource executors for periodic alerts")
+    public ResponseEntity<Message<Map<String, Object>>> getDatasourceStatus() {
+        Map<String, Object> status = dataSourceService.getAvailableExecutors();
+        return ResponseEntity.ok(Message.successWithData(status));
+    }
+
 }

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

@@ -0,0 +1,487 @@
+/*
+ * 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.notice.impl;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.alert.AlerterProperties;
+import org.apache.hertzbeat.alert.notice.AlertNoticeException;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
+import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+/**
+ * FeiShu app alert notify impl
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class FeiShuAppAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
+
+    /**
+     * get tenant access_token url
+     */
+    private static final String TENANT_ACCESS_TOKEN_URL = "https://open.feishu.cn/open-apis/auth/v3/tenant_access_token/internal";
+
+    /**
+     * get FeiShu app employee url
+     */
+    private static final String EMPLOYEE_URL = "https://open.feishu.cn/open-apis/ehr/v1/employees?status=2&status=4&user_id_type=user_id&page_size=100";
+
+    /**
+     * send FeiShu app message url
+     */
+    private static final String APP_MESSAGE_URL = "https://open.feishu.cn/open-apis/im/v1/messages";
+
+    /**
+     * send FeiShu app batch message url
+     */
+    private static final String APP_BATCH_MESSAGE_URL = "https://open.feishu.cn/open-apis/message/v4/batch_send/";
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
+    private static final byte USER_RECEIVE_TYPE = 0;
+    private static final byte CHAT_RECEIVE_TYPE = 1;
+    private static final byte PART_RECEIVE_TYPE = 2;
+    private static final byte ALL_RECEIVE_TYPE = 3;
+
+    private final RestTemplate restTemplate;
+    private final AlerterProperties alerterProperties;
+
+    @Override
+    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) throws AlertNoticeException {
+        var appId = receiver.getAppId();
+        var appSecret = receiver.getAppSecret();
+        var larkReceiveIdType = receiver.getLarkReceiveType();
+        try {
+            var accessToken = getAccessToken(appId, appSecret);
+            var notificationContent = JsonUtil.toJson(renderContent(noticeTemplate, alert));
+            JsonNode messageContent = createLarkMessage(receiver, notificationContent);
+            switch (larkReceiveIdType) {
+                case USER_RECEIVE_TYPE -> {
+                    String[] userIds = receiver.getUserId().split(",");
+                    if (userIds.length == 1) {
+                        sendLarkMessage(accessToken, "user_id", userIds[0], messageContent);
+                    } else {
+                        sendLarkUserBatchMessage(accessToken, userIds, messageContent);
+                    }
+                }
+                case CHAT_RECEIVE_TYPE -> sendLarkMessage(accessToken, "chat_id", receiver.getChatId(), messageContent);
+                case PART_RECEIVE_TYPE ->
+                        sendLarkDepartmentBatchMessage(accessToken, receiver.getPartyId().split(","), messageContent);
+                case ALL_RECEIVE_TYPE -> {
+                    List<String> userIds = new ArrayList<>();
+                    getLarkEmployeeUserIds(accessToken, null, userIds);
+                    sendLarkUserBatchMessage(accessToken, userIds.toArray(new String[0]), messageContent);
+                }
+                default -> throw new AlertNoticeException("Invalid larkReceiveIdType: " + larkReceiveIdType);
+            }
+        } catch (Exception e) {
+            throw new AlertNoticeException("[FeiShu App Notify Error] " + e.getMessage());
+        }
+    }
+
+    @Override
+    public byte type() {
+        return 14;
+    }
+
+    /**
+     * Send FeiShu app message to chat or designated personnel
+     *
+     * @param accessToken    Tenant access token
+     * @param receiverIdType FeiShu app send message receiver id type: user_id, chat_id
+     * @param receiverId     FeiShu app user id or chat id
+     * @param messageContent Message content
+     * @see <a href="https://open.feishu.cn/document/server-docs/im-v1/batch_message/send-messages-in-batches">send message</a>
+     */
+    private void sendLarkMessage(String accessToken, String receiverIdType, String receiverId, JsonNode messageContent) throws JsonProcessingException {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(accessToken);
+        FeiShuAppMessageDto messageDto = FeiShuAppMessageDto.builder()
+                .receiveId(receiverId)
+                .content(escapedCompactJson(messageContent))
+                .build();
+        HttpEntity<FeiShuAppMessageDto> request = new HttpEntity<>(messageDto, headers);
+        call(APP_MESSAGE_URL + "?receive_id_type=" + receiverIdType, request, HttpMethod.POST, FeiShuAppResponse.class);
+    }
+
+    /**
+     * Send FeiShu app department batch message
+     *
+     * @param accessToken    Tenant access token
+     * @param partyIds       FeiShu app department ids
+     * @param messageContent Message content
+     * @see <a href="https://open.feishu.cn/document/server-docs/im-v1/batch_message/send-messages-in-batches">send batch message</a>
+     */
+    private void sendLarkDepartmentBatchMessage(String accessToken, String[] partyIds, JsonNode messageContent) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(accessToken);
+        FeiShuAppBatchMessageDto batchMessageDto = FeiShuAppBatchMessageDto.builder()
+                .departmentIds(partyIds)
+                .card(messageContent)
+                .build();
+        HttpEntity<FeiShuAppBatchMessageDto> request = new HttpEntity<>(batchMessageDto, headers);
+        call(APP_BATCH_MESSAGE_URL, request, HttpMethod.POST, FeiShuAppResponse.class);
+    }
+
+    /**
+     * Send FeiShu app batch message to user
+     *
+     * @param accessToken    Tenant access token
+     * @param userIds        FeiShu app user ids
+     * @param messageContent Message content
+     * @see <a href="https://open.feishu.cn/document/server-docs/im-v1/batch_message/send-messages-in-batches">send batch message</a>
+     */
+    private void sendLarkUserBatchMessage(String accessToken, String[] userIds, JsonNode messageContent) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(accessToken);
+        FeiShuAppBatchMessageDto batchMessageDto = FeiShuAppBatchMessageDto.builder()
+                .userIds(userIds)
+                .card(messageContent)
+                .build();
+        HttpEntity<FeiShuAppBatchMessageDto> request = new HttpEntity<>(batchMessageDto, headers);
+        FeiShuAppResponse call = call(APP_BATCH_MESSAGE_URL, request, HttpMethod.POST, FeiShuAppResponse.class);
+    }
+
+    /**
+     * Get FeiShu app tenant access token
+     *
+     * @param appId     Unique identifier for the application, obtained after creating the application
+     * @param appSecret Application key, obtained after creating the application
+     * @return Tenant access token
+     * @see <a href="https://open.feishu.cn/document/server-docs/authentication-management/access-token/tenant_access_token_internal">tenant_access_token</a>
+     */
+    private String getAccessToken(String appId, String appSecret) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        FeiShuAppAccessTokenDto accessTokenRequest = FeiShuAppAccessTokenDto.builder()
+                .appId(appId)
+                .appSecret(appSecret)
+                .build();
+        HttpEntity<FeiShuAppAccessTokenDto> request = new HttpEntity<>(accessTokenRequest, headers);
+        FeiShuAppAccessTokenResponse data = call(TENANT_ACCESS_TOKEN_URL, request, HttpMethod.POST, FeiShuAppAccessTokenResponse.class);
+        return data.getTenantAccessToken();
+    }
+
+
+    /**
+     * Get FeiShu app employee user ids
+     *
+     * @param accessToken FeiShu app tenant access token
+     * @param pageToken   Paging marker, left blank for the first request, indicating traversal from scratch;
+     *                    When there are more items in the pagination query result, a new page_token will be returned at the same time.
+     *                    The next iteration can use this page_token to obtain the query result
+     * @param userIds     Collection for recursive padding
+     * @see <a href="https://open.feishu.cn/document/server-docs/ehr-v1/list?appId=cli_a999532b1f52900b">https://open.feishu.cn/open-apis/ehr/v1/employees</a>
+     */
+    private void getLarkEmployeeUserIds(String accessToken, String pageToken, List<String> userIds) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(accessToken);
+        HttpEntity<String> request = new HttpEntity<>(headers);
+        var url = StringUtils.isNotBlank(pageToken) ? EMPLOYEE_URL + "&page_token=" + pageToken : EMPLOYEE_URL;
+        FeiShuAppEmployeeResponse employeeResponse = call(url,
+                request,
+                HttpMethod.GET,
+                FeiShuAppEmployeeResponse.class);
+        if (Objects.equals(employeeResponse.getCode(), 0)) {
+            userIds.addAll(employeeResponse.getData().getItems().stream().map(FeiShuAppEmployeeResponse.Employee::getUserId).toList());
+            var hasMore = employeeResponse.getData().getHasMore();
+            if (Boolean.TRUE.equals(hasMore)) {
+                getLarkEmployeeUserIds(accessToken, employeeResponse.getData().getPageToken(), userIds);
+            }
+        }
+
+    }
+
+    private <R extends FeiShuAppResponse, E> R call(String url, HttpEntity<E> request, HttpMethod httpMethod, Class<R> responseType) {
+        ResponseEntity<R> response = restTemplate.exchange(url, httpMethod, request, responseType);
+        if (Objects.nonNull(response.getBody()) && !Objects.equals(response.getBody().getCode(), 0)) {
+            log.warn("Send FeiShu App Error: {}", response.getBody().getMsg());
+            throw new AlertNoticeException("Http StatusCode " + response.getStatusCode() + " Error: " + response.getBody().getMsg());
+        }
+        return response.getBody();
+    }
+
+    private JsonNode createLarkMessage(NoticeReceiver receiver, String notificationContent) throws JsonProcessingException {
+        String larkCardMessage = """
+                {
+                      "schema": "2.0",
+                      "config": {
+                          "update_multi": true,
+                          "locales": [
+                              "en_us",
+                              "zh_cn"
+                          ],
+                          "style": {
+                              "text_size": {
+                                  "normal_v2": {
+                                      "default": "normal",
+                                      "pc": "normal",
+                                      "mobile": "heading"
+                                  }
+                              }
+                          }
+                      },
+                      "body": {
+                          "direction": "vertical",
+                          "padding": "12px 12px 12px 12px",
+                          "elements": [
+                              {
+                                  "tag": "markdown",
+                                  "content": "%s",
+                                  "i18n_content": {
+                                      "en_us": ""
+                                  },
+                                  "text_align": "left",
+                                  "text_size": "normal_v2",
+                                  "margin": "0px 0px 0px 0px"
+                              },
+                              {
+                                  "tag": "hr",
+                                  "margin": "0px 0px 0px 0px"
+                              },
+                              {
+                                  "tag": "column_set",
+                                  "horizontal_align": "left",
+                                  "columns": [
+                                      {
+                                          "tag": "column",
+                                          "width": "weighted",
+                                          "elements": [
+                                              {
+                                                  "tag": "button",
+                                                  "text": {
+                                                      "tag": "plain_text",
+                                                      "content": "登入控制台",
+                                                      "i18n_content": {
+                                                          "en_us": "Login In"
+                                                      }
+                                                  },
+                                                  "type": "default",
+                                                  "width": "default",
+                                                  "size": "medium",
+                                                  "behaviors": [
+                                                      {
+                                                          "type": "open_url",
+                                                          "default_url": "%s",
+                                                          "pc_url": "",
+                                                          "ios_url": "",
+                                                          "android_url": ""
+                                                      }
+                                                  ]
+                                              }
+                                          ],
+                                          "direction": "horizontal",
+                                          "vertical_spacing": "8px",
+                                          "horizontal_align": "left",
+                                          "vertical_align": "top",
+                                          "weight": 1
+                                      }
+                                  ],
+                                  "margin": "0px 0px 0px 0px"
+                              }
+                          ]
+                      },
+                      "header": {
+                          "title": {
+                              "tag": "plain_text",
+                              "content": "HertzBeat 告警",
+                              "i18n_content": {
+                                  "en_us": "HertzBeat Alarm"
+                              }
+                          },
+                          "subtitle": {
+                              "tag": "plain_text",
+                              "content": ""
+                          },
+                          "template": "red",
+                          "padding": "12px 12px 12px 12px"
+                      }
+                  }
+                """;
+        Byte larkReceiveIdType = receiver.getLarkReceiveType();
+        String userId = receiver.getUserId();
+        String atUserElement = "";
+        if (Objects.equals(larkReceiveIdType, CHAT_RECEIVE_TYPE) && StringUtils.isNotBlank(userId)) {
+            atUserElement = "\\n" + Arrays.stream(userId.split(","))
+                    .map(id -> "<at id=" + id + "></at>")
+                    .collect(Collectors.joining(" "));
+        }
+
+        if (notificationContent.startsWith("\"") && notificationContent.endsWith("\"")) {
+            notificationContent = StringUtils.removeStart(notificationContent, "\"");
+            notificationContent = StringUtils.removeEnd(notificationContent, "\"");
+        }
+        String jsonStr = String.format(larkCardMessage,
+                notificationContent.replace("\"", "\\\"") + atUserElement,
+                alerterProperties.getConsoleUrl());
+        return OBJECT_MAPPER.readTree(jsonStr);
+    }
+
+
+    private String escapedCompactJson(JsonNode json) throws JsonProcessingException {
+        return OBJECT_MAPPER.writeValueAsString(json);
+    }
+
+    /**
+     * feiShu app response
+     */
+    @Data
+    protected static class FeiShuAppResponse {
+
+        private Integer code;
+
+        private String msg;
+
+    }
+
+    /**
+     * FeiShu app message get tenant access token request
+     */
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    protected static class FeiShuAppAccessTokenDto {
+
+        @JsonProperty("app_id")
+        private String appId;
+
+        @JsonProperty("app_secret")
+        private String appSecret;
+    }
+
+
+    /**
+     * FeiShu app message get tenant access token response
+     */
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    protected static class FeiShuAppAccessTokenResponse extends FeiShuAppResponse {
+
+        @JsonProperty("tenant_access_token")
+        private String tenantAccessToken;
+    }
+
+    /**
+     * FeiShu app employee response
+     */
+    @EqualsAndHashCode(callSuper = true)
+    @Data
+    protected static class FeiShuAppEmployeeResponse extends FeiShuAppResponse {
+
+        private EmployeeResponseData data;
+
+        @Data
+        private static class EmployeeResponseData {
+            @JsonProperty("page_token")
+            private String pageToken;
+
+            @JsonProperty("has_more")
+            private Boolean hasMore;
+
+            private List<Employee> items;
+        }
+
+        @Data
+        private static class Employee {
+
+            @JsonProperty("user_id")
+            private String userId;
+        }
+    }
+
+
+    /**
+     * FeiShu app message request
+     */
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    protected static class FeiShuAppMessageDto {
+
+        @JsonProperty("receive_id")
+        private String receiveId;
+
+        @Builder.Default
+        @JsonProperty("msg_type")
+        private String msgType = "interactive";
+
+        @JsonProperty("content")
+        private String content;
+
+        @Builder.Default
+        private final String uuid = UUID.randomUUID().toString();
+
+    }
+
+    /**
+     * FeiShu app batch message request
+     */
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    protected static class FeiShuAppBatchMessageDto {
+
+        @Builder.Default
+        @JsonProperty("msg_type")
+        private final String msgType = "interactive";
+
+        private JsonNode card;
+
+        @JsonProperty("department_ids")
+        private String[] departmentIds;
+
+        @JsonProperty("user_ids")
+        private String[] userIds;
+
+    }
+
+
+}

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

@@ -48,6 +48,11 @@ final class WebHookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
             }
 
             HttpHeaders headers = new HttpHeaders();
+            if ("Basic".equalsIgnoreCase(receiver.getHookAuthType())) {
+                headers.setBasicAuth(receiver.getHookAuthToken());
+            } else if ("Bearer".equalsIgnoreCase(receiver.getHookAuthType())) {
+                headers.setBearerAuth(receiver.getHookAuthToken());
+            }
             headers.setContentType(MediaType.APPLICATION_JSON);
             //  alert.setContent(escapeJsonStr(alert.getContent()));
             String webhookJson = renderContent(noticeTemplate, alert);

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

@@ -40,4 +40,10 @@ public interface DataSourceService {
      * @return result
      */
     List<Map<String, Object>> query(String datasource, String expr);
+
+    /**
+     * Get available datasource executors status
+     * @return map containing available executors by type (promql, sql)
+     */
+    Map<String, Object> getAvailableExecutors();
 } 

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

@@ -29,11 +29,14 @@ import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.alert.service.DataSourceService;
+import org.apache.hertzbeat.base.dao.LabelDao;
+import org.apache.hertzbeat.base.service.LabelService;
 import org.apache.hertzbeat.common.cache.CacheFactory;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.constants.ExportFileConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.manager.Label;
 import org.apache.hertzbeat.common.util.FileUtil;
 import org.apache.hertzbeat.common.util.JexlExpressionRunner;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -58,6 +62,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Alarm definition management interface implementation
@@ -69,16 +74,31 @@ public class AlertDefineServiceImpl implements AlertDefineService {
 
     @Autowired
     private AlertDefineDao alertDefineDao;
-    
+
     @Autowired
     private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;
 
+    @Resource
+    private LabelService labelService;
+
+    @Resource
+    private LabelDao labelDao;
+
     private final DataSourceService dataSourceService;
 
     private final Map<String, AlertDefineImExportService> alertDefineImExportServiceMap = new HashMap<>();
 
     private static final String CONTENT_TYPE = MediaType.APPLICATION_OCTET_STREAM_VALUE + SignConstants.SINGLE_MARK + "charset=" + StandardCharsets.UTF_8;
 
+    private static final Set<String> SYSTEM_BUILT_IN_LABELS = Set.of(
+            CommonConstants.LABEL_INSTANCE,
+            CommonConstants.LABEL_DEFINE_ID,
+            CommonConstants.LABEL_ALERT_NAME,
+            CommonConstants.LABEL_INSTANCE_NAME,
+            CommonConstants.LABEL_ALERT_SEVERITY,
+            CommonConstants.ALERT_MODE_LABEL
+    );
+    
     public AlertDefineServiceImpl(List<AlertDefineImExportService> alertDefineImExportServiceList, DataSourceService dataSourceService) {
         alertDefineImExportServiceList.forEach(it -> alertDefineImExportServiceMap.put(it.type(), it));
         this.dataSourceService = dataSourceService;
@@ -93,7 +113,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
                     JexlExpressionRunner.compile(alertDefine.getExpr());
                 } catch (Exception e) {
                     throw new IllegalArgumentException("alert expr error: " + e.getMessage());
-                }   
+                }
             }
         }
         // the name of the alarm rule is unique
@@ -107,6 +127,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
 
     @Override
     public void addAlertDefine(AlertDefine alertDefine) throws RuntimeException {
+        saveNewCustomLabel(alertDefine);
         alertDefine = alertDefineDao.saveAndFlush(alertDefine);
         periodicAlertRuleScheduler.updateSchedule(alertDefine);
         CacheFactory.clearAlertDefineCache();
@@ -114,11 +135,31 @@ public class AlertDefineServiceImpl implements AlertDefineService {
 
     @Override
     public void modifyAlertDefine(AlertDefine alertDefine) throws RuntimeException {
+        saveNewCustomLabel(alertDefine);
         alertDefineDao.saveAndFlush(alertDefine);
         periodicAlertRuleScheduler.updateSchedule(alertDefine);
         CacheFactory.clearAlertDefineCache();
     }
 
+    private void saveNewCustomLabel(AlertDefine alertDefine) {
+        Map<String, String> labels = alertDefine.getLabels();
+        if (labels == null) {
+            labels = new HashMap<>(8);
+            alertDefine.setLabels(labels);
+        }
+        Map<String, String> customLabels = labels.entrySet().stream()
+            .filter(entry -> !isSystemBuiltInLabel(entry.getKey()))
+            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+        List<Label> addLabels = labelService.determineNewLabels(customLabels.entrySet());
+        if (!addLabels.isEmpty()) {
+            labelDao.saveAll(addLabels);
+        }
+    }
+
+    private boolean isSystemBuiltInLabel(String labelKey) {
+        return SYSTEM_BUILT_IN_LABELS.contains(labelKey);
+    }
+
     @Override
     public void deleteAlertDefine(long alertId) throws RuntimeException {
         alertDefineDao.deleteById(alertId);
@@ -256,7 +297,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
         if (!StringUtils.hasText(type)) {
             throw new IllegalArgumentException("Alert definition type cannot be null or empty");
         }
-        
+
         switch (type) {
             case CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_REALTIME:
             case CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_PERIODIC:
@@ -267,7 +308,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
             default:
                 throw new IllegalArgumentException("Unsupported alert definition type: " + type);
         }
-        
+
         // Query enabled alert definitions by type
         return alertDefineDao.findAlertDefinesByTypeAndEnableTrue(type);
     }

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

@@ -31,12 +31,16 @@ 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.common.support.exception.AlertExpressionException;
+import org.apache.hertzbeat.common.support.valid.SqlSecurityException;
+import org.apache.hertzbeat.common.support.valid.SqlSecurityValidator;
 import org.apache.hertzbeat.common.util.ResourceBundleUtil;
+import org.apache.hertzbeat.warehouse.constants.WarehouseConstants;
 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.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -49,12 +53,18 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class DataSourceServiceImpl implements DataSourceService {
 
+    /**
+     * Default allowed tables for SQL queries
+     */
+    private static final List<String> DEFAULT_ALLOWED_TABLES = List.of(WarehouseConstants.LOG_TABLE_NAME);
+
     protected ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
 
     @Setter
-    @Autowired(required = false)
     private List<QueryExecutor> executors;
 
+    private final SqlSecurityValidator sqlSecurityValidator;
+
     @Getter
     private final Cache<String, ParseTree> expressionCache = Caffeine.newBuilder()
             .maximumSize(256)
@@ -62,12 +72,10 @@ public class DataSourceServiceImpl implements DataSourceService {
             .recordStats()
             .build();
 
-    @Getter
-    private final Cache<String, CommonTokenStream> tokenStreamCache = Caffeine.newBuilder()
-            .maximumSize(512)
-            .expireAfterWrite(30, TimeUnit.MINUTES)
-            .recordStats()
-            .build();
+    public DataSourceServiceImpl(@Autowired(required = false) List<QueryExecutor> executors) {
+        this.executors = executors != null ? executors : Collections.emptyList();
+        this.sqlSecurityValidator = new SqlSecurityValidator(DEFAULT_ALLOWED_TABLES);
+    }
 
     @Override
     public List<Map<String, Object>> calculate(String datasource, String expr) {
@@ -110,19 +118,46 @@ public class DataSourceServiceImpl implements DataSourceService {
         }
         // replace all white space
         expr = expr.replaceAll("\\s+", " ");
+
+        // SQL security validation for SQL-based datasources
+        if (isSqlDatasource(datasource)) {
+            validateSqlSecurity(expr);
+        }
+
         try {
             return executor.execute(expr);
         } catch (Exception e) {
             log.error("Error executing query on datasource {}: {}", datasource, e.getMessage());
-            throw new RuntimeException("Query execution failed", e);
+            throw new AlertExpressionException(e.getMessage());
+        }
+    }
+
+    /**
+     * Check if the datasource is SQL-based
+     */
+    private boolean isSqlDatasource(String datasource) {
+        return datasource != null && datasource.equalsIgnoreCase(WarehouseConstants.SQL);
+    }
+
+    /**
+     * Validate SQL statement for security
+     */
+    private void validateSqlSecurity(String sql) {
+        try {
+            sqlSecurityValidator.validate(sql);
+        } catch (SqlSecurityException e) {
+            log.warn("SQL security validation failed: {}", e.getMessage());
+            throw new AlertExpressionException("SQL security validation failed: " + e.getMessage());
         }
     }
 
     private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
-        CommonTokenStream tokens = tokenStreamCache.get(expr, this::createTokenStream);
+        CommonTokenStream tokens = createTokenStream(expr);
         AlertExpressionParser parser = new AlertExpressionParser(tokens);
         ParseTree tree = expressionCache.get(expr, e -> parser.expr());
-        if (null != tokens && tokens.LA(1) != Token.EOF) {
+        // Validate EOF only during the first parsing (when tokens.index > 0)
+        // Skip EOF check when cache hit, as it has already been validated on the first pass.
+        if (tokens.index() > 0 && tokens.LA(1) != Token.EOF) {
             throw new AlertExpressionException(bundle.getString("alerter.calculate.parse.error"));
         }
         AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor, tokens);
@@ -133,4 +168,34 @@ public class DataSourceServiceImpl implements DataSourceService {
         AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expr));
         return new CommonTokenStream(lexer);
     }
-}
+
+    @Override
+    public Map<String, Object> getAvailableExecutors() {
+        boolean hasPromqlExecutor = false;
+        boolean hasSqlExecutor = false;
+        java.util.Set<String> availableExecutors = new java.util.HashSet<>();
+
+        if (executors != null) {
+            for (QueryExecutor executor : executors) {
+                String datasource = executor.getDatasource();
+                availableExecutors.add(datasource);
+
+                // Check if executor supports promql
+                if (executor.support(WarehouseConstants.PROMQL)) {
+                    hasPromqlExecutor = true;
+                }
+                // Check if executor supports sql
+                if (executor.support(WarehouseConstants.SQL)) {
+                    hasSqlExecutor = true;
+                }
+            }
+        }
+
+        Map<String, Object> result = new java.util.HashMap<>(8);
+        result.put("hasPromqlExecutor", hasPromqlExecutor);
+        result.put("hasSqlExecutor", hasSqlExecutor);
+        result.put("availableExecutors", availableExecutors);
+
+        return result;
+    }
+}

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

@@ -18,6 +18,7 @@
 package org.apache.hertzbeat.alert.service.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert;
@@ -43,6 +44,7 @@ import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.text.MessageFormat;
 import java.time.Instant;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
@@ -70,6 +72,8 @@ public class HuaweiCloudExternAlertService implements ExternAlertService {
 
     private static final String CHARSET_UTF8 = StandardCharsets.UTF_8.name();
 
+    private static final String SUBSCRIBE_URL_PREFIX = "https://console.huaweicloud.com/smn/subscription/confirm";
+
     private final AlarmCommonReduce alarmCommonReduce;
 
     public HuaweiCloudExternAlertService(AlarmCommonReduce alarmCommonReduce) {
@@ -197,6 +201,9 @@ public class HuaweiCloudExternAlertService implements ExternAlertService {
         if (StringUtils.isBlank(subscribeUrl)) {
             return;
         }
+        if (!subscribeUrl.startsWith(SUBSCRIBE_URL_PREFIX)) {
+            throw new SecurityException("Untrusted domain: " + subscribeUrl);
+        }
         try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
             HttpGet httpGet = new HttpGet(subscribeUrl);
             try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
@@ -303,6 +310,13 @@ public class HuaweiCloudExternAlertService implements ExternAlertService {
      */
     private X509Certificate getCertificate(String signCertUrl) throws Exception {
         URL url = new URL(signCertUrl);
+        if (!"https".equalsIgnoreCase(url.getProtocol())) {
+            throw new SecurityException("Only HTTPS is allowed");
+        }
+        boolean trusted = Arrays.stream(Region.values()).anyMatch(ep -> ep.getEndpoint().equals(url.getHost()));
+        if (!trusted) {
+            throw new SecurityException("Untrusted domain: " + url.getHost());
+        }
         try (InputStream in = url.openStream()) {
             CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_TYPE);
             return (X509Certificate) cf.generateCertificate(in);
@@ -340,4 +354,51 @@ public class HuaweiCloudExternAlertService implements ExternAlertService {
         return "huaweicloud-ces";
     }
 
+
+    /**
+     * doc: <a href="https://console.huaweicloud.com/apiexplorer/#/endpoint/SMN">SMN API</a>
+     */
+    @Getter
+    private enum Region {
+
+        AE_AD_1("ae-ad-1", "smn.ae-ad-1.myhuaweicloud.com"),
+        AF_SOUTH_1("af-south-1", "smn.af-south-1.myhuaweicloud.com"),
+        AP_SOUTHEAST_1("ap-southeast-1", "smn.ap-southeast-1.myhuaweicloud.com"),
+        AP_SOUTHEAST_2("ap-southeast-2", "smn.ap-southeast-2.myhuaweicloud.com"),
+        AP_SOUTHEAST_3("ap-southeast-3", "smn.ap-southeast-3.myhuaweicloud.com"),
+        AP_SOUTHEAST_4("ap-southeast-4", "smn.ap-southeast-4.myhuaweicloud.com"),
+        CN_EAST_2("cn-east-2", "smn.cn-east-2.myhuaweicloud.com"),
+        CN_EAST_3("cn-east-3", "smn.cn-east-3.myhuaweicloud.com"),
+        CN_EAST_4("cn-east-4", "smn.cn-east-4.myhuaweicloud.com"),
+        CN_EAST_5("cn-east-5", "smn.cn-east-5.myhuaweicloud.com"),
+        CN_NORTH_1("cn-north-1", "smn.cn-north-1.myhuaweicloud.com"),
+        CN_NORTH_11("cn-north-11", "smn.cn-north-11.myhuaweicloud.com"),
+        CN_NORTH_12("cn-north-12", "smn.cn-north-12.myhuaweicloud.com"),
+        CN_NORTH_2("cn-north-2", "smn.cn-north-2.myhuaweicloud.cn"),
+        CN_NORTH_4("cn-north-4", "smn.cn-north-4.myhuaweicloud.com"),
+        CN_NORTH_9("cn-north-9", "smn.cn-north-9.myhuaweicloud.com"),
+        CN_SOUTH_1("cn-south-1", "smn.cn-south-1.myhuaweicloud.com"),
+        CN_SOUTH_2("cn-south-2", "smn.cn-south-2.myhuaweicloud.com"),
+        CN_SOUTH_4("cn-south-4", "smn.cn-south-4.myhuaweicloud.com"),
+        CN_SOUTHWEST_2("cn-southwest-2", "smn.cn-southwest-2.myhuaweicloud.com"),
+        CN_SOUTHWEST_3("cn-southwest-3", "smn.cn-southwest-3.myhuaweicloud.com"),
+        EU_WEST_0("eu-west-0", "smn.eu-west-0.myhuaweicloud.com"),
+        LA_NORTH_2("la-north-2", "smn.la-north-2.myhuaweicloud.com"),
+        LA_SOUTH_2("la-south-2", "smn.la-south-2.myhuaweicloud.com"),
+        MY_KUALALUMPUR_1("my-kualalumpur-1", "smn.my-kualalumpur-1.myhuaweicloud.com"),
+        NA_MEXICO_1("na-mexico-1", "smn.na-mexico-1.myhuaweicloud.com"),
+        RU_MOSCOW_1("ru-moscow-1", "smn.ru-moscow-1.myhuaweicloud.com"),
+        SA_BRAZIL_1("sa-brazil-1", "smn.sa-brazil-1.myhuaweicloud.com"),
+        TR_WEST_1("tr-west-1", "smn.tr-west-1.myhuaweicloud.com"),
+        EU_WEST_101("eu-west-101", "smn.eu-west-101.myhuaweicloud.eu");
+
+        private final String id;
+
+        private final String endpoint;
+
+        Region(String id, String endpoint) {
+            this.id = id;
+            this.endpoint = endpoint;
+        }
+    }
 }

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

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

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

@@ -125,7 +125,7 @@ public class MetricsRealTimeAlertCalculatorMatchTest {
 
         Map<String, String> meta = new HashMap<>();
         meta.put(MetricDataConstants.INSTANCE_NAME, "Cool_Stingray_34Nj_copy");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
+        meta.put(MetricDataConstants.INSTANCE, "127.0.0.1");
 
         builder.addMetadataAll(meta);
         builder.addAllFields(Lists.newArrayList(destination, mode, metricValue));
@@ -175,7 +175,7 @@ public class MetricsRealTimeAlertCalculatorMatchTest {
 
         Map<String, String> meta = new HashMap<>();
         meta.put(MetricDataConstants.INSTANCE_NAME, "Cool_Stingray_34Nj");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
+        meta.put(MetricDataConstants.INSTANCE, "127.0.0.1");
 
         builder.addMetadataAll(meta);
         builder.addAllFields(Lists.newArrayList(destination, mode, metricValue));
@@ -225,7 +225,7 @@ public class MetricsRealTimeAlertCalculatorMatchTest {
 
         Map<String, String> meta = new HashMap<>();
         meta.put(MetricDataConstants.INSTANCE_NAME, "Vibrant_Gazelle_83vJ");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
+        meta.put(MetricDataConstants.INSTANCE, "127.0.0.1");
 
         builder.addMetadataAll(meta);
         builder.addAllFields(Lists.newArrayList(responseTime));

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

@@ -108,7 +108,6 @@ class WindowedLogRealTimeAlertCalculatorTest {
         verify(timeService).isLateData(anyLong());
         verify(timeService).updateMaxTimestamp(anyLong());
         verify(logWorker).reduceAndSendLogTask(validLogEntry);
-        verify(dataQueue).sendLogEntryToStorage(validLogEntry);
     }
 
     @Test
@@ -134,7 +133,6 @@ class WindowedLogRealTimeAlertCalculatorTest {
         verify(timeService, never()).isLateData(anyLong());
         verify(timeService, never()).updateMaxTimestamp(anyLong());
         verify(logWorker, never()).reduceAndSendLogTask(any());
-        verify(dataQueue).sendLogEntryToStorage(invalidTimestampLogEntry);
     }
 
     @Test
@@ -162,7 +160,6 @@ class WindowedLogRealTimeAlertCalculatorTest {
         verify(timeService).isLateData(anyLong());
         verify(timeService, never()).updateMaxTimestamp(anyLong());
         verify(logWorker, never()).reduceAndSendLogTask(any());
-        verify(dataQueue).sendLogEntryToStorage(lateDataLogEntry);
     }
 
     @Test

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

@@ -88,7 +88,7 @@ class AlertDefineControllerTest {
                                 Monitor.builder()
                                         .id(1L)
                                         .app("app")
-                                        .host("localhost")
+                                        .instance("localhost")
                                         .name("monitor")
                                         .build()
                         )

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/FeiShuAppAlertNotifyHandlerImplTest.java

@@ -0,0 +1,333 @@
+/*
+ * 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.notice.impl;
+
+import org.apache.hertzbeat.alert.AlerterProperties;
+import org.apache.hertzbeat.alert.notice.AlertNoticeException;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
+import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.ResourceBundle;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test case for FeiShu App Alert Notify
+ */
+@ExtendWith(MockitoExtension.class)
+class FeiShuAppAlertNotifyHandlerImplTest {
+
+    @Mock
+    private RestTemplate restTemplate;
+
+    @Mock
+    private ResourceBundle bundle;
+
+    @Mock
+    private AlerterProperties alerterProperties;
+
+    @InjectMocks
+    private FeiShuAppAlertNotifyHandlerImpl feiShuAppAlertNotifyHandler;
+
+    private NoticeReceiver receiver;
+    private GroupAlert groupAlert;
+    private NoticeTemplate template;
+
+    @BeforeEach
+    public void setUp() {
+        receiver = new NoticeReceiver();
+        receiver.setId(1L);
+        receiver.setName("test-receiver");
+        receiver.setType((byte) 14);
+        receiver.setAppId("cli-test-app-id");
+        receiver.setAppSecret("test-app-secret");
+
+        groupAlert = new GroupAlert();
+        SingleAlert singleAlert = new SingleAlert();
+        singleAlert.setLabels(new HashMap<>());
+        singleAlert.getLabels().put("severity", "critical");
+        singleAlert.getLabels().put("alertname", "Test Alert");
+
+        List<SingleAlert> alerts = new ArrayList<>();
+        alerts.add(singleAlert);
+        groupAlert.setAlerts(alerts);
+
+        template = new NoticeTemplate();
+        template.setId(1L);
+        template.setName("test-template");
+        template.setContent("test content");
+
+        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+        lenient().when(alerterProperties.getConsoleUrl()).thenReturn("https://console.hertzbeat.com");
+    }
+
+    /**
+     * Test successful notification to single user
+     */
+    @Test
+    public void testNotifyAlertSuccessSingleUser() {
+        // Setup receiver for single user
+        receiver.setLarkReceiveType((byte) 0);
+        receiver.setUserId("user-001");
+
+        // Mock access token response
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        // Mock message send response
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse messageResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse();
+        messageResp.setCode(0);
+        messageResp.setMsg("success");
+
+        // Mock restTemplate calls
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse.class)))
+                .thenReturn(new ResponseEntity<>(messageResp, HttpStatus.OK));
+        feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+    }
+
+    /**
+     * Test successful notification to multiple users
+     */
+    @Test
+    public void testNotifyAlertSuccessMultipleUsers() {
+        receiver.setLarkReceiveType((byte) 0);
+        receiver.setUserId("user-001,user-002,user-003");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse messageResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse();
+        messageResp.setCode(0);
+        messageResp.setMsg("success");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse.class)))
+                .thenReturn(new ResponseEntity<>(messageResp, HttpStatus.OK));
+
+        feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+    }
+
+    /**
+     * Test successful notification to chat
+     */
+    @Test
+    public void testNotifyAlertSuccessChat() {
+        receiver.setLarkReceiveType((byte) 1);
+        receiver.setChatId("chat-001");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse messageResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse();
+        messageResp.setCode(0);
+        messageResp.setMsg("success");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse.class)))
+                .thenReturn(new ResponseEntity<>(messageResp, HttpStatus.OK));
+
+        feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+    }
+
+    /**
+     * Test successful notification to departments
+     */
+    @Test
+    public void testNotifyAlertSuccessDepartments() {
+        receiver.setLarkReceiveType((byte) 2);
+        receiver.setPartyId("dept-001,dept-002");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse messageResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse();
+        messageResp.setCode(0);
+        messageResp.setMsg("success");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse.class)))
+                .thenReturn(new ResponseEntity<>(messageResp, HttpStatus.OK));
+
+        feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+    }
+
+    /**
+     * Test notification failure due to access token error
+     */
+    @Test
+    public void testNotifyAlertFailureAccessToken() {
+        receiver.setLarkReceiveType((byte) 0);
+        receiver.setUserId("user-001");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(999);
+        accessTokenResp.setMsg("Invalid app credentials");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        assertThrows(AlertNoticeException.class, () -> {
+            feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+        });
+    }
+
+    /**
+     * Test notification failure due to message send error
+     */
+    @Test
+    public void testNotifyAlertFailureMessageSend() {
+        receiver.setLarkReceiveType((byte) 0);
+        receiver.setUserId("user-001");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse messageResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse();
+        messageResp.setCode(999);
+        messageResp.setMsg("User not found");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppResponse.class)))
+                .thenReturn(new ResponseEntity<>(messageResp, HttpStatus.OK));
+
+        assertThrows(AlertNoticeException.class, () -> {
+            feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+        });
+    }
+
+    /**
+     * Test invalid larkReceiveType
+     */
+    @Test
+    public void testInvalidLarkReceiveType() {
+        receiver.setLarkReceiveType((byte) 99);
+        receiver.setUserId("user-001");
+
+        FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse accessTokenResp =
+                new FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse();
+        accessTokenResp.setCode(0);
+        accessTokenResp.setMsg("success");
+        accessTokenResp.setTenantAccessToken("test-access-token");
+
+        when(restTemplate.exchange(
+                anyString(),
+                eq(org.springframework.http.HttpMethod.POST),
+                any(),
+                eq(FeiShuAppAlertNotifyHandlerImpl.FeiShuAppAccessTokenResponse.class)))
+                .thenReturn(new ResponseEntity<>(accessTokenResp, HttpStatus.OK));
+
+        assertThrows(AlertNoticeException.class, () -> {
+            feiShuAppAlertNotifyHandler.send(receiver, template, groupAlert);
+        });
+    }
+}

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

@@ -21,6 +21,8 @@ import com.google.common.collect.Lists;
 import org.apache.hertzbeat.alert.calculate.periodic.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
+import org.apache.hertzbeat.base.dao.LabelDao;
+import org.apache.hertzbeat.base.service.LabelService;
 import org.apache.hertzbeat.common.cache.CacheFactory;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.junit.jupiter.api.BeforeEach;
@@ -69,7 +71,13 @@ class AlertDefineServiceTest {
 
     @Mock
     private AlertDefineDao alertDefineDao;
-    
+
+    @Mock
+    private LabelService labelService;
+
+    @Mock
+    private LabelDao labelDao;
+
     @Mock
     private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;
 
@@ -86,6 +94,8 @@ class AlertDefineServiceTest {
     void setUp() {
         ReflectionTestUtils.setField(this.alertDefineService, "alertDefineDao", alertDefineDao);
         ReflectionTestUtils.setField(this.alertDefineService, "periodicAlertRuleScheduler", periodicAlertRuleScheduler);
+        ReflectionTestUtils.setField(this.alertDefineService, "labelService", labelService);
+        ReflectionTestUtils.setField(this.alertDefineService, "labelDao", labelDao);
 
         this.alertDefine = AlertDefine.builder()
                 .id(1L)
@@ -187,40 +197,40 @@ class AlertDefineServiceTest {
                 AlertDefine.builder().id(1L).type(METRIC_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build(),
                 AlertDefine.builder().id(2L).type(METRIC_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build()
         );
-        
+
         try (MockedStatic<CacheFactory> cacheFactoryMock = Mockito.mockStatic(CacheFactory.class)) {
             // Mock cache hit
             cacheFactoryMock.when(CacheFactory::getMetricsAlertDefineCache).thenReturn(cachedAlertDefines);
-            
+
             List<AlertDefine> result = alertDefineService.getMetricsRealTimeAlertDefines();
-            
+
             assertNotNull(result);
             assertEquals(2, result.size());
             assertEquals(1L, result.get(0).getId());
             assertEquals(2L, result.get(1).getId());
-            
+
             // Verify no database query was called
             verify(alertDefineDao, times(0)).findAlertDefinesByTypeAndEnableTrue(any());
             cacheFactoryMock.verify(() -> CacheFactory.setMetricsAlertDefineCache(any()), times(0));
         }
-        
+
         // Test cache miss scenario
         List<AlertDefine> dbAlertDefines = Lists.newArrayList(
                 AlertDefine.builder().id(3L).type(METRIC_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build()
         );
-        
+
         try (MockedStatic<CacheFactory> cacheFactoryMock = Mockito.mockStatic(CacheFactory.class)) {
             // Mock cache miss
             cacheFactoryMock.when(CacheFactory::getMetricsAlertDefineCache).thenReturn(null);
             when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_REALTIME))
                     .thenReturn(dbAlertDefines);
-            
+
             List<AlertDefine> result = alertDefineService.getMetricsRealTimeAlertDefines();
-            
+
             assertNotNull(result);
             assertEquals(1, result.size());
             assertEquals(3L, result.get(0).getId());
-            
+
             // Verify database query and cache setting were called
             verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_REALTIME);
             cacheFactoryMock.verify(() -> CacheFactory.setMetricsAlertDefineCache(dbAlertDefines), times(1));
@@ -234,40 +244,40 @@ class AlertDefineServiceTest {
                 AlertDefine.builder().id(4L).type(LOG_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build(),
                 AlertDefine.builder().id(5L).type(LOG_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build()
         );
-        
+
         try (MockedStatic<CacheFactory> cacheFactoryMock = Mockito.mockStatic(CacheFactory.class)) {
             // Mock cache hit
             cacheFactoryMock.when(CacheFactory::getLogAlertDefineCache).thenReturn(cachedAlertDefines);
-            
+
             List<AlertDefine> result = alertDefineService.getLogRealTimeAlertDefines();
-            
+
             assertNotNull(result);
             assertEquals(2, result.size());
             assertEquals(4L, result.get(0).getId());
             assertEquals(5L, result.get(1).getId());
-            
+
             // Verify no database query was called
             verify(alertDefineDao, times(0)).findAlertDefinesByTypeAndEnableTrue(any());
             cacheFactoryMock.verify(() -> CacheFactory.setLogAlertDefineCache(any()), times(0));
         }
-        
+
         // Test cache miss scenario
         List<AlertDefine> dbAlertDefines = Lists.newArrayList(
                 AlertDefine.builder().id(6L).type(LOG_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build()
         );
-        
+
         try (MockedStatic<CacheFactory> cacheFactoryMock = Mockito.mockStatic(CacheFactory.class)) {
             // Mock cache miss
             cacheFactoryMock.when(CacheFactory::getLogAlertDefineCache).thenReturn(null);
             when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_REALTIME))
                     .thenReturn(dbAlertDefines);
-            
+
             List<AlertDefine> result = alertDefineService.getLogRealTimeAlertDefines();
-            
+
             assertNotNull(result);
             assertEquals(1, result.size());
             assertEquals(6L, result.get(0).getId());
-            
+
             // Verify database query and cache setting were called
             verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_REALTIME);
             cacheFactoryMock.verify(() -> CacheFactory.setLogAlertDefineCache(dbAlertDefines), times(1));
@@ -280,58 +290,58 @@ class AlertDefineServiceTest {
                 AlertDefine.builder().id(7L).type(METRIC_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build(),
                 AlertDefine.builder().id(8L).type(METRIC_ALERT_THRESHOLD_TYPE_REALTIME).enable(true).build()
         );
-        
+
         // Test valid metric realtime alert type
         when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_REALTIME))
                 .thenReturn(mockAlertDefines);
-        
+
         List<AlertDefine> result = alertDefineService.getAlertDefinesByType(METRIC_ALERT_THRESHOLD_TYPE_REALTIME);
-        
+
         assertNotNull(result);
         assertEquals(2, result.size());
         assertEquals(7L, result.get(0).getId());
         assertEquals(8L, result.get(1).getId());
         verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_REALTIME);
-        
+
         // Test valid metric periodic alert type
         reset(alertDefineDao);
         when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC))
                 .thenReturn(Lists.newArrayList());
-        
+
         result = alertDefineService.getAlertDefinesByType(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC);
-        
+
         assertNotNull(result);
         assertEquals(0, result.size());
         verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC);
-        
+
         // Test valid log realtime alert type
         reset(alertDefineDao);
         when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_REALTIME))
                 .thenReturn(mockAlertDefines);
-        
+
         result = alertDefineService.getAlertDefinesByType(LOG_ALERT_THRESHOLD_TYPE_REALTIME);
-        
+
         assertNotNull(result);
         assertEquals(2, result.size());
         verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_REALTIME);
-        
+
         // Test valid log periodic alert type
         reset(alertDefineDao);
         when(alertDefineDao.findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_PERIODIC))
                 .thenReturn(Lists.newArrayList());
-        
+
         result = alertDefineService.getAlertDefinesByType(LOG_ALERT_THRESHOLD_TYPE_PERIODIC);
-        
+
         assertNotNull(result);
         assertEquals(0, result.size());
         verify(alertDefineDao, times(1)).findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_PERIODIC);
-        
+
         // Test empty string type
         assertThrows(IllegalArgumentException.class, () -> alertDefineService.getAlertDefinesByType(""));
-        
+
         // Test null type
         assertThrows(IllegalArgumentException.class, () -> alertDefineService.getAlertDefinesByType(null));
-        
+
         // Test invalid type
         assertThrows(IllegalArgumentException.class, () -> alertDefineService.getAlertDefinesByType("invalid_type"));
     }

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

@@ -18,7 +18,6 @@
 package org.apache.hertzbeat.alert.service;
 
 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.common.support.exception.AlertExpressionException;
@@ -36,7 +35,10 @@ 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 static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
@@ -48,7 +50,7 @@ class DataSourceServiceTest {
 
     @BeforeEach
     void setUp() {
-        dataSourceService = new DataSourceServiceImpl();
+        dataSourceService = new DataSourceServiceImpl(null);
     }
 
     @Test
@@ -554,13 +556,11 @@ class DataSourceServiceTest {
         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();
+        long beforeHits = expressionCache.stats().hitCount();
         dataSourceService.calculate("promql", expr);
         dataSourceService.calculate("promql", expr);
-        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
+        long actualHits = expressionCache.stats().hitCount() - beforeHits;
         assertEquals(1, actualHits, "expression cache should hit but miss");
     }
 
@@ -575,9 +575,7 @@ class DataSourceServiceTest {
         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();
@@ -598,15 +596,13 @@ class DataSourceServiceTest {
         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();
+        long beforeHits = expressionCache.stats().hitCount();
         dataSourceService.calculate("promql", expr1);
         dataSourceService.calculate("promql", expr2);
-        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
+        long actualHits = expressionCache.stats().hitCount() - beforeHits;
         assertEquals(0, actualHits, "expression cache should miss but hit");
     }
 
@@ -639,4 +635,156 @@ class DataSourceServiceTest {
 
         assertThrows(AlertExpressionException.class, () -> dataSourceService.calculate("promql", "http_server_requests_seconds_count{!@~!!#$%^&}"));
     }
+
+    @Test
+    void query1() {
+        List<Map<String, Object>> sqlData = List.of(
+                new HashMap<>(Map.of("count", 10, "severity_text", "ERROR"))
+        );
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        when(mockExecutor.execute(anyString())).thenReturn(sqlData);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        String validSql = "SELECT count(*) FROM hertzbeat_logs WHERE severity_text = 'ERROR'";
+        List<Map<String, Object>> result = dataSourceService.query("sql", validSql);
+
+        assertNotNull(result);
+        assertEquals(1, result.size());
+        verify(mockExecutor).execute(anyString());
+    }
+
+    @Test
+    void query2() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "INSERT INTO hertzbeat_logs (body) VALUES ('test')"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query3() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "DELETE FROM hertzbeat_logs WHERE id = 1"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query4() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "UPDATE hertzbeat_logs SET body = 'hacked' WHERE id = 1"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query5() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "DROP TABLE hertzbeat_logs"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query6() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "SELECT * FROM hertzbeat_logs UNION SELECT * FROM users"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query7() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "SELECT * FROM hertzbeat_logs WHERE id IN (SELECT id FROM other_table)"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query8() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "SELECT * FROM users"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query9() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "WITH cte AS (SELECT * FROM hertzbeat_logs) SELECT * FROM cte"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
+
+    @Test
+    void query10() {
+        List<Map<String, Object>> sqlData = List.of(
+                new HashMap<>(Map.of("errorCount", 5))
+        );
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        when(mockExecutor.execute(anyString())).thenReturn(sqlData);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        String complexSql = "SELECT count(*) AS errorCount FROM hertzbeat_logs "
+                + "WHERE time_unix_nano >= NOW() AND severity_text = 'ERROR' "
+                + "GROUP BY severity_text HAVING count(*) > 2 ORDER BY errorCount LIMIT 10";
+
+        List<Map<String, Object>> result = dataSourceService.query("sql", complexSql);
+        assertNotNull(result);
+        verify(mockExecutor).execute(anyString());
+    }
+
+    @Test
+    void query11() {
+        List<Map<String, Object>> prometheusData = List.of(
+                new HashMap<>(Map.of("__value__", 100.0))
+        );
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("promql")).thenReturn(true);
+        when(mockExecutor.execute(anyString())).thenReturn(prometheusData);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        List<Map<String, Object>> result = dataSourceService.query("promql", "node_cpu_seconds_total > 50");
+
+        assertNotNull(result);
+        verify(mockExecutor).execute(anyString());
+    }
+
+    @Test
+    void query12() {
+        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
+        when(mockExecutor.support("sql")).thenReturn(true);
+        dataSourceService.setExecutors(List.of(mockExecutor));
+
+        assertThrows(AlertExpressionException.class,
+                () -> dataSourceService.query("sql", "SELEC * FORM hertzbeat_logs"));
+        verify(mockExecutor, never()).execute(anyString());
+    }
 }

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

@@ -146,7 +146,42 @@ public class HuaweiCloudExternAlertServiceTest {
         verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
     }
 
+    @Test
+    void testSubscriptionUrlFail() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSubscribeUrl("https://console.huaweicloud.com/smn/subscription/confirm?token=477a784601d744e4ab9ab83986502d31c4b938"
+                + "0ec0b64392b134e517c3aa17eb7b3a12dc9f3b4ab495e61c4dee654b435d7223ea934345bf8ae8901cef912b1d&topic_urn=urn:smn:cn-north-4"
+                + ":477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX&region=cn-north-4");
+        externAlert.setSignature("ottf37C/2RdDgqimRQMIBU6i7XjUfPPMU760jJn71wwP3825YPoIT22uw2A9399rkm9Jrt1qUEFrDLuA5yHFLd5n/XoM4FghIgyFn7VIfgpuVM31a+co78s"
+                + "YBiZ1egOCE/AwFm2oygRhfIceUj9Kw9vmc06el9TXY6RtE5tAEF6qEmICtTh45KwtCO/WRs3DY72dQi5hm0w7/tktS4WFZ1iP4LHt5eCwFvnH0u29Y96cJNI0fLUQxI5MkhgjK"
+                + "77JkFK7UT6ZYJZhzgSp/B7OQGStOQx+3Duvx4T4CzccZQM3sca81Z0B0GFGWeVXuEHyCPLsayY/Iz+5Tco51elT8w==");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("242fac183d3a4936b5ead6c725a32ed0");
+        externAlert.setType("SubscriptionConfirmation");
+        externAlert.setMessage("You are invited to subscribe to topic: urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:"
+                + "CES_notification_group_bngJ2aMpX. To confirm this subscription, please visit the subscribe_url included in this message. The subscribe_url is valid only within 48 hours.");
+        externAlert.setSigningCertUrl("https://xxxx.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
+        externAlert.setTimestamp("2025-06-07T15:07:14Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
 
-
+    @Test
+    void testCertUrlFailed() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSignature("TImrLoeb0tV1JZJSPyA0rpC9mNqH3MmhwQ4tgpuHHa+JztfGVZFvkU//OthKKhzpDAoYiXOYG9DbzXCLb"
+                + "vaGePIRITakoynYyYr9zZIpdx9jXhQNlgF8np1+t0JxNeoIq0DYWgH52tsodwqOm+OnmkcHwCRo/1rFv85KrKAaX2gy3sNwX"
+                + "w1hKnAwAw0mJlxHHSf/N3+7j6GoxCNV7fN9K4CpJiLMGNvUa7zVmG0U9mPvt/7Lac155kPPQ9lYyeL7vVI0e4sfRbuQruz3E"
+                + "0ZP40TKx0afoeR0/Bx/IoZzRP1La7pKlbEISvkcM7TqW/IOGQTkhVsQ32RFRxZWO2snw==");
+        externAlert.setSubject("DCS Redis “dcs-h4tv” ");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
+        externAlert.setType("Notification");
+        externAlert.setMessage("{}");
+        externAlert.setSigningCertUrl("https://xxx.myhuaweicloud.com/failedUrl");
+        externAlert.setTimestamp("2025-06-07T15:12:09Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
 
 }

hertzbeat-base/src/main/java/org/apache/hertzbeat/base/dao/LabelDao.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.manager.dao;
+package org.apache.hertzbeat.base.dao;
 
 import java.util.Optional;
 import java.util.Set;
@@ -33,7 +33,7 @@ public interface LabelDao extends JpaRepository<Label, Long>, JpaSpecificationEx
      * @param ids id list
      */
     void deleteLabelsByIdIn(Set<Long> ids);
-    
+
     /**
      * find Label by name and value
      * @param name Label name
@@ -41,5 +41,5 @@ public interface LabelDao extends JpaRepository<Label, Long>, JpaSpecificationEx
      * @return Label
      */
     Optional<Label> findLabelByNameAndTagValue(String name, String value);
-    
+
 }

hertzbeat-base/src/main/java/org/apache/hertzbeat/base/service/LabelService.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.manager.service;
+package org.apache.hertzbeat.base.service;
 
 import java.util.HashSet;
 import java.util.List;

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

@@ -83,6 +83,10 @@
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver18</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.xugudb</groupId>
+            <artifactId>xugu-jdbc</artifactId>
+        </dependency>
         <!-- postgresql -->
         <dependency>
             <groupId>org.postgresql</groupId>
@@ -109,6 +113,12 @@
             <artifactId>orai18n</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- db2 -->
+        <dependency>
+            <groupId>com.ibm.db2</groupId>
+            <artifactId>jcc</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!--redis-->
         <dependency>
             <groupId>io.lettuce</groupId>
@@ -152,7 +162,6 @@
         </dependency>
 
 
-
         <!--plc-->
         <dependency>
             <groupId>org.apache.plc4x</groupId>

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

@@ -172,6 +172,14 @@ public class JdbcCommonCollect extends AbstractCollect {
                 ".*en\\s*([/\\\\]|\\\\n|/n|\\n)\\s*crypt.*",
                 ".*ci\\s*([/\\\\]|\\\\n|/n|\\n)\\s*pher.*"
         });
+
+        // DB2 bypass mode
+        PLATFORM_BYPASS_PATTERNS.put("db2", new String[]{
+                ".*security\\s*([/\\\\]|\\\\n|/n|\\n)\\s*mechanism.*",
+                ".*client\\s*([/\\\\]|\\\\n|/n|\\n)\\s*accounting.*",
+                ".*ssl\\s*([/\\\\]|\\\\n|/n|\\n)\\s*connection.*",
+                ".*use\\s*([/\\\\]|\\\\n|/n|\\n)\\s*client\\s*([/\\\\]|\\\\n|/n|\\n)\\s*information.*"
+        });
     }
 
     private final GlobalConnectionCache connectionCommonCache = GlobalConnectionCache.getInstance();
@@ -521,6 +529,8 @@ public class JdbcCommonCollect extends AbstractCollect {
             case "mysql", "mariadb" -> "jdbc:mysql://" + host + ":" + port
                     + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase())
                     + "?useUnicode=true&characterEncoding=utf-8&useSSL=false";
+            case "xugu" -> "jdbc:xugu://" + host + ":" + port
+                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
             case "postgresql" -> "jdbc:postgresql://" + host + ":" + port
                     + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
             case "clickhouse" -> "jdbc:clickhouse://" + host + ":" + port
@@ -531,6 +541,8 @@ public class JdbcCommonCollect extends AbstractCollect {
             case "oracle" -> "jdbc:oracle:thin:@" + host + ":" + port
                     + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
             case "dm" -> "jdbc:dm://" + host + ":" + port;
+            case "db2" -> "jdbc:db2://" + host + ":" + port
+                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
             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

@@ -39,6 +39,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.net.ssl.SSLException;
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
@@ -106,6 +107,22 @@ import java.util.Collections;
  */
 @Slf4j
 public class HttpCollectImpl extends AbstractCollect {
+
+    /**
+     * Pre-compiled regex patterns for dangerous Xpath detection.
+     * Compiled once at class load for performance.
+     */
+    private static final List<Pattern> DANGEROUS_XPATH_PATTERNS;
+
+    static {
+        List<Pattern> patterns = new ArrayList<>();
+        for (String pattern : CollectorConstants.DANGEROUS_XPATH_PATTERNS) {
+            // Use CASE_INSENSITIVE to prevent bypass via case variations (e.g., //TEXT() vs //text())
+            patterns.add(Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.DOTALL));
+        }
+        DANGEROUS_XPATH_PATTERNS = Collections.unmodifiableList(patterns);
+    }
+
     private final Set<Integer> defaultSuccessStatusCodes = Set.of(
             HttpStatus.SC_OK,
             HttpStatus.SC_CREATED,
@@ -357,21 +374,83 @@ public class HttpCollectImpl extends AbstractCollect {
         }
     }
 
+    /**
+     * Validates the Xpath expression to prevent DoS attacks.
+     * Checks for dangerous patterns that could traverse the entire XML document.
+     * Uses pre-compiled patterns for performance and case-insensitive matching for security.
+     *
+     * @param xpathExpression the Xpath expression to validate
+     * @throws IllegalArgumentException if the expression contains dangerous patterns
+     */
+    private void validateXpathExpression(String xpathExpression) throws IllegalArgumentException {
+        if (!StringUtils.hasText(xpathExpression)) {
+            return;
+        }
+
+        // Check against dangerous patterns using pre-compiled regex
+        for (Pattern pattern : DANGEROUS_XPATH_PATTERNS) {
+            Matcher matcher = pattern.matcher(xpathExpression);
+            if (matcher.find()) {
+                throw new IllegalArgumentException(
+                    "Xpath expression contains dangerous pattern that may cause DoS: " + pattern.pattern()
+                );
+            }
+        }
+
+        // Check for excessive wildcard usage (more than 3 // or * operators)
+        long descendantAxisCount = xpathExpression.chars().filter(ch -> ch == '/').count();
+        long wildcardCount = xpathExpression.chars().filter(ch -> ch == '*').count();
+
+        if (descendantAxisCount > 10 || wildcardCount > 5) {
+            throw new IllegalArgumentException(
+                "Xpath expression contains too many wildcards or descendant axes, potential DoS risk"
+            );
+        }
+
+        log.debug("Xpath expression validation passed: {}", xpathExpression);
+    }
+
     private void parseResponseByXmlPath(String resp, Metrics metrics,
                                         CollectRep.MetricsData.Builder builder, Long responseTime) {
         HttpProtocol http = metrics.getHttp();
         List<String> aliasFields = metrics.getAliasFields();
         String xpathExpression = http.getParseScript();
+
+        // Layer 1: Validate Xpath expression is not empty
         if (!StringUtils.hasText(xpathExpression)) {
             log.warn("Http collect parse type is xmlPath, but the xpath expression is empty.");
             builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("XPath expression is empty");
+            builder.setMsg("Xpath expression is empty");
             return;
         }
+
+        // Layer 2: Check XML response size to prevent memory exhaustion
+        if (resp != null && resp.length() > CollectorConstants.MAX_XML_RESPONSE_SIZE) {
+            log.warn("XML response size {} bytes exceeds maximum allowed size {} bytes",
+                resp.length(), CollectorConstants.MAX_XML_RESPONSE_SIZE);
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg("XML response exceeds maximum allowed size of "
+                + (CollectorConstants.MAX_XML_RESPONSE_SIZE / 1024 / 1024) + "MB");
+            return;
+        }
+
+        // Layer 3: Validate Xpath expression for dangerous patterns
+        try {
+            validateXpathExpression(xpathExpression);
+        } catch (IllegalArgumentException e) {
+            log.warn("Xpath expression validation failed: {}", e.getMessage());
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(e.getMessage());
+            return;
+        }
+
         int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
 
         try {
             DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+
+            // Layer 4: Enable XML secure processing and XXE protection
+            dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
             dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
             dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
@@ -387,7 +466,7 @@ public class HttpCollectImpl extends AbstractCollect {
             NodeList nodeList = (NodeList) xpath.evaluate(xpathExpression, document, XPathConstants.NODESET);
 
             if (nodeList == null || nodeList.getLength() == 0) {
-                log.debug("XPath expression '{}' returned no nodes.", xpathExpression);
+                log.debug("Xpath expression '{}' returned no nodes.", xpathExpression);
                 boolean requestedSummaryFields = aliasFields.stream()
                         .anyMatch(alias -> NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)
                                 || CollectorConstants.KEYWORD.equalsIgnoreCase(alias));
@@ -408,7 +487,16 @@ public class HttpCollectImpl extends AbstractCollect {
                 return;
             }
 
-            for (int i = 0; i < nodeList.getLength(); i++) {
+            // Layer 5: Limit the number of results to prevent excessive resource consumption
+            int resultSize = nodeList.getLength();
+            int maxResults = CollectorConstants.MAX_XPATH_RESULT_NODES;
+            if (resultSize > maxResults) {
+                log.warn("Xpath expression returned {} nodes, exceeding limit of {}. Processing first {} nodes only.",
+                    resultSize, maxResults, maxResults);
+                resultSize = maxResults;
+            }
+
+            for (int i = 0; i < resultSize; i++) {
                 Node node = nodeList.item(i);
                 CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
 
@@ -422,7 +510,7 @@ public class HttpCollectImpl extends AbstractCollect {
                             String value = (String) xpath.evaluate(alias, node, XPathConstants.STRING);
                             valueRowBuilder.addColumn(StringUtils.hasText(value) ? value : CommonConstants.NULL_VALUE);
                         } catch (XPathExpressionException e) {
-                            log.warn("Failed to evaluate XPath '{}' for node [{}]: {}", alias, node.getNodeName(), e.getMessage());
+                            log.warn("Failed to evaluate Xpath '{}' for node [{}]: {}", alias, node.getNodeName(), e.getMessage());
                             valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
                         }
                     }
@@ -431,7 +519,7 @@ public class HttpCollectImpl extends AbstractCollect {
             }
 
         } catch (Exception e) {
-            log.warn("Failed to parse XML response with XPath '{}': {}", xpathExpression, e.getMessage(), e);
+            log.warn("Failed to parse XML response with Xpath '{}': {}", xpathExpression, e.getMessage(), e);
             builder.setCode(CollectRep.Code.FAIL);
             builder.setMsg("Failed to parse XML response: " + e.getMessage());
         }
@@ -882,4 +970,4 @@ public class HttpCollectImpl extends AbstractCollect {
         }
         return successCodeSet.contains(statusCode);
     }
-}
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/redis/RedisCommonCollectImpl.java

@@ -67,6 +67,8 @@ public class RedisCommonCollectImpl extends AbstractCollect {
 
     private static final String CLUSTER = "3";
 
+    private static final String SINGLE = "1";
+
     private static final String CLUSTER_INFO = "cluster";
 
     private static final String UNIQUE_IDENTITY = "identity";
@@ -140,7 +142,7 @@ public class RedisCommonCollectImpl extends AbstractCollect {
      * @return data
      */
     private List<Map<String, String>> getClusterRedisInfo(Metrics metrics) throws GeneralSecurityException, IOException {
-        Map<String, StatefulRedisClusterConnection<String, String>> connectionMap = getConnectionList(metrics.getRedis());
+        Map<String, StatefulRedisConnection<String, String>> connectionMap = getConnectionList(metrics.getRedis());
         List<Map<String, String>> list = new ArrayList<>(connectionMap.size());
         connectionMap.forEach((identity, connection) ->{
             String info = connection.sync().info(metrics.getName());
@@ -214,16 +216,23 @@ public class RedisCommonCollectImpl extends AbstractCollect {
      * @param redisProtocol protocol
      * @return connection map
      */
-    private Map<String, StatefulRedisClusterConnection<String, String>> getConnectionList(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
+    private Map<String, StatefulRedisConnection<String, String>> getConnectionList(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
         // first connection
         StatefulRedisClusterConnection<String, String> connection = getClusterConnection(redisProtocol);
         Partitions partitions = connection.getPartitions();
-        Map<String, StatefulRedisClusterConnection<String, String>> clusterConnectionMap = new HashMap<>(partitions.size());
+        Map<String, StatefulRedisConnection<String, String>> clusterConnectionMap = new HashMap<>(partitions.size());
         for (RedisClusterNode partition : partitions) {
             RedisURI uri = partition.getUri();
-            redisProtocol.setHost(uri.getHost());
-            redisProtocol.setPort(String.valueOf(uri.getPort()));
-            StatefulRedisClusterConnection<String, String> clusterConnection = getClusterConnection(redisProtocol);
+            RedisProtocol singleRedisProtocol = RedisProtocol.builder()
+                    .host(uri.getHost())
+                    .port(String.valueOf(uri.getPort()))
+                    .username(redisProtocol.getUsername())
+                    .password(redisProtocol.getPassword())
+                    .pattern(SINGLE)
+                    .timeout(redisProtocol.getTimeout())
+                    .sshTunnel(redisProtocol.getSshTunnel())
+                    .build();
+            StatefulRedisConnection<String, String> clusterConnection = getSingleConnection(singleRedisProtocol);
             clusterConnectionMap.put(doUri(uri.getHost(), uri.getPort()), clusterConnection);
         }
         return clusterConnectionMap;

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

@@ -19,10 +19,13 @@ package org.apache.hertzbeat.collector.collect.redis;
 
 import static org.apache.hertzbeat.common.constants.CommonConstants.TYPE_STRING;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
+import io.lettuce.core.api.StatefulRedisConnection;
+import io.lettuce.core.api.sync.RedisCommands;
 import io.lettuce.core.cluster.RedisClusterClient;
 import io.lettuce.core.cluster.api.StatefulRedisClusterConnection;
-import io.lettuce.core.cluster.api.sync.RedisAdvancedClusterCommands;
 import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.resource.ClientResources;
@@ -37,6 +40,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -51,13 +55,19 @@ public class RedisClusterCollectImplTest {
 
 
     @Mock
-    private StatefulRedisClusterConnection<String, String> connection;
+    private StatefulRedisClusterConnection<String, String> clusterConnection;
 
     @Mock
-    private RedisAdvancedClusterCommands<String, String> cmd;
+    private StatefulRedisConnection<String, String> singleConnection;
 
     @Mock
-    private RedisClusterClient client;
+    private RedisCommands<String, String> cmd;
+
+    @Mock
+    private RedisClusterClient clusterClient;
+
+    @Mock
+    private RedisClient singleClient;
 
     @BeforeEach
     void setUp() {
@@ -65,8 +75,10 @@ public class RedisClusterCollectImplTest {
 
     @AfterEach
     void setDown() {
-        connection.close();
-        client.shutdown();
+        clusterConnection.close();
+        singleConnection.close();
+        clusterClient.shutdown();
+        singleClient.shutdown();
     }
 
     @Test
@@ -110,10 +122,14 @@ public class RedisClusterCollectImplTest {
         metrics.setAliasFields(aliasField);
         metrics.setFields(fields);
 
-
-        Mockito.mockStatic(RedisClusterClient.class).when(() -> RedisClusterClient.create(Mockito.any(ClientResources.class),
-                Mockito.any(RedisURI.class))).thenReturn(client);
-        Mockito.when(client.connect()).thenReturn(connection);
+        MockedStatic<RedisClusterClient> redisClusterClientMockedStatic = Mockito.mockStatic(RedisClusterClient.class);
+        redisClusterClientMockedStatic.when(() -> RedisClusterClient.create(Mockito.any(ClientResources.class),
+                Mockito.any(RedisURI.class))).thenReturn(clusterClient);
+        Mockito.when(clusterClient.connect()).thenReturn(clusterConnection);
+        MockedStatic<RedisClient> redisClientMockedStatic = Mockito.mockStatic(RedisClient.class);
+        redisClientMockedStatic.when(() -> RedisClient.create(Mockito.any(ClientResources.class),
+                Mockito.any(RedisURI.class))).thenReturn(singleClient);
+        Mockito.when(singleClient.connect()).thenReturn(singleConnection);
 
         Partitions partitions = new Partitions();
         RedisClusterNode node = new RedisClusterNode();
@@ -125,9 +141,9 @@ public class RedisClusterCollectImplTest {
         node2.setUri(RedisURI.create("redis://" + uri2));
         partitions.add(node2);
 
-        Mockito.when(connection.getPartitions()).thenReturn(partitions);
+        Mockito.when(clusterConnection.getPartitions()).thenReturn(partitions);
 
-        Mockito.when(connection.sync()).thenReturn(cmd);
+        Mockito.when(singleConnection.sync()).thenReturn(cmd);
         Mockito.when(cmd.info(metrics.getName())).thenReturn(info);
         Mockito.when(cmd.clusterInfo()).thenReturn(clusterInfo);
 
@@ -147,6 +163,8 @@ public class RedisClusterCollectImplTest {
                 assertEquals(row.getColumns(2), uri2);
             }
         }
+        redisClusterClientMockedStatic.close();
+        redisClientMockedStatic.close();
 
     }
 }

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

@@ -18,7 +18,7 @@
 <configuration scan="true">
     <springProperty scope="context" name="application_name" source="spring.application.name" defaultValue="collector"/>
     <!-- Output logs to ConsoleAppender -->
-    <appender name="ConsoleAppender" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="CONSOLE_RAW" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <!--<pattern>%d %p (%file:%line\)- %m%n</pattern>-->
             <!-- Format output: %d for date, %thread for thread name, %-5level for level with 5 character width, %msg for log message, %n for new line -->
@@ -27,6 +27,13 @@
         </encoder>
     </appender>
 
+    <appender name="ConsoleAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>0</discardingThreshold>
+        <queueSize>512</queueSize>
+        <includeCallerData>true</includeCallerData>
+        <appender-ref ref="CONSOLE_RAW"/>
+    </appender>
+
     <appender name="SystemOutFileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <!-- Rolling policy for loggers, by date and by size -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -94,6 +101,7 @@
     <!-- Production environment configuration -->
     <springProfile name="prod">
         <root level="INFO">
+            <appender-ref ref="ConsoleAppender"/>
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
         </root>
@@ -101,6 +109,7 @@
 
     <springProfile name="cluster">
         <root level="INFO">
+            <appender-ref ref="ConsoleAppender"/>
             <appender-ref ref="SystemOutFileAppender"/>
             <appender-ref ref="ErrOutFileAppender"/>
         </root>

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/constants/CollectorConstants.java

@@ -49,4 +49,28 @@ public interface CollectorConstants extends NetworkConstants {
 
     String STATUS_CODE = "statusCode";
 
+    /**
+     * Maximum XML response size in bytes (10MB) to prevent DoS attacks
+     */
+    int MAX_XML_RESPONSE_SIZE = 10 * 1024 * 1024;
+
+    /**
+     * Maximum number of nodes returned by Xpath query to prevent excessive resource consumption
+     */
+    int MAX_XPATH_RESULT_NODES = 1000;
+
+    /**
+     * Dangerous Xpath expression patterns that could cause DoS attacks
+     * These patterns match expressions that traverse the entire XML document
+     */
+    String[] DANGEROUS_XPATH_PATTERNS = {
+        "//\\*\\s*\\|\\s*//@\\*\\s*\\|\\s*//text\\(\\)",   // //* | //@* | //text()
+        "//\\*\\s*\\|",                                      // //* | ...
+        "//@\\*\\s*\\|",                                     // //@* | ...
+        "//node\\(\\)\\s*\\|",                               // //node() | ...
+        "descendant-or-self::node\\(\\)\\s*\\|",            // descendant-or-self::node() | ...
+        "/descendant-or-self::node\\(\\)",                   // /descendant-or-self::node()
+        "//\\*[\\s\\S]*//\\*"                                // //** with multiple wildcards
+    };
+
 }

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java

@@ -35,9 +35,9 @@ import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;
  */
 @Slf4j
 public class GoOnlineProcessor implements NettyRemotingProcessor {
-    
+
     private TimerDispatch timerDispatch;
-    
+
     @Override
     public ClusterMsg.Message handle(ChannelHandlerContext ctx, ClusterMsg.Message message) {
         if (this.timerDispatch == null) {
@@ -53,7 +53,9 @@ public class GoOnlineProcessor implements NettyRemotingProcessor {
                 AesUtil.setDefaultSecretKey(serverInfo.getAesSecret());
             }
         }
-        timerDispatch.goOnline();
+        if (ClusterMsg.Direction.REQUEST.equals(message.getDirection())) {
+            timerDispatch.goOnline();
+        }
         log.info("receive online message and handle success");
         return ClusterMsg.Message.newBuilder()
                 .setIdentity(message.getIdentity())

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

@@ -25,6 +25,8 @@ import org.apache.hertzbeat.common.queue.CommonDataQueue;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
+
 /**
  * for collector instance
  * send collect response data by netty
@@ -108,4 +110,24 @@ public class NettyDataQueue implements CommonDataQueue {
     public LogEntry pollLogEntryToStorage() throws InterruptedException {
         return null;
     }
+
+    @Override
+    public void sendLogEntryToAlertBatch(List<LogEntry> logEntries) {
+
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToAlertBatch(int maxBatchSize) throws InterruptedException {
+        return List.of();
+    }
+
+    @Override
+    public void sendLogEntryToStorageBatch(List<LogEntry> logEntries) {
+
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToStorageBatch(int maxBatchSize) throws InterruptedException {
+        return List.of();
+    }
 }

hertzbeat-collector/hertzbeat-collector-common/src/test/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessorTest.java

@@ -0,0 +1,105 @@
+/*
+ * 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.dispatch.entrance.processor;
+
+import com.google.common.collect.Lists;
+import com.google.protobuf.ByteString;
+import io.netty.channel.ChannelHandlerContext;
+import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.timer.TimerDispatcher;
+import org.apache.hertzbeat.common.entity.job.Job;
+import org.apache.hertzbeat.common.entity.job.Metrics;
+import org.apache.hertzbeat.common.entity.message.ClusterMsg;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Test for GoOnlineProcessor
+ */
+class GoOnlineProcessorTest {
+
+    private GoOnlineProcessor goOnlineProcessor;
+    private TimerDispatcher timerDispatcher;
+
+    @Mock
+    private ChannelHandlerContext channelHandlerContext;
+
+    private MockedStatic<SpringContextHolder> springContextHolderMockedStatic;
+
+    @BeforeEach
+    void setUp() {
+        MockitoAnnotations.openMocks(this);
+        goOnlineProcessor = new GoOnlineProcessor();
+        timerDispatcher = new TimerDispatcher();
+        springContextHolderMockedStatic = Mockito.mockStatic(SpringContextHolder.class);
+        springContextHolderMockedStatic.when(() -> SpringContextHolder.getBean(TimerDispatch.class)).thenReturn(timerDispatcher);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        springContextHolderMockedStatic.close();
+        timerDispatcher.destroy();
+    }
+
+    @Test
+    void verifyTaskMapPreservation() throws Exception {
+        Job job = Job.builder()
+            .app("test")
+            .id(12345L)
+            .metrics(Lists.newArrayList(Metrics.builder().interval(100L).build()))
+            .configmap(Lists.newArrayList())
+            .isCyclic(true)
+            .build();
+        timerDispatcher.addJob(job, null);
+
+        Field cyclicTaskMapField = TimerDispatcher.class.getDeclaredField("currentCyclicTaskMap");
+        cyclicTaskMapField.setAccessible(true);
+        Map<?, ?> currentCyclicTaskMap = (Map<?, ?>) cyclicTaskMapField.get(timerDispatcher);
+        assertEquals(1, currentCyclicTaskMap.size(), "Task map should have 1 job initially");
+
+        ClusterMsg.Message responseMsg = ClusterMsg.Message.newBuilder()
+            .setType(ClusterMsg.MessageType.GO_ONLINE)
+            .setDirection(ClusterMsg.Direction.RESPONSE)
+            .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
+            .setIdentity("test-identity")
+            .build();
+        goOnlineProcessor.handle(channelHandlerContext, responseMsg);
+        assertEquals(1, currentCyclicTaskMap.size(), "Task map should still have 1 job after receiving RESPONSE");
+
+        ClusterMsg.Message requestMsg = ClusterMsg.Message.newBuilder()
+            .setType(ClusterMsg.MessageType.GO_ONLINE)
+            .setDirection(ClusterMsg.Direction.REQUEST)
+            .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
+            .setIdentity("test-identity")
+            .build();
+        goOnlineProcessor.handle(channelHandlerContext, requestMsg);
+        assertEquals(0, currentCyclicTaskMap.size(), "Task map should be empty after receiving REQUEST");
+    }
+}

hertzbeat-common/pom.xml

@@ -171,7 +171,7 @@
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-memory-netty</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.xerial.snappy</groupId>
             <artifactId>snappy-java</artifactId>
@@ -183,6 +183,10 @@
             <version>${javaparser.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonProperties.java

@@ -125,6 +125,11 @@ public class CommonProperties {
          */
         private String logEntryToStorageQueueName;
 
+        /**
+         * Timeout for blocking wait in seconds (defaults to 1 second if not configured)
+         */
+        private Long waitTimeout;
+
     }
 
     /**

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

@@ -97,11 +97,6 @@ public interface CommonConstants {
      */
     String LABEL_ALERT_NAME = "alertname";
 
-    /**
-     * label key: instance host
-     */
-    String LABEL_INSTANCE_HOST = "instancehost";
-
     /**
      * label key: instance name
      */

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

@@ -0,0 +1,43 @@
+/*
+ * 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.constants;
+
+/**
+ * HertzBeat Reserved Keywords Enum
+ */
+public enum HertzBeatKeywordsEnum {
+
+    INSTANCE("instance", "metric_instance");
+
+    private final String keyword;
+
+    private final String alias;
+
+    HertzBeatKeywordsEnum(String keyword, String alias) {
+        this.keyword = keyword;
+        this.alias = alias;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+}

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

@@ -38,5 +38,5 @@ public interface MetricDataConstants {
     String CODE = "code";
     String MSG = "msg";
     String INSTANCE_NAME = "instancename";
-    String INSTANCE_HOST = "instancehost";
+    String INSTANCE = "instance";
 }

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

@@ -0,0 +1,50 @@
+/*
+ * 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.constants;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.ToString;
+
+/**
+ * Theme Enum
+ */
+@Getter
+@AllArgsConstructor
+@ToString
+public enum ThemeEnum {
+
+    COMPACT("compact"), DEFAULT("default"), LIGHT("light"), DARK("dark");
+
+    private final String value;
+
+    /**
+     * Convert theme to standard theme
+     *
+     * @param theme the input theme
+     * @return the converted theme
+     */
+    public static String convert(String theme) {
+        if ((theme == null || theme.isEmpty())
+            || ThemeEnum.COMPACT.getValue().equals(theme)
+            || ThemeEnum.DEFAULT.getValue().equals(theme)) {
+            return ThemeEnum.LIGHT.getValue();
+        }
+        return theme;
+    }
+}

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

@@ -48,8 +48,8 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Entity
 @Table(name = "hzb_alert_define_monitor_bind", indexes = {
-        @Index(name = "index_alert_define_monitor", columnList = "alertDefineId"),
-        @Index(name = "index_alert_define_monitor", columnList = "monitor_id")
+        @Index(name = "idx_alert_define_id", columnList = "alert_define_id"),
+        @Index(name = "idx_monitor_id", columnList = "monitor_id")
 })
 @Data
 @Builder

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

@@ -68,12 +68,13 @@ public class NoticeReceiver {
     private String name;
 
     @Schema(title = "Notification information method: 0-SMS 1-Email 2-webhook 3-WeChat Official Account 4-Enterprise WeChat Robot "
-            + "5-DingTalk Robot 6-FeiShu Robot 7-Telegram Bot 8-SlackWebHook 9-Discord Bot 10-Enterprise WeChat app message",
+            + "5-DingTalk Robot 6-FeiShu Robot 7-Telegram Bot 8-SlackWebHook 9-Discord Bot 10-Enterprise WeChat app message "
+            + "11-Slack 12-Discord 13-Gotify 14-FeiShu app message",
             description = "Notification information method: "
                     + "0-SMS 1-Email 2-webhook 3-WeChat Official Account "
                     + "4-Enterprise WeChat Robot 5-DingTalk Robot 6-FeiShu Robot "
                     + "7-Telegram Bot 8-SlackWebHook 9-Discord Bot 10-Enterprise "
-                    + "WeChat app message",
+                    + "WeChat app message 11-Slack 12-Discord 13-Gotify 14-FeiShu app message",
             accessMode = READ_WRITE)
     @Min(0)
     @NotNull(message = "type can not null")
@@ -98,6 +99,20 @@ public class NoticeReceiver {
     @Column(length = 1000)
     private String hookUrl;
 
+    @Schema(title = "Auth Type: WebHook Authorization Type",
+            description = "Auth Type: WebHook Authorization Type, one of the 'None', 'Basic' and 'Bearer'",
+            example = "None", accessMode = READ_ONLY)
+    @Size(max = 300)
+    @Column(length = 300)
+    private String hookAuthType;
+
+    @Schema(title = "Auth Token: WebHook Authorization Token",
+            description = "Auth Token: WebHook Authorization Token",
+            example = "YWxpY2U6c3VwZXJtYW4", accessMode = READ_WRITE)
+    @Size(max = 300)
+    @Column(length = 300)
+    private String hookAuthToken;
+
     @Schema(title = "openId : The notification method is valid for WeChat official account, enterprise WeChat robot or FlyBook robot",
             description = "openId : The notification method is valid for WeChat official account, enterprise WeChat robot or FlyBook robot",
             example = "343432", accessMode = READ_WRITE)
@@ -105,6 +120,12 @@ public class NoticeReceiver {
     @Column(length = 300)
     private String wechatId;
 
+    @Schema(title = "FeiShu app id : The notification method is valid for FeiShu app message",
+            description = "FeiShu app id : The notification method is valid for FeiShu app message",
+            example = "34823984635647", accessMode = READ_WRITE)
+    @Size(max = 255)
+    private String appId;
+
     @Schema(title = "Access token : The notification method is valid for DingTalk robot",
             description = "Access token : The notification method is valid for DingTalk robot",
             example = "34823984635647", accessMode = READ_WRITE)
@@ -127,11 +148,21 @@ public class NoticeReceiver {
             example = "779294123", accessMode = READ_WRITE)
     private String tgMessageThreadId;
 
+    @Schema(title = "FeiShu app message receiveType: 0-user 1-chat 2-party 3-all",
+            description = "FeiShu app message receiveType: 0-user 1-chat 2-party 3-all",
+            example = "1", accessMode = READ_WRITE)
+    private Byte larkReceiveType;
+
     @Schema(title = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
             description = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
             example = "779294123", accessMode = READ_WRITE)
     private String userId;
 
+    @Schema(title = "FeiShu app message chatId: The notification method is valid for FeiShu app message",
+            description = "FeiShu app message chatId: The notification method is valid for FeiShu app message",
+            example = "779294123", accessMode = READ_WRITE)
+    private String chatId;
+
     @Schema(title = "URL address: The notification method is valid for Slack",
             description = "URL address: The notification method is valid for Slack",
             example = "https://hooks.slack.com/services/XXXX/XXXX/XXXX", accessMode = READ_WRITE)

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

@@ -18,13 +18,14 @@
 package org.apache.hertzbeat.common.entity.dto;
 
 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
  */
@@ -35,8 +36,8 @@ import lombok.NoArgsConstructor;
 @Schema(description = "Metric History Range Query Data")
 public class MetricsHistoryData {
 
-    @Schema(title = "Monitoring Task ID")
-    private Long id;
+    @Schema(title = "Monitor Instance (e.g., ip:port or domain)")
+    private String instance;
 
     @Schema(title = "Monitoring Type")
     private String app;

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/grafana/GrafanaDashboard.java

@@ -34,7 +34,7 @@ import lombok.NoArgsConstructor;
 @Entity
 @Table(name = "hzb_grafana_dashboard")
 @Data
-@Builder
+@Builder(toBuilder = true)
 @AllArgsConstructor
 @NoArgsConstructor
 @Schema(description = "Grafana dashboard entity")

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

@@ -42,8 +42,8 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Entity
 @Table(name = "hzb_collector_monitor_bind", indexes = {
-        @Index(name = "index_collector_monitor", columnList = "collector"),
-        @Index(name = "index_collector_monitor", columnList = "monitor_id")
+        @Index(name = "idx_collector_monitor_collector", columnList = "collector"),
+        @Index(name = "idx_collector_monitor_monitor_id", columnList = "monitor_id")
 })
 @Data
 @Builder

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

@@ -51,9 +51,9 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Entity
 @Table(name = "hzb_monitor", indexes = {
-        @Index(name = "monitor_query_index", columnList = "app"),
-        @Index(name = "monitor_query_index", columnList = "host"),
-        @Index(name = "monitor_query_index", columnList = "name")
+        @Index(name = "idx_hzb_monitor_app", columnList = "app"),
+        @Index(name = "idx_hzb_monitor_instance", columnList = "instance"),
+        @Index(name = "idx_hzb_monitor_name", columnList = "name")
 })
 @Data
 @Builder
@@ -62,51 +62,51 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Schema(description = "Monitor Entity")
 @EntityListeners(AuditingEntityListener.class)
 public class Monitor {
-    
+
     @Id
     @Schema(title = "Monitor task ID", example = "87584674384", accessMode = READ_ONLY)
     private Long id;
-    
+
     @Schema(title = "Collect task ID", example = "43243543543", accessMode = READ_ONLY)
     private Long jobId;
-    
+
     @Schema(title = "task name", example = "Api-TanCloud.cn", accessMode = READ_WRITE)
     @Size(max = 100)
     private String name;
-    
+
     @Schema(title = "Type of monitoring", example = "TanCloud", accessMode = READ_WRITE)
     @Size(max = 100)
     private String app;
-    
+
     @Schema(title = "Scrape type: static | http_sd | dns_sd | zookeeper_sd", example = "static", accessMode = READ_WRITE)
     @Size(max = 100)
     private String scrape;
-    
-    @Schema(title = "peer host: ipv4, ipv6, domain name", example = "192.167.25.11", accessMode = READ_WRITE)
+
+    @Schema(title = "the monitor target: ip/domain+port or ip/domain", example = "192.167.25.11:8081", accessMode = READ_WRITE)
     @Size(max = 100)
     @HostValid
-    private String host;
-    
+    private String instance;
+
     @Schema(title = "Monitoring of the acquisition interval time in seconds", example = "600", accessMode = READ_WRITE)
     @Min(10)
     private Integer intervals;
-    
+
     @Schema(title = "Schedule type: interval | cron", example = "interval", accessMode = READ_WRITE)
     @Size(max = 20)
     private String scheduleType;
-    
+
     @Schema(title = "Cron expression when scheduleType is cron", example = "0/5 * * * * ?", accessMode = READ_WRITE)
     @Size(max = 100)
     private String cronExpression;
-    
+
     @Schema(title = "Task status 0: Paused, 1: Up, 2: Down", accessMode = READ_WRITE)
     @Min(0)
     @Max(4)
     private byte status;
-    
+
     @Schema(title = "Task type 0: Normal, 1: push auto create, 2: discovery auto create")
     private byte type;
-    
+
     @Schema(title = "task label", example = "{env:test}", accessMode = READ_WRITE)
     @Convert(converter = JsonMapAttributeConverter.class)
     @Column(length = 4096)
@@ -116,23 +116,23 @@ public class Monitor {
     @Convert(converter = JsonMapAttributeConverter.class)
     @Column(length = 4096)
     private Map<String, String> annotations;
-    
+
     @Schema(title = "Monitor note description", example = "Availability monitoring of the SAAS website TanCloud", accessMode = READ_WRITE)
     @Size(max = 255)
     private String description;
-    
+
     @Schema(title = "The creator of this record", example = "tom", accessMode = READ_ONLY)
     @CreatedBy
     private String creator;
-    
+
     @Schema(title = "The modifier of this record", example = "tom", accessMode = READ_ONLY)
     @LastModifiedBy
     private String modifier;
-    
+
     @Schema(title = "Record create time", example = "2024-07-02T20:09:34.903217", accessMode = READ_ONLY)
     @CreatedDate
     private LocalDateTime gmtCreate;
-    
+
     @Schema(title = "Record modify time", example = "2024-07-02T20:09:34.903217", accessMode = READ_ONLY)
     @LastModifiedDate
     private LocalDateTime gmtUpdate;

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

@@ -42,7 +42,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Entity
 @Table(name = "hzb_monitor_bind", indexes = {
-        @Index(name = "index_monitor_bind", columnList = "bizId"),
+        @Index(name = "index_monitor_bind", columnList = "biz_id"),
         @Index(name = "index_monitor_bin", columnList = "monitor_id")
 })
 @Data
@@ -59,7 +59,7 @@ public class MonitorBind {
 
     @Schema(title = "key string: ip:port")
     private String keyStr;
-    
+
     @Schema(title = "connect bind id", example = "87432674384")
     private Long bizId;
 

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

@@ -46,8 +46,11 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  * Monitor parameter values
  */
 @Entity
-@Table(name = "hzb_param", indexes = { @Index(columnList = "monitorId") },
-        uniqueConstraints = @UniqueConstraint(columnNames = {"monitorId", "field"}))
+@Table(
+    name = "hzb_param",
+    indexes = {@Index(name = "idx_hzb_param_monitor_id", columnList = "monitor_id")},
+    uniqueConstraints = {@UniqueConstraint(name = "uk_hzb_param_monitor_field", columnNames = {"monitor_id", "field"})}
+)
 @Data
 @Builder
 @AllArgsConstructor
@@ -68,6 +71,7 @@ public class Param {
      * Monitor ID
      */
     @Schema(title = "Monitor task ID", example = "875846754543", accessMode = READ_WRITE)
+    @Column(name = "monitor_id")
     private Long monitorId;
 
     /**
@@ -75,6 +79,7 @@ public class Param {
      */
     @Schema(title = "Parameter identifier field", example = "port", accessMode = READ_WRITE)
     @Size(max = 100)
+    @Column(name = "field")
     @NotBlank(message = "field can not null")
     private String field;
 

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

@@ -41,7 +41,6 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 @Entity
 @Table(name = "hzb_status_page_incident_component_bind", indexes = {
         @Index(name = "index_incident_component", columnList = "incident_id"),
-        @Index(name = "index_incident_component", columnList = "component_id")
 })
 @Data
 @Builder
@@ -59,7 +58,7 @@ public class StatusPageIncidentComponentBind {
     @Schema(title = "Incident ID", example = "87432674384")
     @Column(name = "incident_id")
     private Long incidentId;
-    
+
     @Schema(title = "Component ID", example = "87432674336")
     @Column(name = "component_id")
     private Long componentId;
@@ -71,5 +70,5 @@ public class StatusPageIncidentComponentBind {
     @Schema(title = "Record modify time", example = "1612198444000")
     @LastModifiedDate
     private LocalDateTime gmtUpdate;
-    
+
 }

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

@@ -225,9 +225,9 @@ public final class CollectRep {
             return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
         }
 
-        public String getInstanceHost() {
+        public String getInstance() {
             Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
+            return metadata.getOrDefault(MetricDataConstants.INSTANCE, null);
         }
 
         public Map<String, String> getLabels() {
@@ -501,8 +501,8 @@ public final class CollectRep {
                 return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
             }
             
-            public String getInstanceHost() {
-                return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
+            public String getInstance() {
+                return metadata.getOrDefault(MetricDataConstants.INSTANCE, null);
             }
             
             public Map<String, String> getLabels() {

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/push/PushMetrics.java

@@ -35,8 +35,8 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
  */
 @Entity
 @Table(name = "hzb_push_metrics", indexes = {
-        @Index(name = "push_query_index", columnList = "monitorId"),
-        @Index(name = "push_query_index", columnList = "time")
+        @Index(name = "idx_push_metrics_monitor_id", columnList = "monitor_id"),
+        @Index(name = "idx_push_metrics_time", columnList = "time")
 })
 @Data
 @Builder

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/warehouse/History.java

@@ -37,10 +37,10 @@ import lombok.NoArgsConstructor;
  */
 @Entity
 @Table(name = "hzb_history", indexes = {
-        @Index(name = "history_query_index", columnList = "monitorId"),
-        @Index(name = "history_query_index", columnList = "app"),
-        @Index(name = "history_query_index", columnList = "metrics"),
-        @Index(name = "history_query_index", columnList = "metric")
+        @Index(name = "idx_hzb_history_instance", columnList = "instance"),
+        @Index(name = "idx_hzb_history_app", columnList = "app"),
+        @Index(name = "idx_hzb_history_metrics", columnList = "metrics"),
+        @Index(name = "idx_hzb_history_metric", columnList = "metric")
 })
 @Data
 @Builder
@@ -54,8 +54,8 @@ public class History {
     @Schema(description = "Metric data history entity primary key index ID", example = "87584674384", accessMode = READ_ONLY)
     private Long id;
 
-    @Schema(title = "Monitoring Id", example = "87432674336", accessMode = READ_WRITE)
-    private Long monitorId;
+    @Schema(title = "Monitoring instance", example = "127.0.0.1:8080", accessMode = READ_WRITE)
+    private String instance;
 
     @Schema(title = "Monitoring Type mysql oracle db2")
     private String app;
@@ -65,9 +65,9 @@ public class History {
 
     @Schema(title = "Monitoring Metric usage speed count")
     private String metric;
-    
+
     @Column(length = 5000)
-    private String instance;
+    private String metricLabels;
 
     @Schema(title = "Metric Type 0: Number 1：String")
     private Byte metricType;

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/CommonDataQueue.java

@@ -17,6 +17,7 @@
 
 package org.apache.hertzbeat.common.queue;
 
+import java.util.List;
 import org.apache.hertzbeat.common.entity.log.LogEntry;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 
@@ -91,4 +92,32 @@ public interface CommonDataQueue {
      * @throws InterruptedException when poll timeout
      */
     LogEntry pollLogEntryToStorage() throws InterruptedException;
+    
+    /**
+     * send batch log entries to alert queue
+     * @param logEntries list of log entry data
+     */
+    void sendLogEntryToAlertBatch(List<LogEntry> logEntries);
+
+    /**
+     * poll batch log entries from alert queue
+     * @param maxBatchSize maximum number of entries to poll
+     * @return list of log entry data
+     * @throws InterruptedException when poll timeout
+     */
+    List<LogEntry> pollLogEntryToAlertBatch(int maxBatchSize) throws InterruptedException;
+    
+    /**
+     * send batch log entries to storage queue
+     * @param logEntries list of log entry data
+     */
+    void sendLogEntryToStorageBatch(List<LogEntry> logEntries);
+
+    /**
+     * poll batch log entries from storage queue
+     * @param maxBatchSize maximum number of entries to poll
+     * @return list of log entry data
+     * @throws InterruptedException when poll timeout
+     */
+    List<LogEntry> pollLogEntryToStorageBatch(int maxBatchSize) throws InterruptedException;
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/InMemoryCommonDataQueue.java

@@ -17,9 +17,12 @@
 
 package org.apache.hertzbeat.common.queue.impl;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.common.constants.DataQueueConstants;
 import org.apache.hertzbeat.common.entity.log.LogEntry;
@@ -117,6 +120,48 @@ public class InMemoryCommonDataQueue implements CommonDataQueue, DisposableBean
         return logEntryToStorageQueue.take();
     }
 
+    @Override
+    public void sendLogEntryToAlertBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
+        }
+        for (LogEntry logEntry : logEntries) {
+            logEntryQueue.offer(logEntry);
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToAlertBatch(int maxBatchSize) throws InterruptedException {
+        List<LogEntry> batch = new ArrayList<>(maxBatchSize);
+        LogEntry first = logEntryQueue.poll(1, TimeUnit.SECONDS);
+        if (first != null) {
+            batch.add(first);
+            logEntryQueue.drainTo(batch, maxBatchSize - 1);
+        }
+        return batch;
+    }
+
+    @Override
+    public void sendLogEntryToStorageBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
+        }
+        for (LogEntry logEntry : logEntries) {
+            logEntryToStorageQueue.offer(logEntry);
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToStorageBatch(int maxBatchSize) throws InterruptedException {
+        List<LogEntry> batch = new ArrayList<>(maxBatchSize);
+        LogEntry first = logEntryToStorageQueue.poll(1, TimeUnit.SECONDS);
+        if (first != null) {
+            batch.add(first);
+            logEntryToStorageQueue.drainTo(batch, maxBatchSize - 1);
+        }
+        return batch;
+    }
+
     @Override
     public void destroy() {
         metricsDataToAlertQueue.clear();

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/KafkaCommonDataQueue.java

@@ -18,8 +18,10 @@
 package org.apache.hertzbeat.common.queue.impl;
 
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.locks.ReentrantLock;
@@ -33,6 +35,7 @@ import org.apache.hertzbeat.common.serialize.KafkaLogEntryDeserializer;
 import org.apache.hertzbeat.common.serialize.KafkaLogEntrySerializer;
 import org.apache.hertzbeat.common.serialize.KafkaMetricsDataDeserializer;
 import org.apache.hertzbeat.common.serialize.KafkaMetricsDataSerializer;
+import org.apache.hertzbeat.common.support.exception.CommonDataQueueUnknownException;
 import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
@@ -117,7 +120,7 @@ public class KafkaCommonDataQueue implements CommonDataQueue, DisposableBean {
             Map<String, Object> metricsToStorageConsumerConfig = new HashMap<>(consumerConfig);
             metricsToStorageConsumerConfig.put("group.id", "metrics-persistent-consumer");
             metricsDataToStorageConsumer = new KafkaConsumer<>(metricsToStorageConsumerConfig, new LongDeserializer(), new KafkaMetricsDataDeserializer());
-            metricsDataToStorageConsumer.subscribe(Collections.singletonList(kafka.getMetricsDataTopic()));
+            metricsDataToStorageConsumer.subscribe(Collections.singletonList(kafka.getMetricsDataToStorageTopic()));
 
             Map<String, Object> serviceDiscoveryDataConsumerConfig = new HashMap<>(consumerConfig);
             serviceDiscoveryDataConsumerConfig.put("group.id", "service-discovery-data-consumer");
@@ -176,6 +179,7 @@ public class KafkaCommonDataQueue implements CommonDataQueue, DisposableBean {
             dataConsumer.commitAsync();
         } catch (Exception e) {
             log.error(e.getMessage());
+            throw new CommonDataQueueUnknownException(e.getMessage(), e);
         } finally {
             lock.unlock();
         }
@@ -259,6 +263,92 @@ public class KafkaCommonDataQueue implements CommonDataQueue, DisposableBean {
         return genericPollDataFunction(logEntryToStorageQueue, logEntryToStorageConsumer, logEntryToStorageLock);
     }
 
+    @Override
+    public void sendLogEntryToAlertBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
+        }
+        if (logEntryProducer != null) {
+            try {
+                for (LogEntry logEntry : logEntries) {
+                    ProducerRecord<Long, LogEntry> record = new ProducerRecord<>(kafka.getLogEntryDataTopic(), logEntry);
+                    logEntryProducer.send(record);
+                }
+            } catch (Exception e) {
+                log.error("Failed to send LogEntry batch to Kafka: {}", e.getMessage());
+                for (LogEntry logEntry : logEntries) {
+                    logEntryQueue.offer(logEntry);
+                }
+            }
+        } else {
+            log.warn("logEntryProducer is not enabled, using memory queue");
+            for (LogEntry logEntry : logEntries) {
+                logEntryQueue.offer(logEntry);
+            }
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToAlertBatch(int maxBatchSize) throws InterruptedException {
+        return genericBatchPollDataFunction(logEntryQueue, logEntryConsumer, logEntryLock, maxBatchSize);
+    }
+
+    @Override
+    public void sendLogEntryToStorageBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
+        }
+        if (logEntryProducer != null) {
+            try {
+                for (LogEntry logEntry : logEntries) {
+                    ProducerRecord<Long, LogEntry> record = new ProducerRecord<>(kafka.getLogEntryDataToStorageTopic(), logEntry);
+                    logEntryProducer.send(record);
+                }
+            } catch (Exception e) {
+                log.error("Failed to send LogEntry batch to storage via Kafka: {}", e.getMessage());
+                for (LogEntry logEntry : logEntries) {
+                    logEntryToStorageQueue.offer(logEntry);
+                }
+            }
+        } else {
+            log.warn("logEntryProducer is not enabled, using memory queue for storage");
+            for (LogEntry logEntry : logEntries) {
+                logEntryToStorageQueue.offer(logEntry);
+            }
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToStorageBatch(int maxBatchSize) throws InterruptedException {
+        return genericBatchPollDataFunction(logEntryToStorageQueue, logEntryToStorageConsumer, logEntryToStorageLock, maxBatchSize);
+    }
+
+    public <T> List<T> genericBatchPollDataFunction(LinkedBlockingQueue<T> dataQueue, KafkaConsumer<Long, T> dataConsumer,
+            ReentrantLock lock, int maxBatchSize) throws InterruptedException {
+        List<T> batch = new ArrayList<>(maxBatchSize);
+        lock.lockInterruptibly();
+        try {
+            dataQueue.drainTo(batch, maxBatchSize);
+            if (batch.size() >= maxBatchSize) {
+                return batch;
+            }
+            ConsumerRecords<Long, T> records = dataConsumer.poll(Duration.ofSeconds(1));
+            for (ConsumerRecord<Long, T> record : records) {
+                if (batch.size() < maxBatchSize) {
+                    batch.add(record.value());
+                } else {
+                    dataQueue.offer(record.value());
+                }
+            }
+            dataConsumer.commitAsync();
+        } catch (Exception e) {
+            log.error(e.getMessage());
+        } finally {
+            lock.unlock();
+        }
+        return batch;
+    }
+
     @Override
     public void destroy() throws Exception {
         if (metricsDataProducer != null) {

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/queue/impl/RedisCommonDataQueue.java

@@ -17,6 +17,9 @@
 
 package org.apache.hertzbeat.common.queue.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+import io.lettuce.core.KeyValue;
 import io.lettuce.core.RedisClient;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -29,10 +32,13 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
 import org.apache.hertzbeat.common.serialize.RedisLogEntryCodec;
 import org.apache.hertzbeat.common.serialize.RedisMetricsDataCodec;
+import org.apache.hertzbeat.common.support.exception.CommonDataQueueUnknownException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Objects;
+
 /**
  * common data queue implement redis.
  */
@@ -56,6 +62,7 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
     private final String logEntryQueueName;
     private final String logEntryToStorageQueueName;
     private final CommonProperties.RedisProperties redisProperties;
+    private final Long waitTimeout;
 
     public RedisCommonDataQueue(CommonProperties properties) {
 
@@ -83,36 +90,23 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
         this.metricsDataQueueNameToAlerter = redisProperties.getMetricsDataQueueNameToAlerter();
         this.logEntryQueueName = redisProperties.getLogEntryQueueName();
         this.logEntryToStorageQueueName = redisProperties.getLogEntryToStorageQueueName();
+        this.waitTimeout = Objects.requireNonNullElse(redisProperties.getWaitTimeout(), 1L);
     }
 
     @Override
-    public CollectRep.MetricsData pollMetricsDataToAlerter() {
-        try {
-            return syncCommands.rpop(metricsDataQueueNameToAlerter);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            return null;
-        }
+    public CollectRep.MetricsData pollMetricsDataToAlerter() throws InterruptedException {
+        return genericBlockingPollFunction(metricsDataQueueNameToAlerter, syncCommands);
     }
 
     @Override
     public CollectRep.MetricsData pollMetricsDataToStorage() throws InterruptedException {
-        try {
-            return syncCommands.rpop(metricsDataQueueNameToStorage);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            return null;
-        }
+        return genericBlockingPollFunction(metricsDataQueueNameToStorage, syncCommands);
+
     }
 
     @Override
     public CollectRep.MetricsData pollServiceDiscoveryData() throws InterruptedException {
-        try {
-            return syncCommands.rpop(metricsDataQueueNameForServiceDiscovery);
-        } catch (Exception e) {
-            log.error(e.getMessage());
-            return null;
-        }
+        return genericBlockingPollFunction(metricsDataQueueNameForServiceDiscovery, syncCommands);
     }
 
     @Override
@@ -153,12 +147,7 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
 
     @Override
     public LogEntry pollLogEntry() throws InterruptedException {
-        try {
-            return logEntrySyncCommands.rpop(logEntryQueueName);
-        } catch (Exception e) {
-            log.error("Failed to poll LogEntry from Redis: {}", e.getMessage());
-            throw new InterruptedException("Failed to poll LogEntry from Redis");
-        }
+        return genericBlockingPollFunction(logEntryQueueName, logEntrySyncCommands);
     }
 
     @Override
@@ -172,12 +161,43 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
 
     @Override
     public LogEntry pollLogEntryToStorage() throws InterruptedException {
-        try {
-            return logEntrySyncCommands.rpop(logEntryToStorageQueueName);
-        } catch (Exception e) {
-            log.error("Failed to poll LogEntry from storage via Redis: {}", e.getMessage());
-            throw new InterruptedException("Failed to poll LogEntry from storage via Redis");
+        return genericBlockingPollFunction(logEntryToStorageQueueName, logEntrySyncCommands);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void sendLogEntryToAlertBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
         }
+        try {
+            logEntrySyncCommands.lpush(logEntryQueueName, logEntries.toArray(new LogEntry[0]));
+        } catch (Exception e) {
+            log.error("Failed to send LogEntry batch to Redis: {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToAlertBatch(int maxBatchSize) throws InterruptedException {
+        return genericBatchPollFunction(logEntryQueueName, logEntrySyncCommands, maxBatchSize);
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public void sendLogEntryToStorageBatch(List<LogEntry> logEntries) {
+        if (logEntries == null || logEntries.isEmpty()) {
+            return;
+        }
+        try {
+            logEntrySyncCommands.lpush(logEntryToStorageQueueName, logEntries.toArray(new LogEntry[0]));
+        } catch (Exception e) {
+            log.error("Failed to send LogEntry batch to storage via Redis: {}", e.getMessage());
+        }
+    }
+
+    @Override
+    public List<LogEntry> pollLogEntryToStorageBatch(int maxBatchSize) throws InterruptedException {
+        return genericBatchPollFunction(logEntryToStorageQueueName, logEntrySyncCommands, maxBatchSize);
     }
 
     @Override
@@ -187,4 +207,36 @@ public class RedisCommonDataQueue implements CommonDataQueue, DisposableBean {
         redisClient.shutdown();
     }
 
+
+
+    private <T> T genericBlockingPollFunction(String key, RedisCommands<String, T> commands) throws InterruptedException {
+        try {
+            // Use BRPOP for blocking pop with the configured timeout.
+            // If data arrives, it returns immediately; if it times out, it returns null.
+            KeyValue<String, T> keyData = commands.brpop(waitTimeout, key);
+            if (keyData != null) {
+                return keyData.getValue();
+            } else {
+                // Returns null on timeout
+                return null;
+            }
+        } catch (Exception e) {
+            log.error("Redis BRPOP failed: {}", e.getMessage());
+            throw new CommonDataQueueUnknownException(e.getMessage(), e);
+        }
+    }
+
+    private List<LogEntry> genericBatchPollFunction(String key, RedisCommands<String, LogEntry> commands, int maxBatchSize) {
+        List<LogEntry> batch = new ArrayList<>(maxBatchSize);
+        try {
+            List<LogEntry> elements = commands.rpop(key, maxBatchSize);
+            if (elements != null) {
+                batch.addAll(elements);
+            }
+        } catch (Exception e) {
+            log.error("Redis batch poll failed: {}", e.getMessage());
+        }
+        return batch;
+    }
+
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/CommonDataQueueUnknownException.java

@@ -0,0 +1,39 @@
+/*
+ * 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.support.exception;
+
+/**
+ * Common data queue unknown exception
+ */
+public class CommonDataQueueUnknownException extends RuntimeException {
+
+    public CommonDataQueueUnknownException() {
+    }
+
+    public CommonDataQueueUnknownException(String message) {
+        super(message);
+    }
+
+    public CommonDataQueueUnknownException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CommonDataQueueUnknownException(Throwable cause) {
+        super(cause);
+    }
+}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/HostParamValidator.java

@@ -44,7 +44,21 @@ public class HostParamValidator implements ConstraintValidator<HostValid, String
             value = value.replaceFirst(PATTERN_HTTPS, BLANK);
         }
 
-        return IpDomainUtil.validateIpDomain(value);
+        String hostPart = value;
+
+        if (value.contains(":")) {
+            // if contains multiple ":", it may be IPv6 with port
+            if (value.lastIndexOf(":") > value.indexOf(":") && value.contains("[")) {
+                int portIndex = value.lastIndexOf(":");
+                hostPart = value.substring(0, portIndex);
+            } else if (value.split(":").length == 2) {
+                // it is IPv4 or domain with port
+                String[] parts = value.split(":");
+                hostPart = parts[0];
+            }
+        }
+
+        return IpDomainUtil.validateIpDomain(hostPart);
     }
 
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityException.java

@@ -0,0 +1,32 @@
+/*
+ * 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.support.valid;
+
+/**
+ * SQL security validation exception
+ */
+public class SqlSecurityException extends RuntimeException {
+
+    public SqlSecurityException(String message) {
+        super(message);
+    }
+
+    public SqlSecurityException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/valid/SqlSecurityValidator.java

@@ -0,0 +1,150 @@
+/*
+ * 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.support.valid;
+
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.select.LateralSubSelect;
+import net.sf.jsqlparser.statement.select.ParenthesedSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SetOperationList;
+import net.sf.jsqlparser.statement.select.WithItem;
+import net.sf.jsqlparser.util.TablesNamesFinder;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * SQL Security Validator using JSqlParser 5.1+.
+ * Security Policy:
+ * 1. Only SELECT statements are allowed.
+ * 2. All referenced tables must be in the whitelist.
+ * 3. Subqueries, UNION, CTE, LATERAL are blocked.
+ */
+@Slf4j
+public class SqlSecurityValidator {
+
+    private final Set<String> allowedTables;
+
+    public SqlSecurityValidator(Collection<String> allowedTables) {
+        if (CollectionUtils.isEmpty(allowedTables)) {
+            this.allowedTables = new HashSet<>();
+        } else {
+            this.allowedTables = allowedTables.stream()
+                    .map(this::normalizeIdentifier)
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    public void validate(String sql) throws SqlSecurityException {
+        if (sql == null || sql.trim().isEmpty()) {
+            throw new SqlSecurityException("SQL statement cannot be empty");
+        }
+
+        Statement statement;
+        try {
+            statement = CCJSqlParserUtil.parse(sql);
+        } catch (JSQLParserException e) {
+            log.warn("Failed to parse SQL: {}", sql, e);
+            throw new SqlSecurityException("Invalid SQL syntax: " + e.getMessage(), e);
+        }
+
+        if (!(statement instanceof Select select)) {
+            throw new SqlSecurityException("Only SELECT statements are allowed.");
+        }
+
+        // Check for CTE at top level
+        if (select.getWithItemsList() != null && !select.getWithItemsList().isEmpty()) {
+            throw new SqlSecurityException("CTE (WITH clause) is not allowed");
+        }
+
+        // Use custom TablesNamesFinder that throws on dangerous structures
+        SecurityTablesNamesFinder finder = new SecurityTablesNamesFinder();
+        List<String> tables;
+        try {
+            tables = finder.getTableList(statement);
+        } catch (SecurityViolationException e) {
+            throw new SqlSecurityException(e.getMessage());
+        }
+
+        validateTables(tables);
+    }
+
+    private void validateTables(List<String> tables) throws SqlSecurityException {
+        if (CollectionUtils.isEmpty(tables)) {
+            return;
+        }
+        if (allowedTables.isEmpty()) {
+            throw new SqlSecurityException("No access allowed: whitelist is empty.");
+        }
+
+        for (String table : tables) {
+            String normalizedTable = normalizeIdentifier(table);
+            if (!allowedTables.contains(normalizedTable)) {
+                throw new SqlSecurityException("Access to table '" + table + "' is not allowed. "
+                        + "Allowed tables: " + allowedTables);
+            }
+        }
+    }
+
+    private String normalizeIdentifier(String identifier) {
+        if (identifier == null) {
+            return "";
+        }
+        return identifier.replace("\"", "").replace("`", "").replace("'", "").toLowerCase();
+    }
+
+    private static class SecurityViolationException extends RuntimeException {
+        SecurityViolationException(String message) {
+            super(message);
+        }
+    }
+
+    /**
+     * Custom TablesNamesFinder that throws exceptions on dangerous SQL structures.
+     * Extends TablesNamesFinder with proper generic type to avoid raw type warnings.
+     */
+    private static class SecurityTablesNamesFinder extends TablesNamesFinder<Void> {
+
+        @Override
+        public Void visit(ParenthesedSelect parenthesedSelect, Object context) {
+            throw new SecurityViolationException("Subqueries are not allowed");
+        }
+
+        @Override
+        public Void visit(SetOperationList setOpList, Object context) {
+            throw new SecurityViolationException("UNION and set operations are not allowed");
+        }
+
+        @Override
+        public Void visit(LateralSubSelect lateralSubSelect, Object context) {
+            throw new SecurityViolationException("LATERAL subqueries are not allowed");
+        }
+
+        @Override
+        public Void visit(WithItem withItem, Object context) {
+            throw new SecurityViolationException("CTE (WITH clause) is not allowed");
+        }
+    }
+}

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

@@ -17,14 +17,6 @@
 
 package org.apache.hertzbeat.common.util;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.util.ArrayList;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.VectorSchemaRoot;
@@ -32,12 +24,21 @@ import org.apache.arrow.vector.ipc.ArrowStreamReader;
 import org.apache.arrow.vector.ipc.ArrowStreamWriter;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Arrow data serialization and deserialization utility class
  */
 @Slf4j
 public final class ArrowUtil {
-    
+
     private ArrowUtil() {
     }
 
@@ -53,18 +54,22 @@ public final class ArrowUtil {
     public static byte[] serializeMultipleRoots(List<VectorSchemaRoot> roots) {
         try (ByteArrayOutputStream out = new ByteArrayOutputStream();
              DataOutputStream dataOut = new DataOutputStream(out)) {
-            
+
             dataOut.writeInt(roots.size());
             for (VectorSchemaRoot root : roots) {
-                ArrowStreamWriter writer = new ArrowStreamWriter(
-                        root,
-                        null,
-                        Channels.newChannel(out));
-                writer.start();
-                writer.writeBatch();
-                writer.end();
-                writer.close();
-                root.close();
+                // Use a temporary stream to obtain the precise byte length of a single root,
+                // write the length, and resolve the pre-read issue.
+                try (ByteArrayOutputStream tempOut = new ByteArrayOutputStream()) {
+                    try (ArrowStreamWriter writer = new ArrowStreamWriter(root, null, Channels.newChannel(tempOut))) {
+                        writer.start();
+                        writer.writeBatch();
+                        writer.end();
+                    }
+                    int size = tempOut.size();
+                    dataOut.writeInt(size);
+                    dataOut.flush();
+                    tempOut.writeTo(out);
+                }
             }
             return out.toByteArray();
         } catch (IOException e) {
@@ -85,15 +90,20 @@ public final class ArrowUtil {
      */
     public static List<VectorSchemaRoot> deserializeMultipleRoots(byte[] data) {
         List<VectorSchemaRoot> roots = new ArrayList<>();
-        try (ByteArrayInputStream in = new ByteArrayInputStream(data);
-             DataInputStream dataIn = new DataInputStream(in)) {
-            
-            int rootCount = dataIn.readInt();
+        ByteBuffer buffer = ByteBuffer.wrap(data);
+        try {
+            int rootCount = buffer.getInt();
             RootAllocator allocator = new RootAllocator();
-            
+
             for (int i = 0; i < rootCount; i++) {
+                int length = buffer.getInt();
+
+                // Split the InputStream to prevent the Reader from reading beyond its bounds.
+                ByteArrayInputStream rootIn = new ByteArrayInputStream(data, buffer.position(), length);
+                buffer.position(buffer.position() + length);
+
                 ArrowStreamReader reader = new ArrowStreamReader(
-                        Channels.newChannel(in),
+                        Channels.newChannel(rootIn),
                         allocator);
                 VectorSchemaRoot root = reader.getVectorSchemaRoot();
                 reader.loadNextBatch();
@@ -147,11 +157,15 @@ public final class ArrowUtil {
      */
     public static byte[] serializeMetricsData(List<CollectRep.MetricsData> metricsDataList) {
         List<VectorSchemaRoot> roots = new ArrayList<>(metricsDataList.size());
-        for (CollectRep.MetricsData metricsData : metricsDataList) {
-            VectorSchemaRoot root = metricsData.toVectorSchemaRootAndRelease();
-            roots.add(root);
+        try {
+            for (CollectRep.MetricsData metricsData : metricsDataList) {
+                VectorSchemaRoot root = metricsData.toVectorSchemaRootAndRelease();
+                roots.add(root);
+            }
+            return serializeMultipleRoots(roots);
+        } finally {
+            roots.forEach(VectorSchemaRoot::close);
         }
-        return serializeMultipleRoots(roots);
     }
-    
+
 }

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

@@ -0,0 +1,50 @@
+/*
+ * 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.util;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Backoff utility class.
+ */
+public final class BackoffUtils {
+
+    /** Private constructor to prevent instantiation */
+    private BackoffUtils() {}
+
+    /**
+     * Sleeps for the next delay specified by the ExponentialBackoff instance.
+     * If the thread is interrupted during sleep, it resets the interrupt status
+     * and returns false to indicate that the operation should not continue.
+     *
+     * @param backoff the ExponentialBackoff instance to get the next delay from
+     * @return true if the sleep completed without interruption, false otherwise
+     */
+    public static boolean shouldContinueAfterBackoff(ExponentialBackoff backoff) {
+        if (Thread.currentThread().isInterrupted()) {
+            return false;
+        }
+        try {
+            TimeUnit.MILLISECONDS.sleep(backoff.nextDelay());
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return false;
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+ * 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.util;
+
+/**
+ * Exponential backoff utility class.
+ *
+ * <p>Provides exponentially increasing delays starting from an initial value,
+ * doubling with each call to {@link #nextDelay()} until reaching the maximum value.
+ * Call {@link #reset()} to restart from the initial delay.</p>
+ *
+ * <p>Note: This class is <b>not</b> thread-safe. Each thread should use its own instance.</p>
+ */
+public final class ExponentialBackoff {
+    private final long initial;
+    private final long max;
+    private long current;
+
+    public ExponentialBackoff(long initial, long max) {
+        if (initial <= 0 || max < initial) {
+            throw new IllegalArgumentException("Invalid exponential backoff params");
+        }
+        this.initial = initial;
+        this.max = max;
+        this.current = initial;
+    }
+
+    /**
+     * Returns the current delay value and advances to the next delay.
+     * The delay doubles on each call until it reaches the maximum value.
+     *
+     * @return the delay in milliseconds to wait before the next retry
+     */
+    public long nextDelay() {
+        long delay = this.current;
+        if (this.current <= this.max / 2) {
+            this.current = this.current * 2;
+        } else {
+            this.current = this.max;
+        }
+        return delay;
+    }
+
+    /**
+     * Resets the backoff to the initial delay value.
+     * Should be called when an operation succeeds after previous failures.
+     */
+    public void reset() {
+        this.current = this.initial;
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+ * 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.util;
+
+import org.apache.hertzbeat.common.constants.HertzBeatKeywordsEnum;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Validate JEXL rules
+ */
+public class HertzBeatKeywordsUtil {
+
+
+    private static final Map<String, HertzBeatKeywordsEnum> KEYWORDS =
+            Arrays.stream(HertzBeatKeywordsEnum.values())
+                    .collect(Collectors.toMap(HertzBeatKeywordsEnum::getKeyword, e -> e));
+
+
+    /**
+     * Verify if the field matches any reserved keywords
+     *
+     * @param field Field name to verify
+     */
+    public static void verifyKeywords(String field) {
+        HertzBeatKeywordsEnum keyword = KEYWORDS.get(field);
+        if (null == keyword) {
+            return;
+        }
+        throw new IllegalArgumentException(
+                String.format("Field matches keyword `%s`, please set alias `%s`.",
+                        keyword.getKeyword(), keyword.getAlias()));
+    }
+}

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

@@ -25,6 +25,7 @@ import java.util.Enumeration;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.common.constants.NetworkConstants;
+import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.http.conn.util.InetAddressUtils;
 import org.springframework.util.StringUtils;
 
@@ -33,7 +34,7 @@ import org.springframework.util.StringUtils;
  */
 @Slf4j
 public final class IpDomainUtil {
-    
+
     private static final Pattern DOMAIN_PATTERN =
             Pattern.compile("^[-\\w]+(\\.[-\\w]+)*$");
 
@@ -81,6 +82,23 @@ public final class IpDomainUtil {
         return DOMAIN_SCHEMA.matcher(domainIp).matches();
     }
 
+    /**
+     * if instance has the port with mark
+     * @param instance instance ip:port
+     * @return true if has
+     */
+    public static boolean isHasPortWithMark(String instance) {
+        if (instance == null || !StringUtils.hasText(instance)) {
+            return false;
+        }
+        String[] parts = instance.split(SignConstants.DOUBLE_MARK);
+        if (parts.length >= 2) {
+            String port = parts[parts.length - 1];
+            return CommonUtil.isNumeric(port);
+        }
+        return false;
+    }
+
     /**
      * get localhost IP.
      * @return ip
@@ -106,7 +124,7 @@ public final class IpDomainUtil {
         }
         return null;
     }
-    
+
     /**
      * check IP address type.
      * @param ipDomain ip domain
@@ -118,7 +136,7 @@ public final class IpDomainUtil {
         }
         return NetworkConstants.IPV4;
     }
-    
+
     /**
      * get current local host name.
      * @return hostname
@@ -126,7 +144,7 @@ public final class IpDomainUtil {
     public static String getCurrentHostName() {
         try {
             InetAddress inetAddress = InetAddress.getLocalHost();
-            return inetAddress.getHostName();   
+            return inetAddress.getHostName();
         } catch (UnknownHostException e) {
             return null;
         }

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

@@ -159,4 +159,8 @@ public class StrBuffer {
         }
         return Double.parseDouble(s);
     }
+
+    public static String escapeForFormat(String value) {
+        return value.replace("%", "%%");
+    }
 }