docs: update doc and add graduation blog (#3729 )

Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: TJxiaobao <2922035952@qq.com>
[improve] optimize the incident list on the status page to support paginated queries (#3727 )
2026-09-17 18:19:02 +00:00 · 2025-08-30 17:34:50 +08:00 · 2025-08-30 11:23:10 +08:00 · 2025-08-30 00:02:29 +08:00 · 2025-08-29 00:07:49 +08:00 · 2025-08-28 23:56:22 +08:00
570 changed files with 20742 additions and 5906 deletions
@@ -6,6 +6,7 @@
  "files": [
    "README.md",
    "README_CN.md",
+    "README_JP.md"
    "home/src/pages/team/index.jsx"
  ],
  "imageSize": 100,
@@ -2504,6 +2505,24 @@
        "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"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -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
@@ -48,15 +48,6 @@ jobs:
      - name: Build with Maven
        run: mvnd clean -B package -Prelease -Dmaven.test.skip=false --file pom.xml

-      - name: Upload test reports
-        if: failure() 
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-reports-${{ github.run_id }}
-          path: |
-            **/target/surefire-reports
-            **/target/failsafe-reports
-
      - name: Upload coverage reports to Codecov
        uses: codecov/codecov-action@v4.0.1
        with:
@@ -67,6 +67,7 @@ header:
    - 'karma.conf.js'
    - 'proxy.conf.js'
    - '.helmignore'
+    - 'script/helm/**'
    - 'web-app/src/app/core/**'
    - 'web-app/src/app/layout/**'
    - 'web-app/src/app/routes/exception/**'
@@ -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.
@@ -1,4 +1,4 @@
-Apache HertzBeat (incubating)
+Apache HertzBeat™
 Copyright 2024-2025 The Apache Software Foundation

 This product includes software developed at
@@ -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

@@ -527,6 +527,8 @@ 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>
    </tr>
  </tbody>
 </table>
@@ -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，提供强大的自定义监控和状态页构建能力。     

 ### 特点

@@ -525,6 +525,8 @@ 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>
    </tr>
  </tbody>
 </table>
@@ -525,6 +525,12 @@ 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>
    </tr>
  </tbody>
 </table>
@@ -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/)
@@ -0,0 +1,85 @@
+<?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-agent</artifactId>
+	<version>${hertzbeat.version}</version>
+	<properties>
+		<spring-ai.version>1.0.1</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-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-starter-model-openai</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.hertzbeat</groupId>
+			<artifactId>hertzbeat-common</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>
@@ -0,0 +1,41 @@
+/*
+ * 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.agent.adapters;
+
+import org.springframework.data.domain.Page;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import java.util.List;
+
+/**
+ * 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
+    );
+} 
@@ -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.agent.adapters.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.agent.adapters.MonitorServiceAdapter;
+import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
+import org.springframework.data.domain.Page;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * 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);
+        }
+    }
+
+}
@@ -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.agent.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());
+            }
+
+        }
+    }
+}
@@ -0,0 +1,37 @@
+/*
+ * 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.agent.config;
+
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.openai.OpenAiChatModel;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration class for Large Language Model (LLM) settings.
+ */
+
+@Configuration
+public class LlmConfig {
+    @Bean
+    public ChatClient openAiChatClient(OpenAiChatModel chatModel) {
+        return ChatClient.create(chatModel);
+    }
+
+}
@@ -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.agent.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();
+    }
+}
@@ -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.agent.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_MONITORING_PROMPT = """
+            You are an AI assistant specialized in monitoring infrastructure and applications with HertzBeat.
+            Your role is to help users manage and analyze their monitoring data using the available tools.
+            You have access to the following HertzBeat monitoring tools:
+            - list_monitors: Query monitor information with flexible filtering and pagination
+            - add_monitor: Add a new monitor to the system
+            When users ask questions about their monitoring setup or data, identify which tool would be most helpful
+            and use it to provide relevant information. Always provide clear explanations of the monitoring data and
+            suggest next steps or insights based on the results.
+            For monitoring-related queries:
+            1. If users want to see their monitors, use list_monitors with appropriate filters
+            2. If users want to add a new monitor, use add_monitor with the necessary details
+            3. If the monitoring information shows potential issues, highlight them and suggest troubleshooting steps
+            For parameters that accept specific values:
+            - Monitor status values: 0 (no monitor), 1 (usable), 2 (disabled), 9 (all)
+            - Sort fields typically include: name, host, app, gmtCreate
+            - Sort order should be 'asc' or 'desc'
+            Keep responses focused on monitoring topics and HertzBeat capabilities.
+            If you're unsure about specific monitoring details, ask clarifying questions before using the tools.
+            """;
+
+}
@@ -0,0 +1,70 @@
+/*
+ * 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.agent.controller;
+
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
+import org.apache.hertzbeat.ai.agent.service.ChatClientProviderService;
+
+
+/**
+ * Controller class for handling chat-related HTTP requests.
+ */
+@RestController
+@RequestMapping("/api/chat")
+public class ChatController {
+
+    private final ChatClientProviderService chatClientProviderService;
+
+    @Autowired
+    public ChatController(@Qualifier("openAiChatClient") ChatClient openAiChatClient,
+            ChatClientProviderService chatClientProviderService) {
+        this.chatClientProviderService = chatClientProviderService;
+    }
+
+    /**
+     * Send a message and get a streaming response
+     * 
+     * @param context The chat request context containing message and optional
+     *                conversationId
+     * @return SSE emitter for streaming response
+     */
+    @PostMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter streamChat(@RequestBody ChatRequestContext context) {
+        SseEmitter emitter = new SseEmitter();
+        new Thread(() -> {
+            try {
+                String aiResponse = chatClientProviderService.streamChat(context);
+                emitter.send(aiResponse);
+                emitter.complete();
+            } catch (Exception e) {
+                emitter.completeWithError(e);
+            }
+        }).start();
+        return emitter;
+    }
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.agent.controller;
+
+/**
+ * Controller for managing conversations.
+ */
+public class ConversationController {
+
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.dao;
+
+/**
+ * Data Access Object interface for Conversation entities.
+ */
+public interface ConversationDao {
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.dao;
+
+/**
+ * Data Access Object interface for Message entities.
+ */
+public interface MessageDao {
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.dao;
+
+/**
+ * Data Access Object interface for UserPreference entities.
+ */
+public interface UserPreferenceDao {
+}
@@ -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.ai.agent.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Chat request context for AI chat endpoint.
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatRequestContext {
+    /**
+     * The user's message (required)
+     */
+    private String message;
+    /**
+     * Optional conversation ID for context
+     */
+    private String conversationId;
+}
@@ -0,0 +1,26 @@
+/*
+ * 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.agent.service;
+
+/**
+ * Service interface for agent operations.
+ */
+public interface AgentService {
+
+}
@@ -0,0 +1,31 @@
+/*
+ * 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.agent.service;
+
+import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
+
+/**
+ * Service for interacting with LLM providers (like OpenAI, Anthropic, etc.)
+ */
+public interface ChatClientProviderService {
+
+    String complete(String message);
+
+    String streamChat(ChatRequestContext context);
+}
@@ -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.agent.service;
+
+
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Service for managing chat conversations and interactions with LLM providers.
+ */
+public interface ConversationService {
+
+    /**
+     * Send a message and receive a streaming response
+     *
+     * @param message The user's message
+     * @param conversationId Optional conversation ID for continuing a chat
+     * @return SseEmitter for streaming the response
+     */
+    SseEmitter streamChat(String message, String conversationId);
+
+    /**
+     * Send a message and get a complete response
+     *
+     * @param message The user's message
+     * @param conversationId Optional conversation ID for continuing a chat
+     * @return Response object containing the AI's response and conversation metadata
+     */
+    Map<String, Object> chat(String message, String conversationId);
+
+    /**
+     * Get conversation history for a specific conversation
+     *
+     * @param conversationId Conversation ID
+     * @return Conversation data including messages
+     */
+    Map<String, Object> getConversation(String conversationId);
+
+    /**
+     * Get all conversations for the current user
+     *
+     * @return List of conversations
+     */
+    List<Map<String, Object>> getAllConversations();
+
+    /**
+     * Delete a conversation
+     *
+     * @param conversationId Conversation ID to delete
+     */
+    void deleteConversation(String conversationId);
+}
@@ -0,0 +1,28 @@
+/*
+ * 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.agent.service;
+
+import org.springframework.ai.tool.ToolCallbackProvider;
+
+/**
+ * Service interface for MCP server operations.
+ */
+public interface McpServerService {
+    ToolCallbackProvider hertzbeatTools();
+}
@@ -0,0 +1,30 @@
+/*
+ * 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.agent.service.impl;
+
+import org.apache.hertzbeat.ai.agent.service.AgentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * Implementation of the AgentService interface.
+ * This service provides functionality for handling AI agent operations.
+ */
+@Service
+public class AgentServiceImpl implements AgentService {
+}
@@ -0,0 +1,70 @@
+/*
+ * 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.agent.service.impl;
+
+import org.apache.hertzbeat.ai.agent.config.PromptProvider;
+import org.apache.hertzbeat.ai.agent.service.ChatClientProviderService;
+import org.springframework.stereotype.Service;
+import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.tool.ToolCallbackProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+/**
+ * Implementation of the {@link ChatClientProviderService}.
+ * Provides functionality to interact with the ChatClient for handling chat
+ * messages.
+ */
+@Service
+public class ChatClientProviderServiceImpl implements ChatClientProviderService {
+
+    private final ChatClient chatClient;
+
+    @Qualifier("hertzbeatTools")
+    @Autowired
+    private ToolCallbackProvider toolCallbackProvider;
+
+    @Autowired
+    public ChatClientProviderServiceImpl(@Qualifier("openAiChatClient") ChatClient openAiChatClient) {
+        this.chatClient = openAiChatClient;
+    }
+
+    @Override
+    public String complete(String message) {
+        return this.chatClient.prompt()
+                .user(message)
+                .call()
+                .content();
+    }
+
+    @Override
+    public String streamChat(ChatRequestContext context) {
+        try {
+            return this.chatClient.prompt(PromptProvider.HERTZBEAT_MONITORING_PROMPT)
+                    .user(context.getMessage())
+                    .toolCallbacks(toolCallbackProvider)
+                    .call()
+                    .content();
+        } catch (Exception e) {
+            return "Error: " + e.getMessage();
+        }
+
+    }
+}
@@ -0,0 +1,29 @@
+/*
+ * 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.agent.service.impl;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Implementation of the ConversationService interface for managing chat conversations.
+ */
+@Service
+public class ConversationServiceImpl {
+
+}
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hertzbeat.ai.agent.service.impl;
+
+import org.apache.hertzbeat.ai.agent.config.CustomSseServerTransport;
+import org.apache.hertzbeat.ai.agent.service.McpServerService;
+import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.apache.hertzbeat.ai.agent.tools.impl.MonitorToolsImpl;
+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 org.springframework.beans.factory.annotation.Autowired;
+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 MonitorToolsImpl monitorTools;
+
+    @Bean
+    public ToolCallbackProvider hertzbeatTools() {
+        return MethodToolCallbackProvider.builder().toolObjects(monitorTools).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();
+    }
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.tools;
+
+/**
+ * Tools for alert operations
+ */
+public interface AlertTools {
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.tools;
+
+/**
+ * Tools for metrics operations
+ */
+public interface MetricsTools {
+}
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hertzbeat.ai.agent.tools;
+
+import org.springframework.ai.chat.model.ToolContext;
+
+import java.util.List;
+
+/**
+ * Interface for Monitoring Tools
+ */
+public interface MonitorTools {
+
+    String addMonitor(String name, ToolContext context);
+
+    /**
+     * Query monitor information with flexible filtering and pagination.
+     * Supports filtering by monitor IDs, type, status, host, labels, sorting, and
+     * pagination.
+     * Returns results as plain JSON.
+     */
+    String listMonitors(
+            List<Long> ids,
+            String app,
+            Byte status,
+            String search,
+            String labels,
+            String sort,
+            String order,
+            Integer pageIndex,
+            Integer pageSize,
+            ToolContext context);
+
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.tools.impl;
+
+/**
+ * Implementation of Alert Tools functionality
+ */
+public class AlertToolsImpl {
+}
@@ -0,0 +1,25 @@
+/*
+ * 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.agent.tools.impl;
+
+/**
+ * Implementation of Metrics Tools functionality
+ */
+public class MetricsToolsImpl {
+}
@@ -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.agent.tools.impl;
+
+import com.usthe.sureness.subject.SubjectSum;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.ai.agent.adapters.MonitorServiceAdapter;
+import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
+import org.springframework.ai.chat.model.ToolContext;
+import org.springframework.ai.tool.annotation.Tool;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+import org.apache.hertzbeat.ai.agent.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 java.util.List;
+
+/**
+ * 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 monitor names as string.
+     */
+    @Override
+    @Tool(name = "list_monitors", returnDirect = true, description = """
+            Query monitor information with flexible filtering and pagination.
+            Supports filtering by monitor IDs, type, status, host, labels, sorting, and pagination.
+            Returns results as String. When no parameters are available, pass the default value as mentioned below. If the user doesn't provide any specific parameter, the default value will be used.
+            """)
+    public String listMonitors(
+            @ToolParam(description = "List of monitor IDs to filter (default: empty list)", required = false) List<Long> ids,
+            @ToolParam(description = "Monitor type, e.g., 'linux' (default: null)", required = false) String app,
+            @ToolParam(description = "Monitor status (0: no monitor, 1: usable, 2: disabled, 9: all) (default: null)", required = false) Byte status,
+            @ToolParam(description = "Fuzzy search for host or name (default: null)", required = false) String search,
+            @ToolParam(description = "Monitor labels, e.g., 'env:prod,instance:22' (default: null)", required = false) String labels,
+            @ToolParam(description = "Sort field, e.g., 'name' (default: gmtCreate)", required = false) String sort,
+            @ToolParam(description = "Sort order, 'asc' or 'desc' (default: desc)", required = false) String order,
+            @ToolParam(description = "Page index (default: 0)", required = false) Integer pageIndex,
+            @ToolParam(description = "Page size (default: 8)", required = false) Integer pageSize,
+            ToolContext context) {
+        try {
+            Page<Monitor> result = monitorServiceAdapter.getMonitors(ids, app, search, status, sort, order, pageIndex, pageSize, labels);
+            log.debug("MonitorServiceAdapter.getMonitors result: {}", result);
+            return result.getContent().stream().map(Monitor::getName).toList().toString();
+        } catch (Exception e) {
+            return "error is" + e.getMessage();
+        }
+    }
+
+    @Override
+    @Tool(name = "add_monitor", description = "Add a new monitor")
+    public String addMonitor(@ToolParam(description = "Name of the monitor") String name, ToolContext context) {
+        log.debug("Adding monitor with name: {}", name);
+        SubjectSum subjectSum = McpContextHolder.getSubject();
+        log.debug("Current subject in tool: {}", subjectSum);
+        return "Monitor added: " + name;
+    }
+
+}
@@ -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);
+    }
 }
@@ -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());
        }
    }
@@ -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);
+    }
 }
@@ -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;
+        };
+    }
 }
@@ -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);
 }
@@ -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  : '(' ;
@@ -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());
+    }
+}
@@ -181,12 +181,10 @@ class AlertExpressionEvalVisitorTest {
                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
        // promql
        List<Map<String, Object>> result = evaluate("multi_val > 25");
-        assertEquals(1, result.size());
-        assertEquals(30.0, result.get(0).get("__value__"));
+        assertEquals(0, result.size());
        // sql
        result = evaluate("(select values from multi_metrics where group_id = 'test_group') > 25");
-        assertEquals(1, result.size());
-        assertEquals(30.0, result.get(0).get("__value__"));
+        assertEquals(0, result.size());
    }

    @Test
@@ -196,12 +194,10 @@ class AlertExpressionEvalVisitorTest {
                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
        // promql
        List<Map<String, Object>> result = evaluate("multi_val < 15");
-        assertEquals(1, result.size());
-        assertEquals(10.0, result.get(0).get("__value__"));
+        assertEquals(0, result.size());
        // sql
        result = evaluate("(select response_times from performance_data where service = 'api') < 15");
-        assertEquals(1, result.size());
-        assertEquals(10.0, result.get(0).get("__value__"));
+        assertEquals(0, result.size());
    }

    @Test
@@ -211,12 +207,10 @@ class AlertExpressionEvalVisitorTest {
                List.of(new HashMap<>(Map.of("__value__", List.of()))));
        // promql
        List<Map<String, Object>> result = evaluate("empty_list > 50");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
+        assertEquals(0, result.size());
        // sql
        result = evaluate("(select error_codes from error_log where date = '2024-01-01') > 50");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
+        assertEquals(0, result.size());
    }

    @Test
@@ -757,6 +751,118 @@ class AlertExpressionEvalVisitorTest {
        assertEquals(16, result.get(1).get("__value__"));
    }

+    @Test
+    void testComparisonExpr() {
+        String promql = "3 > bool 2";
+
+        // scalar and scalar
+        List<Map<String, Object>> result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(1, result.get(0).get("__value__"));
+
+        // scalar and vector
+        promql = "0 < http_server_requests_seconds_count";
+        Map<String, Object> vector = new HashMap<>() {
+            {
+                put("instance", "host.docker.internal:8989");
+                put("__value__", 1307);
+                put("method", "GET");
+                put("__name__", "http_server_requests_seconds_count");
+                put("__timestamp__", "1.750320922467E9");
+                put("uri", "/actuator/prometheus");
+                put("status", "200");
+            }
+        };
+        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vector));
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(1307, result.get(0).get("__value__"));
+
+        // scalar and vector bool
+        promql = "0 < bool http_server_requests_seconds_count";
+        // true
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(1, result.get(0).get("__value__"));
+
+        // false
+        vector.put("__value__", -1);
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(0, result.get(0).get("__value__"));
+
+        // vector and scalar
+        promql = "http_server_requests_seconds_sum > 0";
+        vector = new HashMap<>() {
+            {
+                put("instance", "host.docker.internal:8989");
+                put("__value__", 13);
+                put("method", "GET");
+                put("__name__", "http_server_requests_seconds_count");
+                put("__timestamp__", "1.750320922467E9");
+                put("uri", "/actuator/prometheus");
+                put("status", "200");
+            }
+        };
+        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vector));
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(13, result.get(0).get("__value__"));
+
+        // vector and scalar bool
+        promql = "http_server_requests_seconds_sum > bool 0";
+        // true
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(1, result.get(0).get("__value__"));
+        // false
+        vector.put("__value__", -1);
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(0, result.get(0).get("__value__"));
+
+        // vector and vector
+        promql = "http_server_requests_seconds_count > http_server_requests_seconds_sum";
+        Map<String, Object> vectorCount = new HashMap<>() {
+            {
+                put("instance", "host.docker.internal:8989");
+                put("__value__", 13);
+                put("method", "GET");
+                put("__name__", "http_server_requests_seconds_count");
+                put("__timestamp__", "1.750320922467E9");
+                put("uri", "/actuator/prometheus");
+                put("status", "200");
+            }
+        };
+        Map<String, Object> vectorSum = new HashMap<>() {
+            {
+                put("instance", "host.docker.internal:8989");
+                put("__value__", 10);
+                put("method", "GET");
+                put("__name__", "http_server_requests_seconds_count");
+                put("__timestamp__", "1.750320922467E9");
+                put("uri", "/actuator/prometheus");
+                put("status", "200");
+            }
+        };
+        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vectorCount));
+        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vectorSum));
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(13, result.get(0).get("__value__"));
+
+        // vector and vector bool
+        promql = "http_server_requests_seconds_count > bool http_server_requests_seconds_sum";
+        // true
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(1, result.get(0).get("__value__"));
+        // false
+        vectorCount.put("__value__", 1);
+        result = evaluate(promql);
+        assertEquals(1, result.size());
+        assertEquals(0, result.get(0).get("__value__"));
+    }

    private List<Map<String, Object>> evaluate(String expression) {
        AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expression));
@@ -471,19 +471,19 @@ public class JdbcCommonCollect extends AbstractCollect {
            // remove special characters
            String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F\\xA0]", "");
            String url = recursiveDecode(cleanedUrl);
-            url = url.toLowerCase();
+            String urlLowerCase = url.toLowerCase();
            // url format check
-            if (!url.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
+            if (!urlLowerCase.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
                throw new IllegalArgumentException("Invalid JDBC URL format");
            }
            // backlist check
            for (String keyword : BLACK_LIST) {
-                if (url.contains(keyword.toLowerCase())) {
+                if (urlLowerCase.contains(keyword.toLowerCase())) {
                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
                }
            }
            // universal detection
-            String normalizedUrl = url.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ").toLowerCase();
+            String normalizedUrl = urlLowerCase.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ");
            // universal detection of JDBC injection and deserialization attacks
            if (normalizedUrl.matches(".*jndi\\s*[:=].*")
                    || normalizedUrl.matches(".*ldap\\s*[:=].*")
@@ -514,7 +514,7 @@ public class JdbcCommonCollect extends AbstractCollect {
                    }
                }
            }
-            return normalizedUrl;
+            return url;
        }
        assert jdbcProtocol.getPlatform() != null;
        return switch (jdbcProtocol.getPlatform()) {
@@ -604,6 +604,18 @@ public class HttpCollectImpl extends AbstractCollect {
                    }
                }
                builder.addValueRow(valueRowBuilder.build());
+            } else if (objectValue instanceof Number numberValue) {
+                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+                for (String alias : aliasFields) {
+                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(responseTime.toString());
+                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
+                    } else {
+                        valueRowBuilder.addColumn(numberValue.toString());
+                    }
+                }
+                builder.addValueRow(valueRowBuilder.build());
            }
        }
    }
@@ -628,11 +640,13 @@ public class HttpCollectImpl extends AbstractCollect {
                        .collect(Collectors.toMap(MetricFamily.Label::getName, MetricFamily.Label::getValue));
                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                for (String aliasField : aliasFields) {
-                    if ("value".equals(aliasField)) {
+                    String columnValue = labelMap.get(aliasField);
+                    if (columnValue != null) {
+                        valueRowBuilder.addColumn(columnValue);
+                    } else if (CommonConstants.PROM_VALUE.equals(aliasField) || CommonConstants.PROM_METRIC_VALUE.equals(aliasField)) {
                        valueRowBuilder.addColumn(String.valueOf(metric.getValue()));
                    } else {
-                        String columnValue = labelMap.get(aliasField);
-                        valueRowBuilder.addColumn(columnValue == null ? CommonConstants.NULL_VALUE : columnValue);
+                        valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
                    }
                }
                builder.addValueRow(valueRowBuilder.build());
@@ -60,7 +60,7 @@ public class PrometheusMatrixParser extends AbstractPrometheusParse {
                boolean setValueFlag = false;
                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                for (String aliasField : aliasFields) {
-                    if (!CollectUtil.assertPromRequireField(aliasField)) {
+                    if (!CollectUtil.assertPromRequireField(aliasField) || CollectUtil.isValueAsLabel(aliasField, r.getMetric())) {
                        JsonElement jsonElement = r.getMetric().get(aliasField);
                        if (jsonElement != null) {
                            valueRowBuilder.addColumn(jsonElement.getAsString());
@@ -93,7 +93,6 @@ public class PrometheusMatrixParser extends AbstractPrometheusParse {
                }
                builder.addValueRow(valueRowBuilder.build());
            }
-
        }
    }
 }
@@ -59,7 +59,7 @@ public class PrometheusVectorParser extends AbstractPrometheusParse {
        for (PromVectorOrMatrix.Result r : result) {
            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
            for (String aliasField : aliasFields) {
-                if (!CollectUtil.assertPromRequireField(aliasField)) {
+                if (!CollectUtil.assertPromRequireField(aliasField) || CollectUtil.isValueAsLabel(aliasField, r.getMetric())) {
                    JsonElement jsonElement = r.getMetric().get(aliasField);
                    if (jsonElement != null) {
                        valueRowBuilder.addColumn(jsonElement.getAsString());
@@ -17,11 +17,6 @@

 package org.apache.hertzbeat.collector.collect.database;

-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol;
@@ -29,6 +24,14 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
 * Test case for {@link JdbcCommonCollect}
 */
@@ -128,4 +131,81 @@ class JdbcCommonCollectTest {
        String protocol = jdbcCommonCollect.supportProtocol();
        assertEquals(DispatchConstants.PROTOCOL_JDBC, protocol);
    }
+
+    @Test
+    void testUrlPassThrough() {
+        String[] testUrls = {
+                "jdbc:mysql://localhost:3306/test?allowPublicKeyRetrieval=true&useSSL=false",
+                "jdbc:mysql://localhost:3306/test?usessl=false&verifyServerCertificate=true",
+                "jdbc:mysql://localhost:3306/test?serverTimezone=UTC&autoReconnect=false"
+        };
+        JdbcCommonCollect jdbcCollect = new JdbcCommonCollect();
+        for (String originalUrl : testUrls) {
+            try {
+                JdbcProtocol jdbcProtocol = JdbcProtocol.builder()
+                        .host("localhost")
+                        .port("3306")
+                        .platform("mysql")
+                        .username("root")
+                        .password("root")
+                        .database("test")
+                        .url(originalUrl)
+                        .build();
+                
+                // Use reflection to call constructDatabaseUrl method
+                Method constructMethod = JdbcCommonCollect.class.getDeclaredMethod("constructDatabaseUrl", JdbcProtocol.class, String.class, String.class);
+                constructMethod.setAccessible(true);
+                String processedUrl = (String) constructMethod.invoke(jdbcCollect, jdbcProtocol, "localhost", "3306");
+                // Verify that the processed URL is the same as the original URL
+                assertEquals(originalUrl, processedUrl, 
+                    "URL should be passed through without modification: " + originalUrl);
+            } catch (Exception e) {
+                System.out.println("URL rejected by security validation: " + originalUrl + ", reason: " + e.getMessage());
+            }
+        }
+    }
+
+    @Test
+    void testConstructDatabaseUrlSecurityInterception() {
+        JdbcCommonCollect jdbcCollect = new JdbcCommonCollect();
+        String[] maliciousUrls = {
+                // URL length limit test
+                "jdbc:mysql://localhost:3306/test?" + "a".repeat(2050) + "=value",
+                // url format check
+                "jdbca:mysql://localhost:3306/test?allowLoadLocalInfile=true",
+                // backlist check
+                "jdbc:mysql://localhost:3306/test?allowLoadLocalInfile=true",
+                // universal detection of JDBC injection and deserialization attacks
+                "jdbc:mysql://localhost:3306/test?jndi:ldap://duansg.com/exploit",
+                // universal detection of bypass
+                "jdbc:mysql://localhost:3306/test?param=create\\trigger",
+                // database platform specific bypass detection
+                "jdbc:mysql://localhost:3306/test?allow\\nload\\nlocal\\ninfile=true"
+
+        };
+
+        // Test malicious URLs - should throw exceptions
+        for (String maliciousUrl : maliciousUrls) {
+            JdbcProtocol jdbcProtocol = JdbcProtocol.builder()
+                    .host("localhost")
+                    .port("3306")
+                    .platform("mysql")
+                    .username("root")
+                    .password("root")
+                    .database("test")
+                    .url(maliciousUrl)
+                    .build();
+
+            assertThrows(Exception.class, () -> {
+                try {
+                    Method constructMethod = JdbcCommonCollect.class.getDeclaredMethod("constructDatabaseUrl", JdbcProtocol.class, String.class, String.class);
+                    constructMethod.setAccessible(true);
+                    constructMethod.invoke(jdbcCollect, jdbcProtocol, "localhost", "3306");
+                } catch (InvocationTargetException e) {
+                    throw e.getCause();
+                }
+            }, "Malicious URL should be blocked: " + maliciousUrl);
+        }
+    }
+
 }
@@ -17,15 +17,6 @@

 package org.apache.hertzbeat.collector.collect.http;

-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-
 import com.google.common.collect.Lists;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
@@ -34,6 +25,18 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
 * Test case for {@link HttpCollectImpl}
 */
@@ -186,4 +189,356 @@ class HttpCollectImplTest {
        assertEquals("0.0", secondRow.getColumns(2), "Second server CPU should be 0.0");
        assertEquals("0", secondRow.getColumns(3), "Second server memory should be 0");
    }
+
+    @Test
+    void parseResponseByJsonPath() throws Exception {
+        String jsonResponse = "{"
+                + "  \"name\": \"jvm.memory.used\","
+                + "  \"description\": \"The amount of used memory\","
+                + "  \"baseUnit\": \"bytes\","
+                + "  \"measurements\": ["
+                + "    {"
+                + "      \"statistic\": \"VALUE\","
+                + "      \"value\": 90282296"
+                + "    }"
+                + "  ],"
+                + "  \"availableTags\": ["
+                + "    {"
+                + "      \"tag\": \"area\","
+                + "      \"values\": ["
+                + "        \"heap\","
+                + "        \"nonheap\""
+                + "      ]"
+                + "    },"
+                + "    {"
+                + "      \"tag\": \"id\","
+                + "      \"values\": ["
+                + "        \"G1 Survivor Space\","
+                + "        \"G1 Eden Space\""
+                + "      ]"
+                + "    }"
+                + "  ]"
+                + "}";
+
+        HttpProtocol http = HttpProtocol.builder()
+                .parseType(DispatchConstants.PARSE_JSON_PATH)
+                .parseScript("$.availableTags[?(@.tag == \"id\")].values[*]")
+                .build();
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByJsonPath",
+                String.class,
+                List.class,
+                HttpProtocol.class,
+                CollectRep.MetricsData.Builder.class,
+                Long.class);
+        parseMethod.setAccessible(true);
+
+        // Call the method
+        parseMethod.invoke(httpCollectImpl, jsonResponse, Lists.newArrayList("id"), http, builder, 100L);
+
+        // Verify the results
+        assertEquals(2, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("G1 Survivor Space", firstRow.getColumns(0));
+        CollectRep.ValueRow secondRow = capturedRows.get(1);
+        assertEquals("G1 Eden Space", secondRow.getColumns(0));
+
+        // number
+        String numberJson = "{"
+                + "  \"name\": \"system.cpu.usage\","
+                + "  \"description\": \"The \\\"recent cpu usage\\\" of the system the application is running in\","
+                + "  \"measurements\": ["
+                + "    {"
+                + "      \"statistic\": \"VALUE\","
+                + "      \"value\": 0.268751364291017"
+                + "    }"
+                + "  ],"
+                + "  \"availableTags\": []"
+                + "}";
+        http = HttpProtocol.builder()
+                .parseType(DispatchConstants.PARSE_JSON_PATH)
+                .parseScript("$.measurements[?(@.statistic == \"VALUE\")].value")
+                .build();
+        capturedRows.clear();
+        builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+        };
+        parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByJsonPath",
+                String.class,
+                List.class,
+                HttpProtocol.class,
+                CollectRep.MetricsData.Builder.class,
+                Long.class);
+        parseMethod.setAccessible(true);
+
+        // Call the method
+        parseMethod.invoke(httpCollectImpl, numberJson, Lists.newArrayList("usage"), http, builder, 100L);
+
+        // Verify the results
+        assertEquals(1, capturedRows.size());
+        firstRow = capturedRows.get(0);
+        assertEquals("0.268751364291017", firstRow.getColumns(0));
+    }
+
+    @Test
+    void testParsePromQlLabelValue() throws Exception {
+        // Create Prometheus format test data
+        String prometheusData = """
+                {
+                  "status": "success",
+                  "data": {
+                    "resultType": "vector",
+                    "result": [
+                      {
+                        "metric": {
+                          "__name__": "taos_cluster_info_first_ep",
+                          "cluster_id": "590779086215866783",
+                          "instance": "host.docker.internal:6043",
+                          "job": "tdengine",
+                          "value": "localhost:6030"
+                        },
+                        "value": [
+                          1756233177.048,
+                          "1"
+                        ]
+                      }
+                    ]
+                  }
+                }""";
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+
+            @Override
+            public String getMetrics() {
+                return "jvm_memory_used_bytes";
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByPromQl",
+                String.class,
+                List.class,
+                HttpProtocol.class,
+                CollectRep.MetricsData.Builder.class);
+        parseMethod.setAccessible(true);
+
+        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value"), new HttpProtocol(), builder);
+
+        // Verify the results
+        assertEquals(1, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("590779086215866783", firstRow.getColumns(0));
+        assertEquals("localhost:6030", firstRow.getColumns(1));
+    }
+
+    @Test
+    void testParsePromQlMetricValue() throws Exception {
+        // Create Prometheus format test data
+        String prometheusData = """
+                {
+                  "status": "success",
+                  "data": {
+                    "resultType": "vector",
+                    "result": [
+                      {
+                        "metric": {
+                          "__name__": "taos_cluster_info_first_ep",
+                          "cluster_id": "590779086215866783",
+                          "instance": "host.docker.internal:6043",
+                          "job": "tdengine",
+                          "value": "localhost:6030"
+                        },
+                        "value": [
+                          1756233177.048,
+                          "1"
+                        ]
+                      }
+                    ]
+                  }
+                }""";
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+
+            @Override
+            public String getMetrics() {
+                return "jvm_memory_used_bytes";
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByPromQl",
+                String.class,
+                List.class,
+                HttpProtocol.class,
+                CollectRep.MetricsData.Builder.class);
+        parseMethod.setAccessible(true);
+
+        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value", "metric_value"), new HttpProtocol(), builder);
+
+        // Verify the results
+        assertEquals(1, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("590779086215866783", firstRow.getColumns(0));
+        assertEquals("localhost:6030", firstRow.getColumns(1));
+        assertEquals("1", firstRow.getColumns(2));
+    }
+
+    @Test
+    void testParsePromQlValue() throws Exception {
+        // Create Prometheus format test data
+        String prometheusData = """
+                {
+                  "status": "success",
+                  "data": {
+                    "resultType": "vector",
+                    "result": [
+                      {
+                        "metric": {
+                          "__name__": "taos_cluster_info_first_ep",
+                          "cluster_id": "590779086215866783",
+                          "instance": "host.docker.internal:6043",
+                          "job": "tdengine"
+                        },
+                        "value": [
+                          1756233177.048,
+                          "1"
+                        ]
+                      }
+                    ]
+                  }
+                }""";
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+
+            @Override
+            public String getMetrics() {
+                return "jvm_memory_used_bytes";
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByPromQl",
+                String.class,
+                List.class,
+                HttpProtocol.class,
+                CollectRep.MetricsData.Builder.class);
+        parseMethod.setAccessible(true);
+
+        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value"), new HttpProtocol(), builder);
+
+        // Verify the results
+        assertEquals(1, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("590779086215866783", firstRow.getColumns(0));
+        assertEquals("1", firstRow.getColumns(1));
+    }
+
+    @Test
+    void testParsePrometheusLabelValue() throws Exception {
+        // Create Prometheus format test data
+        String prometheusData = """
+                # HELP jvm_memory_used_bytes The amount of used memory in bytes
+                # TYPE jvm_memory_used_bytes gauge
+                jvm_memory_used_bytes{area="heap",value="G1 Survivor Space"} 1048576
+                """;
+        InputStream inputStream = new ByteArrayInputStream(prometheusData.getBytes(StandardCharsets.UTF_8));
+        
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+
+            @Override
+            public String getMetrics() {
+                return "jvm_memory_used_bytes";
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByPrometheusExporter",
+                InputStream.class,
+                List.class,
+                CollectRep.MetricsData.Builder.class);
+        parseMethod.setAccessible(true);
+
+        parseMethod.invoke(httpCollectImpl, inputStream, Lists.newArrayList("area", "value"), builder);
+
+        // Verify the results
+        assertEquals(1, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("heap", firstRow.getColumns(0));
+        assertEquals("G1 Survivor Space", firstRow.getColumns(1));
+    }
+
+    @Test
+    void testParsePrometheus() throws Exception {
+        // Create Prometheus format test data
+        String prometheusData = """
+                # HELP jvm_memory_used_bytes The amount of used memory
+                # TYPE jvm_memory_used_bytes gauge
+                jvm_memory_used_bytes{area="heap",id="G1 Eden Space"} 1.63577856E8
+                jvm_memory_used_bytes{area="heap",id="G1 Old Gen"} 2.7874304E7
+                jvm_memory_used_bytes{area="heap",id="G1 Survivor Space"} 512032.0
+                jvm_memory_used_bytes{area="nonheap",id="CodeCache"} 1.460288E7
+                jvm_memory_used_bytes{area="nonheap",id="Compressed Class Space"} 5844504.0
+                jvm_memory_used_bytes{area="nonheap",id="Metaspace"} 4.1576344E7
+                """;
+        InputStream inputStream = new ByteArrayInputStream(prometheusData.getBytes(StandardCharsets.UTF_8));
+
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+
+            @Override
+            public String getMetrics() {
+                return "jvm_memory_used_bytes";
+            }
+        };
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByPrometheusExporter",
+                InputStream.class,
+                List.class,
+                CollectRep.MetricsData.Builder.class);
+        parseMethod.setAccessible(true);
+
+        parseMethod.invoke(httpCollectImpl, inputStream, Lists.newArrayList("area", "id"), builder);
+
+        // Verify the results
+        assertEquals(6, capturedRows.size());
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals("heap", firstRow.getColumns(0));
+        assertEquals("G1 Eden Space", firstRow.getColumns(1));
+        capturedRows.forEach(t -> assertEquals(2, t.getColumnsList().size()));
+    }
 }
@@ -70,14 +70,11 @@
            <version>${hertzbeat.version}</version>
        </dependency>

-
-
        <!-- spring -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
-
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-configuration-processor</artifactId>
@@ -87,7 +84,15 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-autoconfigure</artifactId>
        </dependency>
-
+        <!-- metrics -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
    </dependencies>

    <build>
@@ -23,6 +23,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService;
+import org.apache.hertzbeat.collector.metrics.HertzBeatMetricsCollector;
 import org.apache.hertzbeat.common.timer.Timeout;
 import org.apache.hertzbeat.collector.timer.TimerDispatch;
 import org.apache.hertzbeat.collector.timer.WheelTimerTask;
@@ -33,6 +34,7 @@ import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import java.util.HashMap;
@@ -90,6 +92,9 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc

    private final String collectorIdentity;

+    @Autowired
+    private HertzBeatMetricsCollector metricsCollector;
+
    public CommonDispatcher(MetricsCollectorQueue jobRequestQueue,
                            TimerDispatch timerDispatch,
                            CommonDataQueue commonDataQueue,
@@ -153,12 +158,23 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
            for (Map.Entry<String, MetricsTime> entry : metricsTimeoutMonitorMap.entrySet()) {
                MetricsTime metricsTime = entry.getValue();
                if (metricsTime.getStartTime() < deadline) {
-                    // Metrics collection timeout  
+                    // Metrics collection timeout
+                    MetricsTime removedMetricsTime = metricsTimeoutMonitorMap.remove(entry.getKey());
+                    if (removedMetricsTime == null) {
+                        continue;
+                    }
                    WheelTimerTask timerJob = (WheelTimerTask) metricsTime.getTimeout().task();
+                    Job job = timerJob.getJob();
+                    // timeout metrics
+                    if (metricsCollector != null) {
+                        long duration = System.currentTimeMillis() - removedMetricsTime.getStartTime();
+                        metricsCollector.recordCollectMetrics(job, duration, "timeout");
+                    }
+
                    CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder()
-                            .setId(timerJob.getJob().getMonitorId())
-                            .setTenantId(timerJob.getJob().getTenantId())
-                            .setApp(timerJob.getJob().getApp())
+                            .setId(job.getMonitorId())
+                            .setTenantId(job.getTenantId())
+                            .setApp(job.getApp())
                            .setMetrics(metricsTime.getMetrics().getName())
                            .setPriority(metricsTime.getMetrics().getPriority())
                            .setTime(System.currentTimeMillis())
@@ -167,7 +183,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                    if (metricsData.getPriority() == 0) {
                        dispatchCollectData(metricsTime.timeout, metricsTime.getMetrics(), metricsData);
                    }
-                    metricsTimeoutMonitorMap.remove(entry.getKey());
                }
            }
        } catch (Exception e) {
@@ -177,7 +192,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc

    @Override
    public void dispatchMetricsTask(Timeout timeout) {
-        // Divide the collection task of a single application into corresponding collection tasks of the metrics according to the metrics under it.
+        // Divide the collection task of a single application into corresponding collection tasks of the metrics under it.
        // Put each collect task into the thread pool for scheduling
        WheelTimerTask timerTask = (WheelTimerTask) timeout.task();
        Job job = timerTask.getJob();
@@ -201,16 +216,27 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
    public void dispatchCollectData(Timeout timeout, Metrics metrics, CollectRep.MetricsData metricsData) {
        WheelTimerTask timerJob = (WheelTimerTask) timeout.task();
        Job job = timerJob.getJob();
+        String monitorKey;
+        if (metrics.isHasSubTask()) {
+            monitorKey = job.getId() + "-" + metrics.getName() + "-sub-" + metrics.getSubTaskId();
+        } else {
+            monitorKey = job.getId() + "-" + metrics.getName();
+        }
+        MetricsTime metricsTime = metricsTimeoutMonitorMap.remove(monitorKey);
+
+        // job completed metrics
+        if (metricsTime != null && metricsCollector != null) {
+            long duration = System.currentTimeMillis() - metricsTime.getStartTime();
+            String status = metricsData.getCode() == CollectRep.Code.SUCCESS ? "success" : "fail";
+            metricsCollector.recordCollectMetrics(job, duration, status);
+        }
        if (metrics.isHasSubTask()) {
-            metricsTimeoutMonitorMap.remove(job.getId() + "-" + metrics.getName() + "-sub-" + metrics.getSubTaskId());
            boolean isLastTask = metrics.consumeSubTaskResponse(metricsData);
            if (isLastTask) {
                metricsData = metrics.getSubTaskDataRef().get().build();
            } else {
                return;
            }
-        } else {
-            metricsTimeoutMonitorMap.remove(job.getId() + "-" + metrics.getName());
        }
        Set<Metrics> metricsSet = job.getNextCollectMetrics(metrics, false);
        if (job.isCyclic()) {
@@ -322,7 +348,13 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
    public void dispatchCollectData(Timeout timeout, Metrics metrics, List<CollectRep.MetricsData> metricsDataList) {
        WheelTimerTask timerJob = (WheelTimerTask) timeout.task();
        Job job = timerJob.getJob();
-        metricsTimeoutMonitorMap.remove(String.valueOf(job.getId()));
+        MetricsTime metricsTime = metricsTimeoutMonitorMap.remove(String.valueOf(job.getId()));
+        if (metricsTime != null && metricsCollector != null) {
+            long duration = System.currentTimeMillis() - metricsTime.getStartTime();
+            // For a list, we consider it a success if at least one item is successful.
+            boolean isSuccess = metricsDataList.stream().anyMatch(item -> item.getCode() == CollectRep.Code.SUCCESS);
+            metricsCollector.recordCollectMetrics(job, duration, isSuccess ? "success" : "fail");
+        }
        if (job.isCyclic()) {
            // The collection and execution of all task of this job are completed.
            // The periodic task pushes the task to the time wheel again.
@@ -340,7 +372,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
            // and the result listener is notified of the combination of all metrics data
            timerDispatch.responseSyncJobData(job.getId(), metricsDataList);
        }
-
    }


@@ -354,4 +385,4 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
        private Metrics metrics;
        private Timeout timeout;
    }
-}
+}
@@ -422,6 +422,9 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
     */
    private Object[] transformCal(String cal, Map<String, String> fieldAliasMap) {
        int splitIndex = cal.indexOf("=");
+        if (splitIndex < 0) {
+            return null;
+        }
        String field = cal.substring(0, splitIndex).trim();
        String expressionStr = cal.substring(splitIndex + 1).trim().replace("\\#", "#");
        JexlExpression expression;
@@ -0,0 +1,89 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You under the Apache License, Version 2.0
+ *   (the "License"); you may not use this file except in compliance with
+ *   the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.hertzbeat.collector.metrics;
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.entity.job.Job;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Map;
+
+/**
+ * Service for managing and recording Micrometer metrics.
+ * This service uses Micrometer which integrates natively with Spring Boot Actuator.
+ */
+@Service
+@Slf4j
+public class HertzBeatMetricsCollector {
+
+    private final MeterRegistry meterRegistry;
+
+    public HertzBeatMetricsCollector(MeterRegistry meterRegistry) {
+        this.meterRegistry = meterRegistry;
+        log.info("MetricsService initialized with MeterRegistry: {}", meterRegistry.getClass().getSimpleName());
+    }
+
+    /**
+     * Records the metrics for a completed collection sub-task.
+     *
+     * @param job            The parent job containing monitor info.
+     * @param durationMillis The duration of the collection task in milliseconds.
+     * @param status         The final status of the collection ("success", "fail", "timeout").
+     */
+    public void recordCollectMetrics(Job job, long durationMillis, String status) {
+        if (job == null) {
+            return;
+        }
+
+        Map<String, String> metadata = job.getMetadata();
+        String monitorName = metadata != null ? metadata.get("instancename") : "unknown";
+        String monitorTarget = metadata != null ? metadata.get("instancehost") : "unknown";
+
+        // Record collection count
+        Counter.builder("hertzbeat.collect.total")
+                .description("The total number of collection tasks executed")
+                .tag("status", status)
+                .tag("monitor_type", job.getApp())
+                .tag("monitor_id", String.valueOf(job.getMonitorId()))
+                .tag("monitor_name", monitorName)
+                .tag("monitor_target", monitorTarget)
+                .register(meterRegistry)
+                .increment();
+
+        // Record collection duration
+        Timer.builder("hertzbeat.collect.duration")
+                .description("The duration of collection task executions")
+                .tag("status", status)
+                .tag("monitor_type", job.getApp())
+                .tag("monitor_id", String.valueOf(job.getMonitorId()))
+                .tag("monitor_name", monitorName)
+                .tag("monitor_target", monitorTarget)
+                .register(meterRegistry)
+                .record(Duration.ofMillis(durationMillis));
+
+        if (log.isDebugEnabled()) {
+            log.debug("Recorded metrics for monitor [{}] ({}): status={}, duration={}ms",
+                    monitorName, job.getMonitorId(), status, durationMillis);
+        }
+    }
+}
@@ -30,7 +30,23 @@ spring:
  # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed...
  autoconfigure:
    exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - 'prometheus'
+  endpoint:
+    prometheus:
+      access: read_only
+  metrics:
+    tags:
+      application: ${spring.application.name}
+      environment: ${spring.profiles.active}
+  prometheus:
+    metrics:
+      export:
+        enabled: true
 ---
 spring:
  config:
@@ -39,7 +55,7 @@ spring:

 collector:
  info:
-    version: ${COLLECTOR_VERSION:1.7.2}
+    version: ${COLLECTOR_VERSION:1.7.3}
    ip: ${COLLECTOR_IP:}
  dispatch:
    entrance:
@@ -22,8 +22,11 @@ import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
+import org.apache.hertzbeat.common.util.AesUtil;
+import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;

 /**
@@ -40,6 +43,16 @@ public class GoOnlineProcessor implements NettyRemotingProcessor {
        if (this.timerDispatch == null) {
            this.timerDispatch = SpringContextHolder.getBean(TimerDispatch.class);
        }
+        if (message.getMsg().isEmpty()) {
+            log.warn("The message that server response to collector is empty, please upgrade server");
+        } else {
+            ServerInfo serverInfo = JsonUtil.fromJson(message.getMsg().toStringUtf8(), ServerInfo.class);
+            if (serverInfo == null || serverInfo.getAesSecret() == null) {
+                log.warn("The message that server response to collector has not secret empty, please check");
+            } else {
+                AesUtil.setDefaultSecretKey(serverInfo.getAesSecret());
+            }
+        }
        timerDispatch.goOnline();
        log.info("receive online message and handle success");
        return ClusterMsg.Message.newBuilder()
@@ -171,7 +171,16 @@ public final class CollectUtil {
     * assert prom field
     */
    public static Boolean assertPromRequireField(String aliasField) {
-        return CommonConstants.PROM_TIME.equals(aliasField) || CommonConstants.PROM_VALUE.equals(aliasField);
+        return CommonConstants.PROM_TIME.equals(aliasField)
+            || CommonConstants.PROM_VALUE.equals(aliasField)
+            || CommonConstants.PROM_METRIC_VALUE.equals(aliasField);
+    }
+
+    /**
+     * Check if "value" field should be treated as a label instead of special field
+     */
+    public static Boolean isValueAsLabel(String aliasField, JsonObject metric) {
+        return CommonConstants.PROM_VALUE.equals(aliasField) && null != metric && metric.has(aliasField);
    }

    /**
@@ -19,7 +19,6 @@ package org.apache.hertzbeat.common.config;

 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
-import org.apache.hertzbeat.common.util.AesUtil;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
@@ -34,10 +33,4 @@ import org.springframework.context.annotation.ComponentScan;
        + ConfigConstants.FunctionModuleConstants.COMMON)
@EnableConfigurationProperties(CommonProperties.class)
 public class CommonConfig {
-
-    public CommonConfig(CommonProperties commonProperties) {
-        if (commonProperties != null && commonProperties.getSecret() != null) {
-            AesUtil.setDefaultSecretKey(commonProperties.getSecret());
-        }
-    }
 }
@@ -197,6 +197,11 @@ public interface CommonConstants {
     */
    String PROM_VALUE = "value";

+    /**
+     * prometheus metric value alias
+     */
+    String PROM_METRIC_VALUE = "metric_value";
+
    /**
     * Parameter Type Number
     */
@@ -372,4 +377,9 @@ public interface CommonConstants {
     * status page incident state resolved
     */
    byte MONITOR_TYPE_DISCOVERY_AUTO_CREATE = 2;
+
+    /**
+     * JEXL custom function `json`
+     */
+    String JEXL_CUSTOM_JSON_FUNCTION = "json";
 }
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.constants;
+
+import java.util.Arrays;
+
+/**
+ * Jexl keywords enum
+ */
+public enum JexlKeywordsEnum {
+
+    SIZE("size"),
+    EMPTY("empty"),
+    NEW("new"),
+    VAR("var"),
+    RETURN("return"),
+    IF("if"),
+    ELSE("else"),
+    ELSEIF("elseif"),
+    WHILE("while"),
+    DO("do"),
+    FOR("for"),
+    CONTINUE("continue"),
+    BREAK("break"),
+    TRUE("true"),
+    FALSE("false"),
+    NULL("null"),
+    UNDEFINED("undefined");
+
+    private final String keyword;
+
+    JexlKeywordsEnum(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public static boolean match(String word) {
+        if (word == null || word.trim().isEmpty()) {
+            return false;
+        }
+        return Arrays.stream(values()).anyMatch(t -> t.keyword.equals(word));
+    }
+
+}
@@ -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.common.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * collector info
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "manager server info")
+public class ServerInfo {
+
+    /**
+     * the aes secret key value for aes encode decode
+     */
+    private String aesSecret;
+}
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.support.exception;
+
+/**
+ * Expression visitor exception
+ */
+public class ExpressionVisitorException extends RuntimeException {
+
+
+    public ExpressionVisitorException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
@@ -37,7 +37,7 @@ public final class AesUtil {
     *  Default encryption key The AES encryption key is 16 bits by default.
     *  If the AES encryption key is larger than or smaller than 16 bits, an error message is displayed
     */
-    private static final String ENCODE_RULES = "tomSun28HaHaHaHa";
+    public static final String DEFAULT_ENCODE_RULES = "tomSun28HaHaHaHa";

    /**
     * Default algorithm
@@ -50,13 +50,17 @@ public final class AesUtil {
     * Encryption key The AES encryption key is 16 bits.
     * If the AES encryption key is larger than 16 bits, an error message is displayed
     */
-    private static String secretKey = ENCODE_RULES;
+    private static String secretKey = DEFAULT_ENCODE_RULES;

    private AesUtil() {}

    public static void setDefaultSecretKey(String secretKeyNow) {
        secretKey = secretKeyNow;
    }
+    
+    public static String getDefaultSecretKey() {
+        return secretKey;
+    }

    public static String aesEncode(String content) {
        return aesEncode(content, secretKey);
@@ -109,9 +113,9 @@ public final class AesUtil {
            byte[] byteDecode = getBytes(content, decryptKey);
            return new String(byteDecode, StandardCharsets.UTF_8);
        } catch (BadPaddingException e) {
-            if (!ENCODE_RULES.equals(decryptKey)) {
+            if (!DEFAULT_ENCODE_RULES.equals(decryptKey)) {
                log.warn("There has default encode secret encode content, try to decode with default secret key");
-                return aesDecode(content, ENCODE_RULES);
+                return aesDecode(content, DEFAULT_ENCODE_RULES);
            }
            log.error("aes decode content error: {}, please config right common secret key", e.getMessage());
            return content;
@@ -19,15 +19,19 @@

 package org.apache.hertzbeat.common.util;

+import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Maps;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
 import org.apache.commons.jexl3.JexlBuilder;
 import org.apache.commons.jexl3.JexlContext;
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlExpression;
 import org.apache.commons.jexl3.JexlFeatures;
 import org.apache.commons.jexl3.MapContext;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.function.Function;

 /**
 * jexl express runner
@@ -41,6 +45,7 @@ public class JexlExpressionRunner {
        Map<String, Object> functions = Maps.newLinkedHashMap();
        // set the root namespace function
        functions.put(null, new JexlCommonFunction());
+        functions.put(CommonConstants.JEXL_CUSTOM_JSON_FUNCTION, jsonFunction());
        ClassLoader classLoader = new ClassLoader() {
            @Override
            public String getName() {
@@ -78,5 +83,17 @@ public class JexlExpressionRunner {
    public static JexlExpression compile(String expression) {
        return jexlEngine.createExpression(expression);
    }
-    
+
+    /**
+     * custom function `json:apply(xx)`
+     *
+     * @return java.util.function.Function
+     */
+    private static Function<String, Map<String, Object>> jsonFunction() {
+        return json -> {
+            TypeReference<Map<String, Object>> typeReference = new TypeReference<>() {
+            };
+            return JsonUtil.fromJson(json, typeReference);
+        };
+    }
 }
@@ -90,4 +90,15 @@ class AesUtilTest {
        assertFalse(isCiphertext(encryptedText, invalidKey));
    }

+    @Test
+    void testDefaultKeyCompatibility() {
+        // Test with default key
+        String originalText = "This is a secret message";
+        // encode use default secret key
+        String encryptedText = aesEncode(originalText, AesUtil.DEFAULT_ENCODE_RULES);
+        // decode use new secret key
+        String decryptedText = aesDecode(encryptedText, "newkey1234567890");
+        // old data can decode with default secret key
+        assertEquals(originalText, decryptedText);
+    }
 }
@@ -21,6 +21,7 @@ package org.apache.hertzbeat.common.util;

 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;

 import java.util.HashMap;
@@ -69,4 +70,21 @@ public class JexlExpressionRunnerTest {
                contains("Abc", "a")
                """)); 
    }
+
+    @Test
+    void testJsonFunction() {
+        Map<String, Object> context = new HashMap<String, Object>();
+        context.put("$.info", "{\"current\":537132,\"grantTotal\":63129,\"instanceCode\":\"CSDZMC\",\"timeMillis\":1754579874357}");
+
+        String expression = "json:apply($.info).current";
+
+        JexlExpression expObj = JexlExpressionRunner.compile(expression);
+        assertEquals(537132, JexlExpressionRunner.evaluate(expObj, context));
+
+        context.put("$.info", "{\"grantTotal\":63129,\"instanceCode\":\"CSDZMC\",\"timeMillis\":1754579874357}");
+        assertNull(JexlExpressionRunner.evaluate(expObj, context));
+
+        context.clear();
+        assertNull(JexlExpressionRunner.evaluate(expObj, context));
+    }
 }
@@ -128,11 +128,7 @@ public class DashboardService {
                            ? GrafanaConstants.generateUseDatasource(currentDatasourceName) : "";

                    String relativeDashboardUrl = grafanaDashboard.getUrl();
-                    if (relativeDashboardUrl != null && grafanaProperties.getUrl() != null && relativeDashboardUrl.startsWith(grafanaProperties.getUrl())) {
-                        relativeDashboardUrl = relativeDashboardUrl.substring(grafanaProperties.getUrl().length());
-                    }
-                    String fullDashboardUrl = grafanaProperties.exposeUrl().replaceAll("/$", "")
-                            + (relativeDashboardUrl != null ? relativeDashboardUrl.replaceAll("^/", "") : "");
+                    String fullDashboardUrl = grafanaProperties.exposeUrl().replaceAll("/$", "") + relativeDashboardUrl;

                    grafanaDashboard.setUrl(fullDashboardUrl + KIOSK + REFRESH + INSTANCE + monitorId + useDatasource);

@@ -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.grafana.service;
+
+import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
+import org.apache.hertzbeat.grafana.config.GrafanaProperties;
+import org.apache.hertzbeat.grafana.dao.DashboardDao;
+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 org.springframework.http.HttpEntity;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+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.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test case for {@link DashboardService}
+ */
+@ExtendWith(MockitoExtension.class)
+public class DashboardServiceTest {
+
+    @Mock
+    private ServiceAccountService serviceAccountService;
+
+    @Mock
+    private DashboardDao dashboardDao;
+
+    @Mock
+    private GrafanaProperties grafanaProperties;
+
+    @Mock
+    private RestTemplate restTemplate;
+
+    @Mock
+    private DatasourceService datasourceService;
+
+    @InjectMocks
+    private DashboardService dashboardService;
+
+    static final String GRAFANA_API_RESULT = "{"
+            + "  \"folderUid\": \"\","
+            + "  \"id\": 3,"
+            + "  \"slug\": \"prometheus-dashboard\","
+            + "  \"status\": \"success\","
+            + "  \"uid\": \"5d7d89b0-b273-40fe-bb30-d652b82f47eb\","
+            + "  \"url\": \"/d/5d7d89b0-b273-40fe-bb30-d652b82f47eb/prometheus-dashboard\","
+            + "  \"version\": 3"
+            + "}";
+
+    @BeforeEach
+    void setUp() {
+        when(datasourceService.getCurrentDatasourceName()).thenReturn("hertzbeat-vm-localhost-8428");
+        when(grafanaProperties.enabled()).thenReturn(Boolean.TRUE);
+        when(grafanaProperties.getPrefix()).thenReturn("");
+        when(grafanaProperties.getUrl()).thenReturn("http://127.0.0.1:3000");
+        when(grafanaProperties.exposeUrl()).thenReturn("http://127.0.0.1:3000");
+        when(serviceAccountService.getToken()).thenReturn("test-token");
+    }
+
+
+    @Test
+    void testCreateOrUpdateDashboard() {
+        ResponseEntity<String> responseEntity = new ResponseEntity<>(GRAFANA_API_RESULT, HttpStatus.OK);
+        
+        when(restTemplate.postForEntity(
+                eq("http://127.0.0.1:3000/api/dashboards/db"), any(HttpEntity.class), eq(String.class)
+        )).thenReturn(responseEntity);
+        
+        ArgumentCaptor<GrafanaDashboard> dashboardCaptor = ArgumentCaptor.forClass(GrafanaDashboard.class);
+        dashboardService.createOrUpdateDashboard("{\"id\":11}", 1L);
+        verify(dashboardDao).save(dashboardCaptor.capture());
+
+        GrafanaDashboard savedDashboard = dashboardCaptor.getValue();
+        assertNotNull(savedDashboard);
+        assertNotNull(savedDashboard.getUrl());
+
+        String expectedBaseUrl = "http://127.0.0.1:3000/d/5d7d89b0-b273-40fe-bb30-d652b82f47eb";
+
+        // Verify that the URL begins with the expected base URL.
+        assertTrue(savedDashboard.getUrl().startsWith(expectedBaseUrl), "URL should start with: " + expectedBaseUrl + ", but was: " + savedDashboard.getUrl());
+
+        assertTrue(savedDashboard.getUrl().contains("kiosk=tv"), "URL should contain kiosk parameter");
+        assertTrue(savedDashboard.getUrl().contains("refresh=15s"), "URL should contain refresh parameter");
+        assertTrue(savedDashboard.getUrl().contains("var-instance=1"), "URL should contain instance parameter");
+    }
+    
+    @Test
+    void testCreateOrUpdateDashboardWithTrailingSlash() {
+        when(grafanaProperties.exposeUrl()).thenReturn("http://127.0.0.1:3000/");
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<>(GRAFANA_API_RESULT, HttpStatus.OK);
+
+        when(restTemplate.postForEntity(
+                eq("http://127.0.0.1:3000/api/dashboards/db"), any(HttpEntity.class), eq(String.class)
+        )).thenReturn(responseEntity);
+
+        ArgumentCaptor<GrafanaDashboard> dashboardCaptor = ArgumentCaptor.forClass(GrafanaDashboard.class);
+        dashboardService.createOrUpdateDashboard("{\"id\":11}", 1L);
+        verify(dashboardDao).save(dashboardCaptor.capture());
+
+        GrafanaDashboard savedDashboard = dashboardCaptor.getValue();
+        assertNotNull(savedDashboard);
+        assertNotNull(savedDashboard.getUrl());
+
+        String expectedBaseUrl = "http://127.0.0.1:3000/d/5d7d89b0-b273-40fe-bb30-d652b82f47eb";
+
+        // Verify that the URL begins with the expected base URL.
+        assertTrue(savedDashboard.getUrl().startsWith(expectedBaseUrl), "URL should start with: " + expectedBaseUrl + ", but was: " + savedDashboard.getUrl());
+
+        assertTrue(savedDashboard.getUrl().contains("kiosk=tv"), "URL should contain kiosk parameter");
+        assertTrue(savedDashboard.getUrl().contains("refresh=15s"), "URL should contain refresh parameter");
+        assertTrue(savedDashboard.getUrl().contains("var-instance=1"), "URL should contain instance parameter");
+    }
+
+}
@@ -210,6 +210,15 @@
            <groupId>org.apache.arrow</groupId>
            <artifactId>arrow-memory-netty</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-ai-agent</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
    </dependencies>

    <build>
@@ -284,6 +293,21 @@
                                    </descriptors>
                                </configuration>
                            </execution>
+                            <execution>
+                                <id>make-docker-zip</id>
+                                <!--Bound maven operation-->
+                                <phase>package</phase>
+                                <!--Run once-->
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>../dist</outputDirectory>
+                                    <descriptors>
+                                        <descriptor>../script/assembly/server/assembly-docker.xml</descriptor>
+                                    </descriptors>
+                                </configuration>
+                            </execution>
                            <execution>
                                <id>make-docker-compose-script</id>
                                <!--Bound maven operation-->
@@ -52,4 +52,4 @@ public class Manager {
    public void init() {
        System.setProperty("jdk.jndi.object.factoriesFilter", "!com.zaxxer.hikari.HikariJNDIFactory");
    }
-}
+}
@@ -20,14 +20,15 @@ package org.apache.hertzbeat.manager.config;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.usthe.sureness.util.JsonWebTokenUtil;
 import jakarta.annotation.Resource;
+import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
-import java.util.Random;
 import java.util.TimeZone;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
+import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.TimeZoneUtil;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.manager.pojo.dto.MuteConfig;
@@ -62,6 +63,9 @@ public class ConfigInitializer implements SmartLifecycle {
    @Value("${sureness.jwt.secret:" + DEFAULT_JWT_SECRET + "}")
    private String currentJwtSecret;

+    @Value("${common.secret:" + AesUtil.DEFAULT_ENCODE_RULES + "}")
+    private String currentAesSecret;
+
    @Resource
    private SystemGeneralConfigServiceImpl systemGeneralConfigService;

@@ -110,30 +114,41 @@ public class ConfigInitializer implements SmartLifecycle {
        // for template config, flush the template config in db to memory
        TemplateConfig templateConfig = templateConfigService.getConfig();
        appService.updateCustomTemplateConfig(templateConfig);
-        // for system secrets
+        // for system jwt secrets and aes secret
+        boolean needUpdate = false;
+        SystemSecret.SystemSecretBuilder systemSecretBuilder = SystemSecret.builder();
+        SystemSecret systemSecret = systemSecretService.getConfig();
+        if (systemSecret != null) {
+            systemSecretBuilder.jwtSecret(systemSecret.getJwtSecret());
+            systemSecretBuilder.aesSecret(systemSecret.getAesSecret());
+        }
        if (DEFAULT_JWT_SECRET.equals(currentJwtSecret)) {
            // use the random jwt secret
-            SystemSecret systemSecret = systemSecretService.getConfig();
            if (systemSecret == null || StringUtils.isBlank(systemSecret.getJwtSecret())) {
-                char[] chars = DEFAULT_JWT_SECRET.toCharArray();
-                Random rand = new Random();
-                for (int i = 0; i < chars.length; i++) {
-                    int index = rand.nextInt(chars.length);
-                    char temp = chars[i];
-                    chars[i] = chars[index];
-                    chars[index] = temp;
-                }
-                currentJwtSecret = new String(chars);
-                systemSecret = SystemSecret.builder().jwtSecret(currentJwtSecret).build();
-                systemSecretService.saveConfig(systemSecret);
+                currentJwtSecret = randomizeSecret(DEFAULT_JWT_SECRET);
+                systemSecretBuilder.jwtSecret(currentJwtSecret);
+                needUpdate = true;
            } else {
                currentJwtSecret = systemSecret.getJwtSecret();
            }
        }
-        // else use the user custom jwt secret
-        // set the jwt secret token in util
+        // else use the user custom jwt secret, set the jwt secret token in util
        JsonWebTokenUtil.setDefaultSecretKey(currentJwtSecret);
-
+        // Aes secret config
+        if (AesUtil.DEFAULT_ENCODE_RULES.equals(currentAesSecret)) {
+            // use the random aes secret
+            if (systemSecret == null || StringUtils.isBlank(systemSecret.getAesSecret())) {
+                currentAesSecret = randomizeSecret(AesUtil.DEFAULT_ENCODE_RULES);
+                systemSecretBuilder.aesSecret(currentAesSecret);
+                needUpdate = true;
+            } else {
+                currentAesSecret = systemSecret.getAesSecret();
+            }
+        }
+        AesUtil.setDefaultSecretKey(currentAesSecret);
+        if (needUpdate) {
+            systemSecretService.saveConfig(systemSecretBuilder.build());
+        }
        // init web-app mute config
        MuteConfig muteConfig = muteGeneralConfigService.getConfig();
        if (muteConfig == null) {
@@ -162,4 +177,18 @@ public class ConfigInitializer implements SmartLifecycle {
    public int getPhase() {
        return Ordered.HIGHEST_PRECEDENCE;
    }
+
+    private String randomizeSecret(String secret) {
+        SecureRandom random = new SecureRandom();
+        StringBuilder sb = new StringBuilder(secret.length());
+        for (int i = 0; i < secret.length(); i++) {
+            char ch;
+            do {
+                int codePoint = random.nextInt('z' - '0' + 1) + '0';
+                ch = (char) codePoint;
+            } while (!Character.isLetterOrDigit(ch));
+            sb.append(ch);
+        }
+        return sb.toString();
+    }
 }
@@ -17,7 +17,6 @@

 package org.apache.hertzbeat.manager.controller;

-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,6 +24,7 @@ import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.ResponseUtil;
 import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig;
 import org.apache.hertzbeat.manager.service.ConfigService;
@@ -37,6 +37,19 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.TextStyle;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
 /**
 * Alert sender Configuration API
 */
@@ -45,6 +58,9 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "Alert sender Configuration API")
@Slf4j
 public class GeneralConfigController {
+
+    private static final Set<String> ZONE_IDS = ZoneId.getAvailableZoneIds();
+
    @Resource
    private ConfigService configService;

@@ -74,4 +90,28 @@ public class GeneralConfigController {
            @RequestBody TemplateConfig.AppTemplate template) {
        return ResponseUtil.handle(() -> configService.updateTemplateAppConfig(app, template));
    }
+
+    @GetMapping(path = "/timezones")
+    @Operation(summary = "Get all available timezones and their current UTC offset", description = "Get all available timezones and their current UTC offset")
+    public ResponseEntity<Message<List<Map<String, String>>>> getTimezones() {
+        List<Map<String, String>> timezones = ZONE_IDS.stream()
+                .map(id -> {
+                    try {
+                        ZoneId zoneId = ZoneId.of(id);
+                        ZonedDateTime now = ZonedDateTime.now(zoneId);
+                        int totalSeconds = now.getOffset().getTotalSeconds();
+                        String offset = String.format("UTC%+03d:%02d", totalSeconds / 3600, Math.abs((totalSeconds / 60) % 60));
+                        String displayName = zoneId.getDisplayName(TextStyle.FULL, Locale.getDefault());
+                        return Map.of("zoneId", id, "offset", offset, "displayName", displayName);
+                    } catch (Exception e) {
+                        String errorMsg = CommonUtil.getMessageFromThrowable(e);
+                        log.warn("Query Timezone failed. {} ", errorMsg);
+                        return null;
+                    }
+                })
+                .filter(t -> Objects.nonNull(t) && Objects.nonNull(t.get("zoneId")))
+                .sorted(Comparator.comparing(m -> m.get("zoneId")))
+                .collect(Collectors.toList());
+        return ResponseEntity.ok(Message.success(timezones));
+    }
 }
@@ -17,10 +17,14 @@

 package org.apache.hertzbeat.manager.controller;

+import io.swagger.v3.oas.annotations.Parameter;
+import org.springframework.data.domain.Page;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import java.util.List;
+
 import jakarta.validation.Valid;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.dto.Message;
@@ -37,6 +41,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

 /**
@@ -49,7 +54,7 @@ public class StatusPageController {

    @Autowired
    private StatusPageService statusPageService;
-    
+
    @GetMapping("/org")
    @Operation(summary = "Query Status Page Organization")
    public ResponseEntity<Message<StatusPageOrg>> queryStatusPageOrg() {
@@ -66,35 +71,35 @@ public class StatusPageController {
        StatusPageOrg org = statusPageService.saveStatusPageOrg(statusPageOrg);
        return ResponseEntity.ok(Message.success(org));
    }
-    
+
    @GetMapping("/component")
    @Operation(summary = "Query Status Page Components")
    public ResponseEntity<Message<List<StatusPageComponent>>> queryStatusPageComponent() {
        List<StatusPageComponent> statusPageComponents = statusPageService.queryStatusPageComponents();
        return ResponseEntity.ok(Message.success(statusPageComponents));
    }
-    
+
    @PostMapping("/component")
    @Operation(summary = "Save Status Page Component")
    public ResponseEntity<Message<Void>> newStatusPageComponent(@Valid @RequestBody StatusPageComponent statusPageComponent) {
        statusPageService.newStatusPageComponent(statusPageComponent);
        return ResponseEntity.ok(Message.success("Add success"));
    }
-    
+
    @PutMapping("/component")
    @Operation(summary = "Update Status Page Component")
    public ResponseEntity<Message<Void>> updateStatusPageComponent(@Valid @RequestBody StatusPageComponent statusPageComponent) {
        statusPageService.updateStatusPageComponent(statusPageComponent);
        return ResponseEntity.ok(Message.success("Update success"));
    }
-    
+
    @DeleteMapping("/component/{id}")
    @Operation(summary = "Delete Status Page Component")
    public ResponseEntity<Message<Void>> deleteStatusPageComponent(@PathVariable("id") final long id) {
        statusPageService.deleteStatusPageComponent(id);
        return ResponseEntity.ok(Message.success("Delete success"));
    }
-    
+
    @GetMapping("/component/{id}")
    @Operation(summary = "Query Status Page Component")
    public ResponseEntity<Message<StatusPageComponent>> queryStatusPageComponent(@PathVariable("id") final long id) {
@@ -132,8 +137,13 @@ public class StatusPageController {

    @GetMapping("/incident")
    @Operation(summary = "Query Status Page Incidents")
-    public ResponseEntity<Message<List<StatusPageIncident>>> queryStatusPageIncident() {
-        List<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents();
+    public ResponseEntity<Message<Page<StatusPageIncident>>> queryStatusPageIncident(
+            @Parameter(description = "Search-Target", example = "x") @RequestParam(required = false) String search,
+            @Parameter(description = "Start Time", example = "1756384301907") @RequestParam(required = false) Long startTime,
+            @Parameter(description = "End Time", example = "1756384301907") @RequestParam(required = false) Long endTime,
+            @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
+            @Parameter(description = "Number of list pages", example = "8") @RequestParam(defaultValue = "8") int pageSize) {
+        Page<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents(search, startTime, endTime, pageIndex, pageSize);
        return ResponseEntity.ok(Message.success(incidents));
    }
 }
@@ -17,10 +17,14 @@

 package org.apache.hertzbeat.manager.controller;

+import io.swagger.v3.oas.annotations.Parameter;
+import org.springframework.data.domain.Page;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+
 import java.util.List;
+
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.dto.Message;
 import org.apache.hertzbeat.common.entity.manager.StatusPageIncident;
@@ -32,6 +36,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

 /**
@@ -44,7 +49,7 @@ public class StatusPagePublicController {

    @Autowired
    private StatusPageService statusPageService;
-    
+
    @GetMapping("/org")
    @Operation(summary = "Query Status Page Organization")
    public ResponseEntity<Message<StatusPageOrg>> queryStatusPageOrg() {
@@ -54,14 +59,14 @@ public class StatusPagePublicController {
        }
        return ResponseEntity.ok(Message.success(statusPageOrg));
    }
-    
+
    @GetMapping("/component")
    @Operation(summary = "Query Status Page Components")
    public ResponseEntity<Message<List<ComponentStatus>>> queryStatusPageComponent() {
        List<ComponentStatus> componentStatusList = statusPageService.queryComponentsStatus();
        return ResponseEntity.ok(Message.success(componentStatusList));
    }
-    
+
    @GetMapping("/component/{id}")
    @Operation(summary = "Query Status Page Component")
    public ResponseEntity<Message<ComponentStatus>> queryStatusPageComponent(@PathVariable("id") final long id) {
@@ -71,8 +76,13 @@ public class StatusPagePublicController {

    @GetMapping("/incident")
    @Operation(summary = "Query Status Page Incidents")
-    public ResponseEntity<Message<List<StatusPageIncident>>> queryStatusPageIncident() {
-        List<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents();
+    public ResponseEntity<Message<Page<StatusPageIncident>>> queryStatusPageIncident(
+            @Parameter(description = "Search-Target", example = "x") @RequestParam(required = false) String search,
+            @Parameter(description = "Start Time", example = "1756384301907") @RequestParam(required = false) Long startTime,
+            @Parameter(description = "End Time", example = "1756384301907") @RequestParam(required = false) Long endTime,
+            @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
+            @Parameter(description = "Number of list pages", example = "10") @RequestParam(defaultValue = "10") int pageSize) {
+        Page<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents(search, startTime, endTime, pageIndex, pageSize);
        return ResponseEntity.ok(Message.success(incidents));
    }
 }
@@ -35,4 +35,9 @@ public class SystemSecret {
     * secret key for jwt
     */
    private String jwtSecret;
+
+    /**
+     * secret key for aes
+     */
+    private String aesSecret;
 }
@@ -36,6 +36,7 @@ import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobServi
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
+import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.job.Configmap;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.manager.Collector;
@@ -45,6 +46,7 @@ import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.SnowFlakeIdGenerator;
 import org.apache.hertzbeat.manager.dao.CollectorDao;
@@ -147,6 +149,9 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
                appDefine.setDefaultInterval(monitor.getIntervals());
                appDefine.setCyclic(true);
                appDefine.setTimestamp(System.currentTimeMillis());
+                Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                        CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+                appDefine.setMetadata(metadata);
                List<Param> params = paramDao.findParamsByMonitorId(monitor.getId());
                List<Configmap> configmaps = params.stream()
                        .map(param -> Configmap.builder()
@@ -258,9 +263,11 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        if (Objects.isNull(collector)) {
            return false;
        }
+        ServerInfo serverInfo = ServerInfo.builder().aesSecret(AesUtil.getDefaultSecretKey()).build();
        ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
                .setType(ClusterMsg.MessageType.GO_ONLINE)
                .setDirection(ClusterMsg.Direction.REQUEST)
+                .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(serverInfo)))
                .setIdentity(identity)
                .build();
        ClusterMsg.Message response = this.manageServer.sendMsgSync(identity, message);
@@ -17,12 +17,15 @@

 package org.apache.hertzbeat.manager.scheduler.netty.process;

+import com.google.protobuf.ByteString;
 import io.netty.channel.ChannelHandlerContext;
 import java.net.InetSocketAddress;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
+import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
+import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.manager.scheduler.netty.ManageServer;
 import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;
@@ -52,6 +55,12 @@ public class CollectorOnlineProcessor implements NettyRemotingProcessor {
        }
        this.manageServer.addChannel(collector, ctx.channel());
        this.manageServer.getCollectorAndJobScheduler().collectorGoOnline(collector, collectorInfo);
-        return null;
+        ServerInfo serverInfo = ServerInfo.builder().aesSecret(AesUtil.getDefaultSecretKey()).build();
+        return ClusterMsg.Message.newBuilder()
+                .setIdentity(message.getIdentity())
+                .setDirection(ClusterMsg.Direction.RESPONSE)
+                .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(serverInfo)))
+                .setType(ClusterMsg.MessageType.GO_ONLINE)
+                .build();
    }
 }
@@ -18,10 +18,12 @@
 package org.apache.hertzbeat.manager.service;

 import java.util.List;
+
 import org.apache.hertzbeat.common.entity.manager.StatusPageComponent;
 import org.apache.hertzbeat.common.entity.manager.StatusPageIncident;
 import org.apache.hertzbeat.common.entity.manager.StatusPageOrg;
 import org.apache.hertzbeat.manager.pojo.dto.ComponentStatus;
+import org.springframework.data.domain.Page;

 /**
 * status page service interface.
@@ -30,42 +32,49 @@ public interface StatusPageService {

    /**
     * query status page organization.
+     *
     * @return status page organization
     */
    StatusPageOrg queryStatusPageOrg();

    /**
     * save status page organization.
+     *
     * @return status page organization
     */
    StatusPageOrg saveStatusPageOrg(StatusPageOrg statusPageOrg);
-    
+
    /**
     * query status page components.
+     *
     * @return status page components
     */
    List<StatusPageComponent> queryStatusPageComponents();
-    
+
    /**
     * save status page component.
+     *
     * @param statusPageComponent status page component
     */
    void newStatusPageComponent(StatusPageComponent statusPageComponent);
-    
+
    /**
     * update status page component.
+     *
     * @param statusPageComponent status page component
     */
    void updateStatusPageComponent(StatusPageComponent statusPageComponent);

    /**
     * delete status page component.
+     *
     * @param id status page component id
     */
    void deleteStatusPageComponent(long id);

    /**
     * query status page component.
+     *
     * @param id status page component id
     * @return status page component
     */
@@ -73,44 +82,56 @@ public interface StatusPageService {

    /**
     * query status page components status.
+     *
     * @return status page components status
     */
    List<ComponentStatus> queryComponentsStatus();

    /**
     * query status page component status.
+     *
     * @param id status page component id
     * @return status page component status
     */
    ComponentStatus queryComponentStatus(long id);
-    
+
    /**
     * query status page incidents.
-     * @return status page incidents
+     *
+     * @param search    Search Target
+     * @param startTime Start Time
+     * @param endTime   End Time
+     * @param pageIndex List current page
+     * @param pageSize  Number of list pages
+     * @return The query results
     */
-    List<StatusPageIncident> queryStatusPageIncidents();
-    
+    Page<StatusPageIncident> queryStatusPageIncidents(String search, Long startTime, Long endTime, int pageIndex, int pageSize);
+
    /**
     * query status page incident.
+     *
     * @param id status page incident id
     * @return status page incident
     */
    StatusPageIncident queryStatusPageIncident(long id);
-    
+
    /**
     * save status page incident.
+     *
     * @param statusPageIncident status page incident
     */
    void newStatusPageIncident(StatusPageIncident statusPageIncident);
-    
+
    /**
     * update status page incident.
+     *
     * @param statusPageIncident status page incident
     */
    void updateStatusPageIncident(StatusPageIncident statusPageIncident);
-    
+
    /**
     * delete status page incident.
+     *
     * @param id status page incident id
     */
    void deleteStatusPageIncident(long id);
@@ -41,6 +41,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
+import org.apache.hertzbeat.common.constants.JexlKeywordsEnum;
 import org.apache.hertzbeat.common.entity.job.Configmap;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
@@ -211,7 +212,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
            var name = job.getName();
            var i18nName = CommonUtil.getLangMappingValueFromI18nMap(lang, name);
            if (i18nName != null) {
-                i18nMap.put("monitor.app." + job.getApp().toLowerCase(), i18nName);
+                i18nMap.put("monitor.app." + job.getApp(), i18nName);
            }
            var help = job.getHelp();
            var i18nHelp = CommonUtil.getLangMappingValueFromI18nMap(lang, help);
@@ -458,6 +459,10 @@ public class AppServiceImpl implements AppService, InitializingBean {
                    throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " 
                            + field.getField() + " can not duplicated.");
                }
+                if (JexlKeywordsEnum.match(field.getField())) {
+                    throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " "
+                            + field.getField() + " prohibited keywords.");
+                }
                fieldsSet.add(field.getField());
            }
        }
@@ -518,16 +523,15 @@ public class AppServiceImpl implements AppService, InitializingBean {
        } else {
            if (objectStoreConfig.getType() == ObjectStoreDTO.Type.OBS) {
                appDefineStore = new ObjectStoreAppDefineStoreImpl();
-            } else if (objectStoreConfig.getType() == ObjectStoreDTO.Type.DATABASE){
+            } else if (objectStoreConfig.getType() == ObjectStoreDTO.Type.DATABASE) {
                appDefineStore = new DatabaseAppDefineStoreImpl();
            } else {
                appDefineStore = new LocalFileAppDefineStoreImpl();
            }
        }
-        var success = appDefineStore.loadAppDefines();
-        if (!success) {
-            new JarAppDefineStoreImpl().loadAppDefines();
-        }
+        jarAppDefineStore.loadAppDefines();
+        // merge define yml files inside jars
+        appDefineStore.loadAppDefines();
    }

    private interface AppDefineStore {
@@ -709,7 +713,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
                            }
                        }
                    });
-            return false;
+            return true;
        }

        @Override
@@ -769,8 +773,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
                    appDefines.put(define.getApp().toLowerCase(), app);
                }
            }
-            // merge define yml files inside jars
-            return false;
+            return true;
        }

        @Override
@@ -67,7 +67,7 @@ public class LabelServiceImpl implements LabelService {
    public void modifyLabel(Label label) {
        Optional<Label> optional = labelDao.findById(label.getId());
        if (optional.isPresent()) {
-            
+
            Optional<Label> existOptional = labelDao.findLabelByNameAndTagValue(label.getName(), label.getTagValue());
            if (existOptional.isPresent() && !existOptional.get().getId().equals(label.getId())) {
                throw new IllegalArgumentException("The label with same key and value already exists.");
@@ -116,33 +116,38 @@ public class LabelServiceImpl implements LabelService {

    @Override
    public void deleteLabels(HashSet<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)){
+        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        labelDao.deleteLabelsByIdIn(ids);
    }

-    public List<Label> determineNewLabels(Set<Map.Entry<String, String>> originLabels){
+    @Override
+    public List<Label> determineNewLabels(Set<Map.Entry<String, String>> originLabels) {

        if (originLabels == null || originLabels.isEmpty()) return List.of();

        // Get all labels from the database
-        Set<Map.Entry<String, String>> allLabels = labelDao.findAll().stream()
-                .map(label -> Map.entry(label.getName(), label.getTagValue()))
+        Set<Label> allLabels = labelDao.findAll().stream()
+                .map(label -> Label.builder()
+                        .name(label.getName())
+                        .tagValue(label.getTagValue())
+                        .build())
                .collect(Collectors.toSet());

        // If the bound label (key:value) does not exist, then add it
-        Set<Map.Entry<String, String>> addLabelsKv = originLabels.stream()
+        return originLabels.stream()
+                .map(entry -> Label.builder()
+                        .name(entry.getKey())
+                        .tagValue(entry.getValue())
+                        .build())
                .filter(label -> !allLabels.contains(label))
-                .collect(Collectors.toCollection(HashSet::new));
-
-        return addLabelsKv.stream().map(kv -> {
-            Label label = new Label();
-            label.setId(null);
-            label.setName(kv.getKey());
-            label.setTagValue(kv.getValue());
-            label.setType((byte) 0);
-            return label;
-        }).toList();
+                .map(label -> Label.builder()
+                        .id(null)
+                        .name(label.getName())
+                        .tagValue(label.getTagValue())
+                        .type((byte) 0)
+                        .build())
+                .toList();
    }
 }
@@ -27,6 +27,7 @@ import org.apache.hertzbeat.alert.dao.AlertDefineBindDao;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.constants.ExportFileConstants;
+import org.apache.hertzbeat.common.constants.JexlKeywordsEnum;
 import org.apache.hertzbeat.common.constants.NetworkConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
@@ -436,6 +437,27 @@ public class MonitorServiceImpl implements MonitorService {
                }
            }
        }
+        checkJobFields(monitorDto.getMonitor().getApp());
+    }
+
+    private void checkJobFields(String app) {
+        if (null == app || app.trim().isEmpty()) {
+            return;
+        }
+        Job job = appService.getAppDefine(app);
+        if (null != job && !CollectionUtils.isEmpty(job.getMetrics())) {
+            for (Metrics metrics : job.getMetrics()) {
+                if (null == metrics.getFields() || metrics.getFields().isEmpty()) {
+                    continue;
+                }
+                for (Metrics.Field field : metrics.getFields()) {
+                    if (JexlKeywordsEnum.match(field.getField())) {
+                        throw new IllegalArgumentException(job.getApp() + " " + metrics.getName() + " "
+                                + field.getField() + " prohibited keywords, please modify the template information.");
+                    }
+                }
+            }
+        }
    }

    @Override
@@ -21,9 +21,12 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import jakarta.persistence.criteria.Predicate;
 import lombok.RequiredArgsConstructor;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.manager.StatusPageComponent;
@@ -40,8 +43,12 @@ import org.apache.hertzbeat.manager.dao.StatusPageOrgDao;
 import org.apache.hertzbeat.manager.pojo.dto.ComponentStatus;
 import org.apache.hertzbeat.manager.service.StatusPageService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;

 /**
 * status page service implement.
@@ -257,9 +264,28 @@ public class StatusPageServiceImpl implements StatusPageService {
    }

    @Override
-    public List<StatusPageIncident> queryStatusPageIncidents() {
+    public Page<StatusPageIncident> queryStatusPageIncidents(String search, Long startTime, Long endTime, int pageIndex, int pageSize) {
+        // build search condition
+        Specification<StatusPageIncident> specification = (root, query, criteriaBuilder) -> {
+            List<Predicate> andList = new ArrayList<>();
+            if (StringUtils.hasText(search)) {
+                Predicate predicateName = criteriaBuilder.like(criteriaBuilder.lower(root.get("name")), "%" + search.toLowerCase() + "%");
+                andList.add(predicateName);
+            }
+            if (startTime != null) {
+                andList.add(criteriaBuilder.greaterThanOrEqualTo(root.get("startTime"), startTime));
+            }
+            if (endTime != null) {
+                andList.add(criteriaBuilder.lessThanOrEqualTo(root.get("endTime"), endTime));
+            }
+
+            Predicate[] predicates = new Predicate[andList.size()];
+            return criteriaBuilder.and(andList.toArray(predicates));
+        };
+
        Sort sort = Sort.by(Sort.Direction.DESC, "startTime");
-        return statusPageIncidentDao.findAll(sort);
+        PageRequest pageRequest = PageRequest.of(pageIndex, pageSize, sort);
+        return statusPageIncidentDao.findAll(specification, pageRequest);
    }

    @Override
@@ -22,6 +22,7 @@ spring:
    url: jdbc:h2:./data/test;MODE=MYSQL
    hikari:
      max-lifetime: 120000
+
  jpa:
    show-sql: false
    database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
@@ -30,8 +31,10 @@ spring:
      eclipselink:
        logging:
          level: SEVERE
+
  flyway:
    enabled: false
+
  mail:
    host: smtp.exmail.qq.com
    username: example@tancloud.cn
@@ -55,26 +58,57 @@ warehouse:
    jpa:
      enabled: true
      expire-time: 1h
+      max-history-record-num: 6000
    victoria-metrics:
      enabled: false
      url: http://localhost:8428
      username: root
      password: root
      insert:
-        buffer-size: 1000
+        buffer-size: 100
        flush-interval: 3
+        compression:
+          enabled: false
+      cluster:
+        enabled: false
+        select:
+          url: http://localhost:8481
+          username: root
+          password: root
+        insert:
+          url: http://localhost:8480
+          username: root
+          password: root
+          buffer-size: 1000
+          flush-interval: 3
    td-engine:
      enabled: false
      driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
      url: jdbc:TAOS-RS://127.0.0.1:6041/hertzbeat
      username: root
      password: taosdata
+    greptime:
+      enabled: false
+      grpc-endpoints: localhost:4001
+      http-endpoint: http://localhost:4000
+      database: public
+      username: greptime
+      password: greptime
    iot-db:
      enabled: false
      host: 127.0.0.1
      rpc-port: 6667
      username: root
      password: root
+      query-timeout-in-ms: -1
+      expire-time: '7776000000'
+    influxdb:
+      enabled: false
+      server-url: http://127.0.0.1:8086
+      username: root
+      password: root
+      expire-time: '30d'
+      replication: 1
  # store real-time metrics data, enable only one below
  real-time:
    memory:
@@ -92,6 +126,58 @@ warehouse:
      # redis db index, default: DB0
      db: 0

+alerter:
+  # custom console url
+  console-url: https://console.tancloud.io
+  # we work
+  we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
+  # ding ding talk
+  ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token=
+  # fei shu fly book
+  fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/
+  # telegram
+  telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage
+  # discord
+  discord-webhook-url: https://discord.com/api/v9/channels/%s/messages
+  # serverChan
+  server-chan-webhook-url: https://sctapi.ftqq.com/%s.send
+  # gotify
+  gotify-webhook-url: http://127.0.0.1/message?token=%s
+  # alert inhibit ttl unit ms, default 14400000(4 hours)
+  inhibit:
+    ttl: 14400000
+  sms:
+    enable: false
+    type: tencent
+    tencent:
+      secret-id:
+      secret-key:
+      app-id:
+      sign-name:
+      template-id:
+    alibaba:
+      access-key-id:
+      access-key-secret:
+      sign-name:
+      template-code:
+    unisms:
+      # auth-mode: simple or hmac
+      auth-mode: simple
+      access-key-id: YOUR_ACCESS_KEY_ID
+      # hmac mode need to fill in access-key-secret
+      access-key-secret: YOUR_ACCESS_KEY_SECRET
+      signature: YOUR_SMS_SIGNATURE
+      template-id: YOUR_TEMPLATE_ID
+    smslocal:
+      api-key: YOUR_API_KEY_HERE
+    aws:
+      access-key-id: YOUR_ACCESS_KEY_ID
+      access-key-secret: YOUR_ACCESS_KEY_SECRET
+      region: AWS_REGION_FOR_END_USER_MESSAGING
+    twilio:
+      account-sid: YOUR_ACCOUNT_SID
+      auth-token: YOUR_AUTH_TOKEN
+      twilio-phone-number: YOUR_TWILIO_PHONE_NUMBER
 scheduler:
  server:
    enabled: true
@@ -100,13 +186,13 @@ scheduler:
 grafana:
  enabled: false
  url: http://127.0.0.1:3000
+  expose-url: http://127.0.0.1:3000
  username: admin
  password: admin

-# AI config
 # See the documentation for details : https://hertzbeat.apache.org/zh-cn/docs/help/aiConfig
 ai:
-  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk
+  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk、ollama、openRouter
  type:
  # Model name：glm-4、qwen-turboo、moonshot-v1-8k、generalv3.5
  model:
@@ -114,3 +200,5 @@ ai:
  api-key:
  #At present, only IFLYTEK large model needs to be filled in
  api-secret:
+  # The URL of the ollama AI service
+  api-url:
@@ -19,6 +19,33 @@ spring:
    name: ${HOSTNAME:@hertzbeat@}${PID}
  profiles:
    active: prod
+  ai:
+    mcp:
+      server:
+        enabled: true
+        stdio: false
+        name: sse-mcp-server
+        version: 1.0.0
+        resource-change-notification: true
+        tool-change-notification: true
+        prompt-change-notification: true
+        sse-endpoint: /api/sse
+        sse-message-endpoint: /api/mcp/message
+        type: SYNC
+        capabilities:
+          tool: true
+          resource: true
+          prompt: true
+          completion: true
+    chat:
+      client:
+        enabled: false
+    openai:
+      api-key: OPENAI_API_KEY
+      chat:
+        options:
+          model: gpt-4.1-nano-2025-04-14
+
  mvc:
    static-path-pattern: /**
  jackson:
@@ -38,6 +65,7 @@ spring:
      max-file-size: 100MB
      max-request-size: 100MB

+
 management:
  health:
    mail:
@@ -48,7 +76,19 @@ management:
        include:
          - 'metrics'
          - 'health'
+          - 'prometheus'
    enabled-by-default: on
+  endpoint:
+    prometheus:
+      access: read_only
+  metrics:
+    tags:
+      application: ${spring.application.name}
+      environment: ${spring.profiles.active}
+  prometheus:
+    metrics:
+      export:
+        enabled: true

 sureness:
  container: jakarta_servlet
@@ -140,6 +180,8 @@ warehouse:
      insert:
        buffer-size: 100
        flush-interval: 3
+        compression:
+          enabled: false
      cluster:
        enabled: false
        select:
@@ -0,0 +1,21 @@
+-- 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.
+
+-- ensure every sql can rerun without error
+
+-- Modify message column to TEXT (H2 TEXT is equivalent to CLOB)
+ALTER TABLE HZB_STATUS_PAGE_INCIDENT_CONTENT ALTER COLUMN message CLOB;
@@ -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.
+
+-- ensure every sql can rerun without error
+
+-- Modify hzb_status_page_incident_content table columns to TEXT type to resolve MySQL row size limit issue
+
+DELIMITER //
+CREATE PROCEDURE ModifyStatusIncidentContentColumns()
+BEGIN
+    DECLARE table_exists INT;
+    DECLARE col_exists INT;
+
+    -- Check if the table exists
+    SELECT COUNT(*) INTO table_exists 
+    FROM INFORMATION_SCHEMA.TABLES 
+    WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'HZB_STATUS_PAGE_INCIDENT_CONTENT';
+    
+    IF table_exists = 1 THEN
+        -- Check and modify message column to TEXT
+        SELECT COUNT(*) INTO col_exists 
+        FROM INFORMATION_SCHEMA.COLUMNS 
+        WHERE TABLE_SCHEMA = DATABASE() 
+        AND TABLE_NAME = 'HZB_STATUS_PAGE_INCIDENT_CONTENT'
+        AND COLUMN_NAME = 'message'
+        AND DATA_TYPE != 'text';
+        
+        IF col_exists = 1 THEN
+            ALTER TABLE HZB_STATUS_PAGE_INCIDENT_CONTENT MODIFY COLUMN message TEXT;
+        END IF;
+    END IF;
+END //
+
+DELIMITER ;
+
+CALL ModifyStatusIncidentContentColumns();
+DROP PROCEDURE IF EXISTS ModifyStatusIncidentContentColumns;
+COMMIT;
@@ -0,0 +1,23 @@
+-- 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.
+
+-- ensure every sql can rerun without error
+
+-- Modify message column to TEXT
+ALTER TABLE HZB_STATUS_PAGE_INCIDENT_CONTENT ALTER COLUMN message TYPE TEXT;
+
+commit;
@@ -0,0 +1,619 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
+category: bigdata
+# The monitoring type eg: linux windows tomcat mysql aws...
+app: dolphinscheduler
+# The monitoring i18n name
+name:
+  zh-CN: Apache DolphinScheduler
+  en-US: Apache DolphinScheduler
+  ja-JP: Apache DolphinScheduler
+# The description and help of this monitoring type
+help:
+  zh-CN: Hertzbeat 对 Apache DolphinScheduler (支持v3.3.0或更高版本)通用指标进行测量监控。<br>您可以点击 “<i>新建 Apache DolphinScheduler</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
+  en-US: Hertzbeat measures and monitors the general metrics of Apache DolphinScheduler (support v3.3.0 or later).<br>You can click on “<i>Create New Apache DolphinScheduler</i>” to configure it, or select “<i>More Actions</i>” to import an existing configuration.
+  ja-JP: Hertzbeat は Apache DolphinScheduler（v3.3.0+）の一般的なメトリクスを監視します。<br>「<i>新規 Apache DolphinScheduler</i>」をクリックしてパラメタを設定した後、新規することができます。
+helpLink:
+  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/dolphinscheduler
+  en-US: https://hertzbeat.apache.org/docs/help/dolphinscheduler
+# Input params define for monitoring(render web ui by the definition)
+params:
+  # field-param field key
+  - field: host
+    # name-param field display i18n name
+    name:
+      zh-CN: 目标Host
+      en-US: Target Host
+      ja-JP: 目標ホスト
+    # type-param field type(most mapping the html input type)
+    type: host
+    # required-true or false
+    required: true
+  # field-param field key
+  - field: port
+    # name-param field display i18n name
+    name:
+      zh-CN: 端口
+      en-US: Port
+      ja-JP: ポート
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[0,65535]'
+    # required-true or false
+    required: true
+    # default value
+    defaultValue: 12345
+  # field-param field key
+  - field: timeout
+    # name-param field display i18n name
+    name:
+      zh-CN: 查询超时时间
+      en-US: Query Timeout
+      ja-JP: クエリタイムアウト
+    # type-param field type(most mapping the html input type)
+    type: number
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+    # default value
+    defaultValue: 6000
+  # field-param field key
+  - field: ssl
+    # name-param field display i18n name
+    name:
+      zh-CN: 启用HTTPS
+      en-US: SSL
+      ja-JP: SSL
+    # type-param field type(boolean mapping the html h tag)
+    type: boolean
+    # required-true or false
+    required: true
+  - field: token
+    # name-param field display i18n name
+    name:
+      zh-CN: 令牌
+      en-US: Token
+      ja-JP: トークン
+    type: text
+    limit: 100
+    required: true
+
+# collect metrics config list
+metrics:
+  - name: master
+    i18n:
+      zh-CN: Master
+      en-US: Master
+      ja-JP: マスター情報
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 0
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: host
+        type: 1
+        i18n:
+          zh-CN: 主机地址
+          en-US: Host
+          ja-JP: ホスト
+      - field: port
+        type: 1
+        i18n:
+          zh-CN: 端口
+          en-US: Port
+          ja-JP: ポート
+      - field: serverStatus
+        type: 1
+        i18n:
+          zh-CN: 状态
+          en-US: Server Status
+          ja-JP: サーバーステータス
+      - field: processId
+        type: 1
+        i18n:
+          zh-CN: 进程 ID
+          en-US: Process Id
+          ja-JP: プロセスID
+      - field: runningTime
+        type: 0
+        i18n:
+          zh-CN: 运行时间
+          en-US: Up Time
+          ja-JP: アップタイム
+      - field: cpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 处理器使用量
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: memoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存使用量
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: diskUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 磁盘使用量
+          en-US: Disk Usage
+          ja-JP: ディスク使用率
+      - field: jvmCpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM CPU 使用量
+          en-US: JVM CPU Usage
+          ja-JP: Java仮想マシンのCPU使用率
+      - field: jvmMemoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM 内存 使用量
+          en-US: JVM Memory Usage
+          ja-JP: Java仮想マシンのメモリ使用率
+      - field: jvmHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的堆内存大小
+          en-US: JVM Heap Used
+          ja-JP: Java仮想マシンが使用したヒープメモリのサイズ
+      - field: jvmNonHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的非堆内存大小
+          en-US: JVM NonHeap Used
+          ja-JP: Java仮想マシンが使用したノンヒープメモリのサイズ
+      - field: jvmHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大堆内存大小
+          en-US: JVM Heap Max
+          ja-JP: Java仮想マシンのヒープメモリの最大値
+      - field: jvmNonHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大非堆内存大小
+          en-US: JVM NonHeap Max
+          ja-JP: Java仮想マシンのノンヒープメモリの最大値
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - $.heartBeatInfo
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - host=json:apply($.heartBeatInfo).host
+      - port=json:apply($.heartBeatInfo).port
+      - serverStatus=json:apply($.heartBeatInfo).serverStatus
+      - processId=json:apply($.heartBeatInfo).processId
+      - runningTime=(now()-json:apply($.heartBeatInfo).startupTime)/86400000
+      - cpuUsage=json:apply($.heartBeatInfo).cpuUsage * 100
+      - memoryUsage=json:apply($.heartBeatInfo).memoryUsage * 100
+      - diskUsage=json:apply($.heartBeatInfo).diskUsage * 100
+      - jvmCpuUsage=json:apply($.heartBeatInfo).jvmCpuUsage
+      - jvmMemoryUsage=json:apply($.heartBeatInfo).jvmMemoryUsage
+      - jvmHeapUsed=json:apply($.heartBeatInfo).jvmHeapUsed
+      - jvmNonHeapUsed=json:apply($.heartBeatInfo).jvmNonHeapUsed
+      - jvmHeapMax=json:apply($.heartBeatInfo).jvmHeapMax
+      - jvmNonHeapMax=json:apply($.heartBeatInfo).jvmNonHeapMax
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: http
+    # the config content when protocol is http
+    http:
+      # http host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # http port
+      port: ^_^port^_^
+      # http url
+      url: /dolphinscheduler/monitor/MASTER
+      # http method: GET POST PUT DELETE PATCH
+      method: GET
+      # if enabled https
+      ssl: ^_^ssl^_^
+      # http request header content
+      headers:
+        token: ^_^token^_^
+      # http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
+      parseType: jsonPath
+      parseScript: '$.data[*]'
+
+  - name: worker
+    i18n:
+      zh-CN: Worker
+      en-US: Worker
+      ja-JP: ワーカー情報
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 1
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: host
+        type: 1
+        i18n:
+          zh-CN: 主机地址
+          en-US: Host
+          ja-JP: ホスト
+      - field: port
+        type: 1
+        i18n:
+          zh-CN: 端口
+          en-US: Port
+          ja-JP: ポート
+      - field: serverStatus
+        type: 1
+        i18n:
+          zh-CN: 状态
+          en-US: Server Status
+          ja-JP: サーバーステータス
+      - field: processId
+        type: 1
+        i18n:
+          zh-CN: 进程 ID
+          en-US: Process Id
+          ja-JP: プロセスID
+      - field: runningTime
+        type: 0
+        i18n:
+          zh-CN: 运行时间
+          en-US: Up Time
+          ja-JP: アップタイム
+      - field: cpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 处理器使用量
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: memoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存使用量
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: diskUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 磁盘使用量
+          en-US: Disk Usage
+          ja-JP: ディスク使用率
+      - field: jvmCpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM CPU 使用量
+          en-US: JVM CPU Usage
+          ja-JP: Java仮想マシンのCPU使用率
+      - field: jvmMemoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM 内存 使用量
+          en-US: JVM Memory Usage
+          ja-JP: Java仮想マシンのメモリ使用率
+      - field: jvmHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的堆内存大小
+          en-US: JVM Heap Used
+          ja-JP: Java仮想マシンが使用したヒープメモリのサイズ
+      - field: jvmNonHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的非堆内存大小
+          en-US: JVM NonHeap Used
+          ja-JP: Java仮想マシンが使用したノンヒープメモリのサイズ
+      - field: jvmHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大堆内存大小
+          en-US: JVM Heap Max
+          ja-JP: Java仮想マシンのヒープメモリの最大値
+      - field: jvmNonHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大非堆内存大小
+          en-US: JVM NonHeap Max
+          ja-JP: Java仮想マシンのノンヒープメモリの最大値
+      - field: workerHostWeight
+        type: 0
+        i18n:
+          zh-CN: 权重
+          en-US: Weight
+          ja-JP: ウェイト
+      - field: threadPoolUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 线程池使用量
+          en-US: Thread Pool Usage
+          ja-JP: スレッドプールの使用率
+      - field: workerGroup
+        type: 1
+        i18n:
+          zh-CN: Worker 组
+          en-US: Worker Group
+          ja-JP: ワーカーグループ
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - $.heartBeatInfo
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - host=json:apply($.heartBeatInfo).host
+      - port=json:apply($.heartBeatInfo).port
+      - serverStatus=json:apply($.heartBeatInfo).serverStatus
+      - processId=json:apply($.heartBeatInfo).processId
+      - runningTime=(now()-json:apply($.heartBeatInfo).startupTime)/86400000
+      - cpuUsage=json:apply($.heartBeatInfo).cpuUsage * 100
+      - memoryUsage=json:apply($.heartBeatInfo).memoryUsage * 100
+      - diskUsage=json:apply($.heartBeatInfo).diskUsage * 100
+      - jvmCpuUsage=json:apply($.heartBeatInfo).jvmCpuUsage
+      - jvmMemoryUsage=json:apply($.heartBeatInfo).jvmMemoryUsage
+      - jvmHeapUsed=json:apply($.heartBeatInfo).jvmHeapUsed
+      - jvmNonHeapUsed=json:apply($.heartBeatInfo).jvmNonHeapUsed
+      - jvmHeapMax=json:apply($.heartBeatInfo).jvmHeapMax
+      - jvmNonHeapMax=json:apply($.heartBeatInfo).jvmNonHeapMax
+      - workerHostWeight=json:apply($.heartBeatInfo).workerHostWeight
+      - threadPoolUsage=json:apply($.heartBeatInfo).threadPoolUsage
+      - workerGroup=json:apply($.heartBeatInfo).workerGroup
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: http
+    # the config content when protocol is http
+    http:
+      # http host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # http port
+      port: ^_^port^_^
+      # http url
+      url: /dolphinscheduler/monitor/WORKER
+      # http method: GET POST PUT DELETE PATCH
+      method: GET
+      # if enabled https
+      ssl: ^_^ssl^_^
+      # http request header content
+      headers:
+        token: ^_^token^_^
+      # http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
+      parseType: jsonPath
+      parseScript: '$.data[*]'
+
+  - name: alert-server
+    i18n:
+      zh-CN: Alert Server
+      en-US: Alert Server
+      ja-JP: アラートサーバーの情報
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 0
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: host
+        type: 1
+        i18n:
+          zh-CN: 主机地址
+          en-US: Host
+          ja-JP: ホスト
+      - field: port
+        type: 1
+        i18n:
+          zh-CN: 端口
+          en-US: Port
+          ja-JP: ポート
+      - field: serverStatus
+        type: 1
+        i18n:
+          zh-CN: 状态
+          en-US: Server Status
+          ja-JP: サーバーステータス
+      - field: processId
+        type: 1
+        i18n:
+          zh-CN: 进程 ID
+          en-US: Process Id
+          ja-JP: プロセスID
+      - field: runningTime
+        type: 0
+        i18n:
+          zh-CN: 运行时间
+          en-US: Up Time
+          ja-JP: アップタイム
+      - field: cpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 处理器使用量
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: memoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存使用量
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: diskUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 磁盘使用量
+          en-US: Disk Usage
+          ja-JP: ディスク使用率
+      - field: jvmCpuUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM CPU 使用量
+          en-US: JVM CPU Usage
+          ja-JP: Java仮想マシンのCPU使用率
+      - field: jvmMemoryUsage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: JVM 内存 使用量
+          en-US: JVM Memory Usage
+          ja-JP: Java仮想マシンのメモリ使用率
+      - field: jvmHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的堆内存大小
+          en-US: JVM Heap Used
+          ja-JP: Java仮想マシンが使用したヒープメモリのサイズ
+      - field: jvmNonHeapUsed
+        type: 0
+        i18n:
+          zh-CN: JVM 已使用的非堆内存大小
+          en-US: JVM NonHeap Used
+          ja-JP: Java仮想マシンが使用したノンヒープメモリのサイズ
+      - field: jvmHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大堆内存大小
+          en-US: JVM Heap Max
+          ja-JP: Java仮想マシンのヒープメモリの最大値
+      - field: jvmNonHeapMax
+        type: 0
+        i18n:
+          zh-CN: JVM 配置的最大非堆内存大小
+          en-US: JVM NonHeap Max
+          ja-JP: Java仮想マシンのノンヒープメモリの最大値
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - $.heartBeatInfo
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - host=json:apply($.heartBeatInfo).host
+      - port=json:apply($.heartBeatInfo).port
+      - serverStatus=json:apply($.heartBeatInfo).serverStatus
+      - processId=json:apply($.heartBeatInfo).processId
+      - runningTime=(now()-json:apply($.heartBeatInfo).startupTime)/86400000
+      - cpuUsage=json:apply($.heartBeatInfo).cpuUsage * 100
+      - memoryUsage=json:apply($.heartBeatInfo).memoryUsage * 100
+      - diskUsage=json:apply($.heartBeatInfo).diskUsage * 100
+      - jvmCpuUsage=json:apply($.heartBeatInfo).jvmCpuUsage
+      - jvmMemoryUsage=json:apply($.heartBeatInfo).jvmMemoryUsage
+      - jvmHeapUsed=json:apply($.heartBeatInfo).jvmHeapUsed
+      - jvmNonHeapUsed=json:apply($.heartBeatInfo).jvmNonHeapUsed
+      - jvmHeapMax=json:apply($.heartBeatInfo).jvmHeapMax
+      - jvmNonHeapMax=json:apply($.heartBeatInfo).jvmNonHeapMax
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: http
+    # the config content when protocol is http
+    http:
+      # http host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # http port
+      port: ^_^port^_^
+      # http url
+      url: /dolphinscheduler/monitor/ALERT_SERVER
+      # http method: GET POST PUT DELETE PATCH
+      method: GET
+      # if enabled https
+      ssl: ^_^ssl^_^
+      # http request header content
+      headers:
+        token: ^_^token^_^
+      # http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
+      parseType: jsonPath
+      parseScript: '$.data[*]'
+
+  - name: database
+    i18n:
+      zh-CN: 数据库
+      en-US: Database
+      ja-JP: データベース情報
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 2
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: dbType
+        type: 1
+        i18n:
+          zh-CN: 数据库类型
+          en-US: Database Type
+          ja-JP: データベースのタイプ
+      - field: state
+        type: 1
+        i18n:
+          zh-CN: 状态
+          en-US: State
+          ja-JP: 状態
+      - field: maxConnections
+        type: 0
+        i18n:
+          zh-CN: 最大连接数
+          en-US: Max Connections
+          ja-JP: 最大接続数
+      - field: threadsConnections
+        type: 0
+        i18n:
+          zh-CN: 当前连接数
+          en-US: Threads Connections
+          ja-JP: 現在接続数
+      - field: threadsRunningConnections
+        type: 0
+        i18n:
+          zh-CN: 当前活跃连接数
+          en-US: Threads Running Connections
+          ja-JP: 現在のアクティブな接続数
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - dbType
+      - state
+      - maxConnections
+      - threadsConnections
+      - threadsRunningConnections
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - dbType=dbType
+      - state=state
+      - maxConnections=maxConnections
+      - threadsConnections=threadsConnections
+      - threadsRunningConnections=threadsRunningConnections
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: http
+    # the config content when protocol is http
+    http:
+      # http host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # http port
+      port: ^_^port^_^
+      # http url
+      url: /dolphinscheduler/monitor/databases
+      # http method: GET POST PUT DELETE PATCH
+      method: GET
+      # if enabled https
+      ssl: ^_^ssl^_^
+      # http request header content
+      headers:
+        token: ^_^token^_^
+      # http response data parse type: default-hertzbeat rule, jsonpath-jsonpath script, website-for website monitoring, prometheus-prometheus exporter rule
+      parseType: jsonPath
+      parseScript: '$.data[0]'
@@ -490,7 +490,7 @@ metrics:
          zh-CN: 次数
          en-US: Num
          ja-JP: 数量
-      - field: size
+      - field: Size
        type: 0
        unit: B
        i18n:
@@ -62,6 +62,7 @@ params:
    type: number
    required: false
    hide: true
+    defaultValue: 6000
  - field: authType
    name:
      zh-CN: 认证方式
@@ -125,7 +126,7 @@ metrics:
          zh-CN: 状态
          en-US: Status
          ja-JP: ステータス
-      - field: size
+      - field: Size
        type: 0
        i18n:
          zh-CN: 数量
@@ -137,6 +138,18 @@ metrics:
          zh-CN: 可用数量
          en-US: Available Size
          ja-JP: 利用可能なサイズ
+    aliasFields:
+      - $.app
+      - $.category
+      - $.status
+      - $.size
+      - $.availableSize
+    calculates:
+      - app=$.app
+      - category=$.category
+      - status=$.status
+      - Size=$.size
+      - availableSize=$.availableSize
    #  the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk, we use HTTP protocol here
    protocol: http
    # the config content when protocol is http
@@ -228,7 +241,7 @@ metrics:
    priority: 1
    fields:
      - field: state
-        type: 2
+        type: 1
        i18n:
          zh-CN: 状态
          en-US: State
@@ -160,7 +160,7 @@ metrics:
          zh-CN: 状态
          en-US: Status
          ja-JP: ステータス
-      - field: size
+      - field: Size
        type: 0
        i18n:
          zh-CN: 数量
@@ -172,6 +172,18 @@ metrics:
          zh-CN: 可用数量
          en-US: Available Size
          ja-JP: 利用可能なサイズ
+    aliasFields:
+      - $.app
+      - $.category
+      - $.status
+      - $.size
+      - $.availableSize
+    calculates:
+      - app=$.app
+      - category=$.category
+      - status=$.status
+      - Size=$.size
+      - availableSize=$.availableSize
    protocol: http
    http:
      host: ^_^host^_^
@@ -26,7 +26,7 @@ help:
  zh-CN: Hertzbeat 使用 Prometheus PromQL 从 Prometheus 服务器中查询到 InfluxDB 的通用指标数据来进行监控。此方案适用于 Prometheus 已监控 InfluxDB，需要从 Prometheus 服务器抓取 InfluxDB 的监控数据。<br>您可以点击 “<i>新建 InfluxDB-PromQL</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses Prometheus PromQL query metrics data from Prometheus Server to monitoring InfluxDB. This solution is suitable for Prometheus to monitor InfluxDB, and it need to capture InfluxDB monitoring data from the Prometheus server. <br>You could click the "<i>New InfluxDB-PromQL</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
  zh-TW: Hertzbeat 使用 Prometheus PromQL 從 Prometheus 服務器中查詢到 InfluxDB 的通用指標數據來進行監控。此方案適用于 Prometheus 已監控 InfluxDB，需要從 Prometheus 服務器抓取 InfluxDB 的監控數據。<br>您可以點擊 “<i>新建 InfluxDB-PromQL</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は Prometheus PromQL を介して Prometheus サーバーに InfluxDB の一般的なパフォーマンスのメトリクスをクエリして監視します。このシナリオは、PrometheusがすでにInfluxDBを監視しており、PrometheusサーバーからInfluxDBの監視データを取得する必要がある場合に適用されます。。<br>「<i>新規 InfluxDB-PromQL</i>」をクリックして設定しましょう。
+  ja-JP: Hertzbeat は Prometheus PromQL を介して Prometheus サーバーに InfluxDB の一般的なパフォーマンスのメトリクスをクエリして監視します。このシナリオは、PrometheusがすでにInfluxDBを監視しており、PrometheusサーバーからInfluxDBの監視データを取得する必要がある場合に適用されます。<br>「<i>新規 InfluxDB-PromQL</i>」をクリックして設定しましょう。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/influxdb_promql
  en-US: https://hertzbeat.apache.org/docs/help/influxdb_promql
@@ -26,7 +26,7 @@ help:
  zh-CN: Hertzbeat 使用 Prometheus PromQL 从 Prometheus 服务器中查询到 Kafka 的通用指标数据来进行监控。此方案适用于 Prometheus 已监控 Kafka，需要从 Prometheus 服务器抓取 Kafka 的监控数据。<br>您可以点击 “<i>新建 Kafka-PromQL</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses Prometheus PromQL query metrics data from Prometheus Server to monitoring Kafka. This solution is suitable for Prometheus to monitor Kafka, and it need to capture Kafka monitoring data from the Prometheus server. <br>You could click the "<i>New Kafka-PromQL</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
  zh-TW: Hertzbeat 使用 Prometheus PromQL 從 Prometheus 服務器中查詢到 Kafka 的通用指標數據來進行監控。此方案適用于 Prometheus 已監控 Kafka，需要從 Prometheus 服務器抓取 Kafka 的監控數據。<br>您可以點擊 “<i>新建 Kafka-PromQL</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は Prometheus PromQL を介して Prometheus サーバーに Kafka の一般的なパフォーマンスのメトリクスをクエリして監視します。このシナリオは、PrometheusがすでにKafkaを監視しており、PrometheusサーバーからKafkaの監視データを取得する必要がある場合に適用されます。。<br>「<i>新規 Kafka-PromQL</i>」をクリックして設定しましょう。
+  ja-JP: Hertzbeat は Prometheus PromQL を介して Prometheus サーバーに Kafka の一般的なパフォーマンスのメトリクスをクエリして監視します。このシナリオは、PrometheusがすでにKafkaを監視しており、PrometheusサーバーからKafkaの監視データを取得する必要がある場合に適用されます。<br>「<i>新規 Kafka-PromQL</i>」をクリックして設定しましょう。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/kafka_promql
  en-US: https://hertzbeat.apache.org/docs/help/kafka_promql
@@ -490,7 +490,7 @@ metrics:
          zh-CN: 次数
          en-US: Num
          ja-JP: 数量
-      - field: size
+      - field: Size
        type: 0
        unit: B
        i18n:
@@ -667,7 +667,7 @@ metrics:
        i18n:
          zh-CN: 客户端命令统计
          en-US: cmdstat client
-          ja-JP: クライエントのコマンド
+          ja-JP: クライアントのコマンド
      - field: cmdstat_config
        type: 1
        i18n:
@@ -21,11 +21,13 @@ app: linux_script
 name:
  zh-CN: Linux 命令
  en-US: Linux Script
+  ja-JP: Linux Script
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat 使用采集器作为 agent 直接运行 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-script'> Shell 命令 </a> 对 Linux 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Linux Script</i>”进行添加。或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: Hertzbeat uses a collector as an agent to directly execute <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-script'> Shell commands </a> to collect and monitor general performance metrics of the Linux operating system (system information, CPU, memory, disk, network card, file system, TOP resource processes, etc.).<br>You can click “<i>Create New Linux Script</i>” to add it. Or select “<i>More Actions</i>” to import an existing configuration.
  zh-TW: Hertzbeat 使用采集器作為 agent 直接運行 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-script'> Shell 命令 </a> 對 Linux 操作系統的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Linux Script</i>”進行添加。或者選擇“<i>更多操作</i>”，導入已有配置。
+  ja-JP: Hertzbeat は agent として <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-script'> Shell コマンドを介して </a> Linuxシステムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Linux Script</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/linux_script
  en-US: https://hertzbeat.apache.org/docs/help/linux_script
@@ -37,6 +39,7 @@ params:
    name:
      zh-CN: 目标Host
      en-US: Target Host
+      ja-JP: 目標ホスト
    # type-param field type(most mapping the html input type)
    type: host
    # required-true or false
@@ -48,6 +51,7 @@ metrics:
    i18n:
      zh-CN: 系统基本信息
      en-US: Basic Info
+      ja-JP: 基礎情報
    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
    priority: 0
@@ -60,16 +64,19 @@ metrics:
        i18n:
          zh-CN: 主机名称
          en-US: Host Name
+          ja-JP: ホスト名
      - field: version
        type: 1
        i18n:
          zh-CN: 操作系统版本
          en-US: System Version
+          ja-JP: オーエスバージョン
      - field: uptime
        type: 1
        i18n:
          zh-CN: 启动时间
          en-US: Uptime
+          ja-JP: アップタイム
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: script
    # the config content when protocol is ssh
@@ -89,6 +96,7 @@ metrics:
    i18n:
      zh-CN: CPU 信息
      en-US: CPU Info
+      ja-JP: CPU情報
    priority: 1
    fields:
      - field: info
@@ -96,32 +104,38 @@ metrics:
        i18n:
          zh-CN: 型号
          en-US: Info
+          ja-JP: バージョン
      - field: cores
        type: 1
        i18n:
          zh-CN: 核数
          en-US: Cores
+          ja-JP: コア数
      - field: interrupt
        type: 0
        i18n:
          zh-CN: 中断数
          en-US: Interrupt
+          ja-JP: 割り込み数
      - field: load
        type: 1
        i18n:
          zh-CN: 负载
          en-US: Load
+          ja-JP: ロード
      - field: context_switch
        type: 0
        i18n:
          zh-CN: 上下文切换
          en-US: Context Switch
+          ja-JP: コンテキストスイッチ
      - field: usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: 使用率
          en-US: Usage
+          ja-JP: 使用率
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - info
@@ -152,6 +166,7 @@ metrics:
    i18n:
      zh-CN: 内存信息
      en-US: Memory Info
+      ja-JP: メモリ情報
    priority: 2
    fields:
      - field: total
@@ -160,36 +175,42 @@ metrics:
        i18n:
          zh-CN: 总内存容量
          en-US: Total Memory
+          ja-JP: メモリ容量
      - field: used
        type: 0
        unit: Mb
        i18n:
          zh-CN: 用户程序内存量
          en-US: User Program Memory
+          ja-JP: ユーザープログラムメモリ
      - field: free
        type: 0
        unit: Mb
        i18n:
          zh-CN: 空闲内存容量
          en-US: Free Memory
+          ja-JP: 空きメモリ
      - field: buff_cache
        type: 0
        unit: Mb
        i18n:
          zh-CN: 缓存占用内存
          en-US: Buff Cache Memory
+          ja-JP: バッファメモリ
      - field: available
        type: 0
        unit: Mb
        i18n:
          zh-CN: 剩余可用内存
          en-US: Available Memory
+          ja-JP: 使用可能のメモリ
      - field: usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: 内存使用率
          en-US: Memory Usage
+          ja-JP: メモリ使用率
    aliasFields:
      - total
      - used
@@ -214,6 +235,7 @@ metrics:
    i18n:
      zh-CN: 磁盘信息
      en-US: Disk Info
+      ja-JP: ディスク情報
    priority: 3
    fields:
      - field: disk_num
@@ -221,27 +243,32 @@ metrics:
        i18n:
          zh-CN: 磁盘总数
          en-US: Disk Num
+          ja-JP: ディスク番号
      - field: partition_num
        type: 1
        i18n:
          zh-CN: 分区总数
          en-US: Partition Num
+          ja-JP: パーティション
      - field: block_write
        type: 0
        i18n:
          zh-CN: 写磁盘块数
          en-US: Block Write
+          ja-JP: 書き込みディスクブロック数
      - field: block_read
        type: 0
        i18n:
          zh-CN: 读磁盘块数
          en-US: Block Read
+          ja-JP: 読み取りブロック数
      - field: write_rate
        type: 0
        unit: iops
        i18n:
          zh-CN: 磁盘写速率
          en-US: Write Rate
+          ja-JP: ディスク書き込み速度
    protocol: script
    script:
      scriptTool: bash
@@ -253,6 +280,7 @@ metrics:
    i18n:
      zh-CN: 网卡信息
      en-US: Interface Info
+      ja-JP: ネットワークカード情報
    priority: 4
    fields:
      - field: interface_name
@@ -261,18 +289,21 @@ metrics:
        i18n:
          zh-CN: 网卡名称
          en-US: Interface Name
+          ja-JP: ネットワークカード名
      - field: receive_bytes
        type: 0
        unit: Mb
        i18n:
          zh-CN: 入站数据流量
          en-US: Receive Bytes
+          ja-JP: 受信されたバイト数
      - field: transmit_bytes
        type: 0
        unit: Mb
        i18n:
          zh-CN: 出站数据流量
          en-US: Transmit Bytes
+          ja-JP: 転送されたバイト数
    units:
      - receive_bytes=B->MB
      - transmit_bytes=B->MB
@@ -287,6 +318,7 @@ metrics:
    i18n:
      zh-CN: 文件系统
      en-US: Disk Free
+      ja-JP: ファイルシステム
    priority: 5
    fields:
      - field: filesystem
@@ -294,30 +326,35 @@ metrics:
        i18n:
          zh-CN: 文件系统
          en-US: Filesystem
+          ja-JP: ファイルシステム
      - field: used
        type: 0
        unit: Mb
        i18n:
          zh-CN: 已使用量
          en-US: Used
+          ja-JP: 使用済み
      - field: available
        type: 0
        unit: Mb
        i18n:
          zh-CN: 可用量
          en-US: Available
+          ja-JP: 使用可能
      - field: usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: 使用率
          en-US: Usage
+          ja-JP: 使用率
      - field: mounted
        type: 1
        label: true
        i18n:
          zh-CN: 挂载点
          en-US: Mounted
+          ja-JP: マウント
    protocol: script
    script:
      scriptTool: bash
@@ -329,6 +366,7 @@ metrics:
    i18n:
      zh-CN: Top10 CPU 进程
      en-US: Top10 CPU Process
+      ja-JP: トップ10 CPUプロセス
    priority: 6
    fields:
      - field: pid
@@ -337,23 +375,27 @@ metrics:
        i18n:
          zh-CN: 进程ID
          en-US: PID
+          ja-JP: プロセスID
      - field: cpu_usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: CPU占用率
          en-US: CPU Usage
+          ja-JP: CPU使用率
      - field: mem_usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: 内存占用率
          en-US: Memory Usage
+          ja-JP: メモリ使用率
      - field: command
        type: 1
        i18n:
          zh-CN: 执行命令
          en-US: Command
+          ja-JP: コマンド
    protocol: script
    script:
      scriptTool: bash
@@ -365,6 +407,7 @@ metrics:
    i18n:
      zh-CN: Top10 内存进程
      en-US: Top10 Memory Process
+      ja-JP: トップ10 メモリプロセス
    priority: 7
    fields:
      - field: pid
@@ -373,23 +416,27 @@ metrics:
        i18n:
          zh-CN: 进程ID
          en-US: PID
+          ja-JP: プロセスID
      - field: mem_usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: 内存占用率
          en-US: Memory Usage
+          ja-JP: メモリ使用率
      - field: cpu_usage
        type: 0
        unit: '%'
        i18n:
          zh-CN: CPU占用率
          en-US: CPU Usage
+          ja-JP: CPU使用率
      - field: command
        type: 1
        i18n:
          zh-CN: 执行命令
          en-US: Command
+          ja-JP: コマンド
    protocol: script
    script:
      scriptTool: bash
@@ -0,0 +1,750 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
+category: os
+# The monitoring type eg: linux windows tomcat mysql aws...
+app: macos
+# The monitoring i18n name
+name:
+  zh-CN: macOS
+  en-US: macOS
+  ja-JP: macOS
+# The description and help of this monitoring type
+help:
+  zh-CN: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 对 macOS 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 macOS</i>”并配置 HOST 端口账户等相关参数进行添加，支持 SSH 账户密码或密钥认证。或者选择“<i>更多操作</i>”，导入已有配置。
+  en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH protocol</a> to monitors macOS operating system's general performance metrics such as cpu, memory, disk, basic, interface, disk_free, top_process etc. <br>You can click the "<i>New macOS</i>" and config host port and other related params to add, auth support password or secretKey. Or import an existing setup through the "<i>More Actions</i>" menu.
+  zh-TW: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 對 macOS 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 macOS</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> macOS システムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 macOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+helpLink:
+  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/macos/
+  en-US: https://hertzbeat.apache.org/docs/help/macos/
+# Input params define for monitoring(render web ui by the definition)
+params:
+  # field-param field key
+  - field: host
+    # name-param field display i18n name
+    name:
+      zh-CN: 目标Host
+      en-US: Target Host
+      ja-JP: 目標ホスト
+    # type-param field type(most mapping the html input type)
+    type: host
+    # required-true or false
+    required: true
+  # field-param field key
+  - field: port
+    # name-param field display i18n name
+    name:
+      zh-CN: 端口
+      en-US: Port
+      ja-JP: ポート
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[0,65535]'
+    # required-true or false
+    required: true
+    # default value
+    defaultValue: 22
+  # field-param field key
+  - field: timeout
+    # name-param field display i18n name
+    name:
+      zh-CN: 超时时间(ms)
+      en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[400,200000]'
+    # required-true or false
+    required: false
+    # default value
+    defaultValue: 6000
+  # field-param field key
+  - field: reuseConnection
+    # name-param field display i18n name
+    name:
+      zh-CN: 复用连接
+      en-US: Reuse Connection
+      ja-JP: 接続再利用
+    # type-param field type(most mapping the html input type)
+    type: boolean
+    # required-true or false
+    required: true
+    defaultValue: true
+  # field-param field key
+  - field: useProxy
+    # name-param field display i18n name
+    name:
+      zh-CN: 使用代理
+      en-US: Use Proxy Connection
+      ja-JP: プロキシ接続利用
+    # type-param field type(most mapping the html input type)
+    type: boolean
+    # required-true or false
+    required: true
+    defaultValue: false
+  # field-param field key
+  - field: username
+    # name-param field display i18n name
+    name:
+      zh-CN: 用户名
+      en-US: Username
+      ja-JP: ユーザー名
+    # type-param field type(most mapping the html input type)
+    type: text
+    # when type is text, use limit to limit string length
+    limit: 50
+    # required-true or false
+    required: true
+  # field-param field key
+  - field: password
+    # name-param field display i18n name
+    name:
+      zh-CN: 密码
+      en-US: Password
+      ja-JP: パスワード
+    # type-param field type(most mapping the html input tag)
+    type: password
+    # required-true or false
+    required: false
+  # field-param field key
+  - field: privateKey
+    # name-param field display i18n name
+    name:
+      zh-CN: 私钥
+      en-US: PrivateKey
+      ja-JP: 秘密鍵
+    # type-param field type(most mapping the html input type)
+    type: textarea
+    placeholder: -----BEGIN RSA PRIVATE KEY-----
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: privateKeyPassphrase
+    # name-param field display i18n name
+    name:
+      zh-CN: 密钥短语
+      en-US: PrivateKey PassPhrase
+      ja-JP: 秘密鍵フレーズ
+    # type-param field type(most mapping the html input type)
+    type: password
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: proxyHost
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理主机
+      en-US: Proxy Host
+      ja-JP: プロキシホスト
+    # type-param field type(most mapping the html input type)
+    type: text
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  - field: proxyPort
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理端口
+      en-US: Proxy Port
+      ja-JP: プロキシポート
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[0,65535]'
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+    # default value
+    defaultValue: 22
+  # field-param field key
+  - field: proxyUsername
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理用户名
+      en-US: Proxy Username
+      ja-JP: プロキシユーザー名
+    # type-param field type(most mapping the html input type)
+    type: text
+    # when type is text, use limit to limit string length
+    limit: 50
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: proxyPassword
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理密码
+      en-US: Proxy Password
+      ja-JP: プロキシパスワード
+    # type-param field type(most mapping the html input tag)
+    type: password
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: proxyPrivateKey
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理主机私钥
+      en-US: proxyPrivateKey
+      ja-JP: プロキシ秘密鍵
+    # type-param field type(most mapping the html input type)
+    type: textarea
+    placeholder: -----BEGIN RSA PRIVATE KEY-----
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+# collect metrics config list
+metrics:
+  # metrics - basic, inner monitoring metrics (responseTime - response time)
+  - name: basic
+    i18n:
+      zh-CN: 系统基本信息
+      en-US: Basic Info
+      ja-JP: システム基礎情報
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 0
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: hostname
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 主机名称
+          en-US: Host Name
+          ja-JP: ホスト名
+      - field: version
+        type: 1
+        i18n:
+          zh-CN: 操作系统版本
+          en-US: System Version
+          ja-JP: オーエスバージョン
+      - field: uptime
+        type: 1
+        i18n:
+          zh-CN: 启动时间
+          en-US: Uptime
+          ja-JP: アップタイム
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # the config content when protocol is ssh
+    ssh:
+      # ssh host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # ssh port
+      port: ^_^port^_^
+      # ssh username
+      username: ^_^username^_^
+      # ssh password
+      password: ^_^password^_^
+      # ssh private key
+      privateKey: ^_^privateKey^_^
+      # ssh private key passphrase
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      # ssh run collect script
+      script: scutil --get ComputerName; echo "$(sw_vers -productName) $(sw_vers -productVersion) ($(sw_vers -buildVersion))"; uptime| awk '{print $1,$2,$3,$4}' | sed 's/,//'
+      # ssh response data parse type: oneRow, multiRow
+      parseType: oneRow
+
+  - name: cpu
+    i18n:
+      zh-CN: CPU 信息
+      en-US: CPU Info
+      ja-JP: CPU情報
+    priority: 1
+    fields:
+      - field: info
+        type: 1
+        i18n:
+          zh-CN: 型号
+          en-US: Info
+          ja-JP: バージョン
+      - field: cores
+        type: 1
+        i18n:
+          zh-CN: 核数
+          en-US: Cores
+          ja-JP: コア数
+      - field: load
+        type: 1
+        i18n:
+          zh-CN: 负载
+          en-US: Load
+          ja-JP: ロード
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 使用率
+          en-US: Usage
+          ja-JP: 使用率
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - info
+      - cores
+      - load
+      - idle
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - info=info
+      - cores=cores
+      - load=load
+      - usage=idle
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: sysctl -n machdep.cpu.brand_string; sysctl -n hw.ncpu; sysctl -n vm.loadavg | awk '{print $2,$3,$4}'; top -l 1 | grep 'CPU usage' | awk '{print $3}' | sed 's/%//'
+      parseType: oneRow
+
+  - name: memory
+    i18n:
+      zh-CN: 内存信息
+      en-US: Memory Info
+      ja-JP: メモリ情報
+    priority: 2
+    fields:
+      - field: total
+        type: 1
+        unit: Mb
+        i18n:
+          zh-CN: 总内存容量
+          en-US: Total Memory
+          ja-JP: メモリ容量
+      - field: used
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 用户程序内存量
+          en-US: User Program Memory
+          ja-JP: ユーザープログラムメモリ
+      - field: free
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 空闲内存容量
+          en-US: Free Memory
+          ja-JP: 空きメモリ
+      - field: buff_cache
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 缓存占用内存
+          en-US: Buff Cache Memory
+          ja-JP: バッファメモリ
+      - field: available
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 剩余可用内存
+          en-US: Available Memory
+          ja-JP: 使用可能のメモリ
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存使用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+    aliasFields:
+      - total
+      - used
+      - free
+      - buff_cache
+      - available
+    calculates:
+      - total=total
+      - used=used
+      - free=free
+      - buff_cache=buff_cache
+      - available=available
+      - usage=(used / total) * 100
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: echo "total used free buff_cache available"; vm_stat | awk 'BEGIN{cmd="sysctl -n hw.memsize";cmd|getline total;close(cmd);cmd="sysctl -n hw.pagesize";cmd|getline ps;close(cmd);total=total/1024/1024} /Pages free/{free=$3} /Pages active/{active=$3} /Pages inactive/{inactive=$3} /Pages wired/{wired=$4} /Pages occupied by compressor/{comp=$5} END{free_mb=free*ps/1024/1024;used_mb=(active+inactive+wired+comp)*ps/1024/1024;inactive_mb=inactive*ps/1024/1024;avail_mb=(free+inactive)*ps/1024/1024;printf "%.0f %.0f %.0f %.0f %.0f\n",total,used_mb,free_mb,inactive_mb,avail_mb}'
+      parseType: multiRow
+
+  - name: disk
+    i18n:
+      zh-CN: 磁盘信息
+      en-US: Disk Info
+      ja-JP: ディスク情報
+    priority: 3
+    fields:
+      - field: disk_num
+        type: 1
+        i18n:
+          zh-CN: 磁盘总数
+          en-US: Disk Num
+          ja-JP: ディスク番号
+      - field: partition_num
+        type: 1
+        i18n:
+          zh-CN: 分区总数
+          en-US: Partition Num
+          ja-JP: パーティション
+      - field: block_write
+        type: 0
+        i18n:
+          zh-CN: 写磁盘块数
+          en-US: Block Write
+          ja-JP: 書き込みディスクブロック数
+      - field: block_read
+        type: 0
+        i18n:
+          zh-CN: 读磁盘块数
+          en-US: Block Read
+          ja-JP: 読み取りブロック数
+      - field: write_rate
+        type: 0
+        unit: iops
+        i18n:
+          zh-CN: 磁盘写速率
+          en-US: Write Rate
+          ja-JP: ディスク書き込み速度
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: iostat -d | awk 'NR==3{print $1}'; iostat -d | awk 'NR==3{print $2}'; vm_stat | awk '/Pages free/{print $3}' | tr -d ':'; vm_stat | awk '/Pages active/{print $3}' | tr -d ':'; sysctl -n hw.memsize | awk '{print int($1/1024/1024)}'
+      parseType: oneRow
+
+  - name: interface
+    i18n:
+      zh-CN: 网卡信息
+      en-US: Interface Info
+      ja-JP: ネットワークカード情報
+    priority: 4
+    fields:
+      - field: interface_name
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 网卡名称
+          en-US: Interface Name
+          ja-JP: ネットワークカード名
+      - field: receive_bytes
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 入站数据流量
+          en-US: Receive Bytes
+          ja-JP: 受信されたバイト数
+      - field: transmit_bytes
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 出站数据流量
+          en-US: Transmit Bytes
+          ja-JP: 転送されたバイト数
+    units:
+      - receive_bytes=B->MB
+      - transmit_bytes=B->MB
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: netstat -ibn | awk 'NR==1{print "interface_name receive_bytes transmit_bytes"} NR>1 && $1!~/Name/ && $7~/^[0-9]+$/{print $1,$7,$10}'
+      parseType: multiRow
+
+  - name: disk_free
+    i18n:
+      zh-CN: 文件系统
+      en-US: Disk Free
+      ja-JP: ファイルシステム
+    priority: 5
+    fields:
+      - field: filesystem
+        type: 1
+        i18n:
+          zh-CN: 文件系统
+          en-US: Filesystem
+          ja-JP: ファイルシステム
+      - field: used
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 已使用量
+          en-US: Used
+          ja-JP: 使用済み
+      - field: available
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 可用量
+          en-US: Available
+          ja-JP: 使用可能
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 使用率
+          en-US: Usage
+          ja-JP: 使用率
+      - field: mounted
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 挂载点
+          en-US: Mounted
+          ja-JP: マウント
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: df -m | tail -n +2 | awk 'BEGIN{ print "filesystem used available usage mounted"} {print $1,$3,$4,$5,$9}'
+      parseType: multiRow
+
+  - name: top_cpu_process
+    i18n:
+      zh-CN: Top10 CPU 进程
+      en-US: Top10 CPU Process
+      ja-JP: トップ10 CPUプロセス
+    priority: 6
+    fields:
+      - field: pid
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 进程ID
+          en-US: PID
+          ja-JP: プロセスID
+      - field: cpu_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: CPU占用率
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: mem_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存占用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: command
+        type: 1
+        i18n:
+          zh-CN: 执行命令
+          en-US: Command
+          ja-JP: コマンド
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: ps aux | sort -k3nr | awk 'BEGIN{ print "pid cpu_usage mem_usage command" } {printf "%s %s %s ", $2, $3, $4; for (i=11; i<=NF; i++) { printf "%s", $i; if (i < NF) printf " "; } print ""}' | head -n 11
+      parseType: multiRow
+
+  - name: top_mem_process
+    i18n:
+      zh-CN: Top10 内存进程
+      en-US: Top10 Memory Process
+      ja-JP: トップ10 メモリプロセス
+    priority: 7
+    fields:
+      - field: pid
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 进程ID
+          en-US: PID
+          ja-JP: プロセスID
+      - field: mem_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存占用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: cpu_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: CPU占用率
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: command
+        type: 1
+        i18n:
+          zh-CN: 执行命令
+          en-US: Command
+          ja-JP: コマンド
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+      timeout: ^_^timeout^_^
+      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
+      script: ps aux | sort -k4nr | awk 'BEGIN{ print "pid cpu_usage mem_usage command" } NR>1{cmd=""; for(i=11;i<=NF;i++) cmd=cmd $i (i==NF?"":" "); printf "%s %s %s %s\n", $2, $3, $4, cmd}' | head -n 11
+      parseType: multiRow
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tomsun28andTJxiaobao	67ad4b04ef	docs: update doc and add graduation blog (#3729 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: TJxiaobao <2922035952@qq.com>	2025-08-30 17:34:50 +08:00
DeleiGuoandCalvin	6432d689dd	[improve] optimize the incident list on the status page to support paginated queries (#3727 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-30 11:23:10 +08:00
carl pinto	2eb856fffb	[Improve] changed scroll of intervals in New Monitor page (#3726 )	2025-08-30 00:02:29 +08:00
liutianyouandtomsun28	56312831ca	[release] release new version 1.7.3 (#3724 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-29 00:07:49 +08:00
Duansg	fe54d42bc0	[improve] Improve Prometheus label PromQL parsing logic (#3725 )	2025-08-28 23:56:22 +08:00
DeleiGuoandtomsun28	2ea24c1b3a	[feature] add Synology NAS monitoring support (#3721 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-28 23:41:47 +08:00
DeleiGuoandCalvin	e0040e2ede	[feature] add macOS monitoring support (#3715 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-28 23:26:57 +08:00
Calvinandliutianyou	0ac0fd4a8d	[doc] add japanese i18n in app-tdengine.yml (#3717 ) Co-authored-by: liutianyou <tianyou.liu@qq.com>	2025-08-27 22:11:51 +08:00
DuansgandCalvin	0ef87bcc08	[improve] Improve performance issues when loading large numbers of metric cards in Monitors (#3719 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-27 12:41:41 +08:00
Calvinandlynx009	660bda6e14	[doc] add japanese i18n in app-valkey.yml (#3706 ) Co-authored-by: lynx009 <2030509072@qq.com>	2025-08-27 11:41:22 +08:00
Calvinandtomsun28	242cf40135	[doc] add japanese i18n in app-ubuntu.yml, app-windows.yml and app-yarn.yml (#3703 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-25 23:20:17 +08:00
lynx009	7319c55430	[doc] modify github link. (#3714 )	2025-08-25 21:44:56 +08:00
Duansg Calvin tomsun28 Sherlock Yin	5ea29f610b	[improve] Improve the parsing logic of prometheus label (#3662 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com>	2025-08-25 19:26:31 +08:00
tuzuy tuzy Calvin tomsun28 Kerwin Bryant	b74aff0500	refactor: Optimize the monitoring data chart component (#3668 ) Co-authored-by: tuzy <tuzy.cq@chinaccs.cn> Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Kerwin Bryant <kerwin612@qq.com>	2025-08-24 22:10:27 +08:00
DeleiGuo kangli Calvin	d2e8f2f4aa	[bugfix] fixed jexl keyword issue in vastbase monitoring template (#3708 ) Co-authored-by: kangli <likang@apache.org> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-24 20:51:41 +08:00
DeleiGuoandkangli	28681a1f9e	[bugfix] fixed jexl keyword issue in greenplum monitoring template (#3707 ) Co-authored-by: kangli <likang@apache.org>	2025-08-24 20:49:25 +08:00
DuansgandCalvin	6814c7c357	[feat] Support TDengine monitoring (#3678 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-24 14:23:23 +08:00
DeleiGuoandCalvin	f475540508	[bugfix] fixed jexl keyword issue in kingbase monitoring template (#3705 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-24 13:04:09 +08:00
Calvin	44660a5042	[doc] add japanese i18n in app-vastbase.yml (#3704 )	2025-08-24 12:02:44 +08:00
Wenqi Luo Calvin Yang Chen	339386fd2b	[bugfix] resolve translation value fetching for uppercase app names (#3690 ) Signed-off-by: Wenqi Luo <495872803@qq.com> Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: Yang Chen <1597081640@qq.com>	2025-08-24 00:07:55 +08:00
tomsun28andCalvin	faa7cb71db	[doc] update website, doc while graduate (#3701 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-23 22:11:37 +08:00
DeleiGuo Calvin tomsun28	014a376c30	[refactor] modify message column to TEXT type (#3698 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-23 16:57:04 +08:00
Calvinandtomsun28	377172e44a	[doc] add japanese i18n in app-tomcat.yml (#3700 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-23 16:52:36 +08:00
Calvinandtomsun28	5b9e19cc30	[doc] add japanese i18n in app-seatunnel.yml (#3691 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-23 16:50:24 +08:00
Calvinandtomsun28	0457ec7d16	[doc] add japanese i18n in app-rockylinux.yml (#3688 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-23 16:48:08 +08:00
tomsun28andCalvin	2947ee218e	chore: update ui theme (#3682 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-22 22:37:51 +08:00
DuansgandCalvin	4e841a9fb1	[doc] Fixed menu path errors and MD document format anomalies. (#3695 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-22 10:08:35 +08:00
tomsun28andCalvin	b7ecb9b2ec	[doc] update doc while graduate (#3692 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-22 01:48:48 +08:00
DeleiGuo	7e1873bc10	[bugfix] fixed jexl keyword issue in spring_gateway monitoring template (#3693 )	2025-08-22 01:12:04 +08:00
DeleiGuoandCalvin	8eb60210a3	[bugfix] fixed jexl keyword issue in windows monitoring template (#3687 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-21 22:38:49 +08:00
DeleiGuoandCalvin	d608f732f7	[bugfix] fixed jexl keyword issue in hertzbeat monitoring template (#3686 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-21 22:36:53 +08:00
DeleiGuoandCalvin	2d9a2955ef	[bugfix] fixed jexl keyword issue in postgresql monitoring template (#3685 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-21 22:19:28 +08:00
VampireAchao Calvin 淞筱 aias00 shown	cae4423f30	[doc] graduate and remove incubating (#3584 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: 淞筱 <2030509072@qq.com> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: shown <yuluo08290126@gmail.com>	2025-08-21 21:22:49 +08:00
Calvin liutianyou tomsun28	f0e53a9fb3	[doc] add japanese i18n in app-redis_sentinel.yml (#3681 ) Co-authored-by: liutianyou <tianyou.liu@qq.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-20 00:21:51 +08:00
DeleiGuo Calvin tomsun28	79da1a198b	[improve] optimize status page layout and UI (#3680 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-20 00:17:03 +08:00
Calvin liutianyou tomsun28	64cb804147	[doc] add japanese i18n in app-dolphinscheduler.yml (#3677 ) Co-authored-by: liutianyou <tianyou.liu@qq.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-20 00:03:12 +08:00
Calvinandtomsun28	344cb25229	[doc] add japanese i18n in app-redis_cluster.yml (#3672 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-19 23:30:11 +08:00
DeleiGuo	74d21a7acd	[feature] add user password monitoring metrics in oracle monitor (#3674 )	2025-08-19 22:08:05 +08:00
Duansg Calvin tomsun28	f315bf9607	[fix] Fixed Grafana visualization integration display issue (#3666 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-17 14:51:14 +08:00
Cyanty Copilot Sherlock Yin Calvin	810d54bef5	[improve] Optimize the scheduling logic for batch flush tasks (#3660 ) Signed-off-by: Cyanty <153884653+Cyanty@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-17 14:24:48 +08:00
DeleiGuoandCalvin	48eafa1382	[Feature] add Apache DolphinScheduler monitoring support (#3656 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-17 10:58:46 +08:00
Calvinandtomsun28	4b6c1e0f08	[doc] add japanese i18n in app-redis.yml (#3669 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-17 09:59:11 +08:00
Sarthak Arora Calvin Jast tomsun28	edfd857030	[GSOC] MCP server setup, authorization, and basic tool support (#3610 ) Signed-off-by: Sarthak Arora <f20200060@pilani.bits-pilani.ac.in> Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: Jast <shenghang@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-16 19:08:13 +08:00
tomsun28andLogic	408a06d3eb	[doc] update contribution doc (#3667 ) Co-authored-by: Logic <zqr10159@dromara.org>	2025-08-16 16:07:41 +08:00
Calvinandtomsun28	fd3a2f0569	[doc] add japanese i18n and remove chinese in script folder (#3665 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-16 15:43:24 +08:00
Calvin shown tomsun28	7d8ba72717	[doc] add japanese i18n in app-redhat.yml (#3655 ) Co-authored-by: shown <yuluo08290126@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-16 15:25:39 +08:00
Calvinandtomsun28	f936b50ce9	[doc] add japanese i18n in app-spring_gateway.yml, app-sqlserver.yml (#3661 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-15 20:25:01 +08:00
Calvinandtomsun28	93f5da2d02	[doc] add japanese i18n in app-process.yml (#3654 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-15 20:17:14 +08:00
Calvinandshown	bc06c268ca	[doc] add japanese i18n in app-prestodb.yml, app-spark.yml (#3651 ) Co-authored-by: shown <yuluo08290126@gmail.com>	2025-08-15 20:12:07 +08:00
DeleiGuoandCalvin	9e6f2762c0	[doc] improve documentation formatting and readability (#3659 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-13 00:40:37 +08:00
Duansg	6ac8a42bd3	[doc] add japanese i18n in app-springboot3.yml (#3658 )	2025-08-13 00:37:49 +08:00
Calvinandtomsun28	89647d96c7	[doc] add japanese i18n in app-tidb.yml, app-windows_script.yml (#3650 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-11 00:57:21 +08:00
tomsun28	0b0fac4a41	[bugfix] fix the collector aes decode with secret error (#3652 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-08-10 22:34:10 +08:00
Duansg	f59e15bbbe	[fix] Fixed an issue where template configuration was overwritten (#3649 )	2025-08-09 23:37:10 +08:00
Logic Calvin tomsun28	b7398b1bf9	[feature] Support HertzBeat self monitor (#3641 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-09 17:14:17 +08:00
Calvinandtomsun28	0082e724bc	[doc] add japanese i18n in app-s7.yml, app-tplink_switch.yml, app-shenyu.yml (#3648 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-09 14:25:46 +08:00
Calvin aias00 tomsun28	57a2daf30d	[doc] add japanese i18n in app-prometheus.yml, app-pulsar.yml and app-registry.yml (#3639 ) Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-09 14:23:39 +08:00
Calvinandtomsun28	db90f29cd0	[doc] add japanese i18n in app-qq_mailbox.yml and app-redfish.yml (#3635 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-09 14:21:28 +08:00
DeleiGuoandtomsun28	00fd8fa1da	[bugfix] fixed jexl keyword issue in springboot2 monitoring template (#3632 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-09 14:18:46 +08:00
DeleiGuo tomsun28 aias00	60100eb980	[doc] add English version of linux operating system practice usecase (#3631 ) Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: aias00 <liuhongyu@apache.org>	2025-08-09 14:16:09 +08:00
DuansgandLogic	a6eb6be1ab	[feat] Monitoring templates support JSON nested parsing. (#3645 ) Co-authored-by: Logic <zqr10159@dromara.org>	2025-08-08 21:54:38 +08:00
DeleiGuoandLogic	5eff094af6	[bugfix] fix potential StringIndexOutOfBoundsException (#3642 ) Co-authored-by: Logic <zqr10159@dromara.org>	2025-08-08 21:35:25 +08:00
CalvinandLogic	3b126f53d2	[doc] add japanese i18n in app-smtp.yml, app-ssl_cert.yml, app-storm.yml, app-udp_port.yml, app-uniview.yml, app-website.yml, app-websocket.yml (#3643 ) Co-authored-by: Logic <zqr10159@dromara.org>	2025-08-08 21:15:37 +08:00
Calvinandaias00	1a5b722994	[doc] add japanese i18n in app-openai.yml and app-opengauss.yml (#3617 ) Co-authored-by: aias00 <liuhongyu@apache.org>	2025-08-08 20:56:45 +08:00
Duansg	5fe20dff05	[fix] remove optional metrics (#3636 )	2025-08-07 00:44:35 +08:00
Duansg tomsun28 铁甲小宝	04cfdae1e5	[fix] Fixed issue where jdbc url was replaced (#3625 ) Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: 铁甲小宝 <2922035952@qq.com>	2025-08-05 09:57:04 +08:00
Rocky, Chi zhochi Sherlock Yin tomsun28 Logic	8776f98cf5	[Feature] add customized labels to VM metrics (#3622 ) Co-authored-by: zhochi <zhochi@cisco.com> Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Logic <zqr10159@dromara.org>	2025-08-05 09:37:12 +08:00
Duansgandtomsun28	da484aef26	[fix] Fixed `springboot3` template yaml has the jexl inner conflict keyword(#3629 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-04 23:32:02 +08:00
DeleiGuoandtomsun28	e8ebc65053	[doc] add linux operating system practice usecase (#3628 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-04 23:12:12 +08:00
Calvinandtomsun28	bd08de41d5	[doc] add japanese i18n in app-postgresql.yml (#3624 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-04 23:09:05 +08:00
Calvinandtomsun28	18f8a541f0	[doc] add japanese i18n in app-oracle.yml (#3621 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-04 23:06:40 +08:00
Calvinandtomsun28	007ecd2db1	[doc] add japanese i18n in app-opensuse.yml (#3619 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-08-04 23:04:33 +08:00
VampireAchaoandCalvin	89aaad2401	[doc] Optimize the home website navbar layout UI for medium-sized screens (#3616 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-04 22:47:13 +08:00
Duansg tomsun28 Sherlock Yin	17d836752e	[feat] Http collect supports jsonpath parsing of numeric type (#3612 ) Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com>	2025-08-01 19:05:08 +08:00
VampireAchaoandCalvin	3949b73751	[doc] add japanese i18n in app-oceanbase.yml (#3614 ) Signed-off-by: VampireAchao <achao@apache.org> Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-08-01 00:05:48 +08:00
Calvinandtomsun28	2731504278	[doc] add japanese i18n in app-netease_mailbox.yml and app-ntp.yml (#3607 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-30 22:02:09 +08:00
DeleiGuo Calvin Yang Chen	babbfaea68	[bugfix] the tagValue may be null in the determineNewLabels method (#3606 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: Yang Chen <1597081640@qq.com>	2025-07-30 22:00:19 +08:00
Calvin shown tomsun28	9f7b9994b8	[doc] add japanese i18n in app-nebula_graph_cluster.yml and update japanese of client (#3603 ) Co-authored-by: shown <yuluo08290126@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-29 09:26:51 +08:00
Calvin shown tomsun28	d156c10aed	[doc] update japanese i18n in app-nacos_sd.yml, app-nebula_graph.yml, app-zookeeper.yml (#3602 ) Co-authored-by: shown <yuluo08290126@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-29 09:22:32 +08:00
Calvinandtomsun28	9f3329c85f	[doc] add japanese i18n in app-nvidia.yml, app-ping.yml, app-pop3.yml, app-port.yml and app-push.yml (#3611 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-29 09:20:14 +08:00
cto-huhangandCalvin	fd1c58f68d	[doc] add japanese i18n in app-nacos.yml (#3599 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-07-28 12:04:27 +08:00
DeleiGuo	6d1aa503df	[doc] fix image reference issues in documents (#3608 )	2025-07-28 01:54:05 +08:00
Duansg Calvin shown tomsun28	a58ad35c8b	[fix] Fix collector offline without sending offline notification (#3601 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: shown <yuluo08290126@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-25 21:53:15 +08:00
Calvinandshown	64cd5f9658	[doc] update japanese i18n in app-mqtt.yml and app-mysql.yml (#3597 ) Co-authored-by: shown <yuluo08290126@gmail.com>	2025-07-25 08:19:08 +08:00
Yang Chenandshown	a13dd89fd2	[feat] Auto-generate AES key if not configured (#3604 ) Co-authored-by: shown <yuluo08290126@gmail.com>	2025-07-24 21:06:45 +08:00
Cyanty Calvin Sherlock Yin	2f5cfa9d5d	[improve] VM write request sets up gzip compression and adds saveData unit tests (#3595 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com>	2025-07-24 19:18:17 +08:00
LunaRain_079andCalvin	a9dc7bf7f3	[doc] add japanese i18n in app-rocketmq.yml and app-rabbitmq.yml (#3598 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-07-23 10:59:41 +08:00
DuansgandCalvin	c1492deaa0	[doc] add japanese i18n in app-nginx.yml (#3600 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-07-23 00:18:28 +08:00
CyantyandCalvin	2252b2a769	[doc] add japanese i18n in app-zookeeper.yml and app-zookeeper_sd.yml (#3596 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-07-22 00:32:41 +08:00
cto-huhang	73f71503f5	[doc] add japanese i18n in app-mysql.yml (#3594 )	2025-07-20 21:17:21 +08:00
Calvinandtomsun28	2e224ce626	[doc] add japanese i18n in app-mongodb_atlas.yml (#3593 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-20 09:38:27 +08:00
Duansg Calvin tomsun28	e5406d57c6	[fix] Fix collector online metadata filling (#3579 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-20 09:35:14 +08:00
Duansg Calvin aias00 tomsun28	433a83303f	[refactor] Refactor the comparison logic (#3574 ) Co-authored-by: Calvin <zhengqiwei@apache.org> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-20 01:34:03 +08:00
Calvinandtomsun28	f309d5eafd	[doc] add japanese i18n in app-mongodb.yml (#3590 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 18:20:36 +08:00
Duansg Sherlock Yin tomsun28	986103395b	[feature] System time zone optimization. (#3588 ) Co-authored-by: Sherlock Yin <sherlock.yin1994@gmail.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 18:18:25 +08:00
Calvinandtomsun28	d569721e01	[doc] add japanese i18n in app-modbus.yml (#3580 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 00:44:03 +08:00
Calvinandtomsun28	08cac3c6cc	[doc] add japanese i18n in app-memcached.yml (#3578 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 00:42:16 +08:00
Calvinandtomsun28	f80d066851	[doc] add japanese i18n in app-mariadb.yml (#3577 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 00:39:02 +08:00
Calvin aias00 tomsun28	d6584093f5	[doc] add japanese i18n in app-linux_script.yml (#3575 ) Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-07-19 00:37:03 +08:00
DuansgandCalvin	fb03a57725	[feature] Support i18n of collector online notification (#3585 ) Co-authored-by: Calvin <zhengqiwei@apache.org>	2025-07-18 19:51:08 +08:00
tomsun28	779272d65f	[infra] upgrade openjdk image to fix Debian source failed (#3587 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-07-18 15:32:34 +08:00
Logic	c21a2952a5	[doc]: add FAQs about task limits (#3581 )	2025-07-17 21:52:18 +08:00