fix

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

.all-contributorsrc

@@ -6,7 +6,7 @@
   "files": [
     "README.md",
     "README_CN.md",
-    "home/src/pages/team/index.jsx"
+    "README_JP.md"
   ],
   "imageSize": 100,
   "commit": true,
@@ -1269,16 +1269,12 @@
       ]
     },
     {
-      "login": "a-little-fool",
-      "name": "小笨蛋",
+      "login": "lynx009",
+      "name": "lynx009",
       "avatar_url": "https://avatars.githubusercontent.com/u/105542329?v=4",
-      "profile": "https://github.com/a-little-fool",
+      "profile": "https://github.com/lynx009",
       "contributions": [
-        "code",
-        "doc",
-        "blog",
-        "bug",
-        "design"
+        "doc"
       ]
     },
     {
@@ -1441,7 +1437,7 @@
     },
     {
       "login": "Calvin979",
-      "name": "Naruse",
+      "name": "Calvin",
       "avatar_url": "https://avatars.githubusercontent.com/u/131688897?v=4",
       "profile": "https://github.com/Calvin979",
       "contributions": [
@@ -2504,6 +2500,173 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "RainBondsongyg",
+      "name": "songyg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/94501396?v=4",
+      "profile": "https://github.com/RainBondsongyg",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "lx1229",
+      "name": "Liuxin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44620005?v=4",
+      "profile": "https://github.com/lx1229",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yy549159265",
+      "name": "yy549159265",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40821310?v=4",
+      "profile": "https://github.com/yy549159265",
+      "contributions": [
+        "code",
+        "test",
+        "design"
+      ]
+    },
+    {
+      "login": "cto-huhang",
+      "name": "cto-huhang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53338629?v=4",
+      "profile": "https://github.com/cto-huhang",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Saramanda9988",
+      "name": "LunaRain_079",
+      "avatar_url": "https://avatars.githubusercontent.com/u/176664901?v=4",
+      "profile": "https://github.com/Saramanda9988",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "delei",
+      "name": "DeleiGuo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17263766?v=4",
+      "profile": "https://github.com/delei",
+      "contributions": [
+        "doc",
+        "code",
+        "test",
+        "bug"
+      ]
+    },
+    {
+      "login": "chingjustwe",
+      "name": "Rocky, Chi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13643747?v=4",
+      "profile": "https://github.com/chingjustwe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rowankid",
+      "name": "Wenqi Luo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18652781?v=4",
+      "profile": "https://github.com/rowankid",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "tuzuy",
+      "name": "tuzuy",
+      "avatar_url": "https://avatars.githubusercontent.com/u/95274591?v=4",
+      "profile": "https://github.com/tuzuy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "carlpinto25",
+      "name": "carl pinto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/117299909?v=4",
+      "profile": "https://github.com/carlpinto25",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cxhello",
+      "name": "cxhello",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49056040?v=4",
+      "profile": "https://cxhello.top/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "jl15988",
+      "name": "会功夫的李白",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70638770?v=4",
+      "profile": "https://github.com/jl15988",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AlbertYang0801",
+      "name": "Albert.Yang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/37127008?v=4",
+      "profile": "https://blog.aytop.cloud/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mengnankkkk",
+      "name": "zhou yong kang",
+      "avatar_url": "https://avatars.githubusercontent.com/u/150590575?v=4",
+      "profile": "https://blog.tokenlen.top/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "warrobe",
+      "name": "warrobe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/89446159?v=4",
+      "profile": "https://github.com/warrobe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Jetiaime",
+      "name": "TeAmo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/93769000?v=4",
+      "profile": "https://github.com/Jetiaime",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pentium100",
+      "name": "pentium100",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27917?v=4",
+      "profile": "https://github.com/pentium100",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dedyks",
+      "name": "Dedy Kurniawan Santoso",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23741665?v=4",
+      "profile": "https://github.com/dedyks",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.asf.yaml

@@ -16,7 +16,7 @@
 #
 
 github:
-  description: Apache HertzBeat(incubating) is a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
+  description: Real-time observability system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
   homepage: https://hertzbeat.apache.org/
   labels:
     - monitoring

.devcontainer/devcontainer.json

@@ -15,7 +15,6 @@
     "customizations": {
         "vscode": {
             "settings": {},
-            // same extensions as Gitpod, should match /.gitpod.yml
             "extensions": [
                 "vscjava.vscode-java-pack",
                 "editorconfig.editorconfig",

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

@@ -35,9 +35,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Yarn Install
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
+    - name: Install
       working-directory: web-app
-      run: yarn
+      run: pnpm install
     - name: EsLint Test
       working-directory: web-app
-      run: yarn lint:ts
+      run: pnpm lint:ts

.github/workflows/mcp-bashserver-test.yml

@@ -0,0 +1,97 @@
+# 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: MCP Bash Server CI
+
+on:
+  push:
+    paths:
+      - 'mcp-servers/mcp-bash-server/**'
+      - '.github/workflows/mcp-bashserver-test.yml'
+  pull_request:
+    paths:
+      - 'mcp-servers/mcp-bash-server/**'
+      - '.github/workflows/mcp-bashserver-test.yml'
+
+env:
+  CARGO_TERM_COLOR: always
+  RUST_VERSION: 1.88.0
+
+jobs:
+  test:
+    name: Test MCP Bash Server
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        profile: [dev, release]
+    
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          components: rustfmt, clippy
+
+      - name: Cache cargo registry
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-registry-
+
+      - name: Cache cargo build
+        uses: actions/cache@v4
+        with:
+          path: target/
+          key: ${{ runner.os }}-cargo-build-${{ matrix.profile }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-cargo-build-${{ matrix.profile }}-
+            ${{ runner.os }}-cargo-build-
+
+      - name: Check code format
+        run: cargo fmt --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml --check
+
+      - name: Run cargo check
+        run: |
+          if [ "${{ matrix.profile }}" = "release" ]; then
+            cargo check --release --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml
+          else
+            cargo check --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml
+          fi
+
+      - name: Run clippy
+        run: |
+          if [ "${{ matrix.profile }}" = "release" ]; then
+            cargo clippy --release --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml -- -D warnings
+          else
+            cargo clippy --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml -- -D warnings
+          fi
+
+      - name: Run tests
+        run: |
+          if [ "${{ matrix.profile }}" = "release" ]; then
+            cargo test --release --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml
+          else
+            cargo test --manifest-path ./mcp-servers/mcp-bash-server/Cargo.toml
+          fi

.github/workflows/nightly-build.yml

@@ -31,12 +31,15 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ./script/ci/github-actions/setup-deps
+    - uses: pnpm/action-setup@v4
+      with:
+        version: 10
         
     - name: Build the Frontend
       run: |
         cd web-app
-        yarn install
-        yarn package
+        pnpm install
+        pnpm package
         
     - name: Build the Backend
       run: |

.licenserc.yaml

@@ -66,7 +66,9 @@ header:
     - '.gitpod.yml'
     - 'karma.conf.js'
     - 'proxy.conf.js'
+    - 'pnpm-lock.yaml'
     - '.helmignore'
+    - 'script/helm/**'
     - 'web-app/src/app/core/**'
     - 'web-app/src/app/layout/**'
     - 'web-app/src/app/routes/exception/**'

CONTRIBUTING.md

@@ -44,19 +44,17 @@ Even small corrections to typos are very welcome :)
 
 #### Frontend start
 
-1. Need `Node Yarn` Environment, Make sure `Node.js >= 18`
+1. Need `Node pnpm` Environment, Make sure `Node.js >= 18`
 
 2. Cd to the `web-app` directory: `cd web-app`
 
-3. Install yarn if not existed `npm install -g yarn`
+3. Install pnpm if not existed `npm install -g pnpm`
 
-4. Install Dependencies: `yarn install` or `yarn install --registry=https://registry.npmmirror.com` in `web-app`
+4. Install Dependencies: `pnpm install` or `pnpm install --registry=https://registry.npmmirror.com` in `web-app`
 
-5. Install angular-cli globally: `yarn global add @angular/cli@15` or `yarn global add @angular/cli@15 --registry=https://registry.npmmirror.com`
+5. After the local backend is started, start the local frontend in the web-app directory: `pnpm start`
 
-6. After the local backend is started, start the local frontend in the web-app directory: `ng serve --open`
-
-7. Browser access to localhost:4200 to start, default account/password is *admin/hertzbeat*
+6. Browser access to localhost:4200 to start, default account/password is *admin/hertzbeat*
 
 
 ### Find tasks   
@@ -198,19 +196,17 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group.
 
 #### 前端启动
 
-1. 需要 `nodejs yarn` 环境, Make sure `Node.js >= 18`
+1. 需要 `nodejs pnpm` 环境, Make sure `Node.js >= 18`
 
 2. 进入 `web-app` 目录: `cd web-app`
 
-3. 安装yarn: `npm install -g yarn`
+3. 安装pnpm: `npm install -g pnpm`
 
-4. 在前端工程目录 `web-app` 下执行: `yarn install` or `yarn install --registry=https://registry.npmmirror.com` in `web-app`
+4. 在前端工程目录 `web-app` 下执行: `pnpm install` or `pnpm install --registry=https://registry.npmmirror.com` in `web-app`
 
-5. 全局安装 `angular-cli`: `yarn global add @angular/cli@15` or `yarn global add @angular/cli@15 --registry=https://registry.npmmirror.com`
+5. 待本地后端启动后，在web-app目录下启动本地前端 `pnpm start`
 
-6. 待本地后端启动后，在web-app目录下启动本地前端 `ng serve --open`
-
-7. 浏览器访问 localhost:4200 即可开始，默认账号密码 *admin/hertzbeat*
+6. 浏览器访问 localhost:4200 即可开始，默认账号密码 *admin/hertzbeat*
 
 ### 寻找任务  
 

DISCLAIMER

@@ -1,10 +0,0 @@
-Apache HertzBeat (incubating) is an effort undergoing incubation at the Apache 
-Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.

NOTICE

@@ -1,4 +1,4 @@
-Apache HertzBeat (incubating)
+Apache HertzBeat™
 Copyright 2024-2025 The Apache Software Foundation
 
 This product includes software developed at

README.md

@@ -9,7 +9,7 @@
 <b><a href="README.md">English</a></b> | <a href="README_CN.md">中文</a> | <a href="README_JP.md">日本語</a>
 </p>
 
-> A real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
+> A real-time observability system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
 
 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
 [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
@@ -28,7 +28,7 @@
 
 ## 🎡 <font color="green">Introduction</font>
 
-[Apache HertzBeat](https://github.com/apache/hertzbeat) (incubating) is an easy-to-use, open source, real-time monitoring system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities.   
+[Apache HertzBeat™](https://github.com/apache/hertzbeat) is an easy-to-use, open source, real-time observability system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities.   
 
 ### Features
 
@@ -361,7 +361,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lisongning"><img src="https://avatars.githubusercontent.com/u/93140178?v=4?s=100" width="100px;" alt="lisongning"/><br /><sub><b>lisongning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lisongning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/YutingNie"><img src="https://avatars.githubusercontent.com/u/104416402?v=4?s=100" width="100px;" alt="YutingNie"/><br /><sub><b>YutingNie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Documentation">📖</a> <a href="#design-YutingNie" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikezzb"><img src="https://avatars.githubusercontent.com/u/23418428?v=4?s=100" width="100px;" alt="Mike Zhou"/><br /><sub><b>Mike Zhou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Documentation">📖</a> <a href="#design-mikezzb" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Documentation">📖</a> <a href="#blog-a-little-fool" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aa-little-fool" title="Bug reports">🐛</a> <a href="#design-a-little-fool" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lynx009"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="lynx009"/><br /><sub><b>lynx009</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lynx009" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/littlezhongzer"><img src="https://avatars.githubusercontent.com/u/33685289?v=4?s=100" width="100px;" alt="littlezhongzer"/><br /><sub><b>littlezhongzer</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=littlezhongzer" title="Code">💻</a></td>
@@ -385,7 +385,7 @@ Thanks to these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/1036664317"><img src="https://avatars.githubusercontent.com/u/7696697?v=4?s=100" width="100px;" alt="moghn"/><br /><sub><b>moghn</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=1036664317" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaoguolong"><img src="https://avatars.githubusercontent.com/u/33684988?v=4?s=100" width="100px;" alt="xiaoguolong"/><br /><sub><b>xiaoguolong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaoguolong" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AClownsw" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Calvin"/><br /><sub><b>Calvin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bbelide2"><img src="https://avatars.githubusercontent.com/u/26840796?v=4?s=100" width="100px;" alt="Bala Sukesh"/><br /><sub><b>Bala Sukesh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bbelide2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinyaoMa"><img src="https://avatars.githubusercontent.com/u/25066570?v=4?s=100" width="100px;" alt="Jinyao Ma"/><br /><sub><b>Jinyao Ma</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jinyaoMa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linuxsuren.github.io/open-source-best-practice/"><img src="https://avatars.githubusercontent.com/u/1450685?v=4?s=100" width="100px;" alt="Rick"/><br /><sub><b>Rick</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Tests">⚠️</a></td>
@@ -527,6 +527,28 @@ Thanks to these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
+      <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/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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chingjustwe"><img src="https://avatars.githubusercontent.com/u/13643747?v=4?s=100" width="100px;" alt="Rocky, Chi"/><br /><sub><b>Rocky, Chi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=chingjustwe" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rowankid"><img src="https://avatars.githubusercontent.com/u/18652781?v=4?s=100" width="100px;" alt="Wenqi Luo"/><br /><sub><b>Wenqi Luo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3Arowankid" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tuzuy"><img src="https://avatars.githubusercontent.com/u/95274591?v=4?s=100" width="100px;" alt="tuzuy"/><br /><sub><b>tuzuy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=tuzuy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/carlpinto25"><img src="https://avatars.githubusercontent.com/u/117299909?v=4?s=100" width="100px;" alt="carl pinto"/><br /><sub><b>carl pinto</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=carlpinto25" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://cxhello.top/"><img src="https://avatars.githubusercontent.com/u/49056040?v=4?s=100" width="100px;" alt="cxhello"/><br /><sub><b>cxhello</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cxhello" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jl15988"><img src="https://avatars.githubusercontent.com/u/70638770?v=4?s=100" width="100px;" alt="会功夫的李白"/><br /><sub><b>会功夫的李白</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jl15988" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.aytop.cloud/"><img src="https://avatars.githubusercontent.com/u/37127008?v=4?s=100" width="100px;" alt="Albert.Yang"/><br /><sub><b>Albert.Yang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=AlbertYang0801" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.tokenlen.top/"><img src="https://avatars.githubusercontent.com/u/150590575?v=4?s=100" width="100px;" alt="zhou yong kang"/><br /><sub><b>zhou yong kang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mengnankkkk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/warrobe"><img src="https://avatars.githubusercontent.com/u/89446159?v=4?s=100" width="100px;" alt="warrobe"/><br /><sub><b>warrobe</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=warrobe" title="Code">💻</a></td>
+      <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>
     </tr>
   </tbody>
 </table>
@@ -570,8 +592,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
-CNCF Observability And Analysis - Monitoring Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
+CNCF Observability And Analysis - Observability Landscape.</a>
 </p>
 
 ## 🛡️ License

README_CN.md

@@ -9,7 +9,7 @@
 <a href="README.md">English</a> | <b><a href="README_CN.md">中文</a></b> | <a href="README_JP.md">日本語</a>
 </p>
 
-> 实时监控系统，无需 Agent，性能集群，兼容 Prometheus，自定义监控和状态页构建能力。
+> 实时观测系统，无需 Agent，性能集群，兼容 Prometheus，自定义监控和状态页构建能力。
 
 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
 [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
@@ -28,7 +28,7 @@
 
 ## 🎡 <font color="green">介绍</font>
 
-[Apache HertzBeat](https://github.com/apache/hertzbeat) （incubating）是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。     
+[Apache HertzBeat™](https://github.com/apache/hertzbeat) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。     
 
 ### 特点
 
@@ -37,7 +37,7 @@
 - 将 `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` 等协议规范可配置化，只需在浏览器配置监控模板 `YML` 就能使用这些协议去自定义采集想要的指标。您相信只需简单配置即可快速适配一款 `K8s` 或 `Docker` 等新的监控类型吗？  
 - 兼容 `Prometheus` 的系统生态并且更多，只需页面操作就可以监控 `Prometheus` 所能监控的。
 - 高性能，支持多采集器集群横向扩展，支持多隔离网络监控，云边协同。
-- 自由的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
+- 灵活的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
 - 提供强大的状态页构建能力，轻松向用户传达您产品服务的实时状态。
 
 
@@ -126,7 +126,7 @@
 
    - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。
     - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。
-    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertaBeat 服务的对外 IP。
+    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertzBeat 服务的对外 IP。
     - `-e MANAGER_PORT=1158` : 配置连接主 HertzBeat 服务的对外端口，默认1158。
 
 
@@ -359,7 +359,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lisongning"><img src="https://avatars.githubusercontent.com/u/93140178?v=4?s=100" width="100px;" alt="lisongning"/><br /><sub><b>lisongning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lisongning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/YutingNie"><img src="https://avatars.githubusercontent.com/u/104416402?v=4?s=100" width="100px;" alt="YutingNie"/><br /><sub><b>YutingNie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Documentation">📖</a> <a href="#design-YutingNie" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikezzb"><img src="https://avatars.githubusercontent.com/u/23418428?v=4?s=100" width="100px;" alt="Mike Zhou"/><br /><sub><b>Mike Zhou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Documentation">📖</a> <a href="#design-mikezzb" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Documentation">📖</a> <a href="#blog-a-little-fool" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aa-little-fool" title="Bug reports">🐛</a> <a href="#design-a-little-fool" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lynx009"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="lynx009"/><br /><sub><b>lynx009</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lynx009" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/littlezhongzer"><img src="https://avatars.githubusercontent.com/u/33685289?v=4?s=100" width="100px;" alt="littlezhongzer"/><br /><sub><b>littlezhongzer</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=littlezhongzer" title="Code">💻</a></td>
@@ -383,7 +383,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/1036664317"><img src="https://avatars.githubusercontent.com/u/7696697?v=4?s=100" width="100px;" alt="moghn"/><br /><sub><b>moghn</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=1036664317" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaoguolong"><img src="https://avatars.githubusercontent.com/u/33684988?v=4?s=100" width="100px;" alt="xiaoguolong"/><br /><sub><b>xiaoguolong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaoguolong" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AClownsw" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Calvin"/><br /><sub><b>Calvin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bbelide2"><img src="https://avatars.githubusercontent.com/u/26840796?v=4?s=100" width="100px;" alt="Bala Sukesh"/><br /><sub><b>Bala Sukesh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bbelide2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinyaoMa"><img src="https://avatars.githubusercontent.com/u/25066570?v=4?s=100" width="100px;" alt="Jinyao Ma"/><br /><sub><b>Jinyao Ma</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jinyaoMa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linuxsuren.github.io/open-source-best-practice/"><img src="https://avatars.githubusercontent.com/u/1450685?v=4?s=100" width="100px;" alt="Rick"/><br /><sub><b>Rick</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Tests">⚠️</a></td>
@@ -525,6 +525,28 @@ Thanks these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
+      <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/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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chingjustwe"><img src="https://avatars.githubusercontent.com/u/13643747?v=4?s=100" width="100px;" alt="Rocky, Chi"/><br /><sub><b>Rocky, Chi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=chingjustwe" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rowankid"><img src="https://avatars.githubusercontent.com/u/18652781?v=4?s=100" width="100px;" alt="Wenqi Luo"/><br /><sub><b>Wenqi Luo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3Arowankid" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tuzuy"><img src="https://avatars.githubusercontent.com/u/95274591?v=4?s=100" width="100px;" alt="tuzuy"/><br /><sub><b>tuzuy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=tuzuy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/carlpinto25"><img src="https://avatars.githubusercontent.com/u/117299909?v=4?s=100" width="100px;" alt="carl pinto"/><br /><sub><b>carl pinto</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=carlpinto25" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://cxhello.top/"><img src="https://avatars.githubusercontent.com/u/49056040?v=4?s=100" width="100px;" alt="cxhello"/><br /><sub><b>cxhello</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cxhello" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jl15988"><img src="https://avatars.githubusercontent.com/u/70638770?v=4?s=100" width="100px;" alt="会功夫的李白"/><br /><sub><b>会功夫的李白</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jl15988" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.aytop.cloud/"><img src="https://avatars.githubusercontent.com/u/37127008?v=4?s=100" width="100px;" alt="Albert.Yang"/><br /><sub><b>Albert.Yang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=AlbertYang0801" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.tokenlen.top/"><img src="https://avatars.githubusercontent.com/u/150590575?v=4?s=100" width="100px;" alt="zhou yong kang"/><br /><sub><b>zhou yong kang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mengnankkkk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/warrobe"><img src="https://avatars.githubusercontent.com/u/89446159?v=4?s=100" width="100px;" alt="warrobe"/><br /><sub><b>warrobe</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=warrobe" title="Code">💻</a></td>
+      <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>
     </tr>
   </tbody>
 </table>
@@ -570,8 +592,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
-CNCF Observability And Analysis - Monitoring Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
+CNCF Observability And Analysis - Observability Landscape.</a>
 </p>
 
 ## 🛡️ License

README_JP.md

@@ -363,7 +363,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lisongning"><img src="https://avatars.githubusercontent.com/u/93140178?v=4?s=100" width="100px;" alt="lisongning"/><br /><sub><b>lisongning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lisongning" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/YutingNie"><img src="https://avatars.githubusercontent.com/u/104416402?v=4?s=100" width="100px;" alt="YutingNie"/><br /><sub><b>YutingNie</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=YutingNie" title="Documentation">📖</a> <a href="#design-YutingNie" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mikezzb"><img src="https://avatars.githubusercontent.com/u/23418428?v=4?s=100" width="100px;" alt="Mike Zhou"/><br /><sub><b>Mike Zhou</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=mikezzb" title="Documentation">📖</a> <a href="#design-mikezzb" title="Design">🎨</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/a-little-fool"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="小笨蛋"/><br /><sub><b>小笨蛋</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=a-little-fool" title="Documentation">📖</a> <a href="#blog-a-little-fool" title="Blogposts">📝</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3Aa-little-fool" title="Bug reports">🐛</a> <a href="#design-a-little-fool" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lynx009"><img src="https://avatars.githubusercontent.com/u/105542329?v=4?s=100" width="100px;" alt="lynx009"/><br /><sub><b>lynx009</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lynx009" title="Documentation">📖</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/littlezhongzer"><img src="https://avatars.githubusercontent.com/u/33685289?v=4?s=100" width="100px;" alt="littlezhongzer"/><br /><sub><b>littlezhongzer</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=littlezhongzer" title="Code">💻</a></td>
@@ -387,7 +387,7 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/1036664317"><img src="https://avatars.githubusercontent.com/u/7696697?v=4?s=100" width="100px;" alt="moghn"/><br /><sub><b>moghn</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=1036664317" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaoguolong"><img src="https://avatars.githubusercontent.com/u/33684988?v=4?s=100" width="100px;" alt="xiaoguolong"/><br /><sub><b>xiaoguolong</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaoguolong" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Clownsw"><img src="https://avatars.githubusercontent.com/u/28394742?v=4?s=100" width="100px;" alt="Smliexx"/><br /><sub><b>Smliexx</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Clownsw" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3AClownsw" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Naruse"/><br /><sub><b>Naruse</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Calvin979"><img src="https://avatars.githubusercontent.com/u/131688897?v=4?s=100" width="100px;" alt="Calvin"/><br /><sub><b>Calvin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Documentation">📖</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Code">💻</a> <a href="#design-Calvin979" title="Design">🎨</a> <a href="https://github.com/apache/hertzbeat/issues?q=author%3ACalvin979" title="Bug reports">🐛</a> <a href="https://github.com/apache/hertzbeat/commits?author=Calvin979" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bbelide2"><img src="https://avatars.githubusercontent.com/u/26840796?v=4?s=100" width="100px;" alt="Bala Sukesh"/><br /><sub><b>Bala Sukesh</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bbelide2" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinyaoMa"><img src="https://avatars.githubusercontent.com/u/25066570?v=4?s=100" width="100px;" alt="Jinyao Ma"/><br /><sub><b>Jinyao Ma</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jinyaoMa" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://linuxsuren.github.io/open-source-best-practice/"><img src="https://avatars.githubusercontent.com/u/1450685?v=4?s=100" width="100px;" alt="Rick"/><br /><sub><b>Rick</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=LinuxSuRen" title="Tests">⚠️</a></td>
@@ -525,6 +525,32 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Duansg"><img src="https://avatars.githubusercontent.com/u/112607719?v=4?s=100" width="100px;" alt="Duansg"/><br /><sub><b>Duansg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Duansg" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
+      <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/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>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chingjustwe"><img src="https://avatars.githubusercontent.com/u/13643747?v=4?s=100" width="100px;" alt="Rocky, Chi"/><br /><sub><b>Rocky, Chi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=chingjustwe" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rowankid"><img src="https://avatars.githubusercontent.com/u/18652781?v=4?s=100" width="100px;" alt="Wenqi Luo"/><br /><sub><b>Wenqi Luo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/issues?q=author%3Arowankid" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/tuzuy"><img src="https://avatars.githubusercontent.com/u/95274591?v=4?s=100" width="100px;" alt="tuzuy"/><br /><sub><b>tuzuy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=tuzuy" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/carlpinto25"><img src="https://avatars.githubusercontent.com/u/117299909?v=4?s=100" width="100px;" alt="carl pinto"/><br /><sub><b>carl pinto</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=carlpinto25" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://cxhello.top/"><img src="https://avatars.githubusercontent.com/u/49056040?v=4?s=100" width="100px;" alt="cxhello"/><br /><sub><b>cxhello</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=cxhello" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jl15988"><img src="https://avatars.githubusercontent.com/u/70638770?v=4?s=100" width="100px;" alt="会功夫的李白"/><br /><sub><b>会功夫的李白</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jl15988" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.aytop.cloud/"><img src="https://avatars.githubusercontent.com/u/37127008?v=4?s=100" width="100px;" alt="Albert.Yang"/><br /><sub><b>Albert.Yang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=AlbertYang0801" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://blog.tokenlen.top/"><img src="https://avatars.githubusercontent.com/u/150590575?v=4?s=100" width="100px;" alt="zhou yong kang"/><br /><sub><b>zhou yong kang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=mengnankkkk" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/warrobe"><img src="https://avatars.githubusercontent.com/u/89446159?v=4?s=100" width="100px;" alt="warrobe"/><br /><sub><b>warrobe</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=warrobe" title="Code">💻</a></td>
+      <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>
     </tr>
   </tbody>
 </table>
@@ -570,8 +596,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
-CNCF Observability And Analysis - Monitoring Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
+CNCF Observability And Analysis - Observability Landscape.</a>
 </p>
 
 ## 🛡️ License

SECURITY.md

@@ -1,6 +1,6 @@
 # Security Policy
 
-Apache HertzBeat follows the [ASF vulnerability handling process](https://apache.org/security/#vulnerability-handling)
+Apache HertzBeat™ follows the [ASF vulnerability handling process](https://apache.org/security/#vulnerability-handling)
 
 ## Supported Versions
 
@@ -17,6 +17,6 @@ To report a new vulnerability you have discovered please follow the [ASF vulnera
 
 ## Extra Information  
 
-- [Apache HertzBeat Security Model](https://hertzbeat.apache.org/docs/help/security_model)
+- [Apache HertzBeat™ Security Model](https://hertzbeat.apache.org/docs/help/security_model)
 - [ASF Security](https://www.apache.org/security/)
-- [Apache HertzBeat Document](https://hertzbeat.apache.org/docs/)
+- [Apache HertzBeat™ Document](https://hertzbeat.apache.org/docs/)

e2e/testsuite.yaml

@@ -57,7 +57,7 @@ items:
         "credential": "hertzbeat"
       }
   expect:
-    statusCode: 409
+    statusCode: 500
 - name: monitorList
   request:
     api: /api/monitors?pageIndex=0&pageSize=8

hertzbeat-ai/pom.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.hertzbeat</groupId>
+		<artifactId>hertzbeat</artifactId>
+		<version>2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>hertzbeat-ai</artifactId>
+	<version>${hertzbeat.version}</version>
+	<properties>
+		<spring-ai.version>1.0.3</spring-ai.version>
+		<java.version>17</java.version>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+			<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-openai</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework.ai</groupId>
+            <artifactId>spring-ai-client-chat</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.hertzbeat</groupId>
+			<artifactId>hertzbeat-common</artifactId>
+		</dependency>
+        <!-- common -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-base</artifactId>
+            <scope>provided</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.hertzbeat</groupId>
+			<artifactId>hertzbeat-alerter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.usthe.sureness</groupId>
+			<artifactId>spring-boot3-starter-sureness</artifactId>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.ai</groupId>
+				<artifactId>spring-ai-bom</artifactId>
+				<version>${spring-ai.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertDefineServiceAdapter.java

@@ -0,0 +1,81 @@
+/*
+ * 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.adapters;
+
+import org.apache.hertzbeat.ai.pojo.dto.Hierarchy;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.springframework.data.domain.Page;
+
+import java.util.List;
+
+/**
+ * Interface that provides access to alert definition information by retrieving data
+ * through the underlying alert define service.
+ */
+public interface AlertDefineServiceAdapter {
+
+    /**
+     * Add a new alert rule definition
+     * @param alertDefine Alert definition to add
+     * @return Created alert definition with ID
+     */
+    AlertDefine addAlertDefine(AlertDefine alertDefine);
+
+    /**
+     * Get alert definitions with filtering and pagination
+     * @param search Search term
+     * @param app Monitor type filter
+     * @param enabled Enabled status filter
+     * @param sort Sort field
+     * @param order Sort order
+     * @param pageIndex Page index
+     * @param pageSize Page size
+     * @return Page of alert definitions
+     */
+    Page<AlertDefine> getAlertDefines(String search, String app, Boolean enabled, String sort, String order, int pageIndex, int pageSize);
+
+    /**
+     * Get alert definition by ID
+     * @param id Alert definition ID
+     * @return Alert definition if found
+     */
+    AlertDefine getAlertDefine(Long id);
+
+    /**
+     * Enable or disable alert definition
+     * @param id Alert definition ID
+     * @param enabled Whether to enable
+     */
+    void toggleAlertDefineStatus(Long id, boolean enabled);
+
+    /**
+     * Modify/update an existing alert definition
+     * @param alertDefine Alert definition to update
+     * @return Updated alert definition
+     */
+    AlertDefine modifyAlertDefine(AlertDefine alertDefine);
+
+    /**
+     * Get specific app hierarchy structure
+     * @param app App type
+     * @param lang Language for localization
+     * @return List of hierarchy objects for specific app
+     */
+
+    List<Hierarchy> getAppHierarchy(String app, String lang);
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertServiceAdapter.java

@@ -0,0 +1,60 @@
+/*
+ * 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.adapters;
+
+import org.apache.hertzbeat.alert.dto.AlertSummary;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.springframework.data.domain.Page;
+
+/**
+ * Interface that provides access to alert information by retrieving alert data
+ * through the underlying alert service.
+ */
+public interface AlertServiceAdapter {
+
+    /**
+     * Get single alerts with filtering and pagination
+     * @param status Alert status
+     * @param search Search term
+     * @param sort Sort field
+     * @param order Sort order
+     * @param pageIndex Page index
+     * @param pageSize Page size
+     * @return Page of single alerts
+     */
+    Page<SingleAlert> getSingleAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize);
+
+    /**
+     * Get group alerts with filtering and pagination
+     * @param status Alert status
+     * @param search Search term
+     * @param sort Sort field
+     * @param order Sort order
+     * @param pageIndex Page index
+     * @param pageSize Page size
+     * @return Page of group alerts
+     */
+    Page<GroupAlert> getGroupAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize);
+
+    /**
+     * Get alerts summary statistics
+     * @return Alert summary information
+     */
+    AlertSummary getAlertsSummary();
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MetricsServiceAdapter.java

@@ -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.
+ */
+
+package org.apache.hertzbeat.ai.adapters;
+
+import org.apache.hertzbeat.common.entity.dto.MetricsData;
+import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData;
+
+/**
+ * Interface that provides access to metrics information by retrieving metrics data
+ * through the underlying metrics service.
+ */
+public interface MetricsServiceAdapter {
+
+    /**
+     * Check warehouse storage server status
+     * @return true if warehouse is available, false otherwise
+     */
+    Boolean getWarehouseStorageServerStatus();
+
+    /**
+     * Query real-time metrics data
+     * @param monitorId Monitor ID
+     * @param metrics Metrics name
+     * @return Real-time metrics data
+     */
+    MetricsData getMetricsData(Long monitorId, String metrics);
+
+    /**
+     * Query historical metrics data
+     * @param monitorId Monitor ID
+     * @param app Monitor type
+     * @param metrics Metrics name
+     * @param metric Metric field name
+     * @param label Label filter
+     * @param history Query historical time period
+     * @param interval Whether to aggregate data
+     * @return Historical metrics data
+     */
+    MetricsHistoryData getMetricHistoryData(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval);
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MonitorServiceAdapter.java

@@ -0,0 +1,71 @@
+/*
+ * 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.adapters;
+
+import org.springframework.data.domain.Page;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.Param;
+import org.apache.hertzbeat.common.entity.manager.ParamDefine;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Interface that provides access to monitor information by retrieving monitor data
+ * through the underlying monitor service.
+ */
+public interface MonitorServiceAdapter {
+    Page<Monitor> getMonitors(
+            List<Long> ids,
+            String app,
+            String search,
+            Byte status,
+            String sort,
+            String order,
+            Integer pageIndex,
+            Integer pageSize,
+            String labels
+    );
+
+    /**
+     * Add a new monitor
+     *
+     * @param monitor The monitor entity to create
+     * @param params List of parameters for the monitor
+     * @param collector Optional collector assignment
+     * @return The created monitor ID
+     */
+    Long addMonitor(Monitor monitor, List<Param> params, String collector);
+
+    /**
+     * Get all available monitor types with their display names
+     *
+     * @param language Language code (e.g., "en-US", "zh-CN")
+     * @return Map of monitor type key to display name
+     */
+    Map<String, String> getAvailableMonitorTypes(String language);
+
+    /**
+     * Get parameter definitions for a specific monitor type
+     *
+     * @param app Monitor type/application name (e.g., "linux", "mysql", "redis")
+     * @return List of parameter definitions for the monitor type
+     */
+    List<ParamDefine> getMonitorParamDefines(String app);
+}
+

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertDefineServiceAdapterImpl.java

@@ -0,0 +1,257 @@
+/*
+ * 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.adapters.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.AlertDefineServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.pojo.dto.Hierarchy;
+import org.apache.hertzbeat.ai.utils.UtilityClass;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * Implementation of the AlertDefineServiceAdapter interface that provides access to alert definition information
+ * through reflection by invoking the underlying alert define service implementation.
+ */
+@Slf4j
+@Component
+public class AlertDefineServiceAdapterImpl implements AlertDefineServiceAdapter {
+
+    @Override
+    public AlertDefine addAlertDefine(AlertDefine alertDefine) {
+        try {
+            Object alertDefineService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for addAlertDefine: {}", subjectSum);
+
+            try {
+                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
+            }
+
+            assert alertDefineService != null;
+            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
+            
+            Method method = alertDefineService.getClass().getMethod("addAlertDefine", AlertDefine.class);
+
+            method.invoke(alertDefineService, alertDefine);
+            
+            log.debug("Successfully added alert define with ID: {}", alertDefine.getId());
+            return alertDefine;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: addAlertDefine", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke addAlertDefine via adapter", e);
+            throw new RuntimeException("Failed to invoke addAlertDefine via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public Page<AlertDefine> getAlertDefines(String search, String app, Boolean enabled, String sort, String order, int pageIndex, int pageSize) {
+        try {
+            Object alertDefineService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getAlertDefines: {}", subjectSum);
+
+            try {
+                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
+            }
+
+            assert alertDefineService != null;
+            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
+            
+            Method method = alertDefineService.getClass().getMethod(
+                    "getAlertDefines",
+                    List.class, String.class, String.class, String.class, int.class, int.class);
+
+            @SuppressWarnings("unchecked")
+            Page<AlertDefine> result = (Page<AlertDefine>) method.invoke(
+                    alertDefineService, null, search, sort, order, pageIndex, pageSize);
+            
+            log.debug("Successfully retrieved {} alert defines", result.getContent().size());
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getAlertDefines", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getAlertDefines via adapter", e);
+            throw new RuntimeException("Failed to invoke getAlertDefines via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public AlertDefine getAlertDefine(Long id) {
+        try {
+            Object alertDefineService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getAlertDefine: {}", subjectSum);
+
+            try {
+                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
+            }
+
+            assert alertDefineService != null;
+            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
+            
+            Method method = alertDefineService.getClass().getMethod("getAlertDefine", long.class);
+
+            AlertDefine result = (AlertDefine) method.invoke(alertDefineService, id);
+            
+            log.debug("Successfully retrieved alert define with ID: {}", id);
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getAlertDefine", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getAlertDefine via adapter for ID: {}", id, e);
+            throw new RuntimeException("Failed to invoke getAlertDefine via adapter: " + e.getMessage(), e);
+        }
+    }
+
+
+    @Override
+    public void toggleAlertDefineStatus(Long id, boolean enabled) {
+        try {
+            Object alertDefineService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for toggleAlertDefineStatus: {}", subjectSum);
+
+            try {
+                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
+            }
+
+            assert alertDefineService != null;
+            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
+            
+            // First get the existing AlertDefine
+            Method getMethod = alertDefineService.getClass().getMethod("getAlertDefine", long.class);
+            AlertDefine alertDefine = (AlertDefine) getMethod.invoke(alertDefineService, id);
+            
+            if (alertDefine == null) {
+                throw new RuntimeException("AlertDefine with ID " + id + " not found");
+            }
+            
+            // Update the enable status
+            alertDefine.setEnable(enabled);
+            
+            // Use modifyAlertDefine to save the changes
+            Method modifyMethod = alertDefineService.getClass().getMethod("modifyAlertDefine", AlertDefine.class);
+            modifyMethod.invoke(alertDefineService, alertDefine);
+            
+            log.debug("Successfully toggled alert define status for ID: {} to enabled: {}", id, enabled);
+
+        } catch (Exception e) {
+            log.error("Failed to invoke toggleAlertDefineStatus via adapter for ID: {}", id, e);
+            throw new RuntimeException("Failed to invoke toggleAlertDefineStatus via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public AlertDefine modifyAlertDefine(AlertDefine alertDefine) {
+        try {
+            Object alertDefineService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for modifyAlertDefine: {}", subjectSum);
+
+            try {
+                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
+            }
+
+            assert alertDefineService != null;
+            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
+            
+            Method method = alertDefineService.getClass().getMethod("modifyAlertDefine", AlertDefine.class);
+
+            method.invoke(alertDefineService, alertDefine);
+            
+            log.debug("Successfully modified alert define with ID: {}", alertDefine.getId());
+            return alertDefine;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: modifyAlertDefine", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke modifyAlertDefine via adapter", e);
+            throw new RuntimeException("Failed to invoke modifyAlertDefine via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * Retrieves the application hierarchy for a given app and language.
+     * Uses reflection to call the underlying app service method.
+     *
+     * @param app  The application name
+     * @param lang The language code (optional, defaults to "en-US")
+     * @return List of Hierarchy objects representing the app hierarchy
+     */
+
+    @Override
+    public List<Hierarchy> getAppHierarchy(String app, String lang) {
+        try {
+            Object appService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getAppHierarchy: {}", subjectSum);
+
+            try {
+                appService = SpringContextHolder.getBean("appServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
+            }
+
+            assert appService != null;
+            log.debug("AppService bean found for getAppHierarchy: {}", appService.getClass().getSimpleName());
+
+            // Provide default language if not specified
+            if (lang == null || lang.trim().isEmpty()) {
+                lang = "en-US";
+            }
+
+            // Call getAppHierarchy method: getAppHierarchy(String app, String lang)
+            Method method = appService.getClass().getMethod("getAppHierarchy", String.class, String.class);
+
+            List<?> managerHierarchies = (List<?>) method.invoke(appService, app, lang);
+
+            // Convert manager DTOs to ai-agent DTOs
+            List<Hierarchy> result = UtilityClass.convertToAgentHierarchies(managerHierarchies);
+
+            log.debug("Successfully retrieved and converted {} hierarchies for app '{}'", result.size(), app);
+            return result;
+
+        } catch (Exception e) {
+            log.error("Failed to get app hierarchy for app '{}': {}", app, e.getMessage(), e);
+            throw new RuntimeException("Failed to get app hierarchy for " + app, e);
+        }
+    }
+
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertServiceAdapterImpl.java

@@ -0,0 +1,141 @@
+/*
+ * 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.adapters.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.AlertServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.alert.dto.AlertSummary;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * Implementation of the AlertServiceAdapter interface that provides access to alert information
+ * through reflection by invoking the underlying alert service implementation.
+ */
+@Slf4j
+@Component
+public class AlertServiceAdapterImpl implements AlertServiceAdapter {
+
+    @Override
+    public Page<SingleAlert> getSingleAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize) {
+        try {
+            Object alertService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getSingleAlerts: {}", subjectSum);
+
+            try {
+                alertService = SpringContextHolder.getBean("alertServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertServiceImpl'");
+            }
+
+            assert alertService != null;
+            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
+            
+            Method method = alertService.getClass().getMethod(
+                    "getSingleAlerts",
+                    String.class, String.class, String.class, String.class, int.class, int.class);
+
+            @SuppressWarnings("unchecked")
+            Page<SingleAlert> result = (Page<SingleAlert>) method.invoke(
+                    alertService, status, search, sort, order, pageIndex, pageSize);
+            
+            log.debug("Successfully retrieved {} single alerts", result.getContent().size());
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getSingleAlerts", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getSingleAlerts via adapter", e);
+            throw new RuntimeException("Failed to invoke getSingleAlerts via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public Page<GroupAlert> getGroupAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize) {
+        try {
+            Object alertService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getGroupAlerts: {}", subjectSum);
+
+            try {
+                alertService = SpringContextHolder.getBean("alertServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertServiceImpl'");
+            }
+
+            assert alertService != null;
+            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
+            
+            Method method = alertService.getClass().getMethod(
+                    "getGroupAlerts",
+                    String.class, String.class, String.class, String.class, int.class, int.class);
+
+            @SuppressWarnings("unchecked")
+            Page<GroupAlert> result = (Page<GroupAlert>) method.invoke(
+                    alertService, status, search, sort, order, pageIndex, pageSize);
+            
+            log.debug("Successfully retrieved {} group alerts", result.getContent().size());
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getGroupAlerts", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getGroupAlerts via adapter", e);
+            throw new RuntimeException("Failed to invoke getGroupAlerts via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public AlertSummary getAlertsSummary() {
+        try {
+            Object alertService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getAlertsSummary: {}", subjectSum);
+
+            try {
+                alertService = SpringContextHolder.getBean("alertServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'alertServiceImpl'");
+            }
+
+            assert alertService != null;
+            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
+            
+            Method method = alertService.getClass().getMethod("getAlertsSummary");
+
+            AlertSummary result = (AlertSummary) method.invoke(alertService);
+            
+            log.debug("Successfully retrieved alerts summary");
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getAlertsSummary", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getAlertsSummary via adapter", e);
+            throw new RuntimeException("Failed to invoke getAlertsSummary via adapter: " + e.getMessage(), e);
+        }
+    }
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MetricsServiceAdapterImpl.java

@@ -0,0 +1,136 @@
+/*
+ * 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.adapters.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.MetricsServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.common.entity.dto.MetricsData;
+import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * Implementation of the MetricsServiceAdapter interface that provides access to metrics information
+ * through reflection by invoking the underlying metrics service implementation.
+ */
+@Slf4j
+@Component
+public class MetricsServiceAdapterImpl implements MetricsServiceAdapter {
+
+    @Override
+    public Boolean getWarehouseStorageServerStatus() {
+        try {
+            Object metricsDataService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getWarehouseStorageServerStatus: {}", subjectSum);
+
+            try {
+                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
+            }
+
+            assert metricsDataService != null;
+            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
+            
+            Method method = metricsDataService.getClass().getMethod("getWarehouseStorageServerStatus");
+
+            Boolean result = (Boolean) method.invoke(metricsDataService);
+            
+            log.debug("Successfully retrieved warehouse storage server status: {}", result);
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getWarehouseStorageServerStatus", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getWarehouseStorageServerStatus via adapter", e);
+            throw new RuntimeException("Failed to invoke getWarehouseStorageServerStatus via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public MetricsData getMetricsData(Long monitorId, String metrics) {
+        try {
+            Object metricsDataService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getMetricsData: {}", subjectSum);
+
+            try {
+                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
+            }
+
+            assert metricsDataService != null;
+            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
+            
+            Method method = metricsDataService.getClass().getMethod(
+                    "getMetricsData",
+                    Long.class, String.class);
+
+            MetricsData result = (MetricsData) method.invoke(metricsDataService, monitorId, metrics);
+            
+            log.debug("Successfully retrieved metrics data for monitor {} and metrics {}", monitorId, metrics);
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getMetricsData", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getMetricsData via adapter for monitor {} and metrics {}", monitorId, metrics, e);
+            throw new RuntimeException("Failed to invoke getMetricsData via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public MetricsHistoryData getMetricHistoryData(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval) {
+        try {
+            Object metricsDataService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getMetricHistoryData: {}", subjectSum);
+
+            try {
+                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
+            }
+
+            assert metricsDataService != null;
+            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
+            
+            Method method = metricsDataService.getClass().getMethod(
+                    "getMetricHistoryData",
+                    Long.class, String.class, String.class, String.class, String.class, String.class, Boolean.class);
+
+            MetricsHistoryData result = (MetricsHistoryData) method.invoke(
+                    metricsDataService, monitorId, app, metrics, metric, label, history, interval);
+            
+            log.debug("Successfully retrieved historical metrics data for monitor {} and metrics {}", monitorId, metrics);
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getMetricHistoryData", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getMetricHistoryData via adapter for monitor {} and metrics {}", monitorId, metrics, e);
+            throw new RuntimeException("Failed to invoke getMetricHistoryData via adapter: " + e.getMessage(), e);
+        }
+    }
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MonitorServiceAdapterImpl.java

@@ -0,0 +1,214 @@
+/*
+ * 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.adapters.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.springframework.data.domain.Page;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.Param;
+import org.apache.hertzbeat.common.entity.manager.ParamDefine;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of the MonitorServiceAdapter interface that provides access to monitor information
+ * through reflection by invoking the underlying monitor service implementation.
+ */
+@Slf4j
+@Component
+public class MonitorServiceAdapterImpl implements MonitorServiceAdapter {
+
+    @Override
+    public Page<Monitor> getMonitors(
+            List<Long> ids,
+            String app,
+            String search,
+            Byte status,
+            String sort,
+            String order,
+            Integer pageIndex,
+            Integer pageSize,
+            String labels) {
+        try {
+            // Provide default values for all nullable parameters
+            if (sort == null || sort.trim().isEmpty()) {
+                sort = "gmtCreate";
+            }
+            if (order == null || order.trim().isEmpty()) {
+                order = "desc";
+            }
+            if (pageIndex == null) {
+                pageIndex = 0;
+            }
+            if (pageSize == null) {
+                pageSize = 8;
+            }
+
+            Object monitorService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject: {}", subjectSum);
+
+            try {
+                monitorService = SpringContextHolder.getBean("monitorServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'monitorServiceImpl', trying by class name");
+            }
+
+            assert monitorService != null;
+            log.debug("MonitorService bean found: {}", monitorService.getClass().getSimpleName());
+            Method method = monitorService.getClass().getMethod(
+                    "getMonitors",
+                    List.class, String.class, String.class, Byte.class,
+                    String.class, String.class, int.class, int.class, String.class);
+
+
+            @SuppressWarnings("unchecked")
+            Page<Monitor> result = (Page<Monitor>) method.invoke(
+                    monitorService,
+                    ids, app, search, status, sort, order, pageIndex, pageSize, labels);
+            log.debug("MonitorServiceAdapter.getMonitors result: {}", result.getContent());
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getMonitors", e);
+        } catch (Exception e) {
+            log.debug("Failed to invoke getMonitors via adapter", e);
+            throw new RuntimeException("Failed to invoke getMonitors via adapter", e);
+        }
+    }
+
+    @Override
+    public Long addMonitor(Monitor monitor, List<Param> params, String collector) {
+        try {
+            Object monitorService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for addMonitor: {}", subjectSum);
+
+            try {
+                monitorService = SpringContextHolder.getBean("monitorServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'monitorServiceImpl', trying by class name");
+            }
+
+            assert monitorService != null;
+            log.debug("MonitorService bean found for addMonitor: {}", monitorService.getClass().getSimpleName());
+
+            // Call addMonitor method: addMonitor(Monitor monitor, List<Param> params, String collector, GrafanaDashboard dashboard)
+            Method method = monitorService.getClass().getMethod(
+                    "addMonitor",
+                    Monitor.class, List.class, String.class,
+                    Class.forName("org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard"));
+
+            // Call the method with null dashboard
+            method.invoke(monitorService, monitor, params, collector, null);
+
+            log.debug("Successfully added monitor: {} with ID: {}", monitor.getName(), monitor.getId());
+            return monitor.getId();
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: addMonitor", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke addMonitor via adapter", e);
+            throw new RuntimeException("Failed to invoke addMonitor via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public Map<String, String> getAvailableMonitorTypes(String language) {
+        try {
+            Object appService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getAvailableMonitorTypes: {}", subjectSum);
+
+            try {
+                appService = SpringContextHolder.getBean("appServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
+            }
+
+            assert appService != null;
+            log.debug("AppService bean found for getAvailableMonitorTypes: {}", appService.getClass().getSimpleName());
+
+            // Provide default language if not specified
+            if (language == null || language.trim().isEmpty()) {
+                language = "en-US";
+            }
+
+            // Call getI18nApps method: getI18nApps(String lang)
+            Method method = appService.getClass().getMethod("getI18nApps", String.class);
+
+            @SuppressWarnings("unchecked")
+            Map<String, String> result = (Map<String, String>) method.invoke(appService, language);
+
+            log.debug("Successfully retrieved {} monitor types", result.size());
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getI18nApps", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getI18nApps via adapter", e);
+            throw new RuntimeException("Failed to invoke getI18nApps via adapter: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public List<ParamDefine> getMonitorParamDefines(String app) {
+        try {
+            Object appService = null;
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current security subject for getMonitorParamDefines: {}", subjectSum);
+
+            try {
+                appService = SpringContextHolder.getBean("appServiceImpl");
+            } catch (Exception e) {
+                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
+            }
+
+            assert appService != null;
+            log.debug("AppService bean found for getMonitorParamDefines: {}", appService.getClass().getSimpleName());
+
+            // Validate app parameter
+            if (app == null || app.trim().isEmpty()) {
+                throw new IllegalArgumentException("Monitor type/app parameter is required");
+            }
+
+            // Call getAppParamDefines method: getAppParamDefines(String app)
+            Method method = appService.getClass().getMethod("getAppParamDefines", String.class);
+
+            @SuppressWarnings("unchecked")
+            List<ParamDefine> result = (List<ParamDefine>) method.invoke(appService, app.toLowerCase().trim());
+
+            log.debug("Successfully retrieved {} parameter definitions for monitor type: {}", result.size(), app);
+            return result;
+
+        } catch (NoSuchMethodException e) {
+            throw new RuntimeException("Method not found: getAppParamDefines", e);
+        } catch (Exception e) {
+            log.error("Failed to invoke getAppParamDefines via adapter for app: {}", app, e);
+            throw new RuntimeException("Failed to invoke getAppParamDefines via adapter: " + e.getMessage(), e);
+        }
+    }
+}

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

@@ -0,0 +1,246 @@
+/*
+ * 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/DynamicOpenAiApiKey.java

@@ -0,0 +1,56 @@
+/*
+ * 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 lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig;
+import org.apache.hertzbeat.base.dao.GeneralConfigDao;
+import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.ai.model.ApiKey;
+import org.springframework.stereotype.Component;
+
+/**
+ * Dynamic LLM Provider API Key implementation that retrieves the API key
+ */
+@Slf4j
+@Component
+public class DynamicOpenAiApiKey implements ApiKey {
+
+    private final GeneralConfigDao generalConfigDao;
+    
+    public DynamicOpenAiApiKey(GeneralConfigDao generalConfigDao) {
+        this.generalConfigDao = generalConfigDao;
+    }
+
+    @NotNull
+    @Override
+    public String getValue() {
+        GeneralConfig providerConfig = generalConfigDao.findByType("provider");
+        ModelProviderConfig modelProviderConfig = JsonUtil.fromJson(providerConfig.getContent(), ModelProviderConfig.class);
+
+        if (modelProviderConfig != null && modelProviderConfig.isEnable() && modelProviderConfig.isStatus()) {
+            log.debug("Retrieved {} API key from configuration service", modelProviderConfig.getCode());
+            return modelProviderConfig.getApiKey();
+        } else {
+            log.warn("No valid LLM Provider API key found in configuration");
+            return "";
+        }
+    }
+}

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

@@ -0,0 +1,161 @@
+/*
+ * 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 lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.support.event.AiProviderConfigChangeEvent;
+import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig;
+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.client.ChatClient;
+import org.springframework.ai.openai.OpenAiChatModel;
+import org.springframework.ai.openai.OpenAiChatOptions;
+import org.springframework.ai.openai.api.OpenAiApi;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.event.EventListener;
+
+/**
+ * Configuration class for Large Language Model (LLM) settings.
+ */
+
+@Configuration
+@Slf4j
+public class LlmConfig {
+
+    private final GeneralConfigDao generalConfigDao;
+    
+    private ApplicationContext applicationContext;
+
+    public LlmConfig(GeneralConfigDao generalConfigDao, ApplicationContext applicationContext) {
+        this.generalConfigDao = generalConfigDao;
+        this.applicationContext = applicationContext;
+    }
+
+    /**
+     * Create ChatClient bean with all dependencies created internally
+     */
+    @Bean
+    public ChatClient openAiChatClient() {
+        return createChatClient();
+    }
+
+    /**
+     * Create ChatClient with all necessary components
+     */
+    private ChatClient createChatClient() {
+
+        GeneralConfig providerConfig = generalConfigDao.findByType("provider");
+        if (providerConfig == null || providerConfig.getContent() == null) {
+            log.warn("LLM Provider is not set, ChatClient bean will not be created");
+            return null;
+        }
+        ModelProviderConfig modelProviderConfig = JsonUtil.fromJson(providerConfig.getContent(), ModelProviderConfig.class);
+
+        if (!modelProviderConfig.isEnable() || !modelProviderConfig.isStatus()) {
+            log.warn("LLM Provider is not enabled or status is not valid, ChatClient bean will not be created");
+            return null;
+        }
+
+        if (modelProviderConfig.getApiKey() == null) {
+            log.warn("LLM Provider configuration is incomplete, ChatClient bean will not be created");
+            return null;
+        }
+
+        if (modelProviderConfig.getBaseUrl() == null) {
+            if ("openai".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setBaseUrl("https://api.openai.com/v1");
+            } else if ("zhipu".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setBaseUrl("https://open.bigmodel.cn/api/paas/v4");
+            } else if ("zai".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setBaseUrl("https://api.z.ai/api/paas/v4");
+            } else {
+                modelProviderConfig.setBaseUrl("https://api.openai.com/v1");
+            }
+        }
+        
+        if (modelProviderConfig.getModel() == null) {
+            if ("openai".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setModel("gpt-5");
+            } else if ("zhipu".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setModel("glm-4.6");
+            } else if ("zai".equals(modelProviderConfig.getCode())) {
+                modelProviderConfig.setModel("glm-4.6");
+            } else {
+                modelProviderConfig.setModel("gpt-5");
+            }
+        }
+
+        OpenAiApi.Builder builder = new OpenAiApi.Builder();
+        builder.baseUrl(modelProviderConfig.getBaseUrl());
+        builder.apiKey(modelProviderConfig.getApiKey());
+        builder.completionsPath("/chat/completions");
+        
+        // Create Chat Options
+        OpenAiChatOptions openAiChatOptions = OpenAiChatOptions.builder()
+                .model(modelProviderConfig.getModel())
+                .temperature(0.3)
+                .build();
+        
+        // Create Chat Model
+        OpenAiChatModel openAiChatModel = OpenAiChatModel.builder()
+                .openAiApi(builder.build())
+                .defaultOptions(openAiChatOptions)
+                .build();
+        
+        // Create and return ChatClient
+        return ChatClient.create(openAiChatModel);
+    }
+
+    /**
+     * AI configuration change event listener
+     * Uses ApplicationContext to unregister and re-register the ChatClient bean
+     */
+    @EventListener(AiProviderConfigChangeEvent.class)
+    public void onAiProviderConfigChange(AiProviderConfigChangeEvent event) {
+        log.info("Provider configuration change event received, refreshing ChatClient bean");
+        
+        try {
+            ConfigurableApplicationContext configurableContext = (ConfigurableApplicationContext) applicationContext;
+            DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) configurableContext.getBeanFactory();
+            
+            // Remove the existing ChatClient bean
+            if (beanFactory.containsSingleton("openAiChatClient")) {
+                beanFactory.destroySingleton("openAiChatClient");
+                log.info("Existing ChatClient bean destroyed");
+            }
+                        
+            // Create new ChatClient with updated configuration
+            ChatClient newChatClient = createChatClient();
+            
+            // Register the new ChatClient bean
+            beanFactory.registerSingleton("openAiChatClient", newChatClient);
+            
+            log.info("ChatClient bean refreshed successfully with new AI provider configuration");
+            
+        } catch (Exception e) {
+            log.error("Failed to refresh ChatClient bean after configuration change", e);
+        }
+    }
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.usthe.sureness.subject.SubjectSum;
+import org.springframework.core.NamedInheritableThreadLocal;
+
+/**
+ * Context holder for AI agent security context.
+ */
+public final class McpContextHolder {
+    private static final ThreadLocal<SubjectSum> subjectHolder =
+            new NamedInheritableThreadLocal<>("MCP Security and User Identification Context");
+
+    private McpContextHolder() {}
+
+    /**
+     * Attaches the user's context to the current thread.
+     */
+    public static void setSubject(SubjectSum subject) {
+        subjectHolder.set(subject);
+
+    }
+
+    /**
+     * Retrieves the context from the current thread.
+     */
+    public static SubjectSum getSubject() {
+        return subjectHolder.get();
+    }
+
+    /**
+     * Clears the context from the thread to prevent memory leaks.
+     */
+    public static void clear() {
+        subjectHolder.remove();
+    }
+}

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

@@ -0,0 +1,182 @@
+/*
+ * 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/controller/ChatController.java

@@ -0,0 +1,197 @@
+/*
+ * 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.controller;
+
+import com.usthe.sureness.subject.SubjectSum;
+import com.usthe.sureness.util.SurenessContextHolder;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
+import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto;
+import org.apache.hertzbeat.ai.pojo.dto.ConversationDto;
+import org.apache.hertzbeat.ai.service.ConversationService;
+import org.apache.hertzbeat.common.entity.dto.Message;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.codec.ServerSentEvent;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Flux;
+
+import javax.validation.Valid;
+import java.util.List;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+import static org.springframework.http.MediaType.TEXT_EVENT_STREAM_VALUE;
+
+/**
+ * Controller class for handling AI chat requests and conversation management.
+ */
+@Slf4j
+@Tag(name = "AI Chat API")
+@RestController
+@RequestMapping(path = "/api/chat", produces = {APPLICATION_JSON_VALUE})
+public class ChatController {
+
+    private final ConversationService conversationService;
+
+    @Autowired
+    public ChatController(ConversationService conversationService) {
+        this.conversationService = conversationService;
+    }
+
+    /**
+     * Create a new conversation
+     *
+     * @return Created conversation details
+     */
+    @PostMapping(path = "/conversations")
+    @Operation(summary = "Create a new conversation", description = "Create a new conversation")
+    public ResponseEntity<Message<ConversationDto>> createConversation() {
+        try {
+            ConversationDto conversation = conversationService.createConversation();
+            return ResponseEntity.ok(Message.success(conversation));
+        } catch (Exception e) {
+            log.error("Error creating conversation: ", e);
+            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to create conversation"));
+        }
+    }
+
+    /**
+     * Send a message and get a streaming response with conversation tracking
+     *
+     * @param context The chat request context containing message and optional conversationId
+     * @return Flux of ServerSentEvent for streaming response
+     */
+    @PostMapping(value = "/stream", produces = TEXT_EVENT_STREAM_VALUE)
+    @Operation(summary = "Send a chat message with streaming response", description = "Send a message to AI and get a streaming response with conversation tracking")
+    public Flux<ServerSentEvent<ChatResponseDto>> streamChat(@Valid @RequestBody ChatRequestContext context) {
+        try {
+            // Validate message is not empty
+            SubjectSum subject = SurenessContextHolder.getBindSubject();
+            log.info(subject.toString());
+            McpContextHolder.setSubject(subject);
+            if (context.getMessage() == null || context.getMessage().trim().isEmpty()) {
+                ChatResponseDto errorResponse = ChatResponseDto.builder()
+                        .conversationId(context.getConversationId())
+                        .response("Error: Message cannot be empty")
+                        .build();
+                return Flux.just(ServerSentEvent.builder(errorResponse)
+                        .event("error")
+                        .build());
+            }
+
+            log.info("Received streaming chat request for conversation: {}", context.getConversationId());
+            return conversationService.streamChat(context.getMessage(), context.getConversationId());
+
+        } catch (Exception e) {
+            log.error("Error in stream chat endpoint: ", e);
+            ChatResponseDto errorResponse = ChatResponseDto.builder()
+                    .conversationId(context.getConversationId())
+                    .response("An error occurred: " + e.getMessage())
+                    .build();
+            return Flux.just(ServerSentEvent.builder(errorResponse)
+                    .event("error")
+                    .build());
+        }
+    }
+
+    /**
+     * Get all conversations
+     *
+     * @return List of all conversations
+     */
+    @GetMapping(path = "/conversations")
+    @Operation(summary = "List all conversations", description = "Get a list of all conversations")
+    public ResponseEntity<Message<List<ConversationDto>>> listConversations() {
+        try {
+            List<ConversationDto> conversations = conversationService.getAllConversations();
+            return ResponseEntity.ok(Message.success(conversations));
+        } catch (Exception e) {
+            log.error("Error listing conversations: ", e);
+            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to retrieve conversations"));
+        }
+    }
+
+    /**
+     * Get conversation history
+     *
+     * @param conversationId The conversation ID
+     * @return Conversation details with message history
+     */
+    @GetMapping(path = "/conversations/{conversationId}")
+    @Operation(summary = "Get conversation history", description = "Get detailed information and message history for a specific conversation")
+    public ResponseEntity<Message<ConversationDto>> getConversation(
+            @Parameter(description = "Conversation ID", example = "conv-12345678") @PathVariable("conversationId") String conversationId) {
+        try {
+            // Validate conversation ID
+            if (conversationId == null || conversationId.trim().isEmpty()) {
+                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation ID is required"));
+            }
+
+            ConversationDto conversation = conversationService.getConversation(conversationId);
+
+            if (conversation == null) {
+                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation not found: " + conversationId));
+            }
+
+            return ResponseEntity.ok(Message.success(conversation));
+
+        } catch (Exception e) {
+            log.error("Error getting conversation: ", e);
+            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to retrieve conversation"));
+        }
+    }
+
+    /**
+     * Delete a conversation
+     *
+     * @param conversationId The conversation ID to delete
+     * @return Success or error message
+     */
+    @DeleteMapping(path = "/conversations/{conversationId}")
+    @Operation(summary = "Delete conversation", description = "Delete a specific conversation and all its messages")
+    public ResponseEntity<Message<Void>> deleteConversation(
+            @Parameter(description = "Conversation ID", example = "conv-12345678") @PathVariable("conversationId") String conversationId) {
+        try {
+            // Validate conversation ID
+            if (conversationId == null || conversationId.trim().isEmpty()) {
+                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation ID is required"));
+            }
+
+            boolean deleted = conversationService.deleteConversation(conversationId);
+            if (!deleted) {
+                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation not found: " + conversationId));
+            }
+
+            return ResponseEntity.ok(Message.success("Conversation deleted successfully"));
+        } catch (Exception e) {
+            log.error("Error deleting conversation: ", e);
+            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to delete conversation"));
+        }
+
+    }
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/entity/OpenAiConfig.java

@@ -0,0 +1,80 @@
+/*
+ * 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.entity;
+
+import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
+import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+/**
+ * OpenAI Agent Config Entity
+ */
+@Entity
+@Table(name = "hzb_ai_agent_config")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "OpenAI Agent config entity")
+@EntityListeners(AuditingEntityListener.class)
+public class OpenAiConfig {
+
+    @Id
+    @Schema(title = "Config type: openai, primary key", description = "Config type: openai, primary key",
+            accessMode = READ_WRITE)
+    @NotBlank(message = "type can not null")
+    private String type;
+
+    @Schema(title = "Config content", description = "Config content，format json", accessMode = READ_WRITE)
+    @Column(length = 8192)
+    private String content;
+
+    @Schema(title = "The creator of this record", example = "tom", accessMode = READ_ONLY)
+    @CreatedBy
+    private String creator;
+
+    @Schema(title = "This record was last modified by", example = "tom", accessMode = READ_ONLY)
+    @LastModifiedBy
+    private String modifier;
+
+    @Schema(title = "This record creation time (millisecond timestamp)", accessMode = READ_ONLY)
+    @CreatedDate
+    private LocalDateTime gmtCreate;
+
+    @Schema(title = "Record the latest modification time (timestamp in milliseconds)", accessMode = READ_ONLY)
+    @LastModifiedDate
+    private LocalDateTime gmtUpdate;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatRequestContext.java

@@ -0,0 +1,49 @@
+/*
+ * 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.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * Chat request context for AI chat endpoint.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatRequestContext {
+    /**
+     * The user's message (required)
+     */
+    private String message;
+    /**
+     * Optional conversation ID for context
+     */
+    private String conversationId;
+
+    /**
+     * Conversation history messages for context
+     */
+    private List<MessageDto> conversationHistory;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatResponseDto.java

@@ -0,0 +1,47 @@
+/*
+ * 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.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Chat response DTO for AI responses.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Chat response")
+public class ChatResponseDto {
+
+    @Schema(description = "Conversation ID", example = "conv-123")
+    private String conversationId;
+
+    @Schema(description = "AI response message", example = "Here are your monitors...")
+    private String response;
+
+    @Schema(description = "User message ID", example = "msg-user-123")
+    private String userMessageId;
+
+    @Schema(description = "Assistant message ID", example = "msg-assistant-123")
+    private String assistantMessageId;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ConversationDto.java

@@ -0,0 +1,53 @@
+/*
+ * 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.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * Conversation DTO for AI chat conversations.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Conversation information")
+public class ConversationDto {
+
+    @Schema(description = "Conversation ID", example = "conv-123")
+    private String conversationId;
+
+    @Schema(description = "Creation time")
+    private LocalDateTime createdAt;
+
+    @Schema(description = "Last updated time")
+    private LocalDateTime updatedAt;
+
+    @Schema(description = "Messages in this conversation")
+    private List<MessageDto> messages;
+
+    @Schema(description = "Message count")
+    private Integer messageCount;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/Hierarchy.java

@@ -0,0 +1,87 @@
+/*
+ * 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.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE;
+
+/**
+ * Hierarchical structure
+ * eg: Monitoring Type metrics Information Hierarchy Relationship
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+@Schema(description = "Monitor Hierarchy")
+public class Hierarchy {
+
+    /**
+     * Category value
+     */
+    @Schema(description = "Category Value", example = "os", accessMode = READ_WRITE)
+    String category;
+
+    /**
+     * Attribute value
+     */
+    @Schema(description = "Attribute value", example = "linux", accessMode = READ_WRITE)
+    String value;
+
+    /**
+     * Attribute internationalization tag
+     */
+    @Schema(description = "Attribute internationalization tag", example = "Linux system", accessMode = READ_WRITE)
+    String label;
+
+    /**
+     * Is it a leaf node
+     */
+    @Schema(description = "Is it a leaf node", example = "true", accessMode = READ_WRITE)
+    Boolean isLeaf = false;
+
+    /**
+     * Is hide this app type in main menus layout
+     */
+    @Schema(description = "Is hide this app in main menus layout, only for app type, default true.", example = "true")
+    Boolean hide = true;
+    
+    /**
+     * For leaf metric
+     * metric type 0-number: number 1-string: string
+     */
+    @Schema(description = "metric type 0-number: number 1-string: string")
+    private Byte type;
+    
+    /**
+     * metric unit
+     */
+    @Schema(description = "metric unit")
+    private String unit;
+
+    /**
+     * Next level of association
+     */
+    @Schema(description = "Next Hierarchy", accessMode = READ_WRITE)
+    private List<Hierarchy> children;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/MessageDto.java

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.ai.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * Message DTO for chat messages.
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "Chat message")
+public class MessageDto {
+
+    @Schema(description = "Message ID", example = "msg-123")
+    private String messageId;
+
+    @Schema(description = "Conversation ID", example = "conv-123")
+    private String conversationId;
+
+    @Schema(description = "Message content", example = "List all monitors")
+    private String content;
+
+    @Schema(description = "Message role", example = "user", allowableValues = {"user", "assistant"})
+    private String role;
+
+    @Schema(description = "Message timestamp")
+    private LocalDateTime timestamp;
+}

hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ModelProviderConfig.java

@@ -0,0 +1,59 @@
+/*
+ * 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.pojo.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Model Provider Configuration
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "LLM Model Provider configuration")
+public class ModelProviderConfig {
+    
+    @Schema(title = "Enable Provider", description = "Whether Provider is enabled", example = "true")
+    private boolean enable = false;
+    
+    @Schema(title = "Check the provider available status")
+    private boolean status = false;
+    
+    @Schema(title = "The error message when provider status check failed")
+    private String error;
+    
+    @Schema(title = "Model type, text-generate, vision")
+    private String type;
+    
+    @Schema(title = "Model Provider code, like openai, zai, bigmodel")
+    private String code;
+    
+    @Schema(title = "custom the provider server base url")
+    private String baseUrl;
+    
+    @Schema(title = "use the model id name, eg: gpt-5, glm-4.6")
+    private String model;
+    
+    @Schema(title = "API Key", description = "API key", example = "sk-...")
+    @NotBlank(message = "API Key cannot be empty when enabled")
+    private String apiKey;
+}

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

@@ -0,0 +1,60 @@
+/*
+ * 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.service;
+
+/**
+ * Ai Configuration Service
+ */
+public interface AiConfigService {
+
+    /**
+     * Validate OpenAI API key by calling the OpenAI API
+     * @param apiKey the API key to validate
+     * @return validation result with success status and message
+     */
+    ValidationResult validateApiKey(String apiKey);
+
+    /**
+     * Validation result class
+     */
+    class ValidationResult {
+        private final boolean valid;
+        private final String message;
+
+        private ValidationResult(boolean valid, String message) {
+            this.valid = valid;
+            this.message = message;
+        }
+
+        public static ValidationResult success(String message) {
+            return new ValidationResult(true, message);
+        }
+
+        public static ValidationResult failure(String message) {
+            return new ValidationResult(false, message);
+        }
+
+        public boolean isValid() {
+            return valid;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+ * 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.service;
+
+import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
+import reactor.core.publisher.Flux;
+
+/**
+ * Service for interacting with LLM providers (like OpenAI, Anthropic, etc.)
+ */
+public interface ChatClientProviderService {
+
+    /**
+     * Stream chat response from the LLM
+     *
+     * @param context Chat request context containing message and conversation history
+     * @return Flux of string chunks from the LLM response
+     */
+    Flux<String> streamChat(ChatRequestContext context);
+
+    /**
+     * Check if provider is properly configured
+     * @return true if configured and enabled
+     */
+    boolean isConfigured();
+}

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

@@ -0,0 +1,80 @@
+/*
+ * 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.service;
+
+import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto;
+import org.apache.hertzbeat.ai.pojo.dto.ConversationDto;
+import org.springframework.http.codec.ServerSentEvent;
+import reactor.core.publisher.Flux;
+
+import java.util.List;
+
+/**
+ * Service for managing chat conversations and interactions with LLM providers.
+ */
+public interface ConversationService {
+
+    /**
+     * Create a new conversation
+     *
+     * @return Created conversation data
+     */
+    ConversationDto createConversation();
+
+    /**
+     * Send a message and receive a streaming response
+     *
+     * @param message The user's message
+     * @param conversationId Optional conversation ID for continuing a chat
+     * @return Flux of ServerSentEvent for streaming the response
+     */
+    Flux<ServerSentEvent<ChatResponseDto>> streamChat(String message, String conversationId);
+
+
+    /**
+     * Get conversation history for a specific conversation
+     *
+     * @param conversationId Conversation ID
+     * @return Conversation data including messages
+     */
+    ConversationDto getConversation(String conversationId);
+
+    /**
+     * Get all conversations for the current user
+     *
+     * @return List of conversations
+     */
+    List<ConversationDto> getAllConversations();
+
+    /**
+     * Delete a conversation
+     *
+     * @param conversationId Conversation ID to delete
+     * @return true if deleted, false if conversation not found
+     */
+    boolean deleteConversation(String conversationId);
+
+    /**
+     * Check if a conversation exists
+     *
+     * @param conversationId Conversation ID to check
+     * @return true if conversation exists, false otherwise
+     */
+    boolean conversationExists(String conversationId);
+}

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

@@ -0,0 +1,56 @@
+/*
+ * 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.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.
+ */
+public interface McpServerService {
+    
+    /**
+     * Provides the HertzBeat tools for the MCP server
+     * @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/AiConfigServiceImpl.java

@@ -0,0 +1,100 @@
+/*
+ * 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.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.service.AiConfigService;
+import org.apache.hertzbeat.base.dao.GeneralConfigDao;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Ai Configuration Service Implementation
+ */
+@Slf4j
+@Service
+public class AiConfigServiceImpl implements AiConfigService {
+    
+    private static final String OPENAI_MODELS_ENDPOINT = "https://api.openai.com/v1/models";
+    private final RestTemplate restTemplate;
+
+    private final GeneralConfigDao generalConfigDao;
+
+    public AiConfigServiceImpl(GeneralConfigDao generalConfigDao, RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+        this.generalConfigDao = generalConfigDao;
+    }
+
+    @Override
+    public ValidationResult validateApiKey(String apiKey) {
+        if (!StringUtils.hasText(apiKey)) {
+            return ValidationResult.failure("API key cannot be empty");
+        }
+
+        if (!apiKey.startsWith("sk-")) {
+            return ValidationResult.failure("Invalid API key format. OpenAI API keys should start with 'sk-'");
+        }
+
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("Authorization", "Bearer " + apiKey);
+            headers.set("Content-Type", "application/json");
+            
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+            
+            log.debug("Validating OpenAI API key by calling models endpoint");
+            ResponseEntity<String> response = restTemplate.exchange(
+                OPENAI_MODELS_ENDPOINT,
+                HttpMethod.GET,
+                entity,
+                String.class
+            );
+
+            if (response.getStatusCode() == HttpStatus.OK) {
+                log.info("OpenAI API key validation successful");
+                return ValidationResult.success("API key is valid");
+            } else {
+                log.warn("OpenAI API key validation failed with status: {}", response.getStatusCode());
+                return ValidationResult.failure("API key validation failed: " + response.getStatusCode());
+            }
+
+        } catch (Exception e) {
+            log.error("Error validating OpenAI API key", e);
+            String errorMessage = e.getMessage();
+            
+            // Parse common error messages
+            if (errorMessage.contains("401")) {
+                return ValidationResult.failure("Invalid API key - authentication failed");
+            } else if (errorMessage.contains("403")) {
+                return ValidationResult.failure("API key does not have permission to access models");
+            } else if (errorMessage.contains("429")) {
+                return ValidationResult.failure("Rate limit exceeded - please try again later");
+            } else if (errorMessage.contains("timeout") || errorMessage.contains("connect")) {
+                return ValidationResult.failure("Network error - unable to connect to OpenAI API");
+            } else {
+                return ValidationResult.failure("API key validation failed: " + errorMessage);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,124 @@
+/*
+ * 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.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.config.PromptProvider;
+import org.apache.hertzbeat.ai.pojo.dto.MessageDto;
+import org.apache.hertzbeat.ai.pojo.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.stereotype.Service;
+import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.messages.AssistantMessage;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Implementation of the {@link ChatClientProviderService}.
+ * Provides functionality to interact with the ChatClient for handling chat
+ * messages.
+ */
+@Slf4j
+@Service
+public class ChatClientProviderServiceImpl implements ChatClientProviderService {
+
+    private final ApplicationContext applicationContext;
+
+    private final GeneralConfigDao generalConfigDao;
+
+    @Qualifier("hertzbeatTools")
+    @Autowired
+    private ToolCallbackProvider toolCallbackProvider;
+    
+    private boolean isConfigured = false;
+
+    @Autowired
+    public ChatClientProviderServiceImpl(ApplicationContext applicationContext, GeneralConfigDao generalConfigDao) {
+        this.applicationContext = applicationContext;
+        this.generalConfigDao = generalConfigDao;
+    }
+
+    public String complete(String message) {
+        ChatClient chatClient = applicationContext.getBean("openAiChatClient", ChatClient.class);
+        return chatClient.prompt()
+                .user(message)
+                .call()
+                .content();
+    }
+
+    @Override
+    public Flux<String> streamChat(ChatRequestContext context) {
+        try {
+            // Get the current (potentially refreshed) ChatClient instance
+            ChatClient chatClient = applicationContext.getBean("openAiChatClient", ChatClient.class);
+            
+            List<Message> messages = new ArrayList<>();
+
+            // Add conversation history if available
+            if (context.getConversationHistory() != null && !context.getConversationHistory().isEmpty()) {
+                for (MessageDto historyMessage : context.getConversationHistory()) {
+                    if ("user".equals(historyMessage.getRole())) {
+                        messages.add(new UserMessage(historyMessage.getContent()));
+                    } else if ("assistant".equals(historyMessage.getRole())) {
+                        messages.add(new AssistantMessage(historyMessage.getContent()));
+                    }
+                }
+            }
+
+            messages.add(new UserMessage(context.getMessage()));
+
+            log.info("Starting streaming chat for conversation: {}", context.getConversationId());
+
+            return chatClient.prompt()
+                    .messages(messages)
+                    .system(PromptProvider.HERTZBEAT_SYSTEM_PROMPT)
+                    .toolCallbacks(toolCallbackProvider)
+                    .stream()
+                    .content()
+                    .doOnComplete(() -> log.info("Streaming completed for conversation: {}", context.getConversationId()))
+                    .doOnError(error -> log.error("Error in streaming chat: {}", error.getMessage(), error));
+
+        } catch (Exception e) {
+            log.error("Error setting up streaming chat: {}", e.getMessage(), e);
+            return Flux.error(e);
+        }
+    }
+
+    @Override
+    public boolean isConfigured() {
+        if (!isConfigured) {
+            GeneralConfig providerConfig = generalConfigDao.findByType("provider");
+            ModelProviderConfig modelProviderConfig = JsonUtil.fromJson(providerConfig.getContent(), ModelProviderConfig.class);
+            isConfigured = modelProviderConfig != null && modelProviderConfig.isStatus();   
+        }
+        return isConfigured;
+    }
+}

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

@@ -0,0 +1,272 @@
+/*
+ * 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.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext;
+import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto;
+import org.apache.hertzbeat.ai.pojo.dto.ConversationDto;
+import org.apache.hertzbeat.ai.pojo.dto.MessageDto;
+import org.apache.hertzbeat.ai.service.ChatClientProviderService;
+import org.apache.hertzbeat.ai.service.ConversationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.codec.ServerSentEvent;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * Implementation of the ConversationService interface for managing chat conversations.
+ */
+@Slf4j
+@Service
+public class ConversationServiceImpl implements ConversationService {
+
+    private final Map<String, Map<String, Object>> conversations = new ConcurrentHashMap<>();
+    private final Map<String, List<Map<String, Object>>> conversationMessages = new ConcurrentHashMap<>();
+
+    @Autowired
+    private ChatClientProviderService chatClientProviderService;
+    
+    @Override
+    public ConversationDto createConversation() {
+        String conversationId = createNewConversation();
+        return getConversation(conversationId);
+    }
+
+    @Override
+    public Flux<ServerSentEvent<ChatResponseDto>> streamChat(String message, String conversationId) {
+        // Validate conversation exists
+        if (!conversationExists(conversationId)) {
+            ChatResponseDto errorResponse = ChatResponseDto.builder()
+                    .conversationId(conversationId)
+                    .response("Error: Conversation not found: " + conversationId)
+                    .build();
+            return Flux.just(ServerSentEvent.builder(errorResponse)
+                    .event("error")
+                    .build());
+        }
+
+        // Check if OpenAI is properly configured
+        if (!chatClientProviderService.isConfigured()) {
+            ChatResponseDto errorResponse = ChatResponseDto.builder()
+                    .conversationId(conversationId)
+                    .response("Provider is not configured. Please configure your AI Provider.")
+                    .build();
+            return Flux.just(ServerSentEvent.builder(errorResponse)
+                    .event("error")
+                    .build());
+        }
+
+        log.info("Starting streaming conversation: {}", conversationId);
+
+        // Add user message to conversation
+        String userMessageId = addMessageToConversation(conversationId, message, "user");
+
+        // Get conversation history for context
+        List<Map<String, Object>> messagesList = conversationMessages.get(conversationId);
+        List<MessageDto> conversationHistory = new ArrayList<>();
+
+        if (messagesList != null && messagesList.size() > 1) {
+            // Get all messages except the last one (which is the current user message we just added)
+            for (int i = 0; i < messagesList.size() - 1; i++) {
+                Map<String, Object> msgMap = messagesList.get(i);
+                conversationHistory.add(mapToMessageDto(msgMap));
+            }
+        }
+
+        ChatRequestContext context = ChatRequestContext.builder()
+                .message(message)
+                .conversationId(conversationId)
+                .conversationHistory(conversationHistory)
+                .build();
+
+        // Stream response from AI service
+        StringBuilder fullResponse = new StringBuilder();
+        return chatClientProviderService.streamChat(context)
+                .map(chunk -> {
+                    fullResponse.append(chunk);
+                    ChatResponseDto responseDto = ChatResponseDto.builder()
+                            .conversationId(conversationId)
+                            .response(chunk)
+                            .userMessageId(userMessageId)
+                            .build();
+
+                    return ServerSentEvent.builder(responseDto)
+                            .event("message")
+                            .build();
+                })
+                .concatWith(Flux.defer(() -> {
+                    // Add the complete AI response to conversation
+                    String assistantMessageId = addMessageToConversation(conversationId, fullResponse.toString(), "assistant");
+
+                    ChatResponseDto finalResponse = ChatResponseDto.builder()
+                            .conversationId(conversationId)
+                            .response("")
+                            .userMessageId(userMessageId)
+                            .assistantMessageId(assistantMessageId)
+                            .build();
+
+                    return Flux.just(ServerSentEvent.builder(finalResponse)
+                            .event("complete")
+                            .build());
+                }))
+                .doOnComplete(() -> log.info("Streaming completed for conversation: {}", conversationId))
+                .doOnError(error -> log.error("Error in streaming chat for conversation {}: {}", conversationId, error.getMessage(), error))
+                .onErrorResume(error -> {
+                    ChatResponseDto errorResponse = ChatResponseDto.builder()
+                            .conversationId(conversationId)
+                            .response("An error occurred: " + error.getMessage())
+                            .userMessageId(userMessageId)
+                            .build();
+                    return Flux.just(ServerSentEvent.builder(errorResponse)
+                            .event("error")
+                            .build());
+                });
+    }
+
+    @Override
+    public ConversationDto getConversation(String conversationId) {
+        if (conversationId == null || conversationId.isEmpty()) {
+            return null;
+        }
+
+        Map<String, Object> conversation = conversations.get(conversationId);
+        if (conversation == null) {
+            return null;
+        }
+
+        List<Map<String, Object>> messagesList = conversationMessages.get(conversationId);
+        List<MessageDto> messages = messagesList != null
+                ? messagesList.stream().map(this::mapToMessageDto).collect(Collectors.toList()) :
+                new ArrayList<>();
+
+        return ConversationDto.builder()
+                .conversationId((String) conversation.get("conversationId"))
+                .createdAt((LocalDateTime) conversation.get("createdAt"))
+                .updatedAt((LocalDateTime) conversation.get("updatedAt"))
+                .messages(messages)
+                .build();
+    }
+
+    @Override
+    public List<ConversationDto> getAllConversations() {
+        List<ConversationDto> result = new ArrayList<>();
+
+        for (Map.Entry<String, Map<String, Object>> entry : conversations.entrySet()) {
+            Map<String, Object> conv = entry.getValue();
+            List<Map<String, Object>> messages = conversationMessages.get(entry.getKey());
+
+            ConversationDto dto = ConversationDto.builder()
+                    .conversationId((String) conv.get("conversationId"))
+                    .createdAt((LocalDateTime) conv.get("createdAt"))
+                    .updatedAt((LocalDateTime) conv.get("updatedAt"))
+                    .messages(new ArrayList<>()) // Don't include messages in list view for performance
+                    .build();
+            result.add(dto);
+        }
+
+        result.sort((a, b) -> b.getUpdatedAt().compareTo(a.getUpdatedAt()));
+
+        return result;
+    }
+
+    @Override
+    public boolean deleteConversation(String conversationId) {
+        if (conversationId == null || conversationId.isEmpty()) {
+            return false;
+        }
+
+        boolean existed = conversations.containsKey(conversationId);
+        if (existed) {
+            conversations.remove(conversationId);
+            conversationMessages.remove(conversationId);
+            log.info("Deleted conversation: {}", conversationId);
+        }
+        return existed;
+    }
+
+    @Override
+    public boolean conversationExists(String conversationId) {
+        return conversationId != null && !conversationId.isEmpty() && conversations.containsKey(conversationId);
+    }
+
+    private String createNewConversation() {
+        String conversationId = "conv-" + UUID.randomUUID().toString().substring(0, 8);
+        LocalDateTime now = LocalDateTime.now();
+
+        Map<String, Object> conversation = new HashMap<>();
+        conversation.put("conversationId", conversationId);
+        conversation.put("createdAt", now);
+        conversation.put("updatedAt", now);
+
+        conversations.put(conversationId, conversation);
+        conversationMessages.put(conversationId, new ArrayList<>());
+
+        log.info("Created new conversation: {}", conversationId);
+        return conversationId;
+    }
+
+    private MessageDto mapToMessageDto(Map<String, Object> messageMap) {
+        return MessageDto.builder()
+                .messageId((String) messageMap.get("messageId"))
+                .conversationId((String) messageMap.get("conversationId"))
+                .content((String) messageMap.get("content"))
+                .role((String) messageMap.get("role"))
+                .timestamp((LocalDateTime) messageMap.get("timestamp"))
+                .build();
+    }
+
+    private String addMessageToConversation(String conversationId, String content, String role) {
+        List<Map<String, Object>> messages = conversationMessages.computeIfAbsent(conversationId, k -> new ArrayList<>());
+
+        String messageId = "msg-" + UUID.randomUUID().toString().substring(0, 8);
+        Map<String, Object> message = new HashMap<>();
+        message.put("messageId", messageId);
+        message.put("conversationId", conversationId);
+        message.put("content", content);
+        message.put("role", role);
+        message.put("timestamp", LocalDateTime.now());
+
+        messages.add(message);
+
+        // Update conversation timestamp
+        Map<String, Object> conversation = conversations.get(conversationId);
+        if (conversation != null) {
+            conversation.put("updatedAt", LocalDateTime.now());
+            // Auto-generate title from first user message
+            if ("user".equals(role) && messages.stream().filter(m -> "user".equals(m.get("role"))).count() == 1) {
+                String title = content.length() > 30 ? content.substring(0, 27) + "..." : content;
+                conversation.put("title", title);
+            }
+        }
+
+        return messageId;
+    }
+
+
+
+}

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

@@ -0,0 +1,91 @@
+/*
+ * 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.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.
+ * This service provides functionality for handling MCP server operations.
+ */
+@Service
+@Configuration
+public class McpServerServiceImpl implements McpServerService {
+    @Autowired
+    private MonitorTools monitorTools;
+    @Autowired
+    private AlertTools alertTools;
+    @Autowired
+    private MetricsTools metricsTools;
+    @Autowired
+    private AlertDefineTools alertDefineTools;
+
+    @Bean
+    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/AlertDefineTools.java

@@ -0,0 +1,91 @@
+/*
+ * 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.tools;
+
+/**
+ * Tools for alert definition and threshold configuration operations
+ */
+public interface AlertDefineTools {
+
+    /**
+     * Create a new alert rule with HertzBeat's expression format based on app hierarchy
+
+     * 
+     * @param name Alert rule name (required, must be unique)
+     * @param app App name from hierarchy (must match exact hierarchy app value)
+     * @param metrics Metrics name from hierarchy (must match exact hierarchy metrics value)
+     * @param fieldConditions Field-specific conditions from metric's children (e.g., "VmName = 'arora'", "total_granted > 1000", 
+     *                       "total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)")
+     * @param type Alert rule type: 'realtime' (default) or 'periodic'
+     * @param period Execution period in seconds (only for periodic rules, default: 300)
+     * @param times Number of consecutive violations before triggering (default: 3)
+     * @param priority Alert priority as integer: 0=critical, 1=warning, 2=info (default: 1)
+     * @param description Alert rule description (optional)
+     * @param template Alert message template with variables (optional)
+     * @param datasource Data source type: 'promql' (default)
+     * @param labels Labels as key:value pairs separated by commas
+     * @param annotations Annotations as key:value pairs separated by commas
+     * @param enable Whether to enable the rule immediately (default: true)
+     * @return Result message with rule ID if successful
+     */
+    String createAlertRule(String name, String app, String metrics, String fieldConditions,
+                          String type, Integer period, Integer times, Integer priority, String description,
+                          String template, String datasource, String labels, String annotations, Boolean enable);
+
+    /**
+     * List existing alert rules with filtering
+     * @param search Search term for rule name or description
+     * @param monitorType Filter by monitor type
+     * @param enabled Filter by enabled status
+     * @param pageIndex Page index
+     * @param pageSize Page size
+     * @return Formatted list of alert rules
+     */
+    String listAlertRules(String search, String monitorType, Boolean enabled, Integer pageIndex, Integer pageSize);
+
+    /**
+     * Enable or disable an alert rule
+     * @param ruleId Alert rule ID
+     * @param enabled Whether to enable the rule
+     * @return Result message
+     */
+    String toggleAlertRule(Long ruleId, Boolean enabled);
+
+    /**
+     * Get detailed information about an alert rule
+     * @param ruleId Alert rule ID
+     * @return Detailed rule information
+     */
+    String getAlertRuleDetails(Long ruleId);
+
+
+    /**
+     * Get the hierarchical structure of available apps and metrics for alert rule creation
+     * @param app App type to get hierarchy for (optional, gets all if not specified)
+     * @return Hierarchical structure showing apps and their available metrics
+     */
+    String getAppsMetricsHierarchy(String app);
+
+    /**
+     * Bind monitors to an alert rule by modifying the alert expression
+     * @param ruleId Alert rule ID to bind monitors to
+     * @param monitorIds Comma-separated list of monitor IDs to bind
+     * @return Result message indicating success or failure
+     */
+    String bindMonitorsToAlertRule(Long ruleId, String monitorIds);
+}

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

@@ -0,0 +1,46 @@
+/*
+ * 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.tools;
+
+/**
+ * Tools for alert operations and alarm data queries
+ */
+public interface AlertTools {
+
+    /**
+     * Query alerts with comprehensive filtering and pagination
+     * @param alertType Alert type (single, group, both)
+     * @param status Alert status (firing, resolved, all)
+     * @param search Search term for alert content or labels
+     * @param sort Sort field (startAt, triggerTimes, status)
+     * @param order Sort order (asc, desc)
+     * @param pageIndex Page index
+     * @param pageSize Page size
+     * @return Formatted string with alert information
+     */
+    String queryAlerts(String alertType, String status, String search, String sort, String order, Integer pageIndex, Integer pageSize);
+
+    /**
+     * Get alerts summary statistics
+     * @return Alert summary information including counts by status
+     */
+    String getAlertsSummary();
+
+
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.tools;
+
+/**
+ * Tools for metrics data operations and queries
+ */
+public interface MetricsTools {
+
+    /**
+     * Get real-time metrics data for a monitor
+     * @param monitorId Monitor ID
+     * @param metrics Metrics name (e.g., "system", "cpu", "memory")
+     * @return Formatted real-time metrics data
+     */
+    String getRealtimeMetrics(Long monitorId, String metrics);
+
+    /**
+     * 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 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);
+
+    /**
+     * Check warehouse storage server status
+     * @return Status of the metrics storage system
+     */
+    String getWarehouseStatus();
+
+}

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

@@ -0,0 +1,97 @@
+/*
+ * 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.tools;
+
+import java.util.List;
+
+/**
+ * Interface for Monitoring Tools
+ */
+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 description Monitor description (optional)
+     * @return Result message with monitor ID if successful
+     */
+    String addMonitor(
+            String name, 
+            String app, 
+            String host,
+            Integer port,
+            Integer intervals,
+            String username,
+            String password,
+            String database,
+            String additionalParams,
+            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
+     */
+    String listMonitorTypes(String language);
+
+    /**
+     * Comprehensive monitor querying with flexible filtering, pagination, and specialized views
+     * @param ids Specific monitor IDs to retrieve (optional)
+     * @param app Monitor type filter (linux, mysql, http, etc.)
+     * @param status Monitor status (1=online, 2=offline, 3=unreachable, 0=paused, 9=all)
+     * @param search Search in monitor names or hosts (partial matching)
+     * @param labels Label filters, format: 'key1:value1,key2:value2'
+     * @param sort Sort field (name, gmtCreate, gmtUpdate, status, app)
+     * @param order Sort order (asc, desc)
+     * @param pageIndex Page number starting from 0
+     * @param pageSize Items per page (1-100 recommended)
+     * @param includeStats Include status statistics summary
+     * @return Comprehensive monitor information with optional statistics
+     */
+    String queryMonitors(
+            List<Long> ids,
+            String app,
+            Byte status,
+            String search,
+            String labels,
+            String sort,
+            String order,
+            Integer pageIndex,
+            Integer pageSize,
+            Boolean includeStats);
+
+    /**
+     * 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);
+}

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

@@ -0,0 +1,665 @@
+/*
+ * 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.tools.impl;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.AlertDefineServiceAdapter;
+import org.apache.hertzbeat.ai.pojo.dto.Hierarchy;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.tools.AlertDefineTools;
+import org.apache.hertzbeat.ai.utils.UtilityClass;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of Alert Define Tools functionality
+ */
+@Slf4j
+@Service
+public class AlertDefineToolsImpl implements AlertDefineTools {
+    @Autowired
+    private AlertDefineServiceAdapter alertDefineServiceAdapter;
+
+
+    @Override
+    @Tool(name = "create_alert_rule", description = """
+            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.
+            Create a HertzBeat alert rule based on app hierarchy structure and user requirements.
+            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.
+            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/params
+                6. You will construct the proper expression with field conditions
+                7. once this tool successfully executes, ask the user if they want to bind any existing monitors to this alert rule,
+                get the monitors list for a particular app using the query_monitors tool.
+                8. based on the user's output, conditionally call the bind_monitors_to_alert_rule tool to bind monitors to the alert rule
+             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
+            
+            EXAMPLES FOR FIELD CONDITION EXPRESSION( Do not copy these examples, they are just for reference ):
+            These are all just examples, you can take inspiration from them and create a rule based on hierarchy, always ask the user for all params, do not assume them, even for these examples:
+            
+            1. Kafka JVM Alert:
+               - App: "kafka", Metric: "jvm_basic"
+               - Field condition: equals(VmName, "myVM")
+               - Field condition expression: equals(VmName, "myVM")
+            
+            2. LLM Credits Alert:
+               - App: "openai", Metric: "credit_grants"
+               - Field condition: total_granted > some_value
+               - Field condition  expression: total_granted > 1000
+            
+            3. HBase Master Alert:
+               - App: "hbase_master", Metric: "server"
+               - Field condition: heap_memory_used > 80 or some_factor<100
+               - Field condition  expression: heap_memory_used > 80 or some_factor<100
+            
+            4. Complex OpenAI Credits Alert:
+               - App: "openai", Metric: "credit_grants"
+               - Field condition: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
+               - Field condition expression: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
+            
+            FIELD CONDITIONS GUIDANCE:
+            - Field names come from metric's children in hierarchy (leaf nodes)
+            - Use the "value" field from the metric's children, not the label when creating conditions
+            - Supported operators: >, <, >=, <=, ==, !=, exists(), !exists() for numeric fields
+            - equals(), contains(), matches(),exists(), !equals(), !contains(), !matches(), !exists() for string fields
+            - Supported logical operators: and, or to connect different field parameter rules or rulesets
+            - ONLY USE THESE OPERATORS, when creating conditions, do not use any other operators
+            - Support grouping with parentheses: (condition1 and condition2) or condition3
+            - String values should be quoted: equals(VmName, "my-vm")
+            - Simple conditions: heap_memory_used > 80, total_granted <= 1000
+            - Complex conditions: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)
+            
+            PRIORITY LEVELS:
+            - 0: Critical (immediate action required)
+            - 1: Warning (attention needed, default)
+            - 2: Info (informational only)
+            """)
+    public String createAlertRule(
+            @ToolParam(description = "Alert rule name (required, must be unique)", required = true) String name,
+            @ToolParam(description = "App name from hierarchy (must match exact hierarchy app value)", required = true) String app,
+            @ToolParam(description = "Metrics name from hierarchy (must match exact hierarchy metrics value)", required = true) String metrics,
+            @ToolParam(description = "Field conditions expression)", required = true) String fieldConditions,
+            @ToolParam(description = "Alert rule type: 'realtime' (default) or 'periodic'", required = false) String type,
+            @ToolParam(description = "Execution period in seconds (only for periodic rules, default: 300)", required = false) Integer period,
+            @ToolParam(description = "Number of consecutive violations before triggering (default: 3)", required = false) Integer times,
+            @ToolParam(description = "Alert priority as integer: 0=critical, 1=warning, 2=info (default: 1)", required = false) Integer priority,
+            @ToolParam(description = "Alert rule description (optional)", required = false) String description,
+            @ToolParam(description = "Alert message template with variables (optional)", required = false) String template,
+            @ToolParam(description = "Data source type: 'promql' (default)", required = false) String datasource,
+            @ToolParam(description = "Labels as key:value pairs separated by commas (e.g., 'env:prod,severity:critical')", required = false) String labels,
+            @ToolParam(description = "Annotations as key:value pairs separated by commas (e.g., 'summary:High CPU')", required = false) String annotations,
+            @ToolParam(description = "Whether to enable the rule immediately (default: true)", required = false) Boolean enable) {
+
+        try {
+            log.info("Creating HertzBeat alert rule: name={}, app={}, metrics={}, fieldConditions={}", name, app, metrics, fieldConditions);
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in create_alert_rule tool: {}", subjectSum);
+
+            // Validate required parameters
+            if (name == null || name.trim().isEmpty()) {
+                return "Error: Alert rule name is required";
+            }
+            if (app == null || app.trim().isEmpty()) {
+                return "Error: App name is required (use get_apps_metrics_hierarchy to find exact names)";
+            }
+            if (metrics == null || metrics.trim().isEmpty()) {
+                return "Error: Metrics name is required (use get_apps_metrics_hierarchy to find exact names)";
+            }
+            if (fieldConditions == null || fieldConditions.trim().isEmpty()) {
+                return "Error: Field conditions are required (e.g., 'equals(VmName, \"arora\")', 'total_granted > 1000')";
+            }
+
+            // Set defaults
+            if (type == null || type.trim().isEmpty()) {
+                type = "realtime";
+            }
+            if (times == null || times <= 0) {
+                times = 3;
+            }
+            if (priority == null) {
+                priority = 1; // Default to warning
+            }
+            if (enable == null) {
+                enable = true;
+            }
+            if (datasource == null || datasource.trim().isEmpty()) {
+                datasource = "promql";
+            }
+
+            // Validate alert type
+            if (!type.equals("realtime") && !type.equals("periodic")) {
+                return "Error: Alert type must be 'realtime' or 'periodic'";
+            }
+
+            // Validate priority
+            if (priority < 0 || priority > 2) {
+                return "Error: Priority must be 0 (critical), 1 (warning), or 2 (info)";
+            }
+
+            // For periodic rules, validate period parameter
+            if (type.equals("periodic")) {
+                if (period == null || period <= 0) {
+                    period = 300; // Default 5 minutes
+                }
+            }
+
+            // CRITICAL VALIDATION: Verify app-metric-field relationships using hierarchy
+            String validationResult = validateHierarchyRelationships(app.trim(), metrics.trim(), fieldConditions.trim());
+            if (!validationResult.equals("VALID")) {
+                return validationResult; // Return validation error message
+            }
+
+            // EXPRESSION VALIDATION: Verify field conditions syntax and operators
+            String expressionValidation = UtilityClass.validateExpressionSyntax(fieldConditions.trim());
+            if (!expressionValidation.equals("VALID")) {
+                return expressionValidation; // Return expression validation error message
+            }
+
+            String expr = String.format("equals(__app__,\"%s\") && equals(__metrics__,\"%s\") && %s", 
+                    app.trim(), metrics.trim(), fieldConditions.trim());
+
+
+
+            // Parse labels if provided
+            Map<String, String> labelsMap = new HashMap<>();
+            if (labels != null && !labels.trim().isEmpty()) {
+                labelsMap.putAll(UtilityClass.parseKeyValuePairs(labels));
+            }
+            // Add severity based on priority
+            String severityLabel = priority == 0 ? "critical" : (priority == 1 ? "warning" : "info");
+            labelsMap.put("severity", severityLabel);
+
+            // Parse annotations if provided
+            Map<String, String> annotationsMap = new HashMap<>();
+            if (annotations != null && !annotations.trim().isEmpty()) {
+                annotationsMap.putAll(UtilityClass.parseKeyValuePairs(annotations));
+            }
+            // Add default annotations if not provided
+            if (!annotationsMap.containsKey("summary")) {
+                annotationsMap.put("summary", description != null ? description :
+                    String.format("Alert for %s %s when %s", app, metrics, fieldConditions));
+            }
+            if (!annotationsMap.containsKey("description")) {
+                annotationsMap.put("description", String.format("Monitor %s metrics %s with conditions: %s", app, metrics, fieldConditions));
+            }
+
+            // Generate default template if not provided
+            if (template == null || template.trim().isEmpty()) {
+                template = String.format("Alert: %s %s - %s", app, metrics, fieldConditions);
+            }
+
+            // Create comprehensive alert definition
+            AlertDefine alertDefine = AlertDefine.builder()
+                    .name(name.trim())
+                    .type(type)
+                    .expr(expr)
+                    .period(period)
+                    .times(times)
+                    .labels(labelsMap)
+                    .annotations(annotationsMap)
+                    .template(template)
+                    .datasource(datasource)
+                    .enable(enable)
+                    .build();
+
+            AlertDefine createdAlertDefine = alertDefineServiceAdapter.addAlertDefine(alertDefine);
+
+            // Note: Monitor binding is handled separately via bind_monitors_to_alert_rule tool
+            String bindingNote = String.format(" (Use bind_monitors_to_alert_rule tool to associate specific monitors)");
+
+            log.info("Successfully created alert rule '{}' with ID: {}", name, createdAlertDefine.getId());
+            
+            StringBuilder response = new StringBuilder();
+            response.append(String.format("Successfully created %s alert rule '%s' with ID: %d\n", 
+                    type, name, createdAlertDefine.getId()));
+            response.append(String.format("Expression: %s\n", expr));
+            response.append(String.format("Priority: %d (%s)\n", priority, severityLabel));
+            response.append(String.format("Trigger after: %d consecutive violations\n", times));
+            if (type.equals("periodic")) {
+                response.append(String.format("Execution period: %d seconds\n", period));
+            }
+            response.append(String.format("Data source: %s\n", datasource));
+            response.append(String.format("Enabled: %s\n", enable));
+            if (!labelsMap.isEmpty()) {
+                response.append(String.format("Labels: %s\n", labelsMap));
+            }
+            response.append(bindingNote);
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to create alert rule '{}': {}", name, e.getMessage(), e);
+            return "Error creating alert rule '" + name + "': " + e.getMessage();
+        }
+    }
+
+    // ... other existing methods would go here ...
+
+    @Override
+    @Tool(name = "list_alert_rules", description = """
+            List existing alert rules with filtering options.
+            Shows configured thresholds and alert definitions.
+            """)
+    public String listAlertRules(
+            @ToolParam(description = "Search term for rule name or description", required = false) String search,
+            @ToolParam(description = "Filter by monitor type", required = false) String monitorType,
+            @ToolParam(description = "Filter by enabled status", required = false) Boolean enabled,
+            @ToolParam(description = "Page index (default: 0)", required = false) Integer pageIndex,
+            @ToolParam(description = "Page size (default: 10)", required = false) Integer pageSize) {
+
+        try {
+            log.info("Listing alert rules: search={}, monitorType={}, enabled={}", search, monitorType, enabled);
+
+            if (pageIndex == null || pageIndex < 0) {
+                pageIndex = 0;
+            }
+            if (pageSize == null || pageSize <= 0) {
+                pageSize = 10;
+            }
+
+            Page<AlertDefine> result = alertDefineServiceAdapter.getAlertDefines(
+                    search, monitorType, enabled, "gmtCreate", "desc", pageIndex, pageSize);
+
+            StringBuilder response = new StringBuilder();
+            response.append("Found ").append(result.getContent().size())
+                    .append(" alert rules (Total: ").append(result.getTotalElements()).append("):\n\n");
+
+            for (AlertDefine alertDefine : result.getContent()) {
+                response.append("Rule ID: ").append(alertDefine.getId()).append("\n");
+                response.append("Name: ").append(alertDefine.getName()).append("\n");
+                response.append("Expression: ").append(alertDefine.getExpr()).append("\n");
+                response.append("Type: ").append(alertDefine.getType()).append("\n");
+                response.append("Trigger Times: ").append(alertDefine.getTimes()).append("\n");
+                response.append("Enabled: ").append(alertDefine.isEnable()).append("\n");
+
+                if (alertDefine.getLabels() != null && !alertDefine.getLabels().isEmpty()) {
+                    response.append("Labels: ").append(alertDefine.getLabels()).append("\n");
+                }
+                if (alertDefine.getAnnotations() != null && !alertDefine.getAnnotations().isEmpty()) {
+                    response.append("Summary: ").append(alertDefine.getAnnotations().get("summary")).append("\n");
+                }
+                response.append("Created: ").append(alertDefine.getGmtCreate()).append("\n");
+                response.append("\n");
+            }
+
+            if (result.getContent().isEmpty()) {
+                response.append("No alert rules found matching the specified criteria.");
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to list alert rules: {}", e.getMessage(), e);
+            return "Error retrieving alert rules: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "toggle_alert_rule", description = """
+            Enable or disable an alert rule.
+            Allows activating or deactivating threshold monitoring.
+            """)
+    public String toggleAlertRule(
+            @ToolParam(description = "Alert rule ID", required = true) Long ruleId,
+            @ToolParam(description = "Whether to enable the rule", required = true) Boolean enabled) {
+
+        try {
+            log.info("Toggling alert rule ID: {} to enabled: {}", ruleId, enabled);
+
+            alertDefineServiceAdapter.toggleAlertDefineStatus(ruleId, enabled);
+
+            log.info("Successfully toggled alert rule ID: {} to enabled: {}", ruleId, enabled);
+            return String.format("Successfully %s alert rule ID: %d",
+                    enabled ? "enabled" : "disabled", ruleId);
+
+        } catch (Exception e) {
+            log.error("Failed to toggle alert rule ID {}: {}", ruleId, e.getMessage(), e);
+            return "Error toggling alert rule: " + e.getMessage();
+        }
+    }
+
+
+    @Override
+    @Tool(name = "get_alert_rule_details", description = """
+            Get detailed information about a specific alert rule.
+            Shows complete threshold configuration and rule settings.
+            """)
+    public String getAlertRuleDetails(
+            @ToolParam(description = "Alert rule ID", required = true) Long ruleId) {
+
+        try {
+            log.info("Getting alert rule details for ID: {}", ruleId);
+
+            AlertDefine alertDefine = alertDefineServiceAdapter.getAlertDefine(ruleId);
+            if (alertDefine == null) {
+                return "Alert rule with ID " + ruleId + " not found";
+            }
+
+            StringBuilder response = new StringBuilder();
+            response.append("ALERT RULE DETAILS\n");
+            response.append("==================\n\n");
+
+            response.append("Rule ID: ").append(alertDefine.getId()).append("\n");
+            response.append("Name: ").append(alertDefine.getName()).append("\n");
+            response.append("Type: ").append(alertDefine.getType()).append("\n");
+            response.append("Expression: ").append(alertDefine.getExpr()).append("\n");
+            response.append("Trigger Times: ").append(alertDefine.getTimes()).append("\n");
+            response.append("Enabled: ").append(alertDefine.isEnable()).append("\n");
+
+            if (alertDefine.getPeriod() != null) {
+                response.append("Period: ").append(alertDefine.getPeriod()).append(" seconds\n");
+            }
+
+            if (alertDefine.getLabels() != null && !alertDefine.getLabels().isEmpty()) {
+                response.append("Labels: ").append(alertDefine.getLabels()).append("\n");
+            }
+
+            if (alertDefine.getAnnotations() != null && !alertDefine.getAnnotations().isEmpty()) {
+                response.append("Annotations: ").append(alertDefine.getAnnotations()).append("\n");
+            }
+
+            if (alertDefine.getTemplate() != null) {
+                response.append("Template: ").append(alertDefine.getTemplate()).append("\n");
+            }
+
+            response.append("Created: ").append(alertDefine.getGmtCreate()).append("\n");
+            response.append("Modified: ").append(alertDefine.getGmtUpdate()).append("\n");
+            response.append("Creator: ").append(alertDefine.getCreator()).append("\n");
+            response.append("Modifier: ").append(alertDefine.getModifier()).append("\n");
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to get alert rule details for ID {}: {}", ruleId, e.getMessage(), e);
+            return "Error retrieving alert rule details: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "get_apps_metrics_hierarchy", description = """
+            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.
+            
+            JSON Structure:
+            - app: The application name
+            - description: Tool description
+            - hierarchy: Array of hierarchical data
+              - Each node has: value, label, type, description
+              - Leaf nodes have: dataType (numeric/string), unit (if applicable)
+              - Non-leaf nodes have: children array
+             VERY IMPORTANT:
+              - ALWAYS USE the value field from the field parameters when creating alert expressions.
+            
+            This structured data is needed to create proper alert expressions.
+            """)
+    public String getAppsMetricsHierarchy(
+            @ToolParam(description = "App/Monitor type to get hierarchy for (e.g., 'linux', 'mysql', 'website')", required = true) String app) {
+
+        try {
+            log.info("Getting apps metrics hierarchy for app: {}", app);
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in get_apps_metrics_hierarchy tool: {}", subjectSum);
+
+            List<Hierarchy> hierarchies;
+            hierarchies = alertDefineServiceAdapter.getAppHierarchy(app.trim().toLowerCase(), "en-US");
+
+
+            ObjectMapper mapper = new ObjectMapper();
+            ObjectNode result = mapper.createObjectNode();
+
+            result.put("app", app.toUpperCase());
+
+            if (hierarchies != null && !hierarchies.isEmpty()) {
+                ArrayNode hierarchyArray = mapper.createArrayNode();
+                for (Hierarchy hierarchy : hierarchies) {
+                    hierarchyArray.add(UtilityClass.formatHierarchyAsJson(mapper, hierarchy));
+                }
+                result.set("hierarchy", hierarchyArray);
+            } else {
+                result.put("message", "No hierarchy data available");
+            }
+
+            String jsonResult = mapper.writerWithDefaultPrettyPrinter().writeValueAsString(result);
+            log.info("Hierarchy JSON: {}", jsonResult);
+
+            return jsonResult;
+
+        } catch (Exception e) {
+            log.error("Failed to get apps metrics hierarchy: {}", e.getMessage(), e);
+            return "Error retrieving apps metrics hierarchy: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "bind_monitors_to_alert_rule", description = """
+            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.
+            If monitors are already bound, this will add the new ones to the existing bindings.
+            """)
+    public String bindMonitorsToAlertRule(
+            @ToolParam(description = "Alert rule ID to bind monitors to", required = true) Long ruleId,
+            @ToolParam(description = "Comma-separated list of monitor IDs to bind", required = true) String monitorIds) {
+        try {
+            log.info("Binding monitors to alert rule ID: {}, monitors: {}", ruleId, monitorIds);
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in bind_monitors_to_alert_rule tool: {}", subjectSum);
+
+            if (ruleId == null || ruleId <= 0) {
+                return "Error: Valid alert rule ID is required";
+            }
+            if (monitorIds == null) {
+                return "Error: Monitor IDs are required";
+            }
+
+            // Get the existing alert rule
+            AlertDefine existingRule = alertDefineServiceAdapter.getAlertDefine(ruleId);
+            if (existingRule == null) {
+                return String.format("Error: Alert rule with ID %d not found", ruleId);
+            }
+
+            // Parse monitor IDs from comma-separated string
+            String[] monitorIdArray = monitorIds.split(",");
+            List<String> validMonitorIds = new ArrayList<>();
+            
+            for (String monitorId : monitorIdArray) {
+                String trimmedId = monitorId.trim();
+                if (!trimmedId.isEmpty()) {
+                    try {
+                        Long.parseLong(trimmedId); // Validate it's a number
+                        validMonitorIds.add(trimmedId);
+                    } catch (NumberFormatException e) {
+                        return String.format("Error: Invalid monitor ID '%s'. Monitor IDs must be numeric.", trimmedId);
+                    }
+                }
+            }
+            
+            if (validMonitorIds.isEmpty()) {
+                return "Error: No valid monitor IDs provided";
+            }
+
+            // Build the monitor instance condition
+            String monitorCondition;
+            if (validMonitorIds.size() == 1) {
+                monitorCondition = String.format("equals(__instance__, \"%s\")", validMonitorIds.get(0));
+            } else {
+                StringBuilder conditionBuilder = new StringBuilder("(");
+                for (int i = 0; i < validMonitorIds.size(); i++) {
+                    if (i > 0) {
+                        conditionBuilder.append(" or ");
+                    }
+                    conditionBuilder.append(String.format("equals(__instance__, \"%s\")", validMonitorIds.get(i)));
+                }
+                conditionBuilder.append(")");
+                monitorCondition = conditionBuilder.toString();
+            }
+
+            // Get the current expression and modify it
+            String currentExpr = existingRule.getExpr();
+            String newExpr;
+            
+            // Check if the expression already has __instance__ conditions
+            if (currentExpr.contains("__instance__")) {
+                // Extract existing monitor IDs and merge with new ones
+                List<String> existingMonitorIds = UtilityClass.extractExistingMonitorIds(currentExpr);
+                
+                // Add new monitor IDs that aren't already present
+                for (String newId : validMonitorIds) {
+                    if (!existingMonitorIds.contains(newId)) {
+                        existingMonitorIds.add(newId);
+                    }
+                }
+                
+                String updatedMonitorCondition;
+                if (existingMonitorIds.size() == 1) {
+                    updatedMonitorCondition = String.format("equals(__instance__, \"%s\")", existingMonitorIds.get(0));
+                } else {
+                    StringBuilder conditionBuilder = new StringBuilder("(");
+                    for (int i = 0; i < existingMonitorIds.size(); i++) {
+                        if (i > 0) {
+                            conditionBuilder.append(" or ");
+                        }
+                        conditionBuilder.append(String.format("equals(__instance__, \"%s\")", existingMonitorIds.get(i)));
+                    }
+                    conditionBuilder.append(")");
+                    updatedMonitorCondition = conditionBuilder.toString();
+                }
+                
+                // Replace existing __instance__ conditions with updated ones
+                newExpr = UtilityClass.replaceInstanceConditions(currentExpr, updatedMonitorCondition);
+                
+                // Update the alert rule
+                existingRule.setExpr(newExpr);
+                alertDefineServiceAdapter.modifyAlertDefine(existingRule);
+                
+                log.info("Successfully added monitors {} to existing bindings for alert rule ID: {}", validMonitorIds, ruleId);
+                return String.format("Successfully added %d new monitor(s) to alert rule ID %d.\nTotal bound monitors: %s\nUpdated expression: %s", 
+                    validMonitorIds.size(), ruleId, String.join(", ", existingMonitorIds), newExpr);
+            }
+            
+            // Insert the monitor condition after the metrics condition
+            // Pattern: equals(__app__,"app") && equals(__metrics__,"metric") && [existing_conditions]
+            // Result: equals(__app__,"app") && equals(__metrics__,"metric") && [monitor_condition] && [existing_conditions]
+            
+            if (currentExpr.matches(".*equals\\(__app__,\"[^\"]+\"\\)\\s*&&\\s*equals\\(__metrics__,\"[^\"]+\"\\)\\s*&&\\s*.*")) {
+                // Find the position after the metrics condition
+                String metricsPattern = "equals\\(__metrics__,\"[^\"]+\"\\)";
+                java.util.regex.Pattern regex = java.util.regex.Pattern.compile(metricsPattern);
+                java.util.regex.Matcher matcher = regex.matcher(currentExpr);
+                
+                if (matcher.find()) {
+                    int metricsEnd = matcher.end();
+                    // Find the " && " after the metrics condition
+                    int andPosition = currentExpr.indexOf(" && ", metricsEnd);
+                    if (andPosition != -1) {
+                        String beforeAndPosition = currentExpr.substring(0, andPosition + 4); // Include " && "
+                        String afterAndPosition = currentExpr.substring(andPosition + 4); // Everything after " && "
+                        newExpr = beforeAndPosition + monitorCondition + " && " + afterAndPosition;
+                    } else {
+                        return String.format("Error: Unable to find field conditions after metrics in expression: %s", currentExpr);
+                    }
+                } else {
+                    return String.format("Error: Unable to parse metrics condition in expression: %s", currentExpr);
+                }
+            } else {
+                return String.format("Error: Expression format not supported for monitor binding: %s", currentExpr);
+            }
+
+            // Update the alert rule
+            existingRule.setExpr(newExpr);
+            alertDefineServiceAdapter.modifyAlertDefine(existingRule);
+
+            log.info("Successfully bound monitors {} to alert rule ID: {}", validMonitorIds, ruleId);
+            return String.format("Successfully bound %d monitor(s) to alert rule ID %d.\nMonitor IDs: %s\nUpdated expression: %s", 
+                validMonitorIds.size(), ruleId, String.join(", ", validMonitorIds), newExpr);
+
+        } catch (Exception e) {
+            log.error("Failed to bind monitors to alert rule ID {}: {}", ruleId, e.getMessage(), e);
+            return String.format("Error binding monitors to alert rule: %s", e.getMessage());
+        }
+    }
+
+
+    /**
+     * Validates that the app, metric, and field conditions are valid according to hierarchy
+     * @param app App name to validate
+     * @param metrics Metric name to validate for the app
+     * @param fieldConditions Field conditions to validate for the metric
+     * @return "VALID" if all relationships are correct, error message otherwise
+     */
+    private String validateHierarchyRelationships(String app, String metrics, String fieldConditions) {
+        try {
+            log.debug("Validating hierarchy relationships: app={}, metrics={}, fieldConditions={}", app, metrics, fieldConditions);
+
+            // Get hierarchy for the specified app
+            List<Hierarchy> hierarchies = alertDefineServiceAdapter.getAppHierarchy(app.toLowerCase(), "en-US");
+
+            if (hierarchies == null || hierarchies.isEmpty()) {
+                return String.format("Error: App '%s' not found in hierarchy. Please use list_monitor_types to get valid app names.", app);
+            }
+
+            // Find the metric in the app's hierarchy
+            Hierarchy metricHierarchy = UtilityClass.findMetricInHierarchy(hierarchies, metrics);
+            if (metricHierarchy == null) {
+                return String.format("Error: Metric '%s' not found for app '%s'. Please use get_apps_metrics_hierarchy to get valid metrics for this app.", metrics, app);
+            }
+
+            // Extract field names from field conditions and validate them
+            List<String> fieldNames = UtilityClass.extractFieldNamesFromConditions(fieldConditions);
+            for (String fieldName : fieldNames) {
+                if (!UtilityClass.isFieldValidForMetric(metricHierarchy, fieldName)) {
+                    return String.format("Error: Field '%s' not found for metric '%s' in app '%s'. Please use get_apps_metrics_hierarchy to get valid field parameters.", fieldName, metrics, app);
+                }
+            }
+
+            log.debug("Hierarchy validation passed for app={}, metrics={}", app, metrics);
+            return "VALID";
+
+        } catch (Exception e) {
+            log.error("Error during hierarchy validation: {}", e.getMessage(), e);
+            return String.format("Error: Unable to validate hierarchy relationships: %s", e.getMessage());
+        }
+    }
+
+}

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

@@ -0,0 +1,245 @@
+/*
+ * 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.tools.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.AlertServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.tools.AlertTools;
+import org.apache.hertzbeat.ai.utils.UtilityClass;
+import org.apache.hertzbeat.alert.dto.AlertSummary;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+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
+ */
+@Slf4j
+@Service
+public class AlertToolsImpl implements AlertTools {
+    @Autowired
+    private AlertServiceAdapter alertServiceAdapter;
+
+    @Override
+    @Tool(name = "query_alerts", description = """
+            Query alerts with comprehensive filtering and pagination options.
+            
+            ALERT TYPES:
+            - Pass alertType='single' for individual alert instances
+            - Pass alertType='group' for grouped/aggregated alerts
+            - Pass alertType='both' to get both types (separate sections)
+            
+            STATUS FILTERING:
+            - 'firing': Currently active alerts requiring attention
+            - 'resolved': Previously active alerts that have been cleared
+            - 'all': Both firing and resolved alerts (default)
+            
+            SEARCH & FILTERING:
+            - search: Search in alert content, labels, or descriptions
+            - sort: Order by 'startAt' (trigger time), 'triggerTimes' (frequency), 'status'
+            - order: 'asc' (oldest first) or 'desc' (newest first, default)
+            
+            PAGINATION:
+            - pageIndex: Page number starting from 0
+            - pageSize: Number of alerts per page (default: 10, max recommended: 50)
+            
+            EXAMPLE AND COMMON USE CASES:
+            - Recent active alerts: alertType='single', status='firing', sort='startAt', order='desc'
+            - Historical analysis: alertType='single', status='resolved', pageSize=50
+            - Alert grouping overview: alertType='group', status='all'
+            - Search specific issues: search='cpu', alertType='single', status='firing'
+            - Find abnormal monitors: status='firing' to get active alerts indicating monitor issues
+            - Monitor-specific alerts: use search parameter with monitor ID or name to find related alerts
+            - Frequent alerts analysis: sort='triggerTimes', order='desc' to find most frequently triggered alerts
+            - Recent recurring issues: status='all', sort='triggerTimes', order='desc', pageSize=20
+            """)
+    public String queryAlerts(
+            @ToolParam(description = "Alert type: 'single' (individual alerts), 'group' (grouped alerts), 'both' (default: single)", required = false) String alertType,
+            @ToolParam(description = "Alert status: 'firing' (active), 'resolved' (cleared), 'all' (default: all)", required = false) String status,
+            @ToolParam(description = "Search term for alert content or labels", required = false) String search,
+            @ToolParam(description = "Sort field: 'startAt', 'triggerTimes', 'status' (default: startAt)", required = false) String sort,
+            @ToolParam(description = "Sort order: 'asc' or 'desc' (default: desc)", required = false) String order,
+            @ToolParam(description = "Page index starting from 0 (default: 0)", required = false) Integer pageIndex,
+            @ToolParam(description = "Page size, 1-50 recommended (default: 10)", required = false) Integer pageSize) {
+
+        try {
+            log.info("Querying alerts: alertType={}, status={}, search={}, sort={}, order={}", alertType, status, search, sort, order);
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in query_alerts tool: {}", subjectSum);
+
+            // Set defaults
+            if (alertType == null || alertType.trim().isEmpty()) {
+                alertType = "single";
+            }
+            if (status == null || status.trim().isEmpty()) {
+                status = "all";
+            }
+            if (sort == null || sort.trim().isEmpty()) {
+                sort = "startAt";
+            }
+            if (order == null || order.trim().isEmpty()) {
+                order = "desc";
+            }
+            if (pageIndex == null) {
+                pageIndex = 0;
+            }
+            if (pageSize == null) {
+                pageSize = 10;
+            }
+
+            StringBuilder response = new StringBuilder();
+            response.append("ALERT QUERY RESULTS\n");
+            response.append("===================\n\n");
+
+            // Handle different alert types
+            if ("single".equalsIgnoreCase(alertType) || "both".equalsIgnoreCase(alertType)) {
+                Page<SingleAlert> singleResult = alertServiceAdapter.getSingleAlerts(status, search, sort, order, pageIndex, pageSize);
+                
+                response.append("SINGLE ALERTS:\n");
+                response.append("Found ").append(singleResult.getContent().size()).append(" single alerts (Total: ").append(singleResult.getTotalElements()).append("):\n\n");
+
+                for (SingleAlert alert : singleResult.getContent()) {
+                    response.append("Alert ID: ").append(alert.getId()).append("\n");
+                    response.append("Status: ").append(alert.getStatus()).append("\n");
+                    response.append("Content: ").append(alert.getContent() != null ? alert.getContent() : "No content").append("\n");
+                    response.append("Trigger Times: ").append(alert.getTriggerTimes()).append("\n");
+                    
+                    if (alert.getStartAt() != null) {
+                        response.append("Started At: ").append(UtilityClass.formatTimestamp(alert.getStartAt())).append("\n");
+                    }
+                    if (alert.getActiveAt() != null) {
+                        response.append("Active At: ").append(UtilityClass.formatTimestamp(alert.getActiveAt())).append("\n");
+                    }
+                    if (alert.getEndAt() != null) {
+                        response.append("Ended At: ").append(UtilityClass.formatTimestamp(alert.getEndAt())).append("\n");
+                    }
+                    
+                    if (alert.getLabels() != null && !alert.getLabels().isEmpty()) {
+                        response.append("Labels: ").append(alert.getLabels()).append("\n");
+                    }
+                    response.append("\n");
+                }
+
+                if (singleResult.getContent().isEmpty()) {
+                    response.append("No single alerts found matching the specified criteria.\n");
+                }
+            }
+
+            // Handle group alerts
+            if ("group".equalsIgnoreCase(alertType) || "both".equalsIgnoreCase(alertType)) {
+                if ("both".equalsIgnoreCase(alertType)) {
+                    response.append("\n");
+                }
+                
+                Page<GroupAlert> groupResult = alertServiceAdapter.getGroupAlerts(status, search, sort, order, pageIndex, pageSize);
+                
+                response.append("GROUP ALERTS:\n");
+                response.append("Found ").append(groupResult.getContent().size()).append(" group alerts (Total: ").append(groupResult.getTotalElements()).append("):\n\n");
+
+                for (GroupAlert alert : groupResult.getContent()) {
+                    response.append("Group Alert ID: ").append(alert.getId()).append("\n");
+                    response.append("Status: ").append(alert.getStatus()).append("\n");
+                    response.append("Group Key: ").append(alert.getGroupKey() != null ? alert.getGroupKey() : "No group key").append("\n");
+                    
+                    if (alert.getGmtCreate() != null) {
+                        response.append("Created At: ").append(alert.getGmtCreate()).append("\n");
+                    }
+                    if (alert.getGmtUpdate() != null) {
+                        response.append("Updated At: ").append(alert.getGmtUpdate()).append("\n");
+                    }
+                    
+                    if (alert.getCommonLabels() != null && !alert.getCommonLabels().isEmpty()) {
+                        response.append("Common Labels: ").append(alert.getCommonLabels()).append("\n");
+                    }
+                    if (alert.getCommonAnnotations() != null && !alert.getCommonAnnotations().isEmpty()) {
+                        response.append("Annotations: ").append(alert.getCommonAnnotations()).append("\n");
+                    }
+                    response.append("\n");
+                }
+
+                if (groupResult.getContent().isEmpty()) {
+                    response.append("No group alerts found matching the specified criteria.\n");
+                }
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to query alerts: {}", e.getMessage(), e);
+            return "Error retrieving alerts: " + e.getMessage();
+        }
+    }
+
+
+    @Override
+    @Tool(name = "get_alerts_summary", description = """
+            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() {
+        try {
+            log.info("Getting alerts summary");
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in get_alerts_summary tool: {}", subjectSum);
+
+            AlertSummary summary = alertServiceAdapter.getAlertsSummary();
+
+            StringBuilder response = new StringBuilder();
+            response.append("ALERTS SUMMARY\n");
+            response.append("==============\n\n");
+
+            if (summary != null) {
+                response.append("Total Alerts: ").append(summary.getTotal()).append("\n");
+                response.append("Handled Alerts: ").append(summary.getDealNum()).append("\n");
+                response.append("Handling Rate: ").append(String.format("%.1f", summary.getRate())).append("%\n\n");
+
+                response.append("Priority Breakdown (Unhandled):\n");
+                response.append("- Critical: ").append(summary.getPriorityCriticalNum()).append("\n");
+                response.append("- Emergency: ").append(summary.getPriorityEmergencyNum()).append("\n");
+                response.append("- Warning: ").append(summary.getPriorityWarningNum()).append("\n\n");
+
+                long totalUnhandled = summary.getPriorityCriticalNum() + summary.getPriorityEmergencyNum() + summary.getPriorityWarningNum();
+                response.append("Total Unhandled Alerts: ").append(totalUnhandled).append("\n");
+
+                if (totalUnhandled > 0) {
+                    response.append("\nUnhandled Alert Distribution:\n");
+                    response.append("- Critical: ").append(String.format("%.1f", (summary.getPriorityCriticalNum() * 100.0 / totalUnhandled))).append("%\n");
+                    response.append("- Emergency: ").append(String.format("%.1f", (summary.getPriorityEmergencyNum() * 100.0 / totalUnhandled))).append("%\n");
+                    response.append("- Warning: ").append(String.format("%.1f", (summary.getPriorityWarningNum() * 100.0 / totalUnhandled))).append("%\n");
+                }
+            } else {
+                response.append("No alert summary data available.");
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to get alerts summary: {}", e.getMessage(), e);
+            return "Error retrieving alerts summary: " + e.getMessage();
+        }
+    }
+
+}

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

@@ -0,0 +1,263 @@
+/*
+ * 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.tools.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.MetricsServiceAdapter;
+import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.tools.MetricsTools;
+import org.apache.hertzbeat.common.entity.dto.Field;
+import org.apache.hertzbeat.common.entity.dto.MetricsData;
+import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData;
+import org.apache.hertzbeat.common.entity.dto.Value;
+import org.apache.hertzbeat.common.entity.dto.ValueRow;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of Metrics Tools functionality for metrics data queries and analysis
+ */
+@Slf4j
+@Service
+public class MetricsToolsImpl implements MetricsTools {
+    @Autowired
+    private MetricsServiceAdapter metricsServiceAdapter;
+    @Autowired
+    private MonitorServiceAdapter monitorServiceAdapter;
+
+    @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
+            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.
+            Based on the monitor type/name, use the get_apps_metrics_hierarchy tool to get the metrics hierarchy. i.e., metrics and the field parameter (sub-metric).
+            Each metric has its submetrics as well for example: cpu has field parameters or sub-metrics  like 'usage', 'load', 'core'. These value might be numeric or string
+            User might ask about specific metrics like 'cpu usage', 'memory used', 'disk available', etc.
+            So use this tool to get the real-time metrics data for the monitor- user asked the specific metrics for, along with any logical or numeric conditions if the user mentions
+            In case of multiple monitors matching the user's description, you might have to call query_realtime_metrics tool mutliple times with different parameters.
+            
+            
+            EXAMPLE WORKFLOW
+            
+            If the user asks for 'cpu usage' for a particular monitor or multiple matching monitors like 'web server', 'database server', etc.
+            Get the closest matching monitor name from list_monitor_types tool.
+            Call query_monitors tool to get the monitor ID/IDs with the obtained monitor type
+            Call get_apps_metrics_hierarchy tool to get all the metrics (type=metric) for the obtained monitor type
+            Call query_realtime_metrics tool with each of the IDs and the closest matching metrics name (e.g., 'cpu', 'memory', etc.)
+            From the result, do whatever operation user wants you to do with the data. In this example case display the cpu usage for each matching monitor.
+            """)
+    public String getRealtimeMetrics(
+            @ToolParam(description = "Monitor ID", required = true) Long monitorId,
+            @ToolParam(description = "Metrics name (e.g., 'system', 'cpu', 'memory') obtained from get_apps_metrics_hierarchy result", required = true) String metrics) {
+        try {
+            log.info("Getting real-time metrics for monitor {} and metrics {}", monitorId, metrics);
+            SubjectSum subjectSum = McpContextHolder.getSubject();
+            log.debug("Current subject in get_realtime_metrics tool: {}", subjectSum);
+
+            MetricsData metricsData = metricsServiceAdapter.getMetricsData(monitorId, metrics);
+
+            if (metricsData == null) {
+                return String.format("No real-time metrics data found for monitor ID %d and metrics '%s'", monitorId, metrics);
+            }
+
+            StringBuilder response = new StringBuilder();
+            response.append("REAL-TIME METRICS DATA\n");
+            response.append("=".repeat(50)).append("\n");
+            response.append("Monitor ID: ").append(monitorId).append("\n");
+            response.append("Metrics: ").append(metrics).append("\n");
+            response.append("=".repeat(50)).append("\n\n");
+
+            if (metricsData.getValueRows() != null && !metricsData.getValueRows().isEmpty()) {
+                List<Field> fields = metricsData.getFields();
+
+                response.append("Available Field Parameters (Sub-metrics):\n");
+                response.append("-".repeat(40)).append("\n");
+
+                for (ValueRow valueRow : metricsData.getValueRows()) {
+                    // Show labels if available
+                    if (valueRow.getLabels() != null && !valueRow.getLabels().isEmpty()) {
+                        response.append("Instance Labels: ").append(valueRow.getLabels()).append("\n");
+                        response.append("-".repeat(20)).append("\n");
+                    }
+
+                    List<Value> values = valueRow.getValues();
+                    for (int i = 0; i < values.size() && i < fields.size(); i++) {
+                        Field field = fields.get(i);
+                        Value value = values.get(i);
+
+                        // Enhanced field information display
+                        response.append("• Field Parameter: ").append(field.getName());
+                        if (field.getUnit() != null && !field.getUnit().isEmpty()) {
+                            response.append(" (").append(field.getUnit()).append(")");
+                        }
+                        response.append("\n");
+
+                        response.append("  Current Value: ").append(value.getOrigin());
+
+                        // Add data type indication
+                        try {
+                            Double.parseDouble(value.getOrigin());
+                            response.append(" [Numeric]");
+                        } catch (NumberFormatException e) {
+                            response.append(" [String]");
+                        }
+                        response.append("\n\n");
+                    }
+
+                    if (valueRow.getLabels() != null && !valueRow.getLabels().isEmpty()) {
+                        response.append("-".repeat(20)).append("\n");
+                    }
+                }
+            } else {
+                response.append("No field parameter data available for metrics '").append(metrics).append("'.\n");
+                response.append("Use get_apps_metrics_hierarchy tool to check available metrics for this monitor type.");
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to get real-time metrics: {}", e.getMessage(), e);
+            return "Error retrieving real-time metrics: " + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "get_historical_metrics", description = """
+            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
+            DO NOT USE THE LABEL FIELD ALWAYS USE THE VALUE FIELD FROM THE HIERARCHY JSON
+            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 = "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,
+            @ToolParam(description = "Label filter for specific instances", required = false) String label,
+            @ToolParam(description = "Time range (e.g., '1h', '6h', '24h', '7d')", required = false) String history,
+            @ToolParam(description = "Whether to aggregate data with intervals", required = false) Boolean interval) {
+
+        try {
+            log.info("Getting historical metrics for monitor {} and metrics {}", monitorId, metrics);
+
+            if (history == null || history.trim().isEmpty()) {
+                history = "24h";
+            }
+            if (interval == null) {
+                interval = true;
+            }
+
+            MetricsHistoryData historyData = metricsServiceAdapter.getMetricHistoryData(
+                    monitorId, app, metrics, fieldParameter, label, history, interval);
+
+            if (historyData == null) {
+                return String.format("No historical metrics data found for monitor ID %d and metrics '%s'", monitorId, metrics);
+            }
+
+            StringBuilder response = new StringBuilder();
+            response.append("HISTORICAL METRICS: ").append(metrics).append(" (Monitor ID: ").append(monitorId).append(")\n");
+            response.append("Time Range: ").append(history).append(" | Interval Aggregation: ").append(interval).append("\n");
+            response.append("=".repeat(60)).append("\n\n");
+
+            if (historyData.getValues() != null && !historyData.getValues().isEmpty()) {
+                response.append("Field: ").append(historyData.getField() != null ? historyData.getField().getName() : "Unknown").append("\n");
+                
+                // Calculate total data points
+                int totalPoints = historyData.getValues().values().stream()
+                        .mapToInt(List::size)
+                        .sum();
+                response.append("Data Points: ").append(totalPoints).append("\n");
+                
+                // Show sample data points (first 10) from all value lists
+                int count = 0;
+                response.append("\nSample Data Points:\n");
+                for (Map.Entry<String, List<Value>> entry : historyData.getValues().entrySet()) {
+                    String labelKey = entry.getKey();
+                    List<Value> values = entry.getValue();
+                    
+                    for (Value value : values) {
+                        if (count >= 10) break;
+                        response.append("Label: ").append(labelKey)
+                               .append(" | Time: ").append(value.getTime())
+                               .append(" | Value: ").append(value.getOrigin()).append("\n");
+                        count++;
+                    }
+                    if (count >= 10) break;
+                }
+                
+                if (totalPoints > 10) {
+                    response.append("... and ").append(totalPoints - 10).append(" more data points\n");
+                }
+            } else {
+                response.append("No historical data points available.");
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to get historical metrics: {}", e.getMessage(), e);
+            return "Error retrieving historical metrics: " + e.getMessage();
+        }
+    }
+
+
+    @Override
+    @Tool(name = "get_warehouse_status", description = """
+            Check the status of the metrics storage warehouse system.
+            Returns whether the metrics storage is operational and accessible.
+            """)
+    public String getWarehouseStatus() {
+        try {
+            log.info("Checking warehouse storage status");
+
+            Boolean status = metricsServiceAdapter.getWarehouseStorageServerStatus();
+
+            StringBuilder response = new StringBuilder();
+            response.append("METRICS WAREHOUSE STATUS\n");
+            response.append("========================\n\n");
+
+            if (status != null && status) {
+                response.append("Status: ONLINE ✓\n");
+                response.append("The metrics storage warehouse is operational and accessible.\n");
+                response.append("Historical metrics data queries are available.");
+            } else {
+                response.append("Status: OFFLINE ✗\n");
+                response.append("The metrics storage warehouse is not accessible.\n");
+                response.append("Only real-time metrics may be available.");
+            }
+
+            return response.toString();
+
+        } catch (Exception e) {
+            log.error("Failed to get warehouse status: {}", e.getMessage(), e);
+            return "Error checking warehouse status: " + e.getMessage();
+        }
+    }
+
+}

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

@@ -0,0 +1,491 @@
+/*
+ * 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.tools.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter;
+import org.apache.hertzbeat.ai.config.McpContextHolder;
+import org.apache.hertzbeat.ai.utils.UtilityClass;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+import org.apache.hertzbeat.ai.tools.MonitorTools;
+import org.springframework.ai.tool.annotation.ToolParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.Param;
+import org.apache.hertzbeat.common.entity.manager.ParamDefine;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Implementation of Monitoring Tools functionality
+ */
+@Slf4j
+@Service
+public class MonitorToolsImpl implements MonitorTools {
+    @Autowired
+    private MonitorServiceAdapter monitorServiceAdapter;
+
+
+    /**
+     * Tool to query monitor information with flexible filtering and pagination.
+     * Supports filtering by monitor IDs, type, status, host, labels, sorting, and
+     * pagination.
+     * Returns detailed monitor information including ID, name, type, host, and status.
+     */
+    @Override
+    @Tool(name = "query_monitors", description = """ 
+            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
+            - Shows total count and pagination info
+            """)
+    public String queryMonitors(
+            @ToolParam(description = "Specific monitor IDs to retrieve (optional)", required = false) List<Long> ids,
+            @ToolParam(description = "Monitor type filter: 'linux', 'mysql', 'http', 'redis', etc. (optional)", required = false) String app,
+            @ToolParam(description = "Monitor status: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all (default: 9)", required = false) Byte status,
+            @ToolParam(description = "Search in monitor names or hosts (partial matching)", required = false) String search,
+            @ToolParam(description = "Label filters, format: 'key1:value1,key2:value2'", required = false) String labels,
+            @ToolParam(description = "Sort field: 'name', 'gmtCreate', 'gmtUpdate', 'status', 'app' (default: gmtCreate)", required = false) String sort,
+            @ToolParam(description = "Sort order: 'asc' (ascending) or 'desc' (descending, default)", required = false) String order,
+            @ToolParam(description = "Page number starting from 0 (default: 0)", required = false) Integer pageIndex,
+            @ToolParam(description = "Items per page: 1-100 recommended (default: 20)", required = false) Integer pageSize,
+            @ToolParam(description = "Include status statistics summary (default: false)", required = false) Boolean includeStats) {
+        try {
+            // Set defaults
+            if (pageSize == null || pageSize <= 0) {
+                pageSize = 20;
+            }
+            if (pageIndex == null) {
+                pageIndex = 0;
+            }
+            if (includeStats == null) {
+                includeStats = false;
+            }
+            
+            Page<Monitor> result = monitorServiceAdapter.getMonitors(ids, app, search, status, sort, order, pageIndex, pageSize, labels);
+            log.debug("MonitorServiceAdapter.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
+                long onlineCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 1, null, null, 0, 1000, labels).getTotalElements();
+                long offlineCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 2, null, null, 0, 1000, labels).getTotalElements();
+                long unreachableCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 3, null, null, 0, 1000, labels).getTotalElements();
+                long pausedCount = monitorServiceAdapter.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("- 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;
+                    response.append("- Health Rate: ").append(String.format("%.1f", healthPercentage)).append("%\n");
+                }
+                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(" | 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.
+            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.
+            Use list_monitor_types tool to see available monitor type names to use here in the app parameter.
+            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"}
+            """)
+    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 description (optional)", required = false) String description) {
+        
+        try {
+            log.info("Adding monitor: name={}, app={}, host={}", name, app, host);
+            
+            // Validate required parameters
+            if (name == null || name.trim().isEmpty()) {
+                return "Error: Monitor name is required";
+            }
+            if (app == null || app.trim().isEmpty()) {
+                return "Error: Monitor type/application is required";
+            }
+            if (host == null || host.trim().isEmpty()) {
+                return "Error: Host is required";
+            }
+            
+            // Set defaults
+            if (intervals == null || intervals < 10) {
+                intervals = 600;
+            }
+            
+            // Create Monitor entity
+            Monitor monitor = Monitor.builder()
+                    .name(name.trim())
+                    .app(app.toLowerCase().trim())
+                    .host(host.trim())
+                    .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 {
+                List<ParamDefine> requiredParams = monitorServiceAdapter.getMonitorParamDefines(app);
+                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);
+                        }
+                    }
+                }
+                
+                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 adapter - it handles all the complexity (validation, defaults, app-specific logic)
+            Long monitorId = monitorServiceAdapter.addMonitor(monitor, params, null);
+            
+            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
+     */
+    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());
+        }
+        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());
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("Failed to parse additionalParams: {}", e.getMessage());
+            }
+        }
+        
+        return params;
+    }
+    
+    @Override
+    @Tool(name = "list_monitor_types", description = """
+            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();
+            log.debug("Current subject in list_monitor_types tool: {}", subjectSum);
+            
+            // Set default language if not provided
+            if (language == null || language.trim().isEmpty()) {
+                language = "en-US";
+            }
+            
+            // Get available monitor types from adapter
+            Map<String, String> monitorTypes = monitorServiceAdapter.getAvailableMonitorTypes(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();
+                response.append("• ").append(typeKey)
+                       .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.
+            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(
+            @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();
+            log.debug("Current subject in get_monitor_param_defines tool: {}", subjectSum);
+            
+            // Validate required parameter
+            if (app == null || app.trim().isEmpty()) {
+                return "Error: Monitor type/application parameter is required";
+            }
+            
+            // Get parameter definitions from adapter
+            List<ParamDefine> paramDefines = monitorServiceAdapter.getMonitorParamDefines(app);
+            
+            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", 
+                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

@@ -0,0 +1,691 @@
+/*
+ * 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.utils;
+
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.pojo.dto.Hierarchy;
+
+import java.lang.reflect.Method;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Utility class providing helper methods for field expression validation, parsing,
+ * hierarchy management, timestamp formatting and metric/status conversions.
+ * This class contains stateless utility methods used across the application for
+ * common operations and validations.
+ */
+@Slf4j
+@lombok.experimental.UtilityClass
+public class UtilityClass {
+    
+    /**
+     * Validates the syntax of field conditions expression
+     * @param fieldConditions Field conditions string to validate
+     * @return "VALID" if syntax is correct, error message otherwise
+     */
+    
+    public String validateExpressionSyntax(String fieldConditions) {
+        try {
+            log.debug("Validating expression syntax: {}", fieldConditions);
+
+            // Check for basic syntax requirements
+            if (fieldConditions == null || fieldConditions.trim().isEmpty()) {
+                return "Error: Field conditions cannot be empty";
+            }
+
+            // Check for balanced parentheses
+            if (!hasBalancedParentheses(fieldConditions)) {
+                return "Error: Unbalanced parentheses in field conditions. Please check your expression syntax.";
+            }
+
+            // Validate operators used in the expression
+            String operatorValidation = validateOperators(fieldConditions);
+            if (!operatorValidation.equals("VALID")) {
+                return operatorValidation;
+            }
+
+            // Validate logical connectors
+            String logicalValidation = validateLogicalConnectors(fieldConditions);
+            if (!logicalValidation.equals("VALID")) {
+                return logicalValidation;
+            }
+
+            // Validate function syntax (equals, contains, etc.)
+            String functionValidation = validateFunctions(fieldConditions);
+            if (!functionValidation.equals("VALID")) {
+                return functionValidation;
+            }
+
+            log.debug("Expression syntax validation passed for: {}", fieldConditions);
+            return "VALID";
+
+        } catch (Exception e) {
+            log.error("Error during expression syntax validation: {}", e.getMessage(), e);
+            return String.format("Error: Unable to validate expression syntax: %s", e.getMessage());
+        }
+    }
+
+    /**
+     * Checks if parentheses are balanced in the expression
+     */
+    public boolean hasBalancedParentheses(String expression) {
+        int count = 0;
+        for (char c : expression.toCharArray()) {
+            if (c == '(') {
+                count++;
+            } else if (c == ')') {
+                count--;
+                if (count < 0) {
+                    return false; // More closing than opening
+                }
+            }
+        }
+        return count == 0; // Should be perfectly balanced
+    }
+
+    /**
+     * Validates that only supported operators are used
+     */
+    public String validateOperators(String fieldConditions) {
+        // Define supported operators for different field types
+        String[] numericOperators = {">", "<", ">=", "<=", "==", "!=", "exists()", "!exists()"};
+        String[] stringOperators = {"equals(", "contains(", "matches(", "exists()", "!equals(", "!contains(", "!matches(", "!exists()"};
+        String[] logicalOperators = {" and ", " or "};
+
+        // Remove quotes and function calls temporarily for operator checking
+        String tempExpression = fieldConditions
+                .replaceAll("\"[^\"]*\"", "VALUE") // Remove quoted strings
+                .replaceAll("'[^']*'", "VALUE")    // Remove single quoted strings
+                .replaceAll("\\w+\\([^)]*\\)", "FUNCTION"); // Remove function calls
+
+        // Check for invalid operators (common mistakes)
+        String[] invalidOperators = {"&&", "||", "AND", "OR", "=", "!="};
+        for (String invalidOp : invalidOperators) {
+            if (tempExpression.contains(invalidOp)) {
+                if (invalidOp.equals("&&") || invalidOp.equals("||")) {
+                    return String.format("Error: Use 'and'/'or' instead of '%s' for logical operations", invalidOp);
+                }
+                if (invalidOp.equals("AND") || invalidOp.equals("OR")) {
+                    return String.format("Error: Use lowercase '%s' for logical operations", invalidOp.toLowerCase());
+                }
+                if (invalidOp.equals("=")) {
+                    return "Error: Use '==' for equality comparison, not '='";
+                }
+            }
+        }
+
+        // Check for unsupported special characters that might indicate syntax errors
+        if (tempExpression.matches(".*[#$%^&*+\\[\\]{}|\\\\;:'\"`~].*")) {
+            return "Error: Expression contains unsupported special characters. Use only supported operators and functions.";
+        }
+
+        return "VALID";
+    }
+
+    /**
+     * Validates logical connectors syntax
+     */
+    public String validateLogicalConnectors(String fieldConditions) {
+        // Check for proper spacing around logical operators
+        if (fieldConditions.matches(".*(\\S(and|or)\\S).*")) {
+            return "Error: Logical operators 'and'/'or' must be surrounded by spaces";
+        }
+
+        // Check for consecutive logical operators
+        if (fieldConditions.matches(".*(and\\s+and|or\\s+or|and\\s+or\\s+and|or\\s+and\\s+or).*")) {
+            return "Error: Consecutive logical operators found. Use parentheses to group conditions properly.";
+        }
+
+        // Check for logical operators at the beginning or end
+        String trimmed = fieldConditions.trim();
+        if (trimmed.startsWith("and ") || trimmed.startsWith("or ")
+                || trimmed.endsWith(" and") || trimmed.endsWith(" or")) {
+            return "Error: Expression cannot start or end with logical operators 'and'/'or'";
+        }
+
+        return "VALID";
+    }
+
+    /**
+     * Validates function syntax (equals, contains, matches, etc.)
+     */
+    public String validateFunctions(String fieldConditions) {
+        // Check for properly formed function calls
+        String[] supportedFunctions = {"equals", "contains", "matches", "exists", "!equals", "!contains", "!matches", "!exists"};
+
+        // Find all function-like patterns
+        java.util.regex.Pattern functionPattern = java.util.regex.Pattern.compile("(!?\\w+)\\s*\\(([^)]*)\\)");
+        java.util.regex.Matcher matcher = functionPattern.matcher(fieldConditions);
+
+        while (matcher.find()) {
+            String functionName = matcher.group(1);
+            String functionArgs = matcher.group(2);
+
+            // Check if function is supported
+            boolean isSupported = false;
+            for (String supportedFunc : supportedFunctions) {
+                if (functionName.equals(supportedFunc)) {
+                    isSupported = true;
+                    break;
+                }
+            }
+
+            if (!isSupported) {
+                return String.format("Error: Unsupported function '%s'. Supported functions: %s",
+                        functionName, String.join(", ", supportedFunctions));
+            }
+
+            // Validate function arguments
+            if (functionName.equals("exists") || functionName.equals("!exists")) {
+                // exists() should have one parameter or no parameters
+                String[] args = functionArgs.trim().isEmpty() ? new String[0] : functionArgs.split(",");
+                if (args.length > 1) {
+                    return String.format("Error: Function '%s' should have at most one parameter", functionName);
+                }
+            } else {
+                // Other functions should have exactly 2 parameters
+                String[] args = functionArgs.split(",");
+                if (args.length != 2) {
+                    return String.format("Error: Function '%s' requires exactly 2 parameters (field, value)", functionName);
+                }
+
+                // Check that parameters are not empty
+                for (String arg : args) {
+                    if (arg.trim().isEmpty()) {
+                        return String.format("Error: Function '%s' has empty parameter", functionName);
+                    }
+                }
+            }
+        }
+
+        return "VALID";
+    }
+
+    /**
+     * Helper method to validate operator
+     */
+    public boolean isValidOperator(String operator) {
+        return operator != null && (operator.equals(">") || operator.equals("<")
+                || operator.equals(">=") || operator.equals("<=")
+                || operator.equals("==") || operator.equals("!="));
+    }
+
+    /**
+     * Helper method to validate priority
+     */
+    public boolean isValidPriority(String priority) {
+        return priority != null && (priority.equalsIgnoreCase("critical")
+                || priority.equalsIgnoreCase("warning") || priority.equalsIgnoreCase("info"));
+    }
+
+    /**
+     * Helper method to build expression
+     */
+    public String buildExpression(String metric, String operator, String threshold) {
+        return String.format("%s %s %s", metric, operator, threshold);
+    }
+
+    /**
+     * Helper method to parse existing expression into components
+     */
+    public String[] parseExpression(String expression) {
+        if (expression == null || expression.trim().isEmpty()) {
+            return null;
+        }
+
+        // Simple parsing for basic expressions like "metric > value"
+        String[] operators = {">", "<", ">=", "<=", "==", "!="};
+        for (String op : operators) {
+            if (expression.contains(" " + op + " ")) {
+                String[] parts = expression.split(" " + op + " ");
+                if (parts.length == 2) {
+                    return new String[]{parts[0].trim(), op, parts[1].trim()};
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Helper method to parse key-value pairs from a string
+     * Format: "key1:value1, key2:value2, ..."
+     */
+    public Map<String, String> parseKeyValuePairs(String input) {
+        Map<String, String> result = new HashMap<>();
+        if (input == null || input.trim().isEmpty()) {
+            return result;
+        }
+
+        String[] pairs = input.split(",");
+        for (String pair : pairs) {
+            String[] keyValue = pair.split(":");
+            if (keyValue.length == 2) {
+                result.put(keyValue[0].trim(), keyValue[1].trim());
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * Recursively searches for a metric in the hierarchy
+     */
+    public Hierarchy findMetricInHierarchy(List<Hierarchy> hierarchies, String metricName) {
+        for (Hierarchy hierarchy : hierarchies) {
+            // Check if this is the metric we're looking for
+            if (metricName.equals(hierarchy.getValue())) {
+                // Verify it has field children (leaf nodes)
+                if (hierarchy.getChildren() != null && !hierarchy.getChildren().isEmpty()) {
+                    boolean hasLeafChildren = hierarchy.getChildren().stream()
+                            .anyMatch(child -> child.getIsLeaf() != null && child.getIsLeaf());
+                    if (hasLeafChildren) {
+                        return hierarchy;
+                    }
+                }
+            }
+
+            // Recursively search in children
+            if (hierarchy.getChildren() != null) {
+                Hierarchy found = findMetricInHierarchy(hierarchy.getChildren(), metricName);
+                if (found != null) {
+                    return found;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Checks if a field is valid for the given metric
+     */
+    public boolean isFieldValidForMetric(Hierarchy metricHierarchy, String fieldName) {
+        if (metricHierarchy.getChildren() == null) {
+            return false;
+        }
+
+        for (Hierarchy child : metricHierarchy.getChildren()) {
+            if (child.getIsLeaf() != null && child.getIsLeaf() && fieldName.equals(child.getValue())) {
+                return true;
+            }
+            // Also check nested children
+            if (child.getChildren() != null && isFieldValidForMetric(child, fieldName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Extracts field names from field conditions string
+     * Handles simple cases like "field > 80", "equals(field, 'value')", complex expressions
+     */
+    public List<String> extractFieldNamesFromConditions(String fieldConditions) {
+        List<String> fieldNames = new ArrayList<>();
+
+        // Split by logical operators (and, or) and parentheses, but preserve the field names
+        // This is a simple implementation - could be enhanced with a proper parser
+        String[] parts = fieldConditions.split("\\s+(and|or|&&|\\|\\|)\\s+|[()]+");
+
+        for (String part : parts) {
+            part = part.trim();
+            if (part.isEmpty()) {
+                continue;
+            }
+
+            // Handle equals() function: equals(fieldName, "value")
+            if (part.contains("equals(")) {
+                String fieldName = extractFieldFromEquals(part);
+                if (fieldName != null && !fieldNames.contains(fieldName)) {
+                    fieldNames.add(fieldName);
+                }
+            } else {
+                // Handle simple comparisons: fieldName > value, fieldName <= value
+                String fieldName = extractFieldFromComparison(part);
+                if (fieldName != null && !fieldNames.contains(fieldName)) {
+                    fieldNames.add(fieldName);
+                }
+            }
+        }
+
+        return fieldNames;
+    }
+
+    /**
+     * Extracts field name from equals() function
+     */
+    public String extractFieldFromEquals(String condition) {
+        // Pattern: equals(fieldName, "value") or equals(fieldName, value)
+        int startParen = condition.indexOf('(');
+        int comma = condition.indexOf(',');
+
+        if (startParen != -1 && comma != -1 && comma > startParen) {
+            String fieldName = condition.substring(startParen + 1, comma).trim();
+            // Remove quotes if present
+            if (fieldName.startsWith("\"") && fieldName.endsWith("\"")) {
+                fieldName = fieldName.substring(1, fieldName.length() - 1);
+            }
+            return fieldName;
+        }
+        return null;
+    }
+
+    /**
+     * Extracts field name from comparison operation
+     */
+    public String extractFieldFromComparison(String condition) {
+        // Pattern: fieldName operator value
+        // Updated to include all supported operators
+        String[] operators = {" >= ", " <= ", " > ", " < ", " == ", " != "};
+
+        for (String operator : operators) {
+            if (condition.contains(operator)) {
+                String fieldName = condition.split(operator)[0].trim();
+                // Basic validation - field names shouldn't contain quotes or special chars
+                if (fieldName.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
+                    return fieldName;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Helper method to format hierarchy structure as JSON recursively
+     */
+    public ObjectNode formatHierarchyAsJson(ObjectMapper mapper, Hierarchy hierarchy) {
+        ObjectNode node = mapper.createObjectNode();
+
+        node.put("value", hierarchy.getValue());
+        node.put("label", hierarchy.getLabel());
+
+        if (hierarchy.getIsLeaf() != null && hierarchy.getIsLeaf()) {
+            // Leaf node - actual metric field parameter
+            node.put("type", "field_parameter");
+
+            if (hierarchy.getType() != null) {
+                node.put("dataType", hierarchy.getType() == 0 ? "numeric" : "string");
+            }
+            if (hierarchy.getUnit() != null && !hierarchy.getUnit().trim().isEmpty()) {
+                node.put("unit", hierarchy.getUnit());
+            }
+            node.put("description", "Available field parameter for alert conditions");
+        } else {
+            // Category, app, or metric node
+            // Determine node type based on children
+            boolean hasLeafChildren = hierarchy.getChildren().stream()
+                    .anyMatch(child -> child.getIsLeaf() != null && child.getIsLeaf());
+
+            if (hasLeafChildren) {
+                node.put("type", "metric");
+                node.put("description", "Metric with available field parameters");
+            } else {
+                node.put("type", "app");
+                node.put("description", "Application with available metrics");
+            }
+
+            if (hierarchy.getChildren() != null && !hierarchy.getChildren().isEmpty()) {
+                ArrayNode childrenArray = mapper.createArrayNode();
+                for (Hierarchy child : hierarchy.getChildren()) {
+                    childrenArray.add(formatHierarchyAsJson(mapper, child));
+                }
+                node.set("children", childrenArray);
+
+            }
+        }
+
+        return node;
+    }
+    
+    /**
+     * Format timestamp to readable format
+     */
+    public String formatTimestamp(Long timestamp) {
+        if (timestamp == null) {
+            return "N/A";
+        }
+        LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault());
+        return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+
+    /**
+     * Parse time range string to milliseconds
+     */
+    public long parseTimeRangeToMillis(String timeRange) {
+        return switch (timeRange.toLowerCase()) {
+            case "1h" -> 60 * 60 * 1000L;
+            case "6h" -> 6 * 60 * 60 * 1000L;
+            case "24h" -> 24 * 60 * 60 * 1000L;
+            case "7d" -> 7 * 24 * 60 * 60 * 1000L;
+            default -> 24 * 60 * 60 * 1000L; // default to 24h
+        };
+    }
+
+    /**
+     * Helper method to convert monitor status byte to readable text
+     * @param status The status byte from monitor
+     * @return Human-readable status text
+     */
+    public String getStatusText(Byte status) {
+        if (status == null) {
+            return "Unknown";
+        }
+        return switch (status) {
+            case 0 -> "Paused";
+            case 1 -> "Online";
+            case 2 -> "Offline";
+            case 3 -> "Unreachable";
+            default -> "Unknown (" + status + ")";
+        };
+    }
+
+    /**
+     * Helper method to get metrics name for a metric type
+     */
+    public String getMetricsNameForType(String metricType) {
+        return switch (metricType.toLowerCase()) {
+            case "cpu" -> "cpu";
+            case "memory" -> "memory";
+            case "disk" -> "disk";
+            case "network" -> "network";
+            default -> "system";
+        };
+    }
+
+    /**
+     * Helper method to check if a field represents usage for a metric type
+     */
+    public boolean isUsageField(String field, String metricType) {
+        if (field == null) return false;
+
+        String fieldLower = field.toLowerCase();
+        String typeLower = metricType.toLowerCase();
+
+        return fieldLower.contains("usage")
+                || fieldLower.contains("percent")
+                || fieldLower.contains("util")
+                || (typeLower.equals("cpu") && (fieldLower.contains("cpu") || fieldLower.contains("idle")))
+                || (typeLower.equals("memory") && fieldLower.contains("memory"))
+                || (typeLower.equals("disk") && fieldLower.contains("disk"));
+    }
+
+    /**
+     * Convert manager module Hierarchy objects to ai-agent module Hierarchy objects
+     * This handles the cross-module DTO conversion to avoid ClassCastException
+     */
+    public List<Hierarchy> convertToAgentHierarchies(List<?> managerHierarchies) {
+        List<Hierarchy> agentHierarchies = new ArrayList<>();
+
+        for (Object managerHierarchy : managerHierarchies) {
+            Hierarchy agentHierarchy = convertToAgentHierarchy(managerHierarchy);
+            agentHierarchies.add(agentHierarchy);
+        }
+
+        return agentHierarchies;
+    }
+
+    /**
+     * Convert a single manager Hierarchy object to ai-agent Hierarchy object using reflection
+     */
+    public Hierarchy convertToAgentHierarchy(Object managerHierarchy) {
+        try {
+            Hierarchy agentHierarchy = new Hierarchy();
+
+            // Use reflection to copy properties from manager DTO to agent DTO
+            Class<?> managerClass = managerHierarchy.getClass();
+
+            // Copy basic properties
+            agentHierarchy.setCategory(getStringField(managerHierarchy, managerClass, "category"));
+            agentHierarchy.setValue(getStringField(managerHierarchy, managerClass, "value"));
+            agentHierarchy.setLabel(getStringField(managerHierarchy, managerClass, "label"));
+            agentHierarchy.setIsLeaf(getBooleanField(managerHierarchy, managerClass, "isLeaf"));
+            agentHierarchy.setHide(getBooleanField(managerHierarchy, managerClass, "hide"));
+            agentHierarchy.setType(getByteField(managerHierarchy, managerClass, "type"));
+            agentHierarchy.setUnit(getStringField(managerHierarchy, managerClass, "unit"));
+
+            // Handle children recursively
+            List<?> managerChildren = getListField(managerHierarchy, managerClass, "children");
+            if (managerChildren != null && !managerChildren.isEmpty()) {
+                List<Hierarchy> agentChildren = convertToAgentHierarchies(managerChildren);
+                agentHierarchy.setChildren(agentChildren);
+            }
+
+            return agentHierarchy;
+
+        } catch (Exception e) {
+            log.error("Failed to convert manager hierarchy to agent hierarchy: {}", e.getMessage(), e);
+            throw new RuntimeException("Failed to convert hierarchy", e);
+        }
+    }
+
+    public String getStringField(Object obj, Class<?> clazz, String fieldName) {
+        try {
+            Method getter = clazz.getMethod("get" + capitalize(fieldName));
+            Object value = getter.invoke(obj);
+            return value != null ? value.toString() : null;
+        } catch (Exception e) {
+            log.debug("Could not get string field '{}': {}", fieldName, e.getMessage());
+            return null;
+        }
+    }
+
+    public Boolean getBooleanField(Object obj, Class<?> clazz, String fieldName) {
+        try {
+            Method getter = clazz.getMethod("get" + capitalize(fieldName));
+            Object value = getter.invoke(obj);
+            return value instanceof Boolean ? (Boolean) value : null;
+        } catch (Exception e) {
+            try {
+                // Try alternative getter pattern for boolean fields
+                Method isGetter = clazz.getMethod("is" + capitalize(fieldName));
+                Object value = isGetter.invoke(obj);
+                return value instanceof Boolean ? (Boolean) value : null;
+            } catch (Exception e2) {
+                log.debug("Could not get boolean field '{}': {}", fieldName, e.getMessage());
+                return null;
+            }
+        }
+    }
+
+    public Byte getByteField(Object obj, Class<?> clazz, String fieldName) {
+        try {
+            Method getter = clazz.getMethod("get" + capitalize(fieldName));
+            Object value = getter.invoke(obj);
+            return value instanceof Byte ? (Byte) value : null;
+        } catch (Exception e) {
+            log.debug("Could not get byte field '{}': {}", fieldName, e.getMessage());
+            return null;
+        }
+    }
+
+    public List<?> getListField(Object obj, Class<?> clazz, String fieldName) {
+        try {
+            Method getter = clazz.getMethod("get" + capitalize(fieldName));
+            Object value = getter.invoke(obj);
+            return value instanceof List ? (List<?>) value : null;
+        } catch (Exception e) {
+            log.debug("Could not get list field '{}': {}", fieldName, e.getMessage());
+            return null;
+        }
+    }
+
+    public String capitalize(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
+
+
+    /**
+     * Extract existing monitor IDs from the alert expression
+     * @param expression The alert expression containing __instance__ conditions
+     * @return List of existing monitor IDs
+     */
+    public List<String> extractExistingMonitorIds(String expression) {
+        List<String> monitorIds = new ArrayList<>();
+        String pattern = "equals\\(__instance__,\\s*\"([^\"]+)\"\\)";
+        java.util.regex.Pattern regex = java.util.regex.Pattern.compile(pattern);
+        java.util.regex.Matcher matcher = regex.matcher(expression);
+
+        while (matcher.find()) {
+            monitorIds.add(matcher.group(1));
+        }
+
+        return monitorIds;
+    }
+
+    /**
+     * Replace existing __instance__ conditions in the expression with new ones
+     * @param expression The current expression
+     * @param newMonitorCondition The new monitor condition to replace with
+     * @return Updated expression
+     */
+    public String replaceInstanceConditions(String expression, String newMonitorCondition) {
+        // More precise pattern to match complete __instance__ condition blocks without cutting field parameters
+        // Pattern matches either:
+        // 1. Single: equals(__instance__, "id")
+        // 2. Multiple: (equals(__instance__, "id1") or equals(__instance__, "id2") or ...)
+
+        // First try to match grouped conditions: (equals(__instance__, "id1") or equals(__instance__, "id2"))
+        String groupedPattern = "\\(\\s*equals\\(__instance__,\\s*\"[^\"]+\"\\)(?:\\s+or\\s+equals\\(__instance__,\\s*\"[^\"]+\"\\))*\\s*\\)";
+        if (expression.matches(".*" + groupedPattern + ".*")) {
+            return expression.replaceFirst(groupedPattern, newMonitorCondition);
+        }
+
+        // Then try single condition: equals(__instance__, "id")
+        String singlePattern = "equals\\(__instance__,\\s*\"[^\"]+\"\\)";
+        if (expression.matches(".*" + singlePattern + ".*")) {
+            return expression.replaceFirst(singlePattern, newMonitorCondition);
+        }
+
+        // If no match found, return original expression
+        return expression;
+    }
+
+}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java

@@ -35,10 +35,12 @@ public class AlerterWorkerPool {
 
     private ThreadPoolExecutor workerExecutor;
     private ThreadPoolExecutor notifyExecutor;
+    private ThreadPoolExecutor logWorkerExecutor;
 
     public AlerterWorkerPool() {
         initWorkExecutor();
         initNotifyExecutor();
+        initLogWorkerExecutor();
     }
 
     private void initWorkExecutor() {
@@ -77,6 +79,21 @@ public class AlerterWorkerPool {
                 new ThreadPoolExecutor.AbortPolicy());
     }
 
+    private void initLogWorkerExecutor() {
+        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+                .setUncaughtExceptionHandler((thread, throwable) -> {
+                    log.error("Alerter logWorkerExecutor has uncaughtException.");
+                    log.error(throwable.getMessage(), throwable);
+                })
+                .setDaemon(true)
+                .setNameFormat("log-worker-%d")
+                .build();
+        logWorkerExecutor = new ThreadPoolExecutor(10, 10, 10, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(1000),
+                threadFactory,
+                new ThreadPoolExecutor.AbortPolicy());
+    }
+
     /**
      * Run the alerter task
      * @param runnable task
@@ -96,4 +113,13 @@ public class AlerterWorkerPool {
         notifyExecutor.execute(runnable);
     }
 
+    /**
+     * Executes the given runnable task using the logWorkerExecutor.
+     *
+     * @param runnable the task to be executed
+     * @throws RejectedExecutionException if the task cannot be accepted for execution
+     */
+    public void executeLogJob(Runnable runnable) throws RejectedExecutionException {
+        logWorkerExecutor.execute(runnable);
+    }
 }

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

@@ -109,4 +109,9 @@ public class AlarmCacheManager {
     private String getCustomKey(String fingerPrint) {
         return CUSTOM_FIRING_ROW_KEY + fingerPrint;
     }
+
+
+    public SingleAlert removeFiring(String fingerPrint) {
+        return this.firingAlertMap.remove(getCustomKey(fingerPrint), fingerPrint);
+    }
 }

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

@@ -76,11 +76,12 @@ public class CollectorAlertHandler {
         fingerPrints.put(KEY_COLLECTOR_VERSION, collector.getVersion());
         fingerPrints.put(KEY_COLLECTOR_HOST, collector.getIp());
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert firingAlert = alarmCacheManager.getFiring(fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
         if (firingAlert != null) {
             firingAlert.setTriggerTimes(1);
             firingAlert.setEndAt(System.currentTimeMillis());
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
+            firingAlert.setContent(this.bundle.getString("alerter.availability.collector.recover"));
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
     }

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

@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.jexl3.JexlException;
+import org.apache.commons.jexl3.JexlExpression;
+import org.apache.hertzbeat.common.util.JexlExpressionRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * JexlExprCalculator is a utility class for evaluating JEXL expressions
+ */
+@Slf4j
+@Component
+public class JexlExprCalculator {
+    /**
+     * Execute an alert expression
+     * @param fieldValueMap The field value map for expression evaluation
+     * @param expr The expression to evaluate
+     * @param ignoreJexlException Whether to ignore JEXL exceptions
+     * @return true if the expression matches, false otherwise
+     */
+    public boolean execAlertExpression(Map<String, Object> fieldValueMap, String expr, boolean ignoreJexlException) {
+        Boolean match;
+        JexlExpression expression;
+        try {
+            expression = JexlExpressionRunner.compile(expr);
+        } catch (JexlException jexlException) {
+            log.warn("Alarm Rule: {} Compile Error: {}.", expr, jexlException.getMessage());
+            throw jexlException;
+        } catch (Exception e) {
+            log.error("Alarm Rule: {} Unknown Error: {}.", expr, e.getMessage());
+            throw e;
+        }
+
+        try {
+            match = (Boolean) JexlExpressionRunner.evaluate(expression, fieldValueMap);
+        } catch (JexlException jexlException) {
+            if (ignoreJexlException) {
+                log.debug("Alarm Rule: {} Run Error: {}.", expr, jexlException.getMessage());
+            } else {
+                log.error("Alarm Rule: {} Run Error: {}.", expr, jexlException.getMessage());
+            }
+            throw jexlException;
+        } catch (Exception e) {
+            log.error("Alarm Rule: {} Unknown Error: {}.", expr, e.getMessage());
+            throw e;
+        }
+        return match != null && match;
+    }
+
+}

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

@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.periodic;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.DataSourceService;
+import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * Log Periodic Alert Calculator
+ */
+@Slf4j
+@Component
+public class LogPeriodicAlertCalculator {
+    
+    private static final String ROWS = "__rows__";
+
+    private final DataSourceService dataSourceService;
+    private final AlarmCommonReduce alarmCommonReduce;
+
+
+    public LogPeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce) {
+        this.alarmCommonReduce = alarmCommonReduce;
+        this.dataSourceService = dataSourceService;
+    }
+
+    public void calculate(AlertDefine define) {
+        if (!define.isEnable() || StringUtils.isEmpty(define.getExpr())) {
+            log.error("Log define {} is disabled or expression is empty", define.getName());
+            return;
+        }
+        try {
+            doCalculate(define);
+        } catch (Exception e) {
+            log.error("Calculate periodic define {} failed: {}", define.getName(), e.getMessage());
+        }
+    }
+
+    private void doCalculate(AlertDefine define) {
+        try {
+            // Log-based queries are SQL queries with log-specific expressions
+            List<Map<String, Object>> results = dataSourceService.query(define.getDatasource(), define.getExpr());
+            if (CollectionUtils.isEmpty(results)) {
+                return;
+            }
+            afterThresholdRuleMatch(results, define);
+        } catch (Exception ignored) {
+            // Ignore the query exception eg: no result, timeout, etc
+        }
+    }
+
+    String getAlertMode(AlertDefine alertDefine) {
+        String mode = null;
+        if (alertDefine.getLabels() != null) {
+            mode = alertDefine.getLabels().get(CommonConstants.ALERT_MODE_LABEL);
+        }
+        if (mode == null || mode.isEmpty()) {
+            return CommonConstants.ALERT_MODE_GROUP; // Default to group mode if not specified
+        } else {
+            return mode;
+        }
+    }
+
+    /**
+     * Handle alert after threshold rule match
+     */
+    private void afterThresholdRuleMatch(List<Map<String, Object>> alertContext, AlertDefine define) {
+        // Determine alert mode from configuration
+        String alertMode = getAlertMode(define);
+
+        long currentTime = System.currentTimeMillis();
+
+        switch (alertMode) {
+            case CommonConstants.ALERT_MODE_INDIVIDUAL:
+                // Generate individual alerts for each matching log
+                for (Map<String, Object> context : alertContext) {
+                    generateIndividualAlert(define, context, currentTime);
+                }
+                break;
+
+            case CommonConstants.ALERT_MODE_GROUP:
+                // Generate a single alert group for all matching logs
+                generateGroupAlert(define, alertContext, currentTime);
+                break;
+            default:
+                log.warn("Unknown alert mode for define {}: {}", define.getName(), alertMode);
+        }
+    }
+
+    private void generateIndividualAlert(AlertDefine define, Map<String, Object> context, long currentTime) {
+
+        Map<String, String> alertLabels = new HashMap<>(8);
+
+        Map<String, String> commonFingerPrints = createCommonFingerprints(define);
+        alertLabels.putAll(commonFingerPrints);
+        addContextToMap(context, alertLabels);
+
+        Map<String, Object> fieldValueMap = createFieldValueMap(context, define);
+        Map<String, String> alertAnnotations = createAlertAnnotations(define, fieldValueMap);
+        // Create and send group alert
+        SingleAlert alert = SingleAlert.builder()
+                .labels(alertLabels)
+                .annotations(alertAnnotations)
+                .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
+                .status(CommonConstants.ALERT_STATUS_FIRING)
+                .triggerTimes(1)
+                .startAt(currentTime)
+                .activeAt(currentTime)
+                .build();
+
+        alarmCommonReduce.reduceAndSendAlarm(alert.clone());
+
+        log.debug("Generated individual alert for define: {}", define.getName());
+    }
+
+    private void addContextToMap(Map<String, Object> context, Map<String, String> alertLabels) {
+        for (Map.Entry<String, Object> entry : context.entrySet()) {
+            if (entry.getValue() != null) {
+                alertLabels.put(entry.getKey(), entry.getValue().toString());
+            }
+        }
+    }
+
+    private void generateGroupAlert(AlertDefine define, List<Map<String, Object>> alertContext, long currentTime) {
+
+        List<SingleAlert> alerts = new ArrayList<>(alertContext.size());
+
+        // Create fingerprints for group alert
+        Map<String, String> commonFingerPrints = createCommonFingerprints(define);
+
+        // Add context information to fingerprints
+        commonFingerPrints.put(ROWS, String.valueOf(alertContext.size()));
+        commonFingerPrints.put(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP);
+
+        for (Map<String, Object> context : alertContext) {
+
+            Map<String, String> alertLabels = new HashMap<>(8);
+
+            alertLabels.putAll(commonFingerPrints);
+            // add the context to commonFingerPrints
+            addContextToMap(context, alertLabels);
+
+            Map<String, Object> fieldValueMap = createFieldValueMap(context, define);
+            Map<String, String> alertAnnotations = createAlertAnnotations(define, fieldValueMap);
+            // Create and send group alert
+            SingleAlert alert = SingleAlert.builder()
+                    .labels(alertLabels)
+                    .annotations(alertAnnotations)
+                    .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
+                    .status(CommonConstants.ALERT_STATUS_FIRING)
+                    .triggerTimes(alertContext.size())
+                    .startAt(currentTime)
+                    .activeAt(currentTime)
+                    .build();
+            alerts.add(alert.clone());
+        }
+        alarmCommonReduce.reduceAndSendAlarmGroup(commonFingerPrints, alerts);
+
+        log.debug("Generated group alert for define: {} with {} matching data",
+                define.getName(), alertContext.size());
+    }
+
+
+
+    private Map<String, String> createCommonFingerprints(AlertDefine define) {
+        Map<String, String> fingerprints = new HashMap<>(8);
+        fingerprints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+        fingerprints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
+
+        if (define.getLabels() != null) {
+            fingerprints.putAll(define.getLabels());
+        }
+
+        return fingerprints;
+    }
+
+    private Map<String, Object> createFieldValueMap(Map<String, Object> context, AlertDefine define) {
+        Map<String, Object> fieldValueMap = new HashMap<>(8);
+        for (Map.Entry<String, Object> entry : context.entrySet()) {
+            if (entry.getValue() != null) {
+                fieldValueMap.put(entry.getKey(), entry.getValue().toString());
+            }
+        }
+        if (define.getLabels() != null) {
+            fieldValueMap.putAll(define.getLabels());
+        }
+
+        return fieldValueMap;
+    }
+
+    private Map<String, String> createAlertAnnotations(AlertDefine define, Map<String, Object> fieldValueMap) {
+        Map<String, String> annotations = new HashMap<>(8);
+
+        if (define.getAnnotations() != null) {
+            for (Map.Entry<String, String> entry : define.getAnnotations().entrySet()) {
+                annotations.put(entry.getKey(),
+                        AlertTemplateUtil.render(entry.getValue(), fieldValueMap));
+            }
+        }
+
+        return annotations;
+    }
+
+}

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

@@ -15,11 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate.periodic;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.alert.calculate.AlarmCacheManager;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
@@ -34,12 +35,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Periodic Alert Calculator
+ * Metrics Periodic Alert Calculator
  */
-
 @Slf4j
 @Component
-public class PeriodicAlertCalculator {
+public class MetricsPeriodicAlertCalculator {
     
     private static final String VALUE = "__value__";
     private static final String TIMESTAMP = "__timestamp__";
@@ -48,71 +48,82 @@ public class PeriodicAlertCalculator {
     private final AlarmCommonReduce alarmCommonReduce;
     private final AlarmCacheManager alarmCacheManager;
 
-    public PeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce,
-                                   AlarmCacheManager alarmCacheManager) {
-        this.dataSourceService = dataSourceService;
+    public MetricsPeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce,
+                                          AlarmCacheManager alarmCacheManager) {
         this.alarmCommonReduce = alarmCommonReduce;
         this.alarmCacheManager = alarmCacheManager;
+        this.dataSourceService = dataSourceService;
     }
-    
+
+    /**
+     * Calculate alerts for the given alert definition
+     * @param define The alert definition to calculate
+     */
     public void calculate(AlertDefine define) {
         if (!define.isEnable() || StringUtils.isEmpty(define.getExpr())) {
             log.error("Periodic define {} is disabled or expression is empty", define.getName());
             return;
         }
+
         long currentTimeMilli = System.currentTimeMillis();
         try {
-            // for prometheus is instant promql query, for db is sql query
-            // result: [{'value': 100, 'timestamp': 1343554, 'instance': 'node1'},{'value': 200, 'timestamp': 1343555, 'instance': 'node2'}]
-            // the return result should be matched with threshold
-            try {
-                List<Map<String, Object>> results = dataSourceService.calculate(
-                        define.getDatasource(),
-                        define.getExpr()
-                );
-                // if no match the expr threshold, the results item map {'value': null} should be null and others field keep
-                // if results has multi list, should trigger multi alert
-                if (CollectionUtils.isEmpty(results)) {
-                    return;
-                }
-                for (Map<String, Object> result : results) {
-                    Map<String, String> fingerPrints = new HashMap<>(8);
-                    // here use the alert name as finger, not care the alert name may be changed
-                    fingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
-                    fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                    fingerPrints.putAll(define.getLabels());
-                    for (Map.Entry<String, Object> entry : result.entrySet()) {
-                        if (entry.getValue() != null && !VALUE.equals(entry.getKey())
-                                && !TIMESTAMP.equals(entry.getKey())) {
-                            fingerPrints.put(entry.getKey(), entry.getValue().toString());
-                        }
-                    }
-                    if (result.get(VALUE) == null) {
-                        // recovery the alert
-                        handleRecoveredAlert(define.getId(), fingerPrints);
-                        continue;
-                    }
-                    Map<String, Object> fieldValueMap = new HashMap<>(8);
-                    fieldValueMap.putAll(define.getLabels());
-                    fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                    for (Map.Entry<String, Object> entry : result.entrySet()) {
-                        if (entry.getValue() != null) {
-                            fieldValueMap.put(entry.getKey(), entry.getValue());
-                        }
-                    }
-                    afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
-                }
-            } catch (Exception ignored) {
-                // ignore the query exception eg: no result, timeout, etc
-                return;
-            }
+            doCalculate(define, currentTimeMilli);
         } catch (Exception e) {
             log.error("Calculate periodic define {} failed: {}", define.getName(), e.getMessage());
         }
     }
 
+    private void doCalculate(AlertDefine define, long currentTimeMilli) {
+        try {
+            List<Map<String, Object>> results = dataSourceService.calculate(
+                define.getDatasource(),
+                define.getExpr()
+            );
+            // If no match the expr threshold, the results item map {'value': null} should be null and others field keep
+            // If results has multi list, should trigger multi alert
+            if (CollectionUtils.isEmpty(results)) {
+                return;
+            }
+            
+            for (Map<String, Object> result : results) {
+                Map<String, String> fingerPrints = new HashMap<>(8);
+                // Here use the alert name as finger, not care the alert name may be changed
+                fingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
+                fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                fingerPrints.putAll(define.getLabels());
+                for (Map.Entry<String, Object> entry : result.entrySet()) {
+                    if (entry.getValue() != null && !VALUE.equals(entry.getKey())
+                            && !TIMESTAMP.equals(entry.getKey())) {
+                        fingerPrints.put(entry.getKey(), entry.getValue().toString());
+                    }
+                }
+                
+                if (result.get(VALUE) == null) {
+                    // Recovery the alert
+                    handleRecoveredAlert(define.getId(), fingerPrints);
+                    continue;
+                }
+                
+                Map<String, Object> fieldValueMap = new HashMap<>(8);
+                fieldValueMap.putAll(define.getLabels());
+                fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                for (Map.Entry<String, Object> entry : result.entrySet()) {
+                    if (entry.getValue() != null) {
+                        fieldValueMap.put(entry.getKey(), entry.getValue());
+                    }
+                }
+                afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
+            }
+        } catch (Exception ignored) {
+            // Ignore the query exception eg: no result, timeout, etc
+        }
+    }
+
+    /**
+     * Handle alert after threshold rule match
+     */
     private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
-                                         Map<String, Object> fieldValueMap, AlertDefine define) {
+                                           Map<String, Object> fieldValueMap, AlertDefine define) {
         Long defineId = define.getId();
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
         SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
@@ -124,7 +135,6 @@ public class PeriodicAlertCalculator {
             // First time triggering alert, create new alert and set to pending status
             SingleAlert newAlert = SingleAlert.builder()
                     .labels(labels)
-                    // todo render var content in annotations
                     .annotations(define.getAnnotations())
                     .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
                     .status(CommonConstants.ALERT_STATUS_PENDING)
@@ -158,11 +168,13 @@ public class PeriodicAlertCalculator {
         }
     }
 
+    /**
+     * Handle recovered alert
+     */
     private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
         String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
         SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
         if (firingAlert != null) {
-            // todo consider multi times to tig for resolved alert
             firingAlert.setTriggerTimes(1);
             firingAlert.setEndAt(System.currentTimeMillis());
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
@@ -171,4 +183,4 @@ public class PeriodicAlertCalculator {
         alarmCacheManager.removePending(defineId, fingerprint);
     }
 
-} 
+}

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

@@ -15,10 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate.periodic;
 
-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC;
+import static org.apache.hertzbeat.common.constants.CommonConstants.LOG_ALERT_THRESHOLD_TYPE_PERIODIC;
+import static org.apache.hertzbeat.common.constants.CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_PERIODIC;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -39,13 +42,15 @@ import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 @Component
 public class PeriodicAlertRuleScheduler implements CommandLineRunner {
 
-    private final PeriodicAlertCalculator calculator;
+    private final MetricsPeriodicAlertCalculator metricsCalculator;
+    private final LogPeriodicAlertCalculator logCalculator;
     private final AlertDefineDao alertDefineDao;
     private final ScheduledExecutorService scheduledExecutor;
     private final Map<Long, ScheduledFuture<?>> scheduledFutures;
 
-    public PeriodicAlertRuleScheduler(PeriodicAlertCalculator calculator, AlertDefineDao alertDefineDao) {
-        this.calculator = calculator;
+    public PeriodicAlertRuleScheduler(MetricsPeriodicAlertCalculator metricsCalculator, LogPeriodicAlertCalculator logCalculator, AlertDefineDao alertDefineDao) {
+        this.metricsCalculator = metricsCalculator;
+        this.logCalculator = logCalculator;
         this.alertDefineDao = alertDefineDao;
         ThreadFactory threadFactory = new ThreadFactoryBuilder()
                 .setUncaughtExceptionHandler((thread, throwable) -> {
@@ -76,9 +81,14 @@ public class PeriodicAlertRuleScheduler implements CommandLineRunner {
             return;
         }
         cancelSchedule(rule.getId());
-        if (rule.getType().equals(ALERT_THRESHOLD_TYPE_PERIODIC)) {
+        if (rule.getType().equals(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC)
+                || rule.getType().equals(LOG_ALERT_THRESHOLD_TYPE_PERIODIC)) {
             ScheduledFuture<?> future = scheduledExecutor.scheduleAtFixedRate(() -> {
-                calculator.calculate(rule);
+                if (rule.getType().equals(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC)) {
+                    metricsCalculator.calculate(rule);
+                } else if (rule.getType().equals(LOG_ALERT_THRESHOLD_TYPE_PERIODIC)) {
+                    logCalculator.calculate(rule);
+                }
             }, 0, rule.getPeriod(), java.util.concurrent.TimeUnit.SECONDS);
             scheduledFutures.put(rule.getId(), future);
         }
@@ -87,7 +97,11 @@ public class PeriodicAlertRuleScheduler implements CommandLineRunner {
     @Override
     public void run(String... args) throws Exception {
         log.info("Starting periodic alert rule scheduler...");
-        List<AlertDefine> periodicRules = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(ALERT_THRESHOLD_TYPE_PERIODIC);
+        List<AlertDefine> metricsPeriodicRules = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(METRIC_ALERT_THRESHOLD_TYPE_PERIODIC);
+        List<AlertDefine> logPeriodicRules = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(LOG_ALERT_THRESHOLD_TYPE_PERIODIC);
+        List<AlertDefine> periodicRules = new ArrayList<>(metricsPeriodicRules.size() + logPeriodicRules.size());
+        periodicRules.addAll(metricsPeriodicRules);
+        periodicRules.addAll(logPeriodicRules);
         for (AlertDefine rule : periodicRules) {
             updateSchedule(rule);
         }

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

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
-
+package org.apache.hertzbeat.alert.calculate.realtime;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -28,10 +27,10 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.jexl3.JexlException;
-import org.apache.commons.jexl3.JexlExpression;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.calculate.AlarmCacheManager;
+import org.apache.hertzbeat.alert.calculate.JexlExprCalculator;
 import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
@@ -43,7 +42,6 @@ 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.util.CommonUtil;
-import org.apache.hertzbeat.common.util.JexlExpressionRunner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -53,10 +51,10 @@ import org.springframework.util.CollectionUtils;
  */
 @Component
 @Slf4j
-public class RealTimeAlertCalculator {
-    
+public class MetricsRealTimeAlertCalculator {
+
     private static final int CALCULATE_THREADS = 3;
-    
+
     private static final String KEY_INSTANCE = "__instance__";
     private static final String KEY_INSTANCE_NAME = "__instancename__";
     private static final String KEY_INSTANCE_HOST = "__instancehost__";
@@ -81,38 +79,47 @@ public class RealTimeAlertCalculator {
     private final AlertDefineService alertDefineService;
     private final AlarmCommonReduce alarmCommonReduce;
     private final AlarmCacheManager alarmCacheManager;
+    private final JexlExprCalculator jexlExprCalculator;
+
 
     @Autowired
-    public RealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
-                                   AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
-                                   AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager) {
-        this(workerPool, dataQueue, alertDefineService, singleAlertDao, alarmCommonReduce, alarmCacheManager, true);
+    public MetricsRealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
+                                          AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
+                                          AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager,
+                                          JexlExprCalculator jexlExprCalculator) {
+        this(workerPool, dataQueue, alertDefineService, singleAlertDao, alarmCommonReduce, alarmCacheManager, jexlExprCalculator, true);
     }
 
     /**
-     * Constructor for RealTimeAlertCalculator with a toggle to control whether to start alert calculation threads.
+     * Constructor for MetricsRealTimeAlertCalculator with a toggle to control whether to start alert calculation threads.
      *
      * @param workerPool          The worker pool used for concurrent alert calculation.
      * @param dataQueue           The queue from which metric data is pulled and pushed.
      * @param alertDefineService  The service providing alert definition rules.
      * @param singleAlertDao      The DAO for fetching persisted alert states from storage.
      * @param alarmCommonReduce   The component responsible for reducing and sending alerts.
+     * @param alarmCacheManager   The cache manager for managing alert states.
      * @param start               If true, the alert calculation threads will start automatically;
      *                            set to false to disable thread start (useful for unit testing).
      */
-    public RealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
-                                   AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
-                                   AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager, boolean start) {
+    public MetricsRealTimeAlertCalculator(AlerterWorkerPool workerPool, CommonDataQueue dataQueue,
+                                          AlertDefineService alertDefineService, SingleAlertDao singleAlertDao,
+                                          AlarmCommonReduce alarmCommonReduce, AlarmCacheManager alarmCacheManager,
+                                          JexlExprCalculator jexlExprCalculator, boolean start) {
         this.workerPool = workerPool;
         this.dataQueue = dataQueue;
         this.alarmCommonReduce = alarmCommonReduce;
         this.alertDefineService = alertDefineService;
         this.alarmCacheManager = alarmCacheManager;
+        this.jexlExprCalculator = jexlExprCalculator;
         if (start) {
             startCalculate();
         }
     }
 
+    /**
+     * Start the alert calculation threads
+     */
     public void startCalculate() {
         Runnable runnable = () -> {
             while (!Thread.currentThread().isInterrupted()) {
@@ -132,7 +139,7 @@ public class RealTimeAlertCalculator {
         }
     }
 
-    private void calculate(CollectRep.MetricsData metricsData) {
+    protected void calculate(CollectRep.MetricsData metricsData) {
         long currentTimeMilli = System.currentTimeMillis();
         String instance = String.valueOf(metricsData.getId());
         String instanceName = metricsData.getInstanceName();
@@ -146,7 +153,7 @@ public class RealTimeAlertCalculator {
         int code = metricsData.getCode().getNumber();
         Map<String, String> labels = metricsData.getLabels();
         Map<String, String> annotations = metricsData.getAnnotations();
-        List<AlertDefine> thresholds = this.alertDefineService.getRealTimeAlertDefines();
+        List<AlertDefine> thresholds = this.alertDefineService.getMetricsRealTimeAlertDefines();
         // Filter thresholds by app, metrics, labels and instance
         thresholds = filterThresholdsByAppAndMetrics(thresholds, app, metrics, labels, instance, priority);
         if (thresholds.isEmpty()) {
@@ -198,7 +205,7 @@ public class RealTimeAlertCalculator {
             {
                 // trigger the expr before the metrics data, due the available up down or others
                 try {
-                    boolean match = execAlertExpression(fieldValueMap, expr, true);
+                    boolean match = jexlExprCalculator.execAlertExpression(fieldValueMap, expr, true);
                     try {
                         if (match) {
                             // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
@@ -253,7 +260,7 @@ public class RealTimeAlertCalculator {
                     }
                 }
                 try {
-                    boolean match = execAlertExpression(fieldValueMap, expr, false);
+                    boolean match = jexlExprCalculator.execAlertExpression(fieldValueMap, expr, false);
                     try {
                         if (match) {
                             afterThresholdRuleMatch(defineId, currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
@@ -274,8 +281,9 @@ public class RealTimeAlertCalculator {
      * @param thresholds Alert definitions to filter
      * @param app        Current app name
      * @param metrics    Current metrics name
+     * @param labels     Current labels
      * @param instance   Current instance id
-     * @param priority  Current priority
+     * @param priority   Current priority
      * @return Filtered alert definitions
      */
     public List<AlertDefine> filterThresholdsByAppAndMetrics(List<AlertDefine> thresholds, String app, String metrics, Map<String, String> labels, String instance, int priority) {
@@ -291,7 +299,7 @@ public class RealTimeAlertCalculator {
                     if (!appMatcher.find() || !app.equals(appMatcher.group(1))) {
                         return false;
                     }
-                    
+
                     // Extract and check available - required
                     if (priority != 0) {
                         Matcher availableMatcher = AVAILABLE_PATTERN.matcher(expr);
@@ -313,7 +321,7 @@ public class RealTimeAlertCalculator {
                     if (!instanceMatcher.find() && !labelMatcher.find()) {
                         return true;
                     }
-                    
+
                     // Reset matcher to check all instances
                     instanceMatcher.reset();
                     labelMatcher.reset();
@@ -336,6 +344,9 @@ public class RealTimeAlertCalculator {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * Handle recovered alert
+     */
     private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
         String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
         SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
@@ -349,9 +360,14 @@ public class RealTimeAlertCalculator {
         alarmCacheManager.removePending(defineId, fingerprint);
     }
 
+
+    /**
+     * Handle alert after threshold rule match
+     */
     private void afterThresholdRuleMatch(long defineId, long currentTimeMilli, Map<String, String> fingerPrints,
                                          Map<String, Object> fieldValueMap, AlertDefine define,
                                          Map<String, String> annotations) {
+        // fingerprint for the padding cache
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
         SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
         fieldValueMap.putAll(define.getLabels());
@@ -377,11 +393,11 @@ public class RealTimeAlertCalculator {
                     // render var content in content
                     .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
                     .status(CommonConstants.ALERT_STATUS_PENDING)
-                    .triggerTimes(1) 
+                    .triggerTimes(1)
                     .startAt(currentTimeMilli)
                     .activeAt(currentTimeMilli)
                     .build();
-                    
+
             // If required trigger times is 1, set to firing status directly
             if (requiredTimes <= 1) {
                 newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
@@ -395,7 +411,7 @@ public class RealTimeAlertCalculator {
             // Update existing alert
             existingAlert.setTriggerTimes(existingAlert.getTriggerTimes() + 1);
             existingAlert.setActiveAt(currentTimeMilli);
-            
+
             // Check if required trigger times reached
             if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                 // Reached trigger times threshold, change to firing status
@@ -407,35 +423,6 @@ public class RealTimeAlertCalculator {
         }
     }
 
-    private boolean execAlertExpression(Map<String, Object> fieldValueMap, String expr, boolean ignoreJexlException) {
-        Boolean match;
-        JexlExpression expression;
-        try {
-            expression = JexlExpressionRunner.compile(expr);
-        } catch (JexlException jexlException) {
-            log.warn("Alarm Rule: {} Compile Error: {}.", expr, jexlException.getMessage());
-            throw jexlException;
-        } catch (Exception e) {
-            log.error("Alarm Rule: {} Unknown Error: {}.", expr, e.getMessage());
-            throw e;
-        }
-
-        try {
-            match = (Boolean) JexlExpressionRunner.evaluate(expression, fieldValueMap);
-        } catch (JexlException jexlException) {
-            if (ignoreJexlException) {
-                log.debug("Alarm Rule: {} Run Error: {}.", expr, jexlException.getMessage());
-            } else {
-                log.error("Alarm Rule: {} Run Error: {}.", expr, jexlException.getMessage());   
-            }
-            throw jexlException;
-        } catch (Exception e) {
-            log.error("Alarm Rule: {} Unknown Error: {}.", expr, e.getMessage());
-            throw e;
-        }
-        return match != null && match;
-    }
-
     private Set<String> kvLabelsToKvStringSet(Map<String, String> labels) {
         if (labels == null || labels.isEmpty()) {
             return Collections.singleton("");

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

@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime;
+
+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.springframework.stereotype.Component;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * WindowedLogRealTimeAlertCalculator - Single entry point for log stream processing
+ * Responsible for:
+ * 1. Reading from original log stream
+ * 2. Extracting event timestamps
+ * 3. Maintaining maxTimestamp for watermark generation
+ * 4. Distributing logs to workers
+ */
+@Component
+@Slf4j
+public class WindowedLogRealTimeAlertCalculator implements Runnable {
+
+    private static final int CALCULATE_THREADS = 3;
+
+    private final CommonDataQueue dataQueue;
+    private final TimeService timeService;
+    private ThreadPoolExecutor dispatcherExecutor;
+    private final LogWorker logWorker;
+
+    public WindowedLogRealTimeAlertCalculator(CommonDataQueue dataQueue, TimeService timeService, LogWorker logWorker) {
+        this.dataQueue = dataQueue;
+        this.timeService = timeService;
+        this.logWorker = logWorker;
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                LogEntry logEntry = dataQueue.pollLogEntry();
+                if (logEntry != null) {
+                    processLogEntry(logEntry);
+                    dataQueue.sendLogEntryToStorage(logEntry);
+                }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (Exception e) {
+                log.error("Error in log dispatch loop: {}", e.getMessage(), e);
+            }
+        }
+    }
+    
+    private void processLogEntry(LogEntry logEntry) {
+        // Extract event timestamp
+        long eventTimestamp = extractEventTimestamp(logEntry);
+        
+        // Check if timestamp is within reasonable range
+        if (!timeService.isValidTimestamp(eventTimestamp)) {
+            log.warn("Dropping log with invalid timestamp: {}", eventTimestamp);
+            return;
+        }
+        
+        // Check if this is late data based on current watermark
+        if (timeService.isLateData(eventTimestamp)) {
+            log.warn("Dropping late data, timestamp: {}, watermark: {}", 
+                     eventTimestamp, timeService.getCurrentWatermark());
+            return;
+        }
+        
+        // Update max timestamp (only validated timestamps can update watermark)
+        timeService.updateMaxTimestamp(eventTimestamp);
+        logWorker.reduceAndSendLogTask(logEntry);
+    }
+    
+    private long extractEventTimestamp(LogEntry logEntry) {
+        if (logEntry.getTimeUnixNano() != null && logEntry.getTimeUnixNano() != 0) {
+            return logEntry.getTimeUnixNano() / 1_000_000; // Convert to milliseconds
+        }
+        if (logEntry.getObservedTimeUnixNano() != null && logEntry.getObservedTimeUnixNano() != 0) {
+            return logEntry.getObservedTimeUnixNano() / 1_000_000; // Convert to milliseconds
+        }
+        return System.currentTimeMillis();
+    }
+    
+    @PostConstruct
+    public void start() {
+        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+                .setUncaughtExceptionHandler((thread, throwable) -> {
+                    log.error("Alerter workerExecutor has uncaughtException.");
+                    log.error(throwable.getMessage(), throwable);
+                })
+                .setDaemon(true)
+                .setNameFormat("log-dispatcher-%d")
+                .build();
+        // Create dispatcher thread executor
+        this.dispatcherExecutor = new ThreadPoolExecutor(
+            CALCULATE_THREADS,
+            CALCULATE_THREADS,
+            10,
+            TimeUnit.SECONDS,
+            new LinkedBlockingQueue<>(),
+            threadFactory,
+            new ThreadPoolExecutor.AbortPolicy()
+        );
+        for (int i = 0; i < CALCULATE_THREADS; i++) {
+            dispatcherExecutor.execute(this);
+        }
+    }
+
+    @PreDestroy
+    public void stop() {
+        if (dispatcherExecutor != null) {
+            dispatcherExecutor.shutdownNow();
+        }
+    }
+}

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

@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.springframework.stereotype.Component;
+
+import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+
+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.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Alarm Evaluator - Final alarm logic trigger
+ * Responsible for:
+ * 1. Receiving closed window data from WindowAggregator
+ * 2. Applying alert logic (count threshold, alert mode)
+ * 3. Generating individual alerts or alert groups
+ * 4. Sending alerts to AlarmCommonReduce
+ */
+@Component
+@Slf4j
+public class AlarmEvaluator {
+
+    private static final String WINDOW_START_TIME = "window_start_time";
+    private static final String WINDOW_END_TIME = "window_end_time";
+    private static final String MATCHING_LOGS_COUNT = "matching_logs_count";
+    
+    private final AlarmCommonReduce alarmCommonReduce;
+    private ThreadPoolExecutor workerExecutor;
+    
+    public AlarmEvaluator(AlarmCommonReduce alarmCommonReduce) {
+        this.alarmCommonReduce = alarmCommonReduce;
+        initAlarmEvaluator();
+    }
+
+    public void initAlarmEvaluator() {
+        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+                .setUncaughtExceptionHandler((thread, throwable) -> {
+                    log.error("alerter-reduce-worker has uncaughtException.");
+                    log.error(throwable.getMessage(), throwable);
+                })
+                .setDaemon(true)
+                .setNameFormat("alerter-reduce-worker-%d")
+                .build();
+        workerExecutor = new ThreadPoolExecutor(2,
+                10,
+                10,
+                TimeUnit.SECONDS,
+                new LinkedBlockingQueue<>(),
+                threadFactory,
+                new ThreadPoolExecutor.AbortPolicy());
+    }
+
+    public void sendAndProcessWindowData(WindowAggregator.WindowData windowData) {
+        workerExecutor.execute(processWindowData(windowData));
+    }
+    
+    private Runnable processWindowData(WindowAggregator.WindowData windowData) {
+        return () -> {
+            AlertDefine alertDefine = windowData.getAlertDefine();
+            List<MatchingLogEvent> matchingLogs = windowData.getMatchingLogs();
+
+            if (matchingLogs.isEmpty()) {
+                return;
+            }
+
+            // Check if count threshold is met
+            int requiredTimes = alertDefine.getTimes() != null ? alertDefine.getTimes() : 1;
+            if (matchingLogs.size() < requiredTimes) {
+                log.debug("Window {} has {} matching logs, but requires {} times",
+                        windowData.getWindowKey(), matchingLogs.size(), requiredTimes);
+                return;
+            }
+
+            // Determine alert mode from configuration
+            String alertMode = getAlertMode(alertDefine);
+
+            long currentTime = System.currentTimeMillis();
+
+            switch (alertMode) {
+                case CommonConstants.ALERT_MODE_INDIVIDUAL:
+                    // Generate individual alerts for each matching log
+                    for (MatchingLogEvent matchingLog : matchingLogs) {
+                        generateIndividualAlert(matchingLog, currentTime);
+                    }
+                    break;
+
+                case CommonConstants.ALERT_MODE_GROUP:
+                    // Generate a single alert group for all matching logs
+                    generateGroupAlert(windowData, matchingLogs, currentTime);
+                    break;
+                default:
+                    log.warn("Unknown alert mode for define {}: {}", alertDefine.getName(), alertMode);
+            }
+        };
+    }
+    
+    private void generateIndividualAlert(MatchingLogEvent matchingLog, long currentTime) {
+        AlertDefine define = matchingLog.getAlertDefine();
+        LogEntry logEntry = matchingLog.getLogEntry();
+
+        Map<String, String> alertLabels = new HashMap<>(8);
+
+        // Create fingerprints for group alert
+        Map<String, String> commonFingerPrints = createCommonFingerprints(define);
+        alertLabels.putAll(commonFingerPrints);
+        // add the log data to commonFingerPrints
+        addLogEntryToMap(logEntry, alertLabels);
+
+        Map<String, Object> fieldValueMap = createFieldValueMap(logEntry, define);
+        Map<String, String> alertAnnotations = createAlertAnnotations(define, fieldValueMap);
+        // Create and send group alert
+        SingleAlert alert = SingleAlert.builder()
+                .labels(alertLabels)
+                .annotations(alertAnnotations)
+                .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
+                .status(CommonConstants.ALERT_STATUS_FIRING)
+                .triggerTimes(1)
+                .startAt(currentTime)
+                .activeAt(currentTime)
+                .build();
+        
+        alarmCommonReduce.reduceAndSendAlarm(alert.clone());
+        
+        log.debug("Generated individual alert for define: {}", define.getName());
+    }
+    
+    private void generateGroupAlert(WindowAggregator.WindowData windowData, 
+                                   List<MatchingLogEvent> matchingLogs, long currentTime) {
+
+        List<SingleAlert> alerts = new ArrayList<>(matchingLogs.size());
+        AlertDefine define = windowData.getAlertDefine();
+        
+        // Create fingerprints for group alert
+        Map<String, String> commonFingerPrints = createCommonFingerprints(define);
+        
+        // Add window information to fingerprints
+        commonFingerPrints.put(WINDOW_START_TIME, String.valueOf(windowData.getStartTime()));
+        commonFingerPrints.put(WINDOW_END_TIME, String.valueOf(windowData.getEndTime()));
+        commonFingerPrints.put(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP);
+        commonFingerPrints.put(MATCHING_LOGS_COUNT, String.valueOf(matchingLogs.size()));
+
+        for (MatchingLogEvent event: matchingLogs) {
+            LogEntry logEntry = event.getLogEntry();
+
+            Map<String, String> alertLabels = new HashMap<>(8);
+
+            alertLabels.putAll(commonFingerPrints);
+            // add the log data to commonFingerPrints
+            addLogEntryToMap(logEntry, alertLabels);
+
+            Map<String, Object> fieldValueMap = createFieldValueMap(logEntry, define);
+            Map<String, String> alertAnnotations = createAlertAnnotations(define, fieldValueMap);
+            // Create and send group alert
+            SingleAlert alert = SingleAlert.builder()
+                    .labels(alertLabels)
+                    .annotations(alertAnnotations)
+                    .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
+                    .status(CommonConstants.ALERT_STATUS_FIRING)
+                    .triggerTimes(matchingLogs.size())
+                    .startAt(currentTime)
+                    .activeAt(currentTime)
+                    .build();
+            alerts.add(alert.clone());
+        }
+        alarmCommonReduce.reduceAndSendAlarmGroup(commonFingerPrints, alerts);
+        
+        log.debug("Generated group alert for define: {} with {} matching logs", 
+                 define.getName(), matchingLogs.size());
+    }
+    
+    private String getAlertMode(AlertDefine alertDefine) {
+        String mode = null;
+        if (alertDefine.getLabels() != null) {
+            mode = alertDefine.getLabels().get(CommonConstants.ALERT_MODE_LABEL);
+        }
+        if (mode == null || mode.isEmpty()) {
+            return CommonConstants.ALERT_MODE_GROUP; // Default to group mode if not specified
+        } else {
+            return mode;
+        }
+    }
+    
+    private Map<String, String> createCommonFingerprints(AlertDefine define) {
+        Map<String, String> fingerprints = new HashMap<>(8);
+        fingerprints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+        fingerprints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
+        
+        if (define.getLabels() != null) {
+            fingerprints.putAll(define.getLabels());
+        }
+        
+        return fingerprints;
+    }
+
+    private Map<String, Object> createFieldValueMap(LogEntry logEntry, AlertDefine define) {
+        Map<String, Object> fieldValueMap = new HashMap<>(8);
+        fieldValueMap.put("log", logEntry);
+        
+        if (define.getLabels() != null) {
+            fieldValueMap.putAll(define.getLabels());
+        }
+        
+        return fieldValueMap;
+    }
+    
+    private Map<String, String> createAlertAnnotations(AlertDefine define, Map<String, Object> fieldValueMap) {
+        Map<String, String> annotations = new HashMap<>(8);
+        
+        if (define.getAnnotations() != null) {
+            for (Map.Entry<String, String> entry : define.getAnnotations().entrySet()) {
+                annotations.put(entry.getKey(), 
+                               AlertTemplateUtil.render(entry.getValue(), fieldValueMap));
+            }
+        }
+        
+        return annotations;
+    }
+
+    /**
+     * Add the content from LogEntry object (except timestamp) to commonFingerPrints
+     *
+     * @param logEntry log entry object
+     * @param context context
+     */
+    private void addLogEntryToMap(LogEntry logEntry, Map<String, String> context) {
+        // Add basic fields
+        if (logEntry.getSeverityNumber() != null) {
+            context.put("severityNumber", String.valueOf(logEntry.getSeverityNumber()));
+        }
+        if (logEntry.getSeverityText() != null) {
+            context.put("severityText", logEntry.getSeverityText());
+        }
+        if (logEntry.getBody() != null) {
+            context.put("body", String.valueOf(logEntry.getBody()));
+        }
+        if (logEntry.getDroppedAttributesCount() != null) {
+            context.put("droppedAttributesCount", String.valueOf(logEntry.getDroppedAttributesCount()));
+        }
+        if (logEntry.getTraceId() != null) {
+            context.put("traceId", logEntry.getTraceId());
+        }
+        if (logEntry.getSpanId() != null) {
+            context.put("spanId", logEntry.getSpanId());
+        }
+        if (logEntry.getTraceFlags() != null) {
+            context.put("traceFlags", String.valueOf(logEntry.getTraceFlags()));
+        }
+
+        // Add attributes
+        if (logEntry.getAttributes() != null && !logEntry.getAttributes().isEmpty()) {
+            for (Map.Entry<String, Object> entry : logEntry.getAttributes().entrySet()) {
+                if (entry.getValue() != null) {
+                    context.put("attr_" + entry.getKey(), String.valueOf(entry.getValue()));
+                }
+            }
+        }
+
+        // Add resource
+        if (logEntry.getResource() != null && !logEntry.getResource().isEmpty()) {
+            for (Map.Entry<String, Object> entry : logEntry.getResource().entrySet()) {
+                if (entry.getValue() != null) {
+                    context.put("resource_" + entry.getKey(), String.valueOf(entry.getValue()));
+                }
+            }
+        }
+
+        // Add instrumentationScope
+        if (logEntry.getInstrumentationScope() != null) {
+            LogEntry.InstrumentationScope scope = logEntry.getInstrumentationScope();
+            if (scope.getName() != null) {
+                context.put("scope_name", scope.getName());
+            }
+            if (scope.getVersion() != null) {
+                context.put("scope_version", scope.getVersion());
+            }
+            if (scope.getDroppedAttributesCount() != null) {
+                context.put("scope_droppedAttributesCount", String.valueOf(scope.getDroppedAttributesCount()));
+            }
+            if (scope.getAttributes() != null && !scope.getAttributes().isEmpty()) {
+                for (Map.Entry<String, Object> entry : scope.getAttributes().entrySet()) {
+                    if (entry.getValue() != null) {
+                        context.put("scope_attr_" + entry.getKey(), String.valueOf(entry.getValue()));
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.calculate.JexlExprCalculator;
+import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * LogWorker Responsible for:
+ * 1. Receiving logs from WindowedLogRealTimeAlertCalculator
+ * 2. Evaluating alert expressions against logs
+ * 3. Sending matching logs to WindowAggregator
+ */
+@Slf4j
+@Component
+public class LogWorker {
+    
+    private static final String LOG_PREFIX = "log";
+    
+    private final AlertDefineService alertDefineService;
+    private final JexlExprCalculator jexlExprCalculator;
+    private final WindowAggregator windowAggregator;
+    private final AlerterWorkerPool workerPool;
+
+    @Autowired
+    public LogWorker(AlertDefineService alertDefineService,
+                     JexlExprCalculator jexlExprCalculator, WindowAggregator windowAggregator,
+                     AlerterWorkerPool workerPool) {
+        this.alertDefineService = alertDefineService;
+        this.jexlExprCalculator = jexlExprCalculator;
+        this.windowAggregator = windowAggregator;
+        this.workerPool = workerPool;
+    }
+
+    public void reduceAndSendLogTask(LogEntry logEntry) {
+        workerPool.executeLogJob(reduceLogTask(logEntry));
+    }
+
+    public Runnable reduceLogTask(LogEntry logEntry) {
+        return () -> {
+            try {
+                processLogEntry(logEntry);
+            } catch (Exception e) {
+                log.error("Error processing log entry in worker: {}", e.getMessage(), e);
+            }
+        };
+    }
+
+    private void processLogEntry(LogEntry logEntry) {
+        // Get all log alert definitions
+        List<AlertDefine> alertDefines = alertDefineService.getLogRealTimeAlertDefines();
+        
+        // Create context for expression evaluation
+        Map<String, Object> context = new HashMap<>(8);
+        context.put(LOG_PREFIX, logEntry);
+        
+        // Process each alert definition
+        for (AlertDefine define : alertDefines) {
+            if (define.getExpr() == null || define.getExpr().trim().isEmpty()) {
+                continue;
+            }
+            
+            try {
+                // Evaluate alert expression
+                boolean match = jexlExprCalculator.execAlertExpression(context, define.getExpr(), false);
+                
+                if (match) {
+                    // Create matching log event and send to WindowAggregator
+                    MatchingLogEvent event = createMatchingLogEvent(logEntry, define);
+                    windowAggregator.addMatchingLog(event);
+                }
+            } catch (Exception e) {
+                log.warn("Error evaluating expression for alert define {}: {}", define.getName(), e.getMessage());
+            }
+        }
+    }
+    
+    private MatchingLogEvent createMatchingLogEvent(LogEntry logEntry, AlertDefine define) {
+        long eventTimestamp = extractEventTimestamp(logEntry);
+        
+        return MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(define)
+                .eventTimestamp(eventTimestamp)
+                .workerTimestamp(System.currentTimeMillis())
+                .build();
+    }
+    
+    private long extractEventTimestamp(LogEntry logEntry) {
+        if (logEntry.getTimeUnixNano() != null && logEntry.getTimeUnixNano() != 0) {
+            return logEntry.getTimeUnixNano() / 1_000_000; // Convert to milliseconds
+        }
+        if (logEntry.getObservedTimeUnixNano() != null && logEntry.getObservedTimeUnixNano() != 0) {
+            return logEntry.getObservedTimeUnixNano() / 1_000_000; // Convert to milliseconds
+        }
+        return System.currentTimeMillis();
+    }
+}

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

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import lombok.Builder;
+import lombok.Data;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+
+/**
+ * Represents a log entry that matched an alert expression
+ * Used for communication between LogWorker and WindowAggregator
+ */
+@Data
+@Builder
+public class MatchingLogEvent {
+    
+    private LogEntry logEntry;
+    
+    private AlertDefine alertDefine;
+    
+    private long eventTimestamp;
+    
+    private long workerTimestamp;
+}

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

@@ -0,0 +1,213 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * Watermark Generator responsible for:
+ * 1. Receiving maxTimestamp updates from WindowedLogRealTimeAlertCalculator
+ * 2. Calculating watermarks based on configurable delay
+ * 3. Broadcasting watermarks to all subscribers (WindowAggregator)
+ */
+@Component
+@Slf4j
+public class TimeService {
+    
+    static final long DEFAULT_WATERMARK_DELAY_MS = 30_000; // 30 seconds
+    private static final long WATERMARK_BROADCAST_INTERVAL_MS = 5_000; // 5 seconds
+    
+    // Define acceptable timestamp range to filter abnormal timestamps
+    private static final long MAX_FUTURE_TIME_MS = 60_000; // Allow 1 minute future time
+    private static final long MAX_PAST_TIME_MS = 24 * 60 * 60 * 1000; // Allow 24 hours past time
+    
+    private final AtomicLong maxTimestamp = new AtomicLong(0);
+    private final AtomicLong currentWatermark = new AtomicLong(0);
+    private final CopyOnWriteArrayList<WatermarkListener> listeners = new CopyOnWriteArrayList<>();
+    private ScheduledExecutorService scheduler;
+    
+    public TimeService(List<WatermarkListener> initialListeners) {
+        listeners.addAll(initialListeners);
+    }
+    
+    @PostConstruct
+    public void start() {
+        // Create internal scheduled executor
+        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+                .setUncaughtExceptionHandler((thread, throwable) -> {
+                    log.error("TimeService scheduler has uncaughtException.");
+                    log.error(throwable.getMessage(), throwable);
+                })
+                .setDaemon(true)
+                .setNameFormat("timeservice-scheduler-%d")
+                .build();
+        
+        this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory);
+        
+        // Start watermark broadcast scheduler
+        scheduler.scheduleAtFixedRate(
+                this::broadcastWatermark,
+                0,
+                WATERMARK_BROADCAST_INTERVAL_MS,
+                TimeUnit.MILLISECONDS
+        );
+        
+        log.info("TimeService started with watermark delay: {}ms", DEFAULT_WATERMARK_DELAY_MS);
+    }
+    
+    @PreDestroy
+    public void stop() {
+        if (scheduler != null && !scheduler.isShutdown()) {
+            log.info("Shutting down TimeService scheduler...");
+            scheduler.shutdown();
+            try {
+                if (!scheduler.awaitTermination(10, TimeUnit.SECONDS)) {
+                    log.warn("TimeService scheduler did not terminate within 10 seconds, forcing shutdown");
+                    scheduler.shutdownNow();
+                    if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                        log.error("TimeService scheduler did not terminate");
+                    }
+                }
+            } catch (InterruptedException e) {
+                log.warn("Interrupted while waiting for TimeService scheduler to terminate");
+                scheduler.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+        
+        log.info("TimeService stopped");
+    }
+    
+    /**
+     * Check if timestamp is within acceptable range
+     */
+    public boolean isValidTimestamp(long timestamp) {
+        long currentTime = System.currentTimeMillis();
+        return timestamp >= (currentTime - MAX_PAST_TIME_MS) && timestamp <= (currentTime + MAX_FUTURE_TIME_MS);
+    }
+    
+    /**
+     * Check if data is late based on current watermark
+     */
+    public boolean isLateData(long timestamp) {
+        return timestamp < getCurrentWatermark();
+    }
+    
+    /**
+     * Update max timestamp from WindowedLogRealTimeAlertCalculator
+     */
+    public void updateMaxTimestamp(long timestamp) {
+        maxTimestamp.getAndUpdate(current -> Math.max(current, timestamp));
+    }
+    
+    /**
+     * Add watermark listener
+     */
+    public void addWatermarkListener(WatermarkListener listener) {
+        listeners.add(listener);
+    }
+    
+    /**
+     * Remove watermark listener
+     */
+    public void removeWatermarkListener(WatermarkListener listener) {
+        listeners.remove(listener);
+    }
+    
+    /**
+     * Get current watermark
+     */
+    public long getCurrentWatermark() {
+        return currentWatermark.get();
+    }
+
+    /**
+     * Get max timestamp
+     */
+    public long getMaxTimestamp() {
+        return maxTimestamp.get();
+    }
+    
+    /**
+     * Calculate and broadcast watermark
+     */
+    private void broadcastWatermark() {
+        
+        try {
+            long maxTs = maxTimestamp.get();
+            if (maxTs <= 0) {
+                return;
+            }
+            // Calculate watermark: maxTimestamp - delay
+            long newWatermark = maxTs - DEFAULT_WATERMARK_DELAY_MS;
+            long currentWm = currentWatermark.get();
+            
+            // Only advance watermark (monotonic property)
+            if (newWatermark <= currentWm) {
+                return;
+            }
+            if (currentWatermark.compareAndSet(currentWm, newWatermark)) {
+                // Broadcast to all listeners
+                Watermark watermark = new Watermark(newWatermark);
+                for (WatermarkListener listener : listeners) {
+                    try {
+                        listener.onWatermark(watermark);
+                    } catch (Exception e) {
+                        log.error("Error notifying watermark listener: {}", e.getMessage(), e);
+                    }
+                }
+                log.debug("Broadcast watermark: {} (maxTimestamp: {})", newWatermark, maxTs);
+            }
+        } catch (Exception e) {
+            log.error("Error in watermark broadcast: {}", e.getMessage(), e);
+        }
+    }
+    
+    /**
+     * Watermark data class
+     */
+    @Data
+    @AllArgsConstructor
+    @Getter
+    public static class Watermark {
+        private final long timestamp;
+    }
+    
+    /**
+     * Interface for watermark listeners
+     */
+    public interface WatermarkListener {
+        void onWatermark(Watermark watermark);
+    }
+}

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

@@ -0,0 +1,251 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+
+
+/**
+ * Window Aggregator Responsible for:
+ * 1. Managing window data structure for all active windows
+ * 2. Receiving matching logs from Workers
+ * 3. Receiving watermarks from TimeService
+ * 4. Sending closed windows to AlarmEvaluator
+ */
+@Component
+@Slf4j
+public class WindowAggregator implements TimeService.WatermarkListener, Runnable {
+    
+    private static final long DEFAULT_WINDOW_SIZE_MS = 1 * 60 * 1000; // 1 minutes
+    
+    private final AlarmEvaluator alarmEvaluator;
+    private final BlockingQueue<MatchingLogEvent> eventQueue = new LinkedBlockingQueue<>();
+    private final Map<WindowKey, WindowData> activeWindows = new HashMap<>();
+    private final Object windowLock = new Object();
+    
+    private ExecutorService aggregatorExecutor;
+
+    public WindowAggregator(AlarmEvaluator alarmEvaluator) {
+        this.alarmEvaluator = alarmEvaluator;
+    }
+
+    public void addMatchingLog(MatchingLogEvent event) {
+        try {
+            eventQueue.put(event);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            log.warn("Interrupted while adding matching log to aggregator");
+        }
+    }
+    
+    @Override
+    public void onWatermark(TimeService.Watermark watermark) {
+        List<WindowData> closedWindows;
+        
+        synchronized (windowLock) {
+            closedWindows = new ArrayList<>();
+            
+            // Find windows that should be closed based on watermark
+            Iterator<Map.Entry<WindowKey, WindowData>> iterator = activeWindows.entrySet().iterator();
+            while (iterator.hasNext()) {
+                Map.Entry<WindowKey, WindowData> entry = iterator.next();
+                WindowData windowData = entry.getValue();
+                
+                // Close window if its end time <= watermark timestamp
+                if (windowData.getEndTime() <= watermark.getTimestamp()) {
+                    closedWindows.add(windowData);
+                    iterator.remove();
+                    
+                    log.debug("Closing window: {} with {} matching logs", 
+                             entry.getKey(), windowData.getMatchingLogs().size());
+                }
+            }
+        } 
+        
+        for (WindowData windowData : closedWindows) {
+            alarmEvaluator.sendAndProcessWindowData(windowData);
+        }
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            try {
+                MatchingLogEvent event = eventQueue.take();
+                processMatchingLogEvent(event);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                break;
+            } catch (Exception e) {
+                log.error("Error processing matching log event: {}", e.getMessage(), e);
+            }
+        }
+    }
+    
+    private void processMatchingLogEvent(MatchingLogEvent event) {
+        
+        // Determine window size from alert define (if specified) or use default
+        long windowSizeMs = getWindowSize(event.getAlertDefine());
+        
+        // Calculate window boundaries
+        long eventTime = event.getEventTimestamp();
+        long windowStart = (eventTime / windowSizeMs) * windowSizeMs;
+        long windowEnd = windowStart + windowSizeMs;
+        
+        // Create window key
+        WindowKey windowKey = new WindowKey(
+            event.getAlertDefine().getId(),
+            windowStart,
+            windowEnd
+        );
+        synchronized (windowLock) {
+            // Get or create window data
+            WindowData windowData = activeWindows.computeIfAbsent(windowKey, 
+                key -> new WindowData(key, event.getAlertDefine()));
+            // Add matching log to window
+            windowData.addMatchingLog(event);
+            log.debug("Added matching log to window: {} (total logs: {})", 
+                     windowKey, windowData.getMatchingLogs().size());
+        }
+    }
+    
+    private long getWindowSize(AlertDefine alertDefine) {
+        // Check if alert define has custom window size configuration
+        if (alertDefine.getPeriod() != null) {
+            return alertDefine.getPeriod() * 1000; // Convert seconds to milliseconds
+        }
+        log.info("Using default window size of {} ms for alert define: {}",
+                 DEFAULT_WINDOW_SIZE_MS, alertDefine.getName());
+        return DEFAULT_WINDOW_SIZE_MS;
+    }
+    
+    @PostConstruct
+    public void start() {
+        // Create internal executor
+        ThreadFactory threadFactory = new ThreadFactoryBuilder()
+                .setUncaughtExceptionHandler((thread, throwable) -> {
+                    log.error("WindowAggregator executor has uncaughtException.");
+                    log.error(throwable.getMessage(), throwable);
+                })
+                .setDaemon(true)
+                .setNameFormat("window-aggregator-%d")
+                .build();
+        
+        aggregatorExecutor = Executors.newSingleThreadExecutor(threadFactory);
+
+        // Submit aggregation task
+        aggregatorExecutor.submit(this);
+        
+        log.info("WindowAggregator started");
+    }
+    
+    @PreDestroy
+    public void stop() {
+        if (aggregatorExecutor != null && !aggregatorExecutor.isShutdown()) {
+            log.info("Shutting down WindowAggregator executor...");
+            aggregatorExecutor.shutdown();
+            try {
+                if (!aggregatorExecutor.awaitTermination(10, TimeUnit.SECONDS)) {
+                    log.warn("WindowAggregator executor did not terminate within 10 seconds, forcing shutdown");
+                    aggregatorExecutor.shutdownNow();
+                    if (!aggregatorExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
+                        log.error("WindowAggregator executor did not terminate");
+                    }
+                }
+            } catch (InterruptedException e) {
+                log.warn("Interrupted while waiting for WindowAggregator executor to terminate");
+                aggregatorExecutor.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+        
+        log.info("WindowAggregator stopped");
+    }
+    
+    /**
+     * Window key for identifying unique windows
+     */
+    @Data
+    @Getter
+    @AllArgsConstructor
+    public static class WindowKey {
+        private final long alertDefineId;
+        private final long startTime;
+        private final long endTime;
+    }
+    
+    /**
+     * Window data container
+     */
+    public static class WindowData {
+        @Getter
+        private final WindowKey windowKey;
+        @Getter
+        private final AlertDefine alertDefine;
+        private final List<MatchingLogEvent> matchingLogs = new ArrayList<>();
+        @Getter
+        private final long createdTime;
+        
+        public WindowData(WindowKey windowKey, AlertDefine alertDefine) {
+            this.windowKey = windowKey;
+            this.alertDefine = alertDefine;
+            this.createdTime = System.currentTimeMillis();
+        }
+        
+        public void addMatchingLog(MatchingLogEvent event) {
+            matchingLogs.add(event);
+        }
+
+        public List<MatchingLogEvent> getMatchingLogs() {
+            return new ArrayList<>(matchingLogs);
+        }
+
+        /**
+         * Get start time of the window
+         * @return start time
+         */
+        public long getStartTime() { return windowKey.getStartTime(); }
+
+        /**
+         * Get end time of the window
+         * @return end time
+         */
+        public long getEndTime() { return windowKey.getEndTime(); }
+    }
+}

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

@@ -22,10 +22,12 @@ package org.apache.hertzbeat.alert.config;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -54,16 +56,24 @@ public class AlertSseManager {
                         .name("ALERT_EVENT")
                         .data(data));
             } catch (IOException | IllegalStateException e) {
-                emitter.complete();
-                removeEmitter(clientId);
+                tryCompleteAndClean(clientId, emitter);
             } catch (Exception exception) {
                 log.error("Failed to broadcast alert data to client: {}", exception.getMessage());
-                emitter.complete();
-                removeEmitter(clientId);
+                tryCompleteAndClean(clientId, emitter);
             }
         });
     }
 
+    private void tryCompleteAndClean(Long clientId, SseEmitter emitter) {
+        try {
+            Optional.ofNullable(emitter).ifPresent(ResponseBodyEmitter::complete);
+        } catch (Throwable e) {
+            log.debug("Failed to complete emitter for client {}: {}", clientId, e.getMessage());
+        }
+        // execute clear
+        removeEmitter(clientId);
+    }
+
     private void removeEmitter(Long clientId) {
         emitters.remove(clientId);
     }

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

@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
  * of the available methods.
  *
  * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
+ *            operations with no return type.
  */
 @SuppressWarnings("CheckReturnValue")
 public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements AlertExpressionVisitor<T> {
@@ -37,7 +37,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitExpression(AlertExpressionParser.ExpressionContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitExpression(AlertExpressionParser.ExpressionContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -45,7 +48,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -53,7 +59,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -61,7 +70,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -69,7 +81,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -77,7 +92,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -85,7 +103,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -93,7 +114,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -101,7 +125,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -109,7 +136,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -117,7 +147,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -125,7 +158,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -133,7 +169,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -141,7 +180,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitParameter(AlertExpressionParser.ParameterContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitParameter(AlertExpressionParser.ParameterContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -149,7 +191,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitNumber(AlertExpressionParser.NumberContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitNumber(AlertExpressionParser.NumberContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -157,7 +202,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitString(AlertExpressionParser.StringContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitString(AlertExpressionParser.StringContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -165,7 +213,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitDuration(AlertExpressionParser.DurationContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitDuration(AlertExpressionParser.DurationContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -173,7 +224,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -181,7 +235,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -189,7 +246,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -197,7 +257,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -205,7 +268,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -213,7 +279,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -221,7 +290,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -229,7 +301,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -237,7 +312,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitRelList(AlertExpressionParser.RelListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitRelList(AlertExpressionParser.RelListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -245,7 +323,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitRelation(AlertExpressionParser.RelationContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitRelation(AlertExpressionParser.RelationContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -253,7 +334,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -261,7 +345,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitCompOp(AlertExpressionParser.CompOpContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitCompOp(AlertExpressionParser.CompOpContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -269,7 +356,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitCondition(AlertExpressionParser.ConditionContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitCondition(AlertExpressionParser.ConditionContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -277,7 +367,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -285,7 +378,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitPromql(AlertExpressionParser.PromqlContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitPromql(AlertExpressionParser.PromqlContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -293,7 +389,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -301,7 +400,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -309,7 +411,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -317,7 +422,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -325,7 +433,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitLabelList(AlertExpressionParser.LabelListContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitLabelList(AlertExpressionParser.LabelListContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -333,7 +444,10 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) {
+        return visitChildren(ctx);
+    }
 
     /**
      * {@inheritDoc}
@@ -341,13 +455,8 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) { return visitChildren(ctx); }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override public T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx) { return visitChildren(ctx); }
+    @Override
+    public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) {
+        return visitChildren(ctx);
+    }
 }

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

@@ -18,11 +18,12 @@
 package org.apache.hertzbeat.alert.expr;
 
 import org.antlr.v4.runtime.CommonTokenStream;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.hertzbeat.common.support.exception.ExpressionVisitorException;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -33,7 +34,7 @@ import java.util.stream.Collectors;
  */
 public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<Map<String, Object>>> {
 
-    private static final String THRESHOLD = "__threshold__";
+    private static final String SCALAR = "__scalar__";
     private static final String NAME = "__name__";
     private static final String VALUE = "__value__";
     private static final String TIMESTAMP = "__timestamp__";
@@ -60,28 +61,100 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
     public List<Map<String, Object>> visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
         List<Map<String, Object>> leftResult = visit(ctx.left);
         List<Map<String, Object>> rightResult = visit(ctx.right);
-        if (rightResult.size() == 1 && rightResult.get(0).containsKey(THRESHOLD)) {
-            double threshold = (double) rightResult.get(0).get(THRESHOLD);
-            String operator = ctx.op.getText();
+        int type = ctx.op.getType();
+        boolean boolModifier = ctx.BOOL() != null;
+        boolean leftIsScalar = isScalar(leftResult);
+        boolean rightIsScalar = isScalar(rightResult);
+        List<Map<String, Object>> results = new ArrayList<>();
 
-            List<Map<String, Object>> result = new ArrayList<>();
-            for (Map<String, Object> item : leftResult) {
-                Object queryValues = item.get(VALUE);
-                if (queryValues == null) {
-                    // ignore the query result data is empty
+        // scalar and scalar
+        if (leftIsScalar && rightIsScalar) {
+            if (!boolModifier) {
+                // Between two scalars,
+                // the bool modifier must be provided and these operators result in another scalar that is either 0 (false) or 1 (true), depending on the comparison result.
+                return results;
+            }
+            Object leftVal = leftResult.get(0).get(SCALAR);
+            Object rightVal = rightResult.get(0).get(SCALAR);
+            Boolean match = compareOp(leftVal, type, rightVal);
+            // returns a result only if the comparison condition is met.
+            Map<String, Object> result = new HashMap<>();
+            result.put(VALUE, match ? 1 : 0);
+            results.add(result);
+            return results;
+        }
+
+        // scalar and vector
+        if (leftIsScalar) {
+            Object leftVal = leftResult.get(0).get(SCALAR);
+            for (Map<String, Object> rightItem : rightResult) {
+                Object rightVal = rightItem.getOrDefault(VALUE, null);
+                if (isValidValue(rightVal)) {
                     continue;
                 }
-                // queryValues may be a list of values, or a single value
-                Object matchValue = evaluateCondition(queryValues, operator, threshold);
-                Map<String, Object> resultMap = new HashMap(item);
-                resultMap.put(VALUE, matchValue);
-                // if matchValue is null, mean not match the threshold
-                // if not null, mean match the threshold
-                result.add(resultMap);
+                Boolean match = compareOp(leftVal, type, rightVal);
+                Map<String, Object> result = new HashMap<>(rightItem);
+                if (boolModifier) {
+                    result.put(VALUE, match ? 1 : 0);
+                    results.add(result);
+                } else {
+                    result.put(VALUE, match ? rightVal : null);
+                    results.add(result);
+                }
             }
-            return result;
+            return results;
         }
-        return new LinkedList<>();
+
+        // vector and scalar
+        if (rightIsScalar) {
+            Object rightVal = rightResult.get(0).get(SCALAR);
+            for (Map<String, Object> leftItem : leftResult) {
+                Object leftVal = leftItem.getOrDefault(VALUE, null);
+                if (isValidValue(leftVal)) {
+                    continue;
+                }
+                Boolean match = compareOp(leftVal, type, rightVal);
+                Map<String, Object> result = new HashMap<>(leftItem);
+                if (boolModifier) {
+                    result.put(VALUE, match ? 1 : 0);
+                    results.add(result);
+                } else {
+                    result.put(VALUE, match ? leftVal : null);
+                    results.add(result);
+                }
+            }
+            return results;
+        }
+
+        // vector and vector
+        Map<String, Map<String, Object>> rightMap = rightResult.stream()
+                .filter(item -> item.get(VALUE) != null)
+                .collect(Collectors.toMap(this::labelKey, item -> item, (existing, replacement) -> existing));
+
+        for (Map<String, Object> leftItem : leftResult) {
+            Object leftVal = leftItem.getOrDefault(VALUE, null);
+            if (isValidValue(leftVal)) {
+                continue;
+            }
+            Map<String, Object> rightItem = rightMap.get(labelKey(leftItem));
+            if (rightItem == null) {
+                continue;
+            }
+            Object rightVal = rightItem.get(VALUE);
+            if (isValidValue(rightVal)) {
+                continue;
+            }
+            Boolean match = compareOp(leftVal, type, rightVal);
+            Map<String, Object> result = new HashMap<>(leftItem);
+            if (boolModifier) {
+                result.put(VALUE, match ? 1 : 0);
+                results.add(result);
+            } else {
+                result.put(VALUE, match ? leftVal : null);
+                results.add(result);
+            }
+        }
+        return results;
     }
 
     @Override
@@ -167,7 +240,7 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         double value = Double.parseDouble(ctx.number().getText());
         List<Map<String, Object>> numAsList = new ArrayList<>();
         Map<String, Object> valueMap = new HashMap<>();
-        valueMap.put(THRESHOLD, value);
+        valueMap.put(SCALAR, value);
         numAsList.add(valueMap);
         return numAsList;
     }
@@ -194,83 +267,7 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return callSqlOrPromql(tokens.getText(ctx.string()));
     }
 
-    private Object evaluateCondition(Object value, String operator, Double threshold) {
-        // value may be a list of values, or a single value
-        switch (operator) {
-            case ">":
-                // if value is list, return the max value
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue > threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) > threshold ? value : null;
-                }
-            case ">=":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue >= threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) >= threshold ? value : null;
-                }
-            case "<":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue < threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) < threshold ? value : null;
-                }
-            case "<=":
-                if (value instanceof List<?> values) {
-                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
-                    if (doubleValue != null) {
-                        return doubleValue <= threshold ? doubleValue : null;
-                    } else {
-                        return null;
-                    }
-                } else {
-                    return Double.parseDouble(value.toString()) <= threshold ? value : null;
-                }
-            case "==":
-                if (value instanceof List<?> values) {
-                    for (Object v : values) {
-                        if (v.equals(threshold)) {
-                            return v;
-                        }
-                    }
-                    return null;
-                } else {
-                    return value.equals(threshold) ? value : null;
-                }
-            case "!=":
-                if (value instanceof List<?> values) {
-                    for (Object v : values) {
-                        if (v.equals(threshold)) {
-                            return null;
-                        }
-                    }
-                    return value;
-                } else {
-                    return value.equals(threshold) ? null : value;
-                }
-            default:
-                // unsupported operator todo add more operator
-                return null;
-        }
-    }
-
-    private List<Map<String, Object>> callSqlOrPromql(String text){
+    private List<Map<String, Object>> callSqlOrPromql(String text) {
         String script = text.substring(1, text.length() - 1);
         return executor.execute(script);
     }
@@ -290,4 +287,36 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return key.isEmpty() ? "-" : key;
     }
 
+    private boolean isScalar(List<Map<String, Object>> context) {
+        return CollectionUtils.isNotEmpty(context)
+                && context.size() == 1
+                && context.get(0).containsKey(SCALAR)
+                && null != context.get(0).get(SCALAR);
+    }
+
+    private double parseStrToDouble(String text) {
+        try {
+            return Double.parseDouble(text);
+        } catch (NumberFormatException e) {
+            throw new ExpressionVisitorException("number format exception", e);
+        }
+    }
+
+    private boolean isValidValue(Object val) {
+        return val == null || val instanceof List<?>;
+    }
+
+    private Boolean compareOp(Object leftVal, int opType, Object rightVal) {
+        double left = parseStrToDouble(leftVal.toString());
+        double right = parseStrToDouble(rightVal.toString());
+        return switch (opType) {
+            case AlertExpressionParser.GT -> left > right;
+            case AlertExpressionParser.GE -> left >= right;
+            case AlertExpressionParser.LT -> left < right;
+            case AlertExpressionParser.LE -> left <= right;
+            case AlertExpressionParser.EQ -> left == right;
+            case AlertExpressionParser.NE -> left != right;
+            default -> false;
+        };
+    }
 }

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

@@ -26,12 +26,13 @@ import org.antlr.v4.runtime.tree.ParseTreeVisitor;
  * by {@link AlertExpressionParser}.
  *
  * @param <T> The return type of the visit operation. Use {@link Void} for
- * operations with no return type.
+ *            operations with no return type.
  */
 public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#expression}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -40,6 +41,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code AndExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -48,6 +50,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code ComparisonExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -56,6 +59,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code UnlessExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -64,6 +68,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code SqlExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -72,6 +77,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code SqlCallExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -80,6 +86,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code LiteralExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -88,6 +95,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code ParenExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -96,6 +104,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code PromqlCallExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -104,6 +113,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code PromqlExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -112,6 +122,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code OrExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -119,6 +130,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#functionCall}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -126,6 +138,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#parameterList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -133,6 +146,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#parameter}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -140,6 +154,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#number}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -147,6 +162,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#string}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -154,6 +170,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#duration}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -161,6 +178,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#functionName}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -168,6 +186,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectSql}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -175,6 +194,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectFieldList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -182,6 +202,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectField}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -189,6 +210,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#groupByList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -196,6 +218,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#orderByList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -203,6 +226,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#orderByField}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -210,6 +234,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#limitClause}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -217,6 +242,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#relList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -224,6 +250,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#relation}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -231,6 +258,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#conditionList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -238,6 +266,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#compOp}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -245,6 +274,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#condition}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -252,6 +282,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#conditionUnit}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -259,6 +290,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#promql}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -266,6 +298,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#metricSelector}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -273,6 +306,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -280,6 +314,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherItem}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -287,6 +322,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherOp}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -294,6 +330,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelList}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -301,6 +338,7 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#instantVectorOp}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -308,15 +346,9 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#aggregationOperator}.
+     *
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#binaryOperator}.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx);
 }

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

@@ -60,7 +60,7 @@ public class ServerChanAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
             String webHookUrl = String.format(alerterProperties.getServerChanWebhookUrl(), sanitizedToken);
             
             // Validate the constructed URL against a whitelist
-            List<String> allowedBaseUrls = List.of("https://api.serverchan.com", "https://serverchan.example.com");
+            List<String> allowedBaseUrls = List.of("https://api.serverchan.com", "https://serverchan.example.com", "https://sctapi.ftqq.com");
             boolean isValidUrl = allowedBaseUrls.stream().anyMatch(webHookUrl::startsWith);
             if (!isValidUrl) {
                 throw new AlertNoticeException("Invalid webhook URL: " + webHookUrl);

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

@@ -18,6 +18,7 @@
 package org.apache.hertzbeat.alert.notice.impl;
 
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.notice.AlertNoticeException;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
@@ -39,6 +40,13 @@ final class WebHookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
     @Override
     public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
         try {
+            String hookUrl = receiver.getHookUrl();
+
+            // Basic URL validation
+            if (StringUtils.isBlank(hookUrl)) {
+                throw new AlertNoticeException("Webhook URL is null or empty");
+            }
+
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             //  alert.setContent(escapeJsonStr(alert.getContent()));
@@ -46,11 +54,11 @@ final class WebHookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
             webhookJson = webhookJson.replace(",\n  }", "\n }");
 
             HttpEntity<String> alertHttpEntity = new HttpEntity<>(webhookJson, headers);
-            ResponseEntity<String> entity = restTemplate.postForEntity(receiver.getHookUrl(), alertHttpEntity, String.class);
+            ResponseEntity<String> entity = restTemplate.postForEntity(hookUrl, alertHttpEntity, String.class);
             if (entity.getStatusCode().value() < HttpStatus.BAD_REQUEST.value()) {
-                log.debug("Send WebHook: {} Success", receiver.getHookUrl());
+                log.debug("Send WebHook: {} Success", hookUrl);
             } else {
-                log.warn("Send WebHook: {} Failed: {}", receiver.getHookUrl(), entity.getBody());
+                log.warn("Send WebHook: {} Failed: {}", hookUrl, entity.getBody());
                 throw new AlertNoticeException("Http StatusCode " + entity.getStatusCode());
             }
         } catch (Exception e) {

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmCommonReduce.java

@@ -18,6 +18,8 @@
 package org.apache.hertzbeat.alert.reduce;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
@@ -66,6 +68,22 @@ public class AlarmCommonReduce {
     public void reduceAndSendAlarm(SingleAlert alert) {
         workerExecutor.execute(reduceAlarmTask(alert));
     }
+
+    public void reduceAndSendAlarmGroup(Map<String, String> groupLabels, List<SingleAlert> alerts) {
+        workerExecutor.execute(() -> {
+            try {
+                // Generate alert fingerprint
+                for (SingleAlert alert : alerts) {
+                    String fingerprint = generateAlertFingerprint(alert.getLabels());
+                    alert.setFingerprint(fingerprint);
+                }
+                // Process the group alert
+                alarmGroupReduce.processGroupAlert(groupLabels, alerts);
+            } catch (Exception e) {
+                log.error("Reduce alarm group failed: {}", e.getMessage());
+            }
+        });
+    }
     
     Runnable reduceAlarmTask(SingleAlert alert) {
         return () -> {

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/reduce/AlarmGroupReduce.java

@@ -159,7 +159,20 @@ public class AlarmGroupReduce {
             sendSingleAlert(alert);
         }
     }
-    
+
+    public void processGroupAlert(Map<String, String> groupLabels, List<SingleAlert> alertList) {
+        GroupAlert groupAlert = GroupAlert.builder()
+                .groupKey(generateGroupKey(groupLabels))
+                .groupLabels(groupLabels)
+                .commonLabels(extractCommonLabels(alertList))
+                .commonAnnotations(extractCommonAnnotations(alertList))
+                .alerts(alertList)
+                .status(CommonConstants.ALERT_STATUS_FIRING)
+                .build();
+
+        alarmInhibitReduce.inhibitAlarm(groupAlert);
+    }
+
     private boolean hasRequiredLabels(Map<String, String> labels, List<String> requiredLabels) {
         return requiredLabels.stream().allMatch(labels::containsKey);
     }

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

@@ -22,6 +22,7 @@ import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.springframework.data.domain.Page;
 import org.springframework.web.multipart.MultipartFile;
+import org.apache.hertzbeat.common.constants.CommonConstants;
 
 import java.util.List;
 import java.util.Map;
@@ -106,10 +107,23 @@ public interface AlertDefineService {
     void importConfig(MultipartFile file) throws Exception;
 
     /**
-     * Get the real-time alarm definition list
-     * @return Real-time alarm definition list
+     * Get the real-time metrics alarm definition list
+     * @return Real-time metrics alarm definition list
      */
-    List<AlertDefine> getRealTimeAlertDefines();
+    List<AlertDefine> getMetricsRealTimeAlertDefines();
+
+    /**
+     * Get the real-time log alarm definition list
+     * @return Real-time log alarm definition list
+     */
+    List<AlertDefine> getLogRealTimeAlertDefines();
+
+    /**
+     * Get the alarm definition list by type
+     * @param type Alarm definition type, must be one of the constants defined in {@link CommonConstants}
+     * @return List of enabled alarm definitions matching the specified type, empty list if none found
+     */
+    List<AlertDefine> getAlertDefinesByType(String type);
 
     /**
      * Get define preview

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

@@ -32,4 +32,12 @@ public interface DataSourceService {
      * @return result
      */
     List<Map<String, Object>> calculate(String datasource, String expr);
+
+    /**
+     * query result set from db
+     * @param datasource sql or promql
+     * @param expr query expr
+     * @return result
+     */
+    List<Map<String, Object>> query(String datasource, String expr);
 } 

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

@@ -24,7 +24,7 @@ import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
+import org.apache.hertzbeat.alert.calculate.periodic.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
@@ -87,7 +87,8 @@ public class AlertDefineServiceImpl implements AlertDefineService {
     @Override
     public void validate(AlertDefine alertDefine, boolean isModify) throws IllegalArgumentException {
         if (StringUtils.hasText(alertDefine.getExpr())) {
-            if (CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
+            if (CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())
+                    || CommonConstants.LOG_ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
                 try {
                     JexlExpressionRunner.compile(alertDefine.getExpr());
                 } catch (Exception e) {
@@ -106,14 +107,14 @@ public class AlertDefineServiceImpl implements AlertDefineService {
 
     @Override
     public void addAlertDefine(AlertDefine alertDefine) throws RuntimeException {
-        alertDefine = alertDefineDao.save(alertDefine);
+        alertDefine = alertDefineDao.saveAndFlush(alertDefine);
         periodicAlertRuleScheduler.updateSchedule(alertDefine);
         CacheFactory.clearAlertDefineCache();
     }
 
     @Override
     public void modifyAlertDefine(AlertDefine alertDefine) throws RuntimeException {
-        alertDefineDao.save(alertDefine);
+        alertDefineDao.saveAndFlush(alertDefine);
         periodicAlertRuleScheduler.updateSchedule(alertDefine);
         CacheFactory.clearAlertDefineCache();
     }
@@ -214,11 +215,21 @@ public class AlertDefineServiceImpl implements AlertDefineService {
     }
 
     @Override
-    public List<AlertDefine> getRealTimeAlertDefines() {
-        List<AlertDefine> alertDefines = CacheFactory.getAlertDefineCache();
+    public List<AlertDefine> getMetricsRealTimeAlertDefines() {
+        List<AlertDefine> alertDefines = CacheFactory.getMetricsAlertDefineCache();
         if (alertDefines == null) {
-            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME);
-            CacheFactory.setAlertDefineCache(alertDefines);
+            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_REALTIME);
+            CacheFactory.setMetricsAlertDefineCache(alertDefines);
+        }
+        return alertDefines;
+    }
+
+    @Override
+    public List<AlertDefine> getLogRealTimeAlertDefines() {
+        List<AlertDefine> alertDefines = CacheFactory.getLogAlertDefineCache();
+        if (alertDefines == null) {
+            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(CommonConstants.LOG_ALERT_THRESHOLD_TYPE_REALTIME);
+            CacheFactory.setLogAlertDefineCache(alertDefines);
         }
         return alertDefines;
     }
@@ -229,11 +240,35 @@ public class AlertDefineServiceImpl implements AlertDefineService {
             return Collections.emptyList();
         }
         switch (type) {
-            case CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC:
+            case CommonConstants.METRIC_ALERT_THRESHOLD_TYPE_PERIODIC:
                 return dataSourceService.calculate(datasource, expr);
+            case CommonConstants.LOG_ALERT_THRESHOLD_TYPE_PERIODIC:
+                // todo support alert expr preview
+                return dataSourceService.query(datasource, expr);
             default:
                 log.error("Get define preview unsupported type: {}", type);
                 return Collections.emptyList();
         }
     }
+
+    @Override
+    public List<AlertDefine> getAlertDefinesByType(String type) {
+        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:
+            case CommonConstants.LOG_ALERT_THRESHOLD_TYPE_REALTIME:
+            case CommonConstants.LOG_ALERT_THRESHOLD_TYPE_PERIODIC:
+                // Valid type, proceed with query
+                break;
+            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

@@ -75,7 +75,7 @@ public class DataSourceServiceImpl implements DataSourceService {
             throw new IllegalArgumentException("Empty expression");
         }
         if (executors == null || executors.isEmpty()) {
-            throw new IllegalArgumentException("No query executor found");
+            throw new IllegalArgumentException(bundle.getString("alerter.datasource.executor.not.found"));
         }
         QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);
 
@@ -87,7 +87,7 @@ public class DataSourceServiceImpl implements DataSourceService {
         try {
             return evaluate(expr, executor);
         } catch (AlertExpressionException ae) {
-            log.error("Calculate query parse error {}: {}", datasource, ae.getMessage());
+            log.error("Calculate query parse error, datasource: {}, expr: {}, msg: {}", datasource, expr, ae.getMessage(), ae);
             throw ae;
         } catch (Exception e) {
             log.error("Error executing query on datasource {}: {}", datasource, e.getMessage());
@@ -95,6 +95,29 @@ public class DataSourceServiceImpl implements DataSourceService {
         }
     }
 
+    @Override
+    public List<Map<String, Object>> query(String datasource, String expr) {
+        if (!StringUtils.hasText(expr)) {
+            throw new IllegalArgumentException("Empty expression");
+        }
+        if (executors == null || executors.isEmpty()) {
+            throw new IllegalArgumentException(bundle.getString("alerter.datasource.executor.not.found"));
+        }
+        QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);
+
+        if (executor == null) {
+            throw new IllegalArgumentException("Unsupported datasource: " + datasource);
+        }
+        // replace all white space
+        expr = expr.replaceAll("\\s+", " ");
+        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);
+        }
+    }
+
     private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
         CommonTokenStream tokens = tokenStreamCache.get(expr, this::createTokenStream);
         AlertExpressionParser parser = new AlertExpressionParser(tokens);

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

@@ -17,6 +17,8 @@
 
 package org.apache.hertzbeat.alert.util;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -33,10 +35,11 @@ public final class AlertTemplateUtil {
     }
 
     /**
-     * Match the variable ${key}
+     * Match the variable ${key} or ${key.property.subproperty}
      * eg: Alert, the instance: ${instance} metrics: ${metrics} is over flow.
+     * eg: Log alert: ${log.attributes.level} - ${log.message}
      */
-    private static final Pattern PATTERN = Pattern.compile("\\$\\{(\\w+)\\}");
+    private static final Pattern PATTERN = Pattern.compile("\\$\\{([\\w.]+)}");
 
     public static String render(String template, Map<String, Object> replaceData) {
         if (!StringUtils.hasText(template)) {
@@ -50,7 +53,8 @@ public final class AlertTemplateUtil {
             Matcher matcher = PATTERN.matcher(template);
             StringBuilder builder = new StringBuilder();
             while (matcher.find()) {
-                Object objectValue = replaceData.getOrDefault(matcher.group(1), "NullValue");
+                String propertyPath = matcher.group(1);
+                Object objectValue = getNestedProperty(replaceData, propertyPath);
                 String value = objectValue != null ? objectValue.toString() : "NullValue";
                 matcher.appendReplacement(builder, Matcher.quoteReplacement(value));
             }
@@ -61,4 +65,116 @@ public final class AlertTemplateUtil {
             return template;
         }
     }
+
+    /**
+     * Get nested property value from object using property path like "log.attributes.demo"
+     * @param replaceData the root data map
+     * @param propertyPath the property path, e.g., "log.attributes.demo"
+     * @return the property value or null if not found
+     */
+    private static Object getNestedProperty(Map<String, Object> replaceData, String propertyPath) {
+        if (propertyPath == null || propertyPath.isEmpty()) {
+            return null;
+        }
+
+        String[] parts = propertyPath.split("\\.");
+        Object current = replaceData.get(parts[0]);
+        
+        if (current == null) {
+            return null;
+        }
+
+        // If only one part, return the direct value
+        if (parts.length == 1) {
+            return current;
+        }
+
+        // Navigate through the property path
+        for (int i = 1; i < parts.length; i++) {
+            current = getPropertyValue(current, parts[i]);
+            if (current == null) {
+                return null;
+            }
+        }
+
+        return current;
+    }
+
+    /**
+     * Get property value from an object using reflection
+     * @param obj the object
+     * @param propertyName the property name
+     * @return the property value or null if not found
+     */
+    private static Object getPropertyValue(Object obj, String propertyName) {
+        if (obj == null || propertyName == null) {
+            return null;
+        }
+
+        try {
+            // Handle Map objects
+            if (obj instanceof Map) {
+                return ((Map<?, ?>) obj).get(propertyName);
+            }
+
+            Class<?> clazz = obj.getClass();
+
+            // Try getter method first (getPropertyName or isPropertyName for boolean)
+            String getterName = "get" + capitalize(propertyName);
+            String booleanGetterName = "is" + capitalize(propertyName);
+            
+            try {
+                Method getter = clazz.getMethod(getterName);
+                return getter.invoke(obj);
+            } catch (NoSuchMethodException e) {
+                // Try boolean getter
+                try {
+                    Method booleanGetter = clazz.getMethod(booleanGetterName);
+                    return booleanGetter.invoke(obj);
+                } catch (NoSuchMethodException ignored) {
+                    // Continue to field access
+                }
+            }
+
+            // Try direct field access
+            try {
+                Field field = clazz.getDeclaredField(propertyName);
+                field.setAccessible(true);
+                return field.get(obj);
+            } catch (NoSuchFieldException ignored) {
+                // Field not found
+            }
+
+            // Try parent classes
+            Class<?> superClass = clazz.getSuperclass();
+            while (superClass != null && !superClass.equals(Object.class)) {
+                try {
+                    Field field = superClass.getDeclaredField(propertyName);
+                    field.setAccessible(true);
+                    return field.get(obj);
+                } catch (NoSuchFieldException ignored) {
+                    // Continue with parent class
+                }
+                superClass = superClass.getSuperclass();
+            }
+
+        } catch (Exception e) {
+            log.debug("Failed to access property '{}' on object of type {}: {}", 
+                     propertyName, obj.getClass().getSimpleName(), e.getMessage());
+        }
+
+        return null;
+    }
+
+    /**
+     * Capitalize the first letter of a string
+     * @param str the input string
+     * @return the capitalized string
+     */
+    private static String capitalize(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+        return str.substring(0, 1).toUpperCase() + str.substring(1);
+    }
 }

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

@@ -21,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -64,7 +63,7 @@ public class CryptoUtils {
         try {
             MessageDigest md = MessageDigest.getInstance("SHA-256");
             byte[] digest = md.digest(data.getBytes(UTF8));
-            return DatatypeConverter.printHexBinary(digest).toLowerCase();
+            return bytesToHex(digest).toLowerCase();
         } catch (Exception e) {
             log.error("Failed to calculate SHA256: {}", e.getMessage());
             throw new RuntimeException("Failed to calculate SHA256", e);
@@ -101,6 +100,19 @@ public class CryptoUtils {
      */
     public static String hmacSha256Hex(byte[] key, String data) {
         byte[] hmacResult = hmac256(key, data);
-        return DatatypeConverter.printHexBinary(hmacResult).toLowerCase();
+        return bytesToHex(hmacResult).toLowerCase();
+    }
+
+    /**
+     * Convert byte array to hexadecimal string
+     * @param bytes byte array to convert
+     * @return hexadecimal string representation
+     */
+    private static String bytesToHex(byte[] bytes) {
+        StringBuilder result = new StringBuilder();
+        for (byte byteValue : bytes) {
+            result.append(String.format("%02x", byteValue));
+        }
+        return result.toString();
     }
 } 

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

@@ -33,3 +33,4 @@ alerter.priority.0 = Emergency Alert
 alerter.priority.1 = Critical Alert
 alerter.priority.2 = Warning Alert
 alerter.calculate.parse.error = Expression is not fully parsed, may have syntax errors or incomplete inputs
+alerter.datasource.executor.not.found = No query executor found

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

@@ -33,3 +33,4 @@ alerter.priority.0 = 紧急告警
 alerter.priority.1 = 严重告警
 alerter.priority.2 = 警告告警
 alerter.calculate.parse.error = 表达式未完全解析，可能存在语法错误或输入不完整
+alerter.datasource.executor.not.found = 未找到查询执行器

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

@@ -33,3 +33,4 @@ alerter.priority.0 = 緊急警報
 alerter.priority.1 = 嚴重警報
 alerter.priority.2 = 警告警報
 alerter.calculate.parse.error = 表達式未完全解析，可能存在語法錯誤或輸入不完整
+alerter.datasource.executor.not.found = 未找到查詢執行器

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

@@ -23,7 +23,7 @@ expression
 
 expr
     : LPAREN expr RPAREN                                          # ParenExpr
-    | left=expr op=(GE|LE|GT|LT|EQ|NE) right=expr                 # ComparisonExpr
+    | left=expr op=(GE|LE|GT|LT|EQ|NE) BOOL? right=expr          # ComparisonExpr
     | left=expr AND right=expr                                    # AndExpr
     | left=expr UNLESS right=expr                                 # UnlessExpr
     | left=expr OR right=expr                                     # OrExpr
@@ -191,11 +191,6 @@ aggregationOperator
     : SUM | AVG | COUNT | MIN | MAX | STDDEV | STDVAR | TOPK | BOTTOMK | QUANTILE
     ;
 
-binaryOperator
-    : EQ | NE | GT | LT | GE | LE
-    | AND | OR | UNLESS
-    ;
-
 // Lexer rules
 
 // Boolean operators
@@ -259,6 +254,7 @@ LT      : '<' ;
 LE      : '<=' ;
 EQ      : '==' | '=' ;
 NE      : '!=' ;
+BOOL    : 'bool';
 
 // Delimiters
 LPAREN  : '(' ;

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/AlerterWorkerPoolTest.java

@@ -52,4 +52,36 @@ class AlerterWorkerPoolTest {
 
         assertEquals(NUMBER_OF_THREADS, counter.get());
     }
+
+    @Test
+    void executeNotify() throws InterruptedException {
+        counter = new AtomicInteger();
+        latch = new CountDownLatch(NUMBER_OF_THREADS);
+        
+        for (int i = 0; i < NUMBER_OF_THREADS; i++) {
+            pool.executeNotify(() -> {
+                counter.incrementAndGet();
+                latch.countDown();
+            });
+        }
+        latch.await();
+
+        assertEquals(NUMBER_OF_THREADS, counter.get());
+    }
+
+    @Test
+    void executeLogJob() throws InterruptedException {
+        counter = new AtomicInteger();
+        latch = new CountDownLatch(NUMBER_OF_THREADS);
+        
+        for (int i = 0; i < NUMBER_OF_THREADS; i++) {
+            pool.executeLogJob(() -> {
+                counter.incrementAndGet();
+                latch.countDown();
+            });
+        }
+        latch.await();
+
+        assertEquals(NUMBER_OF_THREADS, counter.get());
+    }
 }

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

@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate;
+
+import org.apache.hertzbeat.alert.dao.AlertCollectorDao;
+import org.apache.hertzbeat.alert.dao.SingleAlertDao;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.util.AlertUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.entity.manager.Collector;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Collector alert handler test
+ */
+@ExtendWith(MockitoExtension.class)
+public class CollectorAlertHandlerTest {
+
+    @Mock
+    private AlertCollectorDao alertCollectorDao;
+
+    @Mock
+    private SingleAlertDao singleAlertDao;
+
+    @Mock
+    private AlarmCommonReduce alarmCommonReduce;
+
+    private AlarmCacheManager alarmCacheManager;
+
+    private CollectorAlertHandler collectorAlertHandler;
+
+    @BeforeEach
+    void setUp() {
+        alarmCacheManager = Mockito.spy(new AlarmCacheManager(singleAlertDao));
+        collectorAlertHandler = new CollectorAlertHandler(alarmCommonReduce, alertCollectorDao, alarmCacheManager);
+    }
+
+    @Test
+    public void testOnline() {
+        String identity = "localhost-collector";
+        Collector collector = Collector.builder()
+                .name(identity)
+                .ip("127.0.0.1")
+                .version("1.0")
+                .build();
+        SingleAlert singleAlert = SingleAlert.builder().build();
+
+        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
+        when(alarmCacheManager.removeFiring(any(String.class))).thenReturn(singleAlert);
+
+        collectorAlertHandler.online(identity);
+
+        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, singleAlert.getStatus());
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    public void testOffline() {
+        String identity = "localhost-collector";
+        Collector collector = Collector.builder()
+                .name(identity)
+                .ip("127.0.0.1")
+                .version("1.0")
+                .build();
+
+        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
+        when(alarmCacheManager.getFiring(any(String.class))).thenReturn(null);
+
+        collectorAlertHandler.offline(identity);
+
+        verify(alarmCacheManager, times(1)).putFiring(any(String.class), any(SingleAlert.class));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testOfflineAndOnlineLifecycle() {
+        String identity = "localhost-collector";
+        Collector collector = Collector.builder()
+                .name(identity)
+                .ip("127.0.0.1")
+                .version("1.0")
+                .build();
+
+        Map<String, String> fingerPrints = new HashMap<>(8);
+        fingerPrints.put("collectorName", collector.getName());
+        fingerPrints.put("collectorVersion", collector.getVersion());
+        fingerPrints.put("collectorHost", collector.getIp());
+        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
+
+        when(alertCollectorDao.findCollectorByName(identity)).thenReturn(collector);
+
+        // step1. first time offline
+        collectorAlertHandler.offline(identity);
+        assertNotNull(alarmCacheManager.getFiring(fingerprint));
+
+        // step2. online
+        collectorAlertHandler.online(identity);
+        assertNull(alarmCacheManager.getFiring(fingerprint));
+
+        // step3. second time offline
+        collectorAlertHandler.offline(identity);
+        assertNotNull(alarmCacheManager.getFiring(fingerprint));
+
+        // Verify that the push status is correct.
+        ArgumentCaptor<SingleAlert> captor = ArgumentCaptor.forClass(SingleAlert.class);
+        verify(alarmCommonReduce, atLeast(3)).reduceAndSendAlarm(captor.capture());
+        List<SingleAlert> alerts = captor.getAllValues();
+        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(0).getStatus());
+        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, alerts.get(1).getStatus());
+        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(2).getStatus());
+    }
+}

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

@@ -0,0 +1,252 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.periodic;
+
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.DataSourceService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+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.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test case for {@link LogPeriodicAlertCalculator}
+ */
+@ExtendWith(MockitoExtension.class)
+class LogPeriodicAlertCalculatorTest {
+
+    @Mock
+    private DataSourceService dataSourceService;
+
+    @Mock
+    private AlarmCommonReduce alarmCommonReduce;
+
+    @InjectMocks
+    private LogPeriodicAlertCalculator calculator;
+
+    private AlertDefine groupAlertDefine;
+    private AlertDefine individualAlertDefine;
+
+    @BeforeEach
+    void setUp() {
+        groupAlertDefine = AlertDefine.builder()
+                .id(1L)
+                .name("log_error_alert")
+                .type("periodic_log")
+                .expr("SELECT * FROM hertzbeat_logs WHERE severity_text = 'ERROR' AND time_unix_nano >= ? AND time_unix_nano <= ?")
+                .labels(Map.of(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_WARNING, "team", "backend", CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP))
+                .annotations(Map.of("summary", "Error logs detected", "description", "Multiple error logs found"))
+                .template("Found ${severity_text} log: ${body} from ${service_name}")
+                .datasource("sql")
+                .enable(true)
+                .period(300)
+                .build();
+
+        individualAlertDefine = AlertDefine.builder()
+                .id(1L)
+                .name("log_error_alert")
+                .type("periodic_log")
+                .expr("SELECT * FROM hertzbeat_logs WHERE severity_text = 'ERROR' AND time_unix_nano >= ? AND time_unix_nano <= ?")
+                .labels(Map.of(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_WARNING, "team", "backend",
+                        CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_INDIVIDUAL))
+                .annotations(Map.of("summary", "Error logs detected", "description", "Multiple error logs found"))
+                .template("Found ${severity_text} log: ${body} from ${service_name}")
+                .datasource("sql")
+                .enable(true)
+                .period(300)
+                .build();
+    }
+
+    @Test
+    void testCalculateWithEnabledRuleAndValidExpression() {
+        // Given
+        List<Map<String, Object>> queryResults = createSampleLogResults(3);
+        when(dataSourceService.query(anyString(), anyString())).thenReturn(queryResults);
+
+        // When
+        calculator.calculate(groupAlertDefine);
+
+        // Then
+        verify(dataSourceService).query("sql", "SELECT * FROM hertzbeat_logs WHERE severity_text = 'ERROR' AND time_unix_nano >= ? AND time_unix_nano <= ?");
+        verify(alarmCommonReduce).reduceAndSendAlarmGroup(any(), any());
+    }
+
+    @Test
+    void testCalculateWithEmptyQueryResults() {
+        // Given
+        when(dataSourceService.query(anyString(), anyString())).thenReturn(new ArrayList<>());
+
+        // When
+        calculator.calculate(groupAlertDefine);
+
+        // Then
+        verify(dataSourceService).query(anyString(), anyString());
+        verifyNoInteractions(alarmCommonReduce);
+    }
+
+    @Test
+    void testCalculateWithNullQueryResults() {
+        // Given
+        when(dataSourceService.query(anyString(), anyString())).thenReturn(null);
+
+        // When
+        calculator.calculate(groupAlertDefine);
+
+        // Then
+        verify(dataSourceService).query(anyString(), anyString());
+        verifyNoInteractions(alarmCommonReduce);
+    }
+
+    @Test
+    void testCalculateWithQueryException() {
+        // Given
+        when(dataSourceService.query(anyString(), anyString())).thenThrow(new RuntimeException("Database connection failed"));
+
+        // When
+        calculator.calculate(groupAlertDefine);
+
+        // Then
+        verify(dataSourceService).query(anyString(), anyString());
+        verifyNoInteractions(alarmCommonReduce);
+    }
+
+    @Test
+    void testIndividualAlertGeneration() {
+        // Given
+        Map<String, Object> logContext = createSingleLogResult("Error in payment service", "ERROR");
+        List<Map<String, Object>> queryResults = List.of(logContext);
+        when(dataSourceService.query(anyString(), anyString())).thenReturn(queryResults);
+
+        try (MockedStatic<org.apache.hertzbeat.alert.util.AlertTemplateUtil> mockedTemplateUtil =
+             Mockito.mockStatic(org.apache.hertzbeat.alert.util.AlertTemplateUtil.class)) {
+
+            mockedTemplateUtil.when(() -> org.apache.hertzbeat.alert.util.AlertTemplateUtil.render(anyString(), any()))
+                             .thenReturn("Rendered alert content");
+
+            // When
+            calculator.calculate(individualAlertDefine);
+
+            // Then
+            ArgumentCaptor<SingleAlert> alertCaptor = ArgumentCaptor.forClass(SingleAlert.class);
+            verify(alarmCommonReduce).reduceAndSendAlarm(alertCaptor.capture());
+
+            SingleAlert capturedAlert = alertCaptor.getValue();
+            assertAll(
+                () -> assertEquals(CommonConstants.ALERT_STATUS_FIRING, capturedAlert.getStatus()),
+                () -> assertEquals(1, capturedAlert.getTriggerTimes()),
+                () -> assertEquals("Rendered alert content", capturedAlert.getContent()),
+                () -> assertNotNull(capturedAlert.getStartAt()),
+                () -> assertNotNull(capturedAlert.getActiveAt()),
+                () -> assertTrue(capturedAlert.getLabels().containsKey("alertname")),
+                () -> assertTrue(capturedAlert.getLabels().containsKey("defineid")),
+                () -> assertEquals("log_error_alert", capturedAlert.getLabels().get("alertname")),
+                () -> assertEquals("1", capturedAlert.getLabels().get("defineid"))
+            );
+        }
+    }
+
+    @Test
+    void testGroupAlertGeneration() {
+        // Given
+        List<Map<String, Object>> queryResults = createSampleLogResults(2);
+        when(dataSourceService.query(anyString(), anyString())).thenReturn(queryResults);
+
+        try (MockedStatic<org.apache.hertzbeat.alert.util.AlertTemplateUtil> mockedTemplateUtil = 
+             Mockito.mockStatic(org.apache.hertzbeat.alert.util.AlertTemplateUtil.class)) {
+            
+            mockedTemplateUtil.when(() -> org.apache.hertzbeat.alert.util.AlertTemplateUtil.render(anyString(), any()))
+                             .thenReturn("Rendered alert content");
+
+            // When
+            calculator.calculate(groupAlertDefine);
+
+            // Then
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<Map<String, String>> groupLabelsCaptor = ArgumentCaptor.forClass(Map.class);
+            @SuppressWarnings("unchecked")
+            ArgumentCaptor<List<SingleAlert>> alertsCaptor = ArgumentCaptor.forClass(List.class);
+            verify(alarmCommonReduce).reduceAndSendAlarmGroup(groupLabelsCaptor.capture(), alertsCaptor.capture());
+
+            Map<String, String> groupLabels = groupLabelsCaptor.getValue();
+            List<SingleAlert> alerts = alertsCaptor.getValue();
+
+            assertAll(
+                () -> assertEquals("2", groupLabels.get("__rows__")),
+                () -> assertEquals(CommonConstants.ALERT_MODE_GROUP, groupLabels.get(CommonConstants.ALERT_MODE_LABEL)),
+                () -> assertEquals("log_error_alert", groupLabels.get("alertname")),
+                () -> assertEquals("1", groupLabels.get("defineid")),
+                () -> assertEquals(2, alerts.size()),
+                () -> alerts.forEach(alert -> {
+                    assertEquals(CommonConstants.ALERT_STATUS_FIRING, alert.getStatus());
+                    assertEquals(2, alert.getTriggerTimes());
+                    assertNotNull(alert.getStartAt());
+                    assertNotNull(alert.getActiveAt());
+                })
+            );
+        }
+    }
+
+    /**
+     * Create sample log results with simplified structure - only key fields
+     */
+    private List<Map<String, Object>> createSampleLogResults(int count) {
+        List<Map<String, Object>> results = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            results.add(createSingleLogResult("Error message " + i, "ERROR"));
+        }
+        return results;
+    }
+
+    /**
+     * Create a single log result with simplified structure
+     */
+    private Map<String, Object> createSingleLogResult(String message, String severityText) {
+        Map<String, Object> logEntry = new HashMap<>();
+        
+        // Only essential fields for testing
+        logEntry.put("time_unix_nano", System.nanoTime());
+        logEntry.put("severity_text", severityText);
+        logEntry.put("body", message);
+        logEntry.put("service_name", "payment-service");
+        
+        return logEntry;
+    }
+}

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

@@ -15,8 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate.periodic;
 
+import org.apache.hertzbeat.alert.calculate.AlarmCacheManager;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -50,10 +51,10 @@ import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.when;
 
 /**
- * Test case for {@link PeriodicAlertCalculator}
+ * Test case for {@link MetricsPeriodicAlertCalculator}
  */
 @ExtendWith(MockitoExtension.class)
-class PeriodicAlertCalculatorTest {
+class MetricsPeriodicAlertCalculatorTest {
 
     @Mock
     private DataSourceService dataSourceService;
@@ -65,7 +66,7 @@ class PeriodicAlertCalculatorTest {
     private AlarmCacheManager alarmCacheManager;
 
     @InjectMocks
-    private PeriodicAlertCalculator periodicAlertCalculator;
+    private MetricsPeriodicAlertCalculator periodicAlertCalculator;
 
     private AlertDefine rule;
 

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

@@ -15,10 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate.realtime;
 
 import com.google.common.collect.Lists;
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.calculate.AlarmCacheManager;
+import org.apache.hertzbeat.alert.calculate.JexlExprCalculator;
 import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
@@ -48,7 +50,7 @@ import static org.mockito.Mockito.when;
 /**
  *
  */
-public class RealTimeAlertCalculatorMatchTest {
+public class MetricsRealTimeAlertCalculatorMatchTest {
 
     private final AlerterWorkerPool workerPool = new AlerterWorkerPool();
 
@@ -67,19 +69,20 @@ public class RealTimeAlertCalculatorMatchTest {
     @Mock
     private AlarmCacheManager alarmCacheManager;
 
-    private RealTimeAlertCalculator realTimeAlertCalculator;
+    private MetricsRealTimeAlertCalculator metricsRealTimeAlertCalculator;
 
     @BeforeEach
     public void setUp() {
         MockitoAnnotations.openMocks(this);
         when(singleAlertDao.querySingleAlertsByStatus(any())).thenReturn(new ArrayList<>());
-        realTimeAlertCalculator = new RealTimeAlertCalculator(
+        metricsRealTimeAlertCalculator = new MetricsRealTimeAlertCalculator(
                 workerPool,
                 dataQueue,
                 alertDefineService,
                 singleAlertDao,
                 alarmCommonReduce,
                 alarmCacheManager,
+                new JexlExprCalculator(),
                 false
         );
     }
@@ -99,7 +102,7 @@ public class RealTimeAlertCalculatorMatchTest {
 
         List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
 
-        List<AlertDefine> filtered = realTimeAlertCalculator.filterThresholdsByAppAndMetrics(allDefines, app, "", Map.of(), instanceId, priority);
+        List<AlertDefine> filtered = metricsRealTimeAlertCalculator.filterThresholdsByAppAndMetrics(allDefines, app, "", Map.of(), instanceId, priority);
 
         // It should filter out 999999999.
         assertEquals(1, filtered.size());
@@ -145,10 +148,10 @@ public class RealTimeAlertCalculatorMatchTest {
 
         List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
 
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
+        when(alertDefineService.getMetricsRealTimeAlertDefines()).thenReturn(allDefines);
         when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
 
-        realTimeAlertCalculator.startCalculate();
+        metricsRealTimeAlertCalculator.startCalculate();
 
         Thread.sleep(3000);
 
@@ -189,10 +192,10 @@ public class RealTimeAlertCalculatorMatchTest {
 
         List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
 
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
+        when(alertDefineService.getMetricsRealTimeAlertDefines()).thenReturn(allDefines);
         when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
 
-        realTimeAlertCalculator.startCalculate();
+        metricsRealTimeAlertCalculator.startCalculate();
 
         Thread.sleep(3000);
 
@@ -239,10 +242,10 @@ public class RealTimeAlertCalculatorMatchTest {
 
         List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
 
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
+        when(alertDefineService.getMetricsRealTimeAlertDefines()).thenReturn(allDefines);
         when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
 
-        realTimeAlertCalculator.startCalculate();
+        metricsRealTimeAlertCalculator.startCalculate();
 
         Thread.sleep(3000);
 

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

@@ -15,11 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate.realtime;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.calculate.AlarmCacheManager;
+import org.apache.hertzbeat.alert.calculate.JexlExprCalculator;
 import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
@@ -35,9 +37,9 @@ import java.util.List;
 import java.util.Map;
 
 
-class RealTimeAlertCalculatorTest {
+class MetricsRealTimeAlertCalculatorTest {
 
-    private RealTimeAlertCalculator calculator;
+    private MetricsRealTimeAlertCalculator calculator;
 
     @BeforeEach
     void setUp() {
@@ -51,7 +53,8 @@ class RealTimeAlertCalculatorTest {
         Mockito.when(mockDao.querySingleAlertsByStatus(Mockito.anyString()))
                 .thenReturn(Collections.emptyList());
 
-        calculator = new RealTimeAlertCalculator(mockPool, mockQueue, mockAlertDefineService, mockDao, mockReduce, alarmCacheManager, false);
+        calculator = new MetricsRealTimeAlertCalculator(mockPool, mockQueue, mockAlertDefineService
+                , mockDao, mockReduce, alarmCacheManager, new JexlExprCalculator(), false);
     }
 
     @Test

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

@@ -0,0 +1,189 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime;
+
+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.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 static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test case for {@link WindowedLogRealTimeAlertCalculator}
+ */
+@ExtendWith(MockitoExtension.class)
+class WindowedLogRealTimeAlertCalculatorTest {
+
+    @Mock
+    private CommonDataQueue dataQueue;
+
+    @Mock
+    private TimeService timeService;
+
+    @Mock
+    private LogWorker logWorker;
+
+    @InjectMocks
+    private WindowedLogRealTimeAlertCalculator calculator;
+
+    private LogEntry validLogEntry;
+    private LogEntry invalidTimestampLogEntry;
+    private LogEntry lateDataLogEntry;
+
+    @BeforeEach
+    void setUp() {
+        // Create valid log entry with current timestamp
+        long currentTimeNano = System.currentTimeMillis() * 1_000_000L;
+        validLogEntry = LogEntry.builder()
+                .timeUnixNano(currentTimeNano)
+                .severityText("ERROR")
+                .body("Test error message")
+                .build();
+
+        // Create log entry with invalid timestamp (far future)
+        long invalidTimeNano = (System.currentTimeMillis() + 2 * 60 * 60 * 1000L) * 1_000_000L; // 2 hours in future
+        invalidTimestampLogEntry = LogEntry.builder()
+                .timeUnixNano(invalidTimeNano)
+                .severityText("ERROR")
+                .body("Test error message with invalid timestamp")
+                .build();
+
+        // Create late data log entry
+        long lateTimeNano = (System.currentTimeMillis() - 60 * 60 * 1000L) * 1_000_000L; // 1 hour in past
+        lateDataLogEntry = LogEntry.builder()
+                .timeUnixNano(lateTimeNano)
+                .severityText("ERROR")
+                .body("Test late data message")
+                .build();
+    }
+
+    @Test
+    void testRunWithValidLogEntry() throws InterruptedException {
+        // Given
+        when(dataQueue.pollLogEntry()).thenReturn(validLogEntry, (LogEntry) null);
+        when(timeService.isValidTimestamp(anyLong())).thenReturn(true);
+        when(timeService.isLateData(anyLong())).thenReturn(false);
+
+        // Create a thread to run the calculator
+        Thread calculatorThread = new Thread(calculator);
+
+        // When
+        calculatorThread.start();
+        
+        // Give some time for processing
+        Thread.sleep(100);
+        calculatorThread.interrupt();
+        calculatorThread.join(1000);
+
+        // Then
+        verify(dataQueue, atLeastOnce()).pollLogEntry();
+        verify(timeService).isValidTimestamp(anyLong());
+        verify(timeService).isLateData(anyLong());
+        verify(timeService).updateMaxTimestamp(anyLong());
+        verify(logWorker).reduceAndSendLogTask(validLogEntry);
+        verify(dataQueue).sendLogEntryToStorage(validLogEntry);
+    }
+
+    @Test
+    void testRunWithInvalidTimestamp() throws InterruptedException {
+        // Given
+        when(dataQueue.pollLogEntry()).thenReturn(invalidTimestampLogEntry, (LogEntry) null);
+        when(timeService.isValidTimestamp(anyLong())).thenReturn(false);
+
+        // Create a thread to run the calculator
+        Thread calculatorThread = new Thread(calculator);
+
+        // When
+        calculatorThread.start();
+        
+        // Give some time for processing
+        Thread.sleep(100);
+        calculatorThread.interrupt();
+        calculatorThread.join(1000);
+
+        // Then
+        verify(dataQueue, atLeastOnce()).pollLogEntry();
+        verify(timeService).isValidTimestamp(anyLong());
+        verify(timeService, never()).isLateData(anyLong());
+        verify(timeService, never()).updateMaxTimestamp(anyLong());
+        verify(logWorker, never()).reduceAndSendLogTask(any());
+        verify(dataQueue).sendLogEntryToStorage(invalidTimestampLogEntry);
+    }
+
+    @Test
+    void testRunWithLateData() throws InterruptedException {
+        // Given
+        when(dataQueue.pollLogEntry()).thenReturn(lateDataLogEntry, (LogEntry) null);
+        when(timeService.isValidTimestamp(anyLong())).thenReturn(true);
+        when(timeService.isLateData(anyLong())).thenReturn(true);
+        when(timeService.getCurrentWatermark()).thenReturn(System.currentTimeMillis() - 30 * 60 * 1000L); // 30 minutes ago
+
+        // Create a thread to run the calculator
+        Thread calculatorThread = new Thread(calculator);
+
+        // When
+        calculatorThread.start();
+        
+        // Give some time for processing
+        Thread.sleep(100);
+        calculatorThread.interrupt();
+        calculatorThread.join(1000);
+
+        // Then
+        verify(dataQueue, atLeastOnce()).pollLogEntry();
+        verify(timeService).isValidTimestamp(anyLong());
+        verify(timeService).isLateData(anyLong());
+        verify(timeService, never()).updateMaxTimestamp(anyLong());
+        verify(logWorker, never()).reduceAndSendLogTask(any());
+        verify(dataQueue).sendLogEntryToStorage(lateDataLogEntry);
+    }
+
+    @Test
+    void testRunWithGeneralException() throws InterruptedException {
+        // Given
+        when(dataQueue.pollLogEntry()).thenThrow(new RuntimeException("Test runtime exception"))
+                .thenReturn(null); // Return null to exit the loop
+
+        // Create a thread to run the calculator
+        Thread calculatorThread = new Thread(calculator);
+
+        // When
+        calculatorThread.start();
+        
+        // Give some time for processing
+        Thread.sleep(100);
+        calculatorThread.interrupt();
+        calculatorThread.join(1000);
+
+        // Then
+        verify(dataQueue, atLeastOnce()).pollLogEntry();
+    }
+
+}

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

@@ -0,0 +1,346 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Test case for {@link AlarmEvaluator}
+ */
+@ExtendWith(MockitoExtension.class)
+class AlarmEvaluatorTest {
+
+    @Mock
+    private AlarmCommonReduce alarmCommonReduce;
+
+    @InjectMocks
+    private AlarmEvaluator alarmEvaluator;
+
+    private AlertDefine alertDefine;
+    private WindowAggregator.WindowData windowData;
+
+    @BeforeEach
+    void setUp() {
+        // Create test log entry
+        LogEntry logEntry = LogEntry.builder()
+                .timeUnixNano(System.currentTimeMillis() * 1_000_000L)
+                .severityText("ERROR")
+                .body("Test error message")
+                .attributes(Map.of("service", "test-service", "pod", "test-pod"))
+                .resource(Map.of("cluster", "test-cluster"))
+                .build();
+
+        // Create test alert define for individual mode
+        alertDefine = AlertDefine.builder()
+                .id(1L)
+                .name("test_log_alert")
+                .type("realtime_log")
+                .expr("log.severityText == 'ERROR'")
+                .times(1)
+                .template("Alert: {{log.body}}")
+                .labels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_INDIVIDUAL, CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL))
+                .annotations(Map.of("summary", "Test alert summary"))
+                .enable(true)
+                .build();
+
+        // Create matching log events
+        MatchingLogEvent matchingEvent = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(System.currentTimeMillis())
+                .workerTimestamp(System.currentTimeMillis())
+                .build();
+
+        // Create window data
+        WindowAggregator.WindowKey windowKey = new WindowAggregator.WindowKey(1L, 
+            System.currentTimeMillis() - 60000, System.currentTimeMillis());
+        windowData = new WindowAggregator.WindowData(windowKey, alertDefine);
+        windowData.addMatchingLog(matchingEvent);
+    }
+
+    @Test
+    void testProcessWindowDataWithIndividualMode() throws InterruptedException {
+        // Given - alert define with individual mode
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_INDIVIDUAL));
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarmGroup(anyMap(), anyList());
+    }
+
+    @Test
+    void testProcessWindowDataWithGroupMode() throws InterruptedException {
+        // Given - alert define with group mode
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP));
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarmGroup(anyMap(), anyList());
+    }
+
+    @Test
+    void testProcessWindowDataWithEmptyLogs() throws InterruptedException {
+        // Given - window data with no matching logs
+        WindowAggregator.WindowKey emptyWindowKey = new WindowAggregator.WindowKey(1L, 
+            System.currentTimeMillis() - 60000, System.currentTimeMillis());
+        WindowAggregator.WindowData emptyWindowData = new WindowAggregator.WindowData(emptyWindowKey, alertDefine);
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(emptyWindowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then - should not process any alerts
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarmGroup(anyMap(), anyList());
+    }
+
+    @Test
+    void testProcessWindowDataWithInsufficientTimes() throws InterruptedException {
+        // Given - alert define requiring 3 times but only 1 matching log
+        alertDefine.setTimes(3);
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then - should not process any alerts due to insufficient count
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarmGroup(anyMap(), anyList());
+    }
+
+    @Test
+    void testIndividualAlertGeneration() throws InterruptedException {
+        // Given
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_INDIVIDUAL, CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL));
+        alertDefine.setAnnotations(Map.of("summary", "Test summary", "description", "Test description"));
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then
+        ArgumentCaptor<SingleAlert> alertCaptor = ArgumentCaptor.forClass(SingleAlert.class);
+        verify(alarmCommonReduce).reduceAndSendAlarm(alertCaptor.capture());
+        
+        SingleAlert capturedAlert = alertCaptor.getValue();
+        assertAll(
+            () -> assertNotNull(capturedAlert),
+            () -> assertEquals(CommonConstants.ALERT_STATUS_FIRING, capturedAlert.getStatus()),
+            () -> assertEquals(1, capturedAlert.getTriggerTimes()),
+            () -> assertNotNull(capturedAlert.getContent()),
+            () -> assertNotNull(capturedAlert.getLabels()),
+            () -> assertNotNull(capturedAlert.getAnnotations()),
+            () -> assertTrue(capturedAlert.getStartAt() > 0),
+            () -> assertTrue(capturedAlert.getActiveAt() > 0)
+        );
+        
+        // Verify labels contain alert define info and log entry data
+        Map<String, String> labels = capturedAlert.getLabels();
+        assertTrue(labels.containsKey(CommonConstants.LABEL_ALERT_SEVERITY));
+        assertTrue(labels.containsKey("severityText"));
+        assertTrue(labels.containsKey("body"));
+    }
+
+    @Test
+    void testGroupAlertGeneration() throws InterruptedException {
+        // Given
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP, CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_WARNING));
+        
+        // Add more matching logs to test group functionality
+        MatchingLogEvent secondEvent = MatchingLogEvent.builder()
+                .logEntry(LogEntry.builder()
+                    .timeUnixNano((System.currentTimeMillis() + 1000) * 1_000_000L)
+                    .severityText("ERROR") 
+                    .body("Second error message")
+                    .build())
+                .alertDefine(alertDefine)
+                .eventTimestamp(System.currentTimeMillis() + 1000)
+                .workerTimestamp(System.currentTimeMillis() + 1000)
+                .build();
+        
+        windowData.addMatchingLog(secondEvent);
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        
+        // Wait for async processing
+        Thread.sleep(2000);
+
+        // Then
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, String>> labelsCaptor = ArgumentCaptor.forClass(Map.class);
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<List<SingleAlert>> alertsCaptor = ArgumentCaptor.forClass(List.class);
+        verify(alarmCommonReduce).reduceAndSendAlarmGroup(labelsCaptor.capture(), alertsCaptor.capture());
+        
+        Map<String, String> groupLabels = labelsCaptor.getValue();
+        List<SingleAlert> alerts = alertsCaptor.getValue();
+        
+        assertAll(
+            () -> assertNotNull(groupLabels),
+            () -> assertNotNull(alerts),
+            () -> assertEquals(2, alerts.size()),
+            () -> assertTrue(groupLabels.containsKey("window_start_time")),
+            () -> assertTrue(groupLabels.containsKey("window_end_time")),
+            () -> assertTrue(groupLabels.containsKey("matching_logs_count")),
+            () -> assertEquals(CommonConstants.ALERT_MODE_GROUP, groupLabels.get(CommonConstants.ALERT_MODE_LABEL)),
+            () -> assertEquals("2", groupLabels.get("matching_logs_count"))
+        );
+        
+        // Verify each alert in the group
+        for (SingleAlert alert : alerts) {
+            assertEquals(CommonConstants.ALERT_STATUS_FIRING, alert.getStatus());
+            assertEquals(2, alert.getTriggerTimes()); // Should equal the count of matching logs
+        }
+    }
+
+    @Test
+    void testLogEntryDataMapping() throws InterruptedException {
+        // Given - log entry with comprehensive data
+        LogEntry detailedLogEntry = LogEntry.builder()
+                .timeUnixNano(System.currentTimeMillis() * 1_000_000L)
+                .severityNumber(17) // ERROR level
+                .severityText("ERROR")
+                .body("Detailed error message")
+                .attributes(Map.of("service", "api-service", "version", "1.0.0"))
+                .resource(Map.of("cluster", "prod-cluster", "namespace", "default"))
+                .droppedAttributesCount(0)
+                .traceId("trace123")
+                .spanId("span456")
+                .traceFlags(1)
+                .build();
+
+        MatchingLogEvent detailedEvent = MatchingLogEvent.builder()
+                .logEntry(detailedLogEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(System.currentTimeMillis())
+                .workerTimestamp(System.currentTimeMillis())
+                .build();
+
+        WindowAggregator.WindowData detailedWindowData = new WindowAggregator.WindowData(
+            new WindowAggregator.WindowKey(1L, System.currentTimeMillis() - 60000, System.currentTimeMillis()),
+            alertDefine);
+        detailedWindowData.addMatchingLog(detailedEvent);
+
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_INDIVIDUAL));
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(detailedWindowData);
+        Thread.sleep(2000);
+
+        // Then
+        ArgumentCaptor<SingleAlert> alertCaptor = ArgumentCaptor.forClass(SingleAlert.class);
+        verify(alarmCommonReduce).reduceAndSendAlarm(alertCaptor.capture());
+        
+        SingleAlert alert = alertCaptor.getValue();
+        Map<String, String> labels = alert.getLabels();
+        
+        // Verify log entry fields are mapped to labels
+        assertAll(
+            () -> assertEquals("17", labels.get("severityNumber")),
+            () -> assertEquals("ERROR", labels.get("severityText")),
+            () -> assertEquals("Detailed error message", labels.get("body")),
+            () -> assertEquals("0", labels.get("droppedAttributesCount")),
+            () -> assertEquals("trace123", labels.get("traceId")),
+            () -> assertEquals("span456", labels.get("spanId")),
+            () -> assertEquals("1", labels.get("traceFlags")),
+            () -> assertEquals("api-service", labels.get("attr_service")),
+            () -> assertEquals("1.0.0", labels.get("attr_version")),
+            () -> assertEquals("prod-cluster", labels.get("resource_cluster")),
+            () -> assertEquals("default", labels.get("resource_namespace"))
+        );
+    }
+
+    @Test
+    void testMultipleMatchingLogsInWindow() throws InterruptedException {
+        // Given - multiple matching logs in the same window
+        alertDefine.setTimes(2); // Require at least 2 occurrences
+        alertDefine.setLabels(Map.of(CommonConstants.ALERT_MODE_LABEL, CommonConstants.ALERT_MODE_GROUP));
+        
+        // Add second matching log
+        MatchingLogEvent secondEvent = MatchingLogEvent.builder()
+                .logEntry(LogEntry.builder()
+                    .severityText("ERROR")
+                    .body("Another error")
+                    .build())
+                .alertDefine(alertDefine)
+                .eventTimestamp(System.currentTimeMillis() + 5000)
+                .workerTimestamp(System.currentTimeMillis() + 5000)
+                .build();
+        
+        windowData.addMatchingLog(secondEvent);
+        
+        // When
+        alarmEvaluator.sendAndProcessWindowData(windowData);
+        Thread.sleep(2000);
+
+        // Then - should trigger group alert since threshold is met
+        verify(alarmCommonReduce).reduceAndSendAlarmGroup(anyMap(), anyList());
+        
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<List<SingleAlert>> alertsCaptor = ArgumentCaptor.forClass(List.class);
+        verify(alarmCommonReduce).reduceAndSendAlarmGroup(anyMap(), alertsCaptor.capture());
+        
+        List<SingleAlert> alerts = alertsCaptor.getValue();
+        assertEquals(2, alerts.size());
+        assertEquals(2, alerts.get(0).getTriggerTimes()); // Each alert should have trigger times = total count
+    }
+}

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

@@ -0,0 +1,239 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.calculate.JexlExprCalculator;
+import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+
+/**
+ * Test case for {@link LogWorker}
+ */
+@ExtendWith(MockitoExtension.class)
+class LogWorkerTest {
+
+    @Mock
+    private AlertDefineService alertDefineService;
+
+    @Mock
+    private JexlExprCalculator jexlExprCalculator;
+
+    @Mock
+    private WindowAggregator windowAggregator;
+
+    @Mock
+    private AlerterWorkerPool workerPool;
+
+    @InjectMocks
+    private LogWorker logWorker;
+
+    private LogEntry logEntry;
+    private AlertDefine alertDefine;
+    private List<AlertDefine> alertDefines;
+
+    @BeforeEach
+    void setUp() {
+        // Create test log entry
+        logEntry = LogEntry.builder()
+                .timeUnixNano(System.currentTimeMillis() * 1_000_000L)
+                .severityText("ERROR")
+                .body("Test error message")
+                .build();
+
+        // Create test alert define
+        alertDefine = AlertDefine.builder()
+                .id(1L)
+                .name("test_log_alert")
+                .type("realtime_log")
+                .expr("log.severityText == 'ERROR'")
+                .enable(true)
+                .build();
+
+        alertDefines = new ArrayList<>();
+        alertDefines.add(alertDefine);
+    }
+
+    @Test
+    void testReduceAndSendLogTask() {
+        // When
+        logWorker.reduceAndSendLogTask(logEntry);
+
+        // Then
+        verify(workerPool).executeLogJob(any(Runnable.class));
+    }
+
+    @Test
+    void testReduceLogTask() {
+        // Given
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(alertDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), anyString(), eq(false))).thenReturn(true);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        
+        // Execute the task
+        task.run();
+
+        // Then
+        verify(alertDefineService).getLogRealTimeAlertDefines();
+        verify(jexlExprCalculator).execAlertExpression(anyMap(), eq("log.severityText == 'ERROR'"), eq(false));
+        verify(windowAggregator).addMatchingLog(any(MatchingLogEvent.class));
+    }
+
+    @Test
+    void testProcessLogEntryWithMatchingExpression() {
+        // Given
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(alertDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), anyString(), eq(false))).thenReturn(true);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        task.run();
+
+        // Then
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, Object>> contextCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(jexlExprCalculator).execAlertExpression(contextCaptor.capture(), eq("log.severityText == 'ERROR'"), eq(false));
+        
+        Map<String, Object> context = contextCaptor.getValue();
+        assertEquals(logEntry, context.get("log"));
+        
+        ArgumentCaptor<MatchingLogEvent> eventCaptor = ArgumentCaptor.forClass(MatchingLogEvent.class);
+        verify(windowAggregator).addMatchingLog(eventCaptor.capture());
+        
+        MatchingLogEvent capturedEvent = eventCaptor.getValue();
+        assertEquals(logEntry, capturedEvent.getLogEntry());
+        assertEquals(alertDefine, capturedEvent.getAlertDefine());
+        assertTrue(capturedEvent.getEventTimestamp() > 0);
+        assertTrue(capturedEvent.getWorkerTimestamp() > 0);
+    }
+
+    @Test
+    void testProcessLogEntryWithNonMatchingExpression() {
+        // Given
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(alertDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), anyString(), eq(false))).thenReturn(false);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        task.run();
+
+        // Then
+        verify(jexlExprCalculator).execAlertExpression(anyMap(), eq("log.severityText == 'ERROR'"), eq(false));
+        verify(windowAggregator, never()).addMatchingLog(any(MatchingLogEvent.class));
+    }
+
+    @Test
+    void testProcessLogEntryWithMultipleAlertDefines() {
+        // Given
+        AlertDefine secondDefine = AlertDefine.builder()
+                .id(2L)
+                .name("second_alert")
+                .type("realtime_log")
+                .expr("log.body != null")
+                .enable(true)
+                .build();
+        
+        List<AlertDefine> multipleDefines = List.of(alertDefine, secondDefine);
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(multipleDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), eq("log.severityText == 'ERROR'"), eq(false))).thenReturn(true);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), eq("log.body != null"), eq(false))).thenReturn(true);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        task.run();
+
+        // Then
+        verify(jexlExprCalculator).execAlertExpression(anyMap(), eq("log.severityText == 'ERROR'"), eq(false));
+        verify(jexlExprCalculator).execAlertExpression(anyMap(), eq("log.body != null"), eq(false));
+        verify(windowAggregator, times(2)).addMatchingLog(any(MatchingLogEvent.class));
+    }
+
+    @Test
+    void testCreateMatchingLogEventStructure() {
+        // Given
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(alertDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), anyString(), eq(false))).thenReturn(true);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        task.run();
+
+        // Then
+        ArgumentCaptor<MatchingLogEvent> eventCaptor = ArgumentCaptor.forClass(MatchingLogEvent.class);
+        verify(windowAggregator).addMatchingLog(eventCaptor.capture());
+        
+        MatchingLogEvent event = eventCaptor.getValue();
+        assertAll(
+            () -> assertNotNull(event.getLogEntry()),
+            () -> assertNotNull(event.getAlertDefine()),
+            () -> assertTrue(event.getEventTimestamp() > 0),
+            () -> assertTrue(event.getWorkerTimestamp() > 0),
+            () -> assertEquals(logEntry, event.getLogEntry()),
+            () -> assertEquals(alertDefine, event.getAlertDefine()),
+            () -> assertTrue(event.getWorkerTimestamp() >= event.getEventTimestamp() - 1000) 
+        );
+    }
+
+    @Test
+    void testLogPrefixInContext() {
+        // Given
+        when(alertDefineService.getLogRealTimeAlertDefines()).thenReturn(alertDefines);
+        when(jexlExprCalculator.execAlertExpression(anyMap(), anyString(), eq(false))).thenReturn(false);
+
+        // When
+        Runnable task = logWorker.reduceLogTask(logEntry);
+        task.run();
+
+        // Then
+        @SuppressWarnings("unchecked")
+        ArgumentCaptor<Map<String, Object>> contextCaptor = ArgumentCaptor.forClass(Map.class);
+        verify(jexlExprCalculator).execAlertExpression(contextCaptor.capture(), anyString(), eq(false));
+        
+        Map<String, Object> context = contextCaptor.getValue();
+        assertTrue(context.containsKey("log"));
+        assertEquals(logEntry, context.get("log"));
+    }
+}

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

@@ -0,0 +1,291 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Test case for {@link TimeService}
+ */
+@ExtendWith(MockitoExtension.class)
+class TimeServiceTest {
+
+    @Mock
+    private TimeService.WatermarkListener mockListener1;
+
+    @Mock
+    private TimeService.WatermarkListener mockListener2;
+
+    private TimeService timeService;
+    
+    @BeforeEach
+    void setUp() {
+        timeService = new TimeService(Collections.emptyList());
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (timeService != null) {
+            timeService.stop();
+        }
+    }
+
+    @Test
+    void testIsValidTimestamp() {
+        // Given
+        long currentTime = System.currentTimeMillis();
+        long validFutureTime = currentTime + 30_000; // 30 seconds in future
+        long validPastTime = currentTime - 60_000; // 1 minute in past
+        long invalidFutureTime = currentTime + 120_000; // 2 minutes in future (exceeds 1 minute limit)
+        long invalidPastTime = currentTime - 25 * 60 * 60 * 1000; // 25 hours in past (exceeds 24 hours limit)
+
+        // When & Then
+        assertAll(
+            () -> assertTrue(timeService.isValidTimestamp(currentTime)),
+            () -> assertTrue(timeService.isValidTimestamp(validFutureTime)),
+            () -> assertTrue(timeService.isValidTimestamp(validPastTime)),
+            () -> assertFalse(timeService.isValidTimestamp(invalidFutureTime)),
+            () -> assertFalse(timeService.isValidTimestamp(invalidPastTime))
+        );
+    }
+
+    @Test
+    void testIsLateData() {
+        // Given
+        long currentTime = System.currentTimeMillis();
+        timeService.updateMaxTimestamp(currentTime);
+        timeService.start();
+        
+        // Wait for watermark to be set
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        // When & Then
+        long currentWatermark = timeService.getCurrentWatermark();
+        if (currentWatermark > 0) {
+            assertTrue(timeService.isLateData(currentWatermark - 1000));
+            assertFalse(timeService.isLateData(currentWatermark + 1000));
+        }
+    }
+
+    @Test
+    void testUpdateMaxTimestamp() {
+        // Given
+        long timestamp1 = 1000L;
+        long timestamp2 = 2000L;
+        long timestamp3 = 1500L; 
+
+        // When
+        timeService.updateMaxTimestamp(timestamp1);
+        timeService.updateMaxTimestamp(timestamp2);
+        timeService.updateMaxTimestamp(timestamp3); 
+
+        timeService.start();
+        
+        // Wait for potential watermark broadcast
+        try {
+            Thread.sleep(100);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+
+        // Then - The max timestamp should be the highest value (timestamp2)
+        assertEquals(timestamp2, timeService.getMaxTimestamp());
+    }
+
+    @Test
+    void testWatermarkBroadcastWithRealTimestamps() throws InterruptedException {
+        // Given
+        CountDownLatch latch = new CountDownLatch(1);
+        AtomicLong receivedWatermark = new AtomicLong();
+        
+        TimeService.WatermarkListener testListener = watermark -> {
+            receivedWatermark.set(watermark.getTimestamp());
+            latch.countDown();
+        };
+
+        timeService.addWatermarkListener(testListener);
+        timeService.start();
+
+        // When
+        long testTimestamp = System.currentTimeMillis();
+        timeService.updateMaxTimestamp(testTimestamp);
+
+        // Then
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Should receive watermark within 10 seconds");
+        
+        long watermark = receivedWatermark.get();
+        long expectedWatermark = testTimestamp - TimeService.DEFAULT_WATERMARK_DELAY_MS; // DEFAULT_WATERMARK_DELAY_MS
+        assertEquals(expectedWatermark, watermark);
+    }
+
+    @Test
+    void testWatermarkMonotonicProperty() throws InterruptedException {
+        // Given
+        List<Long> receivedWatermarks = Collections.synchronizedList(new ArrayList<>());
+        CountDownLatch latch = new CountDownLatch(2);
+        
+        TimeService.WatermarkListener testListener = watermark -> {
+            receivedWatermarks.add(watermark.getTimestamp());
+            latch.countDown();
+        };
+
+        timeService.addWatermarkListener(testListener);
+        timeService.start();
+
+        // When - Update with increasing timestamps
+        long baseTime = System.currentTimeMillis();
+        timeService.updateMaxTimestamp(baseTime);
+        Thread.sleep(6000); // Wait for first watermark
+        
+        timeService.updateMaxTimestamp(baseTime + 40_000); // Increase by 40 seconds
+        
+        // Then
+        assertTrue(latch.await(15, TimeUnit.SECONDS), "Should receive at least 2 watermarks");
+        
+        // Verify watermarks are monotonic (non-decreasing)
+        for (int i = 1; i < receivedWatermarks.size(); i++) {
+            assertTrue(receivedWatermarks.get(i) >= receivedWatermarks.get(i - 1),
+                "Watermarks should be monotonic: " + receivedWatermarks);
+        }
+    }
+
+    @Test
+    void testListenerExceptionHandling() throws InterruptedException {
+        // Given
+        AtomicInteger successfulCalls = new AtomicInteger(0);
+        CountDownLatch latch = new CountDownLatch(1);
+        
+        // Mock listener that throws exception
+        TimeService.WatermarkListener faultyListener = watermark -> {
+            throw new RuntimeException("Test exception");
+        };
+        
+        // Mock listener that works normally
+        TimeService.WatermarkListener normalListener = watermark -> {
+            successfulCalls.incrementAndGet();
+            latch.countDown();
+        };
+
+        timeService.addWatermarkListener(faultyListener);
+        timeService.addWatermarkListener(normalListener);
+        timeService.start();
+
+        // When
+        timeService.updateMaxTimestamp(System.currentTimeMillis());
+
+        // Then - Normal listener should still work despite faulty listener
+        assertTrue(latch.await(10, TimeUnit.SECONDS), "Normal listener should receive watermark");
+        assertTrue(successfulCalls.get() > 0, "Normal listener should be called successfully");
+    }
+
+    @Test
+    void testGetCurrentWatermark() {
+        // Given
+        timeService.start();
+        
+        // Initially watermark should be 0
+        assertEquals(0, timeService.getCurrentWatermark());
+        
+        // When
+        long testTimestamp = System.currentTimeMillis();
+        timeService.updateMaxTimestamp(testTimestamp);
+        
+        // Wait for watermark update
+        try {
+            Thread.sleep(6000);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+        
+        // Then
+        long watermark = timeService.getCurrentWatermark();
+        assertEquals(testTimestamp - TimeService.DEFAULT_WATERMARK_DELAY_MS, watermark);
+    }
+
+    @Test
+    void testZeroTimestampHandling() throws InterruptedException {
+        // Given
+        CountDownLatch latch = new CountDownLatch(1);
+        AtomicInteger callCount = new AtomicInteger(0);
+        
+        TimeService.WatermarkListener testListener = watermark -> {
+            callCount.incrementAndGet();
+            latch.countDown();
+        };
+
+        timeService.addWatermarkListener(testListener);
+        timeService.start();
+
+        // When - Update with zero timestamp
+        timeService.updateMaxTimestamp(0);
+        
+        // Wait for potential watermark broadcast
+        boolean received = latch.await(8, TimeUnit.SECONDS);
+        
+        // Then - No watermark should be broadcast for zero timestamp
+        assertFalse(received, "No watermark should be broadcast for zero timestamp");
+        assertEquals(0, callCount.get());
+    }
+
+    @Test
+    void testNegativeTimestampHandling() throws InterruptedException {
+        // Given
+        CountDownLatch latch = new CountDownLatch(1);
+        AtomicInteger callCount = new AtomicInteger(0);
+        
+        TimeService.WatermarkListener testListener = watermark -> {
+            callCount.incrementAndGet();
+            latch.countDown();
+        };
+
+        timeService.addWatermarkListener(testListener);
+        timeService.start();
+
+        // When - Update with negative timestamp
+        timeService.updateMaxTimestamp(-1000L);
+        
+        // Wait for potential watermark broadcast
+        boolean received = latch.await(8, TimeUnit.SECONDS);
+        
+        // Then - No watermark should be broadcast for negative timestamp
+        assertFalse(received, "No watermark should be broadcast for negative timestamp");
+        assertEquals(0, callCount.get());
+    }
+}

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

@@ -0,0 +1,239 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.calculate.realtime.window;
+
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.log.LogEntry;
+import org.junit.jupiter.api.AfterEach;
+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 java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Test case for {@link WindowAggregator}
+ */
+@ExtendWith(MockitoExtension.class)
+class WindowAggregatorTest {
+
+    @Mock
+    private AlarmEvaluator alarmEvaluator;
+
+    @InjectMocks
+    private WindowAggregator windowAggregator;
+
+    private AlertDefine alertDefine;
+    private LogEntry logEntry;
+
+    @BeforeEach
+    void setUp() {
+        // Create test log entry
+        logEntry = LogEntry.builder()
+                .timeUnixNano(System.currentTimeMillis() * 1_000_000L)
+                .severityText("ERROR")
+                .body("Test error message")
+                .attributes(Map.of("service", "test-service"))
+                .build();
+
+        // Create test alert define
+        alertDefine = AlertDefine.builder()
+                .id(1L)
+                .name("test_log_alert")
+                .type("realtime_log")
+                .expr("log.severityText == 'ERROR'")
+                .period(60) // 60 seconds window
+                .times(1)
+                .enable(true)
+                .build();
+
+        // Stop the default aggregator to avoid conflicts
+        windowAggregator.stop();
+    }
+
+    @AfterEach
+    void tearDown() {
+        if (windowAggregator != null) {
+            windowAggregator.stop();
+        }
+    }
+
+    @Test
+    void testWatermarkProcessing() throws InterruptedException {
+        // Given - add a matching log event first
+        long eventTime = System.currentTimeMillis();
+        long windowSize = 60 * 1000; // 60 seconds
+        long windowStart = (eventTime / windowSize) * windowSize;
+        long windowEnd = windowStart + windowSize;
+
+        MatchingLogEvent testEvent = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(eventTime)
+                .workerTimestamp(eventTime)
+                .build();
+        windowAggregator.start();
+        windowAggregator.addMatchingLog(testEvent);
+        Thread.sleep(100); // Allow processing
+
+        // When - send watermark that should close the window
+        TimeService.Watermark watermark = new TimeService.Watermark(windowEnd + 1000);
+        windowAggregator.onWatermark(watermark);
+
+        // Then - the window should be closed and sent to AlarmEvaluator
+        verify(alarmEvaluator, timeout(1000)).sendAndProcessWindowData(any(WindowAggregator.WindowData.class));
+    }
+
+    @Test
+    void testWatermarkNotClosingActiveWindow() throws InterruptedException {
+        // Given - add a matching log event
+        long eventTime = System.currentTimeMillis();
+        MatchingLogEvent testEvent = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(eventTime)
+                .workerTimestamp(eventTime)
+                .build();
+        windowAggregator.start();
+        windowAggregator.addMatchingLog(testEvent);
+        Thread.sleep(100);
+
+        // When - send watermark that should NOT close the window (watermark before window end)
+        TimeService.Watermark earlyWatermark = new TimeService.Watermark(eventTime - 1000);
+        windowAggregator.onWatermark(earlyWatermark);
+
+        // Give some time for potential processing
+        Thread.sleep(100);
+
+        // Then - no window should be closed
+        verify(alarmEvaluator, never()).sendAndProcessWindowData(any(WindowAggregator.WindowData.class));
+    }
+
+    @Test
+    void testMultipleWindowsWithDifferentAlertDefines() throws InterruptedException {
+        // Given - two different alert defines
+        AlertDefine alertDefine2 = AlertDefine.builder()
+                .id(2L)
+                .name("second_alert")
+                .type("realtime_log")
+                .expr("log.severityText == 'WARN'")
+                .period(60)
+                .times(1)
+                .enable(true)
+                .build();
+
+        long eventTime = System.currentTimeMillis();
+        
+        MatchingLogEvent event1 = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(eventTime)
+                .workerTimestamp(eventTime)
+                .build();
+
+        MatchingLogEvent event2 = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine2)
+                .eventTimestamp(eventTime)
+                .workerTimestamp(eventTime)
+                .build();
+
+        // When
+        windowAggregator.start();
+        windowAggregator.addMatchingLog(event1);
+        windowAggregator.addMatchingLog(event2);
+        Thread.sleep(100);
+
+        // Send watermark to close both windows
+        long windowSize = 60 * 1000;
+        long windowStart = (eventTime / windowSize) * windowSize;
+        long windowEnd = windowStart + windowSize;
+        
+        TimeService.Watermark watermark = new TimeService.Watermark(windowEnd + 1000);
+        windowAggregator.onWatermark(watermark);
+
+        // Then - both windows should be closed
+        verify(alarmEvaluator, timeout(1000).times(2)).sendAndProcessWindowData(any(WindowAggregator.WindowData.class));
+    }
+
+    @Test
+    void testMultipleStartCalls() {
+        // When - call start multiple times
+        windowAggregator.start(); // First call (already called in setUp)
+        windowAggregator.start(); // Second call
+
+        // Then - should handle multiple start calls gracefully
+        assertNotNull(windowAggregator);
+    }
+
+    @Test
+    void testWatermarkWithMultipleWindows() throws InterruptedException {
+        // Given - multiple windows at different times
+        long baseTime = System.currentTimeMillis();
+        long windowSize = 60 * 1000; // 60 seconds
+
+        // Event in first window
+        MatchingLogEvent event1 = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(baseTime)
+                .workerTimestamp(baseTime)
+                .build();
+
+        // Event in second window (1 minute later)
+        MatchingLogEvent event2 = MatchingLogEvent.builder()
+                .logEntry(logEntry)
+                .alertDefine(alertDefine)
+                .eventTimestamp(baseTime + windowSize + 5000)
+                .workerTimestamp(baseTime + windowSize + 5000)
+                .build();
+        windowAggregator.start();
+        windowAggregator.addMatchingLog(event1);
+        windowAggregator.addMatchingLog(event2);
+        Thread.sleep(100);
+
+        // When - send watermark that closes only the first window
+        long firstWindowStart = (baseTime / windowSize) * windowSize;
+        long firstWindowEnd = firstWindowStart + windowSize;
+
+        TimeService.Watermark watermark = new TimeService.Watermark(firstWindowEnd + 1000);
+        windowAggregator.onWatermark(watermark);
+
+        // Then - only first window should be closed
+        verify(alarmEvaluator, timeout(1000).times(1)).sendAndProcessWindowData(any(WindowAggregator.WindowData.class));
+
+        // When - send watermark that closes the second window
+        long secondWindowStart = ((baseTime + windowSize + 5000) / windowSize) * windowSize;
+        long secondWindowEnd = secondWindowStart + windowSize;
+
+        TimeService.Watermark secondWatermark = new TimeService.Watermark(secondWindowEnd + 1000);
+        windowAggregator.onWatermark(secondWatermark);
+
+        // Then - second window should also be closed (total 2 windows)
+        verify(alarmEvaluator, timeout(1000).times(2)).sendAndProcessWindowData(any(WindowAggregator.WindowData.class));
+    }
+}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/config/AlertSseManagerTest.java

@@ -0,0 +1,69 @@
+/*
+ * 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.config;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+
+/**
+ * alert sse manager test
+ */
+public class AlertSseManagerTest {
+
+    private AlertSseManager alertSseManager;
+
+    @BeforeEach
+    void setUp() {
+        alertSseManager = new AlertSseManager();
+    }
+
+    @Test
+    void testCompleteThrowsException() throws Exception {
+        SseEmitter emitter = alertSseManager.createEmitter(1L);
+        assertNotNull(emitter);
+
+        Map<Long, SseEmitter> emitters = new HashMap<>();
+        SseEmitter spyEmitter = mock(SseEmitter.class);
+        
+        doThrow(new IllegalStateException("Simulated output stream error")).when(spyEmitter).send(any(SseEmitter.SseEventBuilder.class));
+        doThrow(new RuntimeException("Complete failed")).when(spyEmitter).complete();
+        
+        emitters.put(1L, spyEmitter);
+
+        Field emittersField = AlertSseManager.class.getDeclaredField("emitters");
+        emittersField.setAccessible(true);
+        emittersField.set(alertSseManager, emitters);
+
+        assertThrows(RuntimeException.class, () -> alertSseManager.broadcast("{\"id\":1,\"content\":\"Test alert\"}"));
+        Map<Long, SseEmitter> currentEmitters = (Map<Long, SseEmitter>) emittersField.get(alertSseManager);
+        assertFalse(currentEmitters.containsKey(1L), "Emitter should still exist because complete() threw exception");
+    }
+
+}