docs(help): add FAQs about monitoring intervals and task limits

- Add troubleshooting steps for incorrect monitoring intervals in Kubernetes - Include information on task limits for a single collector - Address issues with token authentication in HTTP API monitoring - Update existing FAQs with more detailed solutions
Merge branch 'master' of github.com:apache/hertzbeat
2026-09-17 18:19:02 +00:00 · 2025-07-17 10:01:39 +08:00 · 2025-07-17 09:32:00 +08:00 · 2025-07-14 08:56:20 +08:00 · 2025-06-25 10:45:49 +08:00 · 2025-06-19 15:42:13 +08:00
371 changed files with 4894 additions and 13732 deletions
@@ -6,7 +6,6 @@
  "files": [
    "README.md",
    "README_CN.md",
-    "README_JP.md"
    "home/src/pages/team/index.jsx"
  ],
  "imageSize": 100,
@@ -2505,24 +2504,6 @@
        "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: Real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
+  description: Apache HertzBeat(incubating) is a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
  homepage: https://hertzbeat.apache.org/
  labels:
    - monitoring
@@ -48,6 +48,15 @@ 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:
@@ -0,0 +1,10 @@
+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
+Apache HertzBeat (incubating)
 Copyright 2024-2025 The Apache Software Foundation

 This product includes software developed at
@@ -28,7 +28,7 @@

 ## 🎡 <font color="green">Introduction</font>

-[Apache HertzBeat](https://github.com/apache/hertzbeat) 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) (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.   

 ### Features

@@ -527,8 +527,6 @@ 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>
@@ -28,7 +28,7 @@

 ## 🎡 <font color="green">介绍</font>

-[Apache HertzBeat](https://github.com/apache/hertzbeat) 是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。     
+[Apache HertzBeat](https://github.com/apache/hertzbeat) （incubating）是一个易用友好的开源实时监控告警系统，无需 Agent，高性能集群，兼容 Prometheus，提供强大的自定义监控和状态页构建能力。     

 ### 特点

@@ -525,8 +525,6 @@ 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,12 +525,6 @@ 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,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.hertzbeat</groupId>
-		<artifactId>hertzbeat</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>hertzbeat-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>
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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
-    );
-} 
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.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);
-        }
-    }
-
-}
@@ -1,246 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.ai.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());
-            }
-
-        }
-    }
-}
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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);
-    }
-
-}
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.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();
-    }
-}
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.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.
-            """;
-
-}
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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;
-    }
-}
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.controller;
-
-/**
- * Controller for managing conversations.
- */
-public class ConversationController {
-
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.dao;
-
-/**
- * Data Access Object interface for Conversation entities.
- */
-public interface ConversationDao {
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.dao;
-
-/**
- * Data Access Object interface for Message entities.
- */
-public interface MessageDao {
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.dao;
-
-/**
- * Data Access Object interface for UserPreference entities.
- */
-public interface UserPreferenceDao {
-}
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.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;
-}
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.service;
-
-/**
- * Service interface for agent operations.
- */
-public interface AgentService {
-
-}
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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);
-}
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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);
-}
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.service;
-
-import org.springframework.ai.tool.ToolCallbackProvider;
-
-/**
- * Service interface for MCP server operations.
- */
-public interface McpServerService {
-    ToolCallbackProvider hertzbeatTools();
-}
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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 {
-}
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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();
-        }
-
-    }
-}
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.service.impl;
-
-import org.springframework.stereotype.Service;
-
-/**
- * Implementation of the ConversationService interface for managing chat conversations.
- */
-@Service
-public class ConversationServiceImpl {
-
-}
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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();
-    }
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.tools;
-
-/**
- * Tools for alert operations
- */
-public interface AlertTools {
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.tools;
-
-/**
- * Tools for metrics operations
- */
-public interface MetricsTools {
-}
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.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);
-
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.tools.impl;
-
-/**
- * Implementation of Alert Tools functionality
- */
-public class AlertToolsImpl {
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.hertzbeat.ai.agent.tools.impl;
-
-/**
- * Implementation of Metrics Tools functionality
- */
-public class MetricsToolsImpl {
-}
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.ai.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,9 +109,4 @@ 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,12 +76,11 @@ 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.removeFiring(fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.getFiring(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,10 +37,7 @@ 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}
@@ -48,10 +45,7 @@ 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}
@@ -59,10 +53,7 @@ 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}
@@ -70,10 +61,7 @@ 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}
@@ -81,10 +69,7 @@ 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}
@@ -92,10 +77,7 @@ 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}
@@ -103,10 +85,7 @@ 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}
@@ -114,10 +93,7 @@ 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}
@@ -125,10 +101,7 @@ 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}
@@ -136,10 +109,7 @@ 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}
@@ -147,10 +117,7 @@ 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}
@@ -158,10 +125,7 @@ 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}
@@ -169,10 +133,7 @@ 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}
@@ -180,10 +141,7 @@ 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}
@@ -191,10 +149,7 @@ 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}
@@ -202,10 +157,7 @@ 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}
@@ -213,10 +165,7 @@ 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}
@@ -224,10 +173,7 @@ 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}
@@ -235,10 +181,7 @@ 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}
@@ -246,10 +189,7 @@ 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}
@@ -257,10 +197,7 @@ 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}
@@ -268,10 +205,7 @@ 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}
@@ -279,10 +213,7 @@ 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}
@@ -290,10 +221,7 @@ 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}
@@ -301,10 +229,7 @@ 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}
@@ -312,10 +237,7 @@ 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}
@@ -323,10 +245,7 @@ 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}
@@ -334,10 +253,7 @@ 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}
@@ -345,10 +261,7 @@ 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}
@@ -356,10 +269,7 @@ 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}
@@ -367,10 +277,7 @@ 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}
@@ -378,10 +285,7 @@ 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}
@@ -389,10 +293,7 @@ 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}
@@ -400,10 +301,7 @@ 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}
@@ -411,10 +309,7 @@ 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}
@@ -422,10 +317,7 @@ 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}
@@ -433,10 +325,7 @@ 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}
@@ -444,10 +333,7 @@ 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}
@@ -455,8 +341,13 @@ 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);
-    }
+    @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); }
 }
@@ -18,12 +18,11 @@
 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;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
 */
 public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<Map<String, Object>>> {

-    private static final String SCALAR = "__scalar__";
+    private static final String THRESHOLD = "__threshold__";
    private static final String NAME = "__name__";
    private static final String VALUE = "__value__";
    private static final String TIMESTAMP = "__timestamp__";
@@ -61,100 +60,28 @@ 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);
-        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<>();
+        if (rightResult.size() == 1 && rightResult.get(0).containsKey(THRESHOLD)) {
+            double threshold = (double) rightResult.get(0).get(THRESHOLD);
+            String operator = ctx.op.getText();

-        // 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)) {
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map<String, Object> item : leftResult) {
+                Object queryValues = item.get(VALUE);
+                if (queryValues == null) {
+                    // ignore the query result data is empty
                    continue;
                }
-                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);
-                }
+                // 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);
            }
-            return results;
+            return result;
        }
-
-        // 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;
+        return new LinkedList<>();
    }

    @Override
@@ -240,7 +167,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(SCALAR, value);
+        valueMap.put(THRESHOLD, value);
        numAsList.add(valueMap);
        return numAsList;
    }
@@ -267,7 +194,83 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
        return callSqlOrPromql(tokens.getText(ctx.string()));
    }

-    private List<Map<String, Object>> callSqlOrPromql(String text) {
+    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){
        String script = text.substring(1, text.length() - 1);
        return executor.execute(script);
    }
@@ -287,36 +290,4 @@ 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,13 +26,12 @@ 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
     */
@@ -41,7 +40,6 @@ 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
     */
@@ -50,7 +48,6 @@ 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
     */
@@ -59,7 +56,6 @@ 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
     */
@@ -68,7 +64,6 @@ 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
     */
@@ -77,7 +72,6 @@ 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
     */
@@ -86,7 +80,6 @@ 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
     */
@@ -95,7 +88,6 @@ 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
     */
@@ -104,7 +96,6 @@ 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
     */
@@ -113,7 +104,6 @@ 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
     */
@@ -122,7 +112,6 @@ 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
     */
@@ -130,7 +119,6 @@ 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
     */
@@ -138,7 +126,6 @@ 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
     */
@@ -146,7 +133,6 @@ 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
     */
@@ -154,7 +140,6 @@ 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
     */
@@ -162,7 +147,6 @@ 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
     */
@@ -170,7 +154,6 @@ 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
     */
@@ -178,7 +161,6 @@ 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
     */
@@ -186,7 +168,6 @@ 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
     */
@@ -194,7 +175,6 @@ 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
     */
@@ -202,7 +182,6 @@ 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
     */
@@ -210,7 +189,6 @@ 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
     */
@@ -218,7 +196,6 @@ 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
     */
@@ -226,7 +203,6 @@ 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
     */
@@ -234,7 +210,6 @@ 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
     */
@@ -242,7 +217,6 @@ 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
     */
@@ -250,7 +224,6 @@ 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
     */
@@ -258,7 +231,6 @@ 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
     */
@@ -266,7 +238,6 @@ 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
     */
@@ -274,7 +245,6 @@ 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
     */
@@ -282,7 +252,6 @@ 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
     */
@@ -290,7 +259,6 @@ 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
     */
@@ -298,7 +266,6 @@ 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
     */
@@ -306,7 +273,6 @@ 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
     */
@@ -314,7 +280,6 @@ 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
     */
@@ -322,7 +287,6 @@ 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
     */
@@ -330,7 +294,6 @@ 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
     */
@@ -338,7 +301,6 @@ 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
     */
@@ -346,9 +308,15 @@ 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) BOOL? right=expr          # ComparisonExpr
+    | left=expr op=(GE|LE|GT|LT|EQ|NE) right=expr                 # ComparisonExpr
    | left=expr AND right=expr                                    # AndExpr
    | left=expr UNLESS right=expr                                 # UnlessExpr
    | left=expr OR right=expr                                     # OrExpr
@@ -191,6 +191,11 @@ 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
@@ -254,7 +259,6 @@ LT      : '<' ;
 LE      : '<=' ;
 EQ      : '==' | '=' ;
 NE      : '!=' ;
-BOOL    : 'bool';

 // Delimiters
 LPAREN  : '(' ;
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.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,10 +181,12 @@ 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(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
        // sql
        result = evaluate("(select values from multi_metrics where group_id = 'test_group') > 25");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
    }

    @Test
@@ -194,10 +196,12 @@ 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(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
        // sql
        result = evaluate("(select response_times from performance_data where service = 'api') < 15");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
    }

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

    @Test
@@ -751,118 +757,6 @@ 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);
-            String urlLowerCase = url.toLowerCase();
+            url = url.toLowerCase();
            // url format check
-            if (!urlLowerCase.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
+            if (!url.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
                throw new IllegalArgumentException("Invalid JDBC URL format");
            }
            // backlist check
            for (String keyword : BLACK_LIST) {
-                if (urlLowerCase.contains(keyword.toLowerCase())) {
+                if (url.contains(keyword.toLowerCase())) {
                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
                }
            }
            // universal detection
-            String normalizedUrl = urlLowerCase.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ");
+            String normalizedUrl = url.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ").toLowerCase();
            // 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 url;
+            return normalizedUrl;
        }
        assert jdbcProtocol.getPlatform() != null;
        return switch (jdbcProtocol.getPlatform()) {
@@ -604,18 +604,6 @@ 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());
            }
        }
    }
@@ -17,6 +17,11 @@

 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;
@@ -24,14 +29,6 @@ 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}
 */
@@ -131,81 +128,4 @@ 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,6 +17,15 @@

 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;
@@ -25,15 +34,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

-import java.lang.reflect.Method;
-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,107 +186,4 @@ 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));
-    }
 }
@@ -70,11 +70,14 @@
            <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>
@@ -84,15 +87,7 @@
            <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,7 +23,6 @@ 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;
@@ -34,7 +33,6 @@ 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;
@@ -92,9 +90,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc

    private final String collectorIdentity;

-    @Autowired
-    private HertzBeatMetricsCollector metricsCollector;
-
    public CommonDispatcher(MetricsCollectorQueue jobRequestQueue,
                            TimerDispatch timerDispatch,
                            CommonDataQueue commonDataQueue,
@@ -158,23 +153,12 @@ 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
-                    MetricsTime removedMetricsTime = metricsTimeoutMonitorMap.remove(entry.getKey());
-                    if (removedMetricsTime == null) {
-                        continue;
-                    }
+                    // Metrics collection timeout  
                    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(job.getMonitorId())
-                            .setTenantId(job.getTenantId())
-                            .setApp(job.getApp())
+                            .setId(timerJob.getJob().getMonitorId())
+                            .setTenantId(timerJob.getJob().getTenantId())
+                            .setApp(timerJob.getJob().getApp())
                            .setMetrics(metricsTime.getMetrics().getName())
                            .setPriority(metricsTime.getMetrics().getPriority())
                            .setTime(System.currentTimeMillis())
@@ -183,6 +167,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                    if (metricsData.getPriority() == 0) {
                        dispatchCollectData(metricsTime.timeout, metricsTime.getMetrics(), metricsData);
                    }
+                    metricsTimeoutMonitorMap.remove(entry.getKey());
                }
            }
        } catch (Exception e) {
@@ -192,7 +177,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 under it.
+        // Divide the collection task of a single application into corresponding collection tasks of the metrics according to the metrics under it.
        // Put each collect task into the thread pool for scheduling
        WheelTimerTask timerTask = (WheelTimerTask) timeout.task();
        Job job = timerTask.getJob();
@@ -216,27 +201,16 @@ 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()) {
@@ -348,13 +322,7 @@ 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();
-        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");
-        }
+        metricsTimeoutMonitorMap.remove(String.valueOf(job.getId()));
        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.
@@ -372,6 +340,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
            // and the result listener is notified of the combination of all metrics data
            timerDispatch.responseSyncJobData(job.getId(), metricsDataList);
        }
+
    }


@@ -385,4 +354,4 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
        private Metrics metrics;
        private Timeout timeout;
    }
-}
+}
@@ -422,9 +422,6 @@ 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;
@@ -1,89 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.hertzbeat.collector.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,23 +30,7 @@ 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:
@@ -22,11 +22,8 @@ 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;

 /**
@@ -43,16 +40,6 @@ 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()
@@ -19,6 +19,7 @@ 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;
@@ -33,4 +34,10 @@ 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());
+        }
+    }
 }
@@ -372,9 +372,4 @@ 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";
 }
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.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));
-    }
-
-}
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.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;
-}
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.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
     */
-    public static final String DEFAULT_ENCODE_RULES = "tomSun28HaHaHaHa";
+    private static final String ENCODE_RULES = "tomSun28HaHaHaHa";

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

 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
@@ -45,7 +41,6 @@ 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() {
@@ -83,17 +78,5 @@ 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,15 +90,4 @@ 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,7 +21,6 @@ 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;
@@ -70,21 +69,4 @@ 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,7 +128,11 @@ public class DashboardService {
                            ? GrafanaConstants.generateUseDatasource(currentDatasourceName) : "";

                    String relativeDashboardUrl = grafanaDashboard.getUrl();
-                    String fullDashboardUrl = grafanaProperties.exposeUrl().replaceAll("/$", "") + relativeDashboardUrl;
+                    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("^/", "") : "");

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

@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.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,15 +210,6 @@
            <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>
@@ -293,21 +284,6 @@
                                    </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,15 +20,14 @@ 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;
@@ -63,9 +62,6 @@ 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;

@@ -114,41 +110,30 @@ 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 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());
-        }
+        // for system secrets
        if (DEFAULT_JWT_SECRET.equals(currentJwtSecret)) {
            // use the random jwt secret
+            SystemSecret systemSecret = systemSecretService.getConfig();
            if (systemSecret == null || StringUtils.isBlank(systemSecret.getJwtSecret())) {
-                currentJwtSecret = randomizeSecret(DEFAULT_JWT_SECRET);
-                systemSecretBuilder.jwtSecret(currentJwtSecret);
-                needUpdate = true;
+                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);
            } 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) {
@@ -177,18 +162,4 @@ 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,6 +17,7 @@

 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;
@@ -24,7 +25,6 @@ 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,19 +37,6 @@ 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
 */
@@ -58,9 +45,6 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
@Tag(name = "Alert sender Configuration API")
@Slf4j
 public class GeneralConfigController {
-
-    private static final Set<String> ZONE_IDS = ZoneId.getAvailableZoneIds();
-
    @Resource
    private ConfigService configService;

@@ -90,28 +74,4 @@ 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));
-    }
 }
@@ -35,9 +35,4 @@ public class SystemSecret {
     * secret key for jwt
     */
    private String jwtSecret;
-
-    /**
-     * secret key for aes
-     */
-    private String aesSecret;
 }
@@ -36,7 +36,6 @@ 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;
@@ -46,7 +45,6 @@ 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;
@@ -149,9 +147,6 @@ 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()
@@ -263,11 +258,9 @@ 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,15 +17,12 @@

 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;
@@ -55,12 +52,6 @@ public class CollectorOnlineProcessor implements NettyRemotingProcessor {
        }
        this.manageServer.addChannel(collector, ctx.channel());
        this.manageServer.getCollectorAndJobScheduler().collectorGoOnline(collector, collectorInfo);
-        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();
+        return null;
    }
 }
@@ -41,7 +41,6 @@ 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;
@@ -459,10 +458,6 @@ 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());
            }
        }
@@ -523,15 +518,16 @@ 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();
            }
        }
-        jarAppDefineStore.loadAppDefines();
-        // merge define yml files inside jars
-        appDefineStore.loadAppDefines();
+        var success = appDefineStore.loadAppDefines();
+        if (!success) {
+            new JarAppDefineStoreImpl().loadAppDefines();
+        }
    }

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

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

        @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,38 +116,33 @@ public class LabelServiceImpl implements LabelService {

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

-    @Override
-    public List<Label> determineNewLabels(Set<Map.Entry<String, String>> originLabels) {
+    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<Label> allLabels = labelDao.findAll().stream()
-                .map(label -> Label.builder()
-                        .name(label.getName())
-                        .tagValue(label.getTagValue())
-                        .build())
+        Set<Map.Entry<String, String>> allLabels = labelDao.findAll().stream()
+                .map(label -> Map.entry(label.getName(), label.getTagValue()))
                .collect(Collectors.toSet());

        // If the bound label (key:value) does not exist, then add it
-        return originLabels.stream()
-                .map(entry -> Label.builder()
-                        .name(entry.getKey())
-                        .tagValue(entry.getValue())
-                        .build())
+        Set<Map.Entry<String, String>> addLabelsKv = originLabels.stream()
                .filter(label -> !allLabels.contains(label))
-                .map(label -> Label.builder()
-                        .id(null)
-                        .name(label.getName())
-                        .tagValue(label.getTagValue())
-                        .type((byte) 0)
-                        .build())
-                .toList();
+                .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();
    }
 }
@@ -27,7 +27,6 @@ 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;
@@ -437,27 +436,6 @@ 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
@@ -22,7 +22,6 @@ spring:
    url: jdbc:h2:./data/test;MODE=MYSQL
    hikari:
      max-lifetime: 120000
-
  jpa:
    show-sql: false
    database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
@@ -31,10 +30,8 @@ spring:
      eclipselink:
        logging:
          level: SEVERE
-
  flyway:
    enabled: false
-
  mail:
    host: smtp.exmail.qq.com
    username: example@tancloud.cn
@@ -58,57 +55,26 @@ 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: 100
+        buffer-size: 1000
        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:
@@ -126,58 +92,6 @@ 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
@@ -186,13 +100,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、ollama、openRouter
+  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk
  type:
  # Model name：glm-4、qwen-turboo、moonshot-v1-8k、generalv3.5
  model:
@@ -200,5 +114,3 @@ 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,33 +19,6 @@ 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:
@@ -65,7 +38,6 @@ spring:
      max-file-size: 100MB
      max-request-size: 100MB

-
 management:
  health:
    mail:
@@ -76,19 +48,7 @@ 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
@@ -180,8 +140,6 @@ warehouse:
      insert:
        buffer-size: 100
        flush-interval: 3
-        compression:
-          enabled: false
      cluster:
        enabled: false
        select:
@@ -1,619 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
-category: 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]'
@@ -62,7 +62,6 @@ params:
    type: number
    required: false
    hide: true
-    defaultValue: 6000
  - field: authType
    name:
      zh-CN: 认证方式
@@ -126,7 +125,7 @@ metrics:
          zh-CN: 状态
          en-US: Status
          ja-JP: ステータス
-      - field: Size
+      - field: size
        type: 0
        i18n:
          zh-CN: 数量
@@ -138,18 +137,6 @@ 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
@@ -241,7 +228,7 @@ metrics:
    priority: 1
    fields:
      - field: state
-        type: 1
+        type: 2
        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,18 +172,6 @@ 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^_^
@@ -667,7 +667,7 @@ metrics:
        i18n:
          zh-CN: 客户端命令统计
          en-US: cmdstat client
-          ja-JP: クライアントのコマンド
+          ja-JP: クライエントのコマンド
      - field: cmdstat_config
        type: 1
        i18n:
@@ -21,13 +21,11 @@ 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
@@ -39,7 +37,6 @@ 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
@@ -51,7 +48,6 @@ 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
@@ -64,19 +60,16 @@ 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
@@ -96,7 +89,6 @@ metrics:
    i18n:
      zh-CN: CPU 信息
      en-US: CPU Info
-      ja-JP: CPU情報
    priority: 1
    fields:
      - field: info
@@ -104,38 +96,32 @@ 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
@@ -166,7 +152,6 @@ metrics:
    i18n:
      zh-CN: 内存信息
      en-US: Memory Info
-      ja-JP: メモリ情報
    priority: 2
    fields:
      - field: total
@@ -175,42 +160,36 @@ 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
@@ -235,7 +214,6 @@ metrics:
    i18n:
      zh-CN: 磁盘信息
      en-US: Disk Info
-      ja-JP: ディスク情報
    priority: 3
    fields:
      - field: disk_num
@@ -243,32 +221,27 @@ 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
@@ -280,7 +253,6 @@ metrics:
    i18n:
      zh-CN: 网卡信息
      en-US: Interface Info
-      ja-JP: ネットワークカード情報
    priority: 4
    fields:
      - field: interface_name
@@ -289,21 +261,18 @@ 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
@@ -318,7 +287,6 @@ metrics:
    i18n:
      zh-CN: 文件系统
      en-US: Disk Free
-      ja-JP: ファイルシステム
    priority: 5
    fields:
      - field: filesystem
@@ -326,35 +294,30 @@ 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
@@ -366,7 +329,6 @@ metrics:
    i18n:
      zh-CN: Top10 CPU 进程
      en-US: Top10 CPU Process
-      ja-JP: トップ10 CPUプロセス
    priority: 6
    fields:
      - field: pid
@@ -375,27 +337,23 @@ 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
@@ -407,7 +365,6 @@ metrics:
    i18n:
      zh-CN: Top10 内存进程
      en-US: Top10 Memory Process
-      ja-JP: トップ10 メモリプロセス
    priority: 7
    fields:
      - field: pid
@@ -416,27 +373,23 @@ 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
@@ -21,13 +21,11 @@ app: mariadb
 name:
  zh-CN: MariaDB数据库
  en-US: MariaDB
-  ja-JP: MariaDB データベース
 # 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-jdbc'> JDBC 协议</a> 通过配置 SQL 对 MariaDB 数据库的通用性能指标(系统信息、性能状态、Innodb、缓存、事物、用户线程、慢SQL等)进行采集监控，支持版本为 MariaDB5+。<br>您可以点击“<i>新建 MariaDB 数据库</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC Protocol</a> to configure SQL for collecting general metrics of MariaDB database (system information, performance status, Innodb, cache, things, user threads, slow SQL, etc.). Supported version is MariaDB5+. <br>You can click "<i>New MariaDB Database</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC 協議</a> 通過配置 SQL 對 MariaDB 數據庫的通用性能指標(系統信息、性能狀態、Innodb、緩存、事物、用戶線程、慢SQL等)進行采集監控，支持版本爲 MariaDB5+。<br>您可以點擊“<i>新建 MariaDB 數據庫</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBCプロトコルを介して</a> MariaDB データベース（MariaDB5+）の一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 MariaDB データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/mariadb
  en-US: https://hertzbeat.apache.org/docs/help/mariadb
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    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
@@ -63,7 +59,6 @@ params:
    name:
      zh-CN: 查询超时时间(ms)
      en-US: Query Timeout(ms)
-      ja-JP: クエリタイムアウト（ｍｓ）
    type: number
    # when type is number, range is required
    range: '[400,200000]'
@@ -74,14 +69,12 @@ params:
    name:
      zh-CN: 数据库名称
      en-US: Database Name
-      ja-JP: データベース名
    type: text
    required: false
  - field: username
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    type: text
    limit: 50
    required: false
@@ -89,14 +82,12 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    type: password
    required: false
  - field: url
    name:
      zh-CN: URL
      en-US: URL
-      ja-JP: URL
    type: text
    required: false
    hide: true
@@ -109,9 +100,8 @@ metrics:
    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
    priority: 0
    i18n:
-      zh-CN: 基础信息
+      zh-CN: 基础 信息
      en-US: Basic Info
-      ja-JP: 基礎情報
    # 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
@@ -120,38 +110,32 @@ metrics:
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: port
        type: 1
        i18n:
          zh-CN: 端口
          en-US: Port
-          ja-JP: ポート
      - field: datadir
        type: 1
        i18n:
          zh-CN: 存储目录
-          en-US: Data Directory
-          ja-JP: データディレクトリ
+          en-US: DataDir
      - field: max_connections
        type: 0
        i18n:
          zh-CN: 最大连接数
          en-US: Max Connections
-          ja-JP: 最大接続数
      - field: thread_cache_size
        type: 0
        i18n:
          zh-CN: 连接池大小
          en-US: Thread Cache Size
-          ja-JP: キャッシュするスレッドの数
      - field: innodb_buffer_pool_size
        type: 0
        unit: KB
        i18n:
          zh-CN: InnoDB缓冲池的大小
          en-US: Innodb Buffer Pool Size
-          ja-JP: Innodbバッファープールのサイズ
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - version
@@ -204,9 +188,8 @@ metrics:
    priority: 1
    # collect metrics content
    i18n:
-      zh-CN: 缓存信息
+      zh-CN: 缓存 信息
      en-US: Cache Info
-      ja-JP: キャッシュ情報
    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: query_cache_hit_rate
@@ -215,32 +198,27 @@ metrics:
        i18n:
          zh-CN: 缓存命中率
          en-US: Query Cache Hit Rate
-          ja-JP: キャッシュ命中率
      - field: cache_hits
        type: 0
        i18n:
          zh-CN: 缓存命中数
          en-US: Cache Hits
-          ja-JP: キャッシュ命中数
      - field: cache_inserts
        type: 0
        i18n:
          zh-CN: 缓存插入数
          en-US: Cache Inserts
-          ja-JP: キャッシュインサート数
      - field: cache_free_blocks
        type: 0
        i18n:
          zh-CN: 缓存空闲块数量
          en-US: Cache Free Blocks
-          ja-JP: キャッシュの空きブロック数
      - field: cache_free_memory
        type: 0
        unit: KB
        i18n:
          zh-CN: 空闲缓存大小
          en-US: Cache Free Memory
-          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:
      - Qcache_hits
@@ -263,6 +241,7 @@ metrics:
    # the config content when protocol is jdbc
    jdbc:
      # jdbc host
+      # jdbchost
      host: ^_^host^_^
      # port
      port: ^_^port^_^
@@ -285,22 +264,19 @@ metrics:
  - name: performance
    priority: 2
    i18n:
-      zh-CN: 性能信息
+      zh-CN: 性能 信息
      en-US: Performance Info
-      ja-JP: パフォーマンス情報
    fields:
      - field: questions
        type: 0
        i18n:
          zh-CN: 查询总数
          en-US: Questions
-          ja-JP: クエリ総数
      - field: qps
        type: 0
        i18n:
-          zh-CN: QPS
-          en-US: QPS
-          ja-JP: QPS
+          zh-CN: 每秒处理查询数
+          en-US: Queries Per Second
    aliasFields:
      - uptime
      - questions
@@ -322,9 +298,8 @@ metrics:
  - name: innodb
    priority: 3
    i18n:
-      zh-CN: Innodb信息
+      zh-CN: Innodb 信息
      en-US: Innodb Info
-      ja-JP: Innodb情報
    fields:
      - field: innodb_data_reads
        type: 0
@@ -332,35 +307,30 @@ metrics:
        i18n:
          zh-CN: 磁盘读取次数
          en-US: Innodb Data Reads
-          ja-JP: Innodb読み取り回数
      - field: innodb_data_writes
        type: 0
        unit: Times
        i18n:
          zh-CN: 磁盘写入次数
          en-US: Innodb Data Writes
-          ja-JP: Innodb書き込み回数
      - field: innodb_data_read
        type: 0
        unit: KB
        i18n:
          zh-CN: 磁盘读取数据量
          en-US: Innodb Data Read
-          ja-JP: Innodb読み取り（KB）
      - field: innodb_data_written
        type: 0
        unit: KB
        i18n:
          zh-CN: 磁盘写入数据量
          en-US: Innodb Data Written
-          ja-JP: Innodb書き込み（KB）
      - field: innodb_buffer_hit_rate
        type: 0
        unit: '%'
        i18n:
          zh-CN: Innodb 缓存命中数
          en-US: Innodb Buffer Hit Rate
-          ja-JP: Innodbバッファーキャッシュ命中率
    aliasFields:
      - Innodb_data_reads
      - Innodb_data_writes
@@ -394,9 +364,8 @@ metrics:
  - name: status
    priority: 4
    i18n:
-      zh-CN: 状态信息
+      zh-CN: 状态 信息
      en-US: Status Info
-      ja-JP: 状態情報
    fields:
      - field: uptime
        type: 0
@@ -404,73 +373,61 @@ metrics:
        i18n:
          zh-CN: 运行时间
          en-US: Uptime
-          ja-JP: アップタイム
      - field: com_select
        type: 0
        i18n:
          zh-CN: 查询次数
          en-US: Com Select
-          ja-JP: セレクト回数
      - field: com_insert
        type: 0
        i18n:
          zh-CN: 插入次数
          en-US: Com Insert
-          ja-JP: インサート回数
      - field: com_update
        type: 0
        i18n:
          zh-CN: 更新次数
          en-US: Com Update
-          ja-JP: 更新回数
      - field: com_delete
        type: 0
        i18n:
          zh-CN: 删除次数
          en-US: Com Delete
-          ja-JP: 削除回数
      - field: com_commit
        type: 0
        i18n:
          zh-CN: 事务提交次数
          en-US: Com Commit
-          ja-JP: トランザクションのコミット数
      - field: com_rollback
        type: 0
        i18n:
          zh-CN: 事务回滚次数
          en-US: Com Rollback
-          ja-JP: トランザクションのロールバック数
      - field: threads_created
        type: 0
        i18n:
          zh-CN: 线程创建数
          en-US: Threads Created
-          ja-JP: スレッド作成数
      - field: threads_connected
        type: 0
        i18n:
          zh-CN: 连接线程数
          en-US: Threads Connected
-          ja-JP: 接続スレッド数
      - field: threads_cached
        type: 0
        i18n:
          zh-CN: 缓存线程数
          en-US: Threads Cached
-          ja-JP: キャッシュスレッド数
      - field: threads_running
        type: 0
        i18n:
          zh-CN: 活动线程数
          en-US: Threads Running
-          ja-JP: 活動中のスレッド数
      - field: qps
        type: 0
        i18n:
-          zh-CN: QPS
-          en-US: QPS
-          ja-JP: QPS
+          zh-CN: 每秒处理查询数
+          en-US: Com Insert
    aliasFields:
      - uptime
      - com_select
@@ -502,82 +459,69 @@ metrics:
  - name: handler
    priority: 5
    i18n:
-      zh-CN: 处理器信息
+      zh-CN: 处理器 信息
      en-US: Handler Info
-      ja-JP: ハンドラ情報
    fields:
      - field: handler_commit
        type: 0
        i18n:
          zh-CN: 处理的事务提交数
          en-US: Handler Commit
-          ja-JP: ハンドラのコミット操作数
      - field: handler_delete
        type: 0
        i18n:
          zh-CN: 处理的删除操作数
          en-US: Handler Delete
-          ja-JP: ハンドラの削除操作数
      - field: handler_write
        type: 0
        i18n:
          zh-CN: 处理的写入操作数
          en-US: Handler Write
-          ja-JP: ハンドラの書き込み操作数
      - field: handler_update
        type: 0
        i18n:
          zh-CN: 处理的更新操作数
          en-US: Handler Update
-          ja-JP: ハンドラの更新操作数
      - field: handler_discover
        type: 0
        i18n:
          zh-CN: 处理的发现操作数
          en-US: Handler Discover
-          ja-JP: ハンドラのディスカバー操作数
      - field: handler_prepare
        type: 0
        i18n:
          zh-CN: 处理的准备操作数
          en-US: Handler Prepare
-          ja-JP: ハンドラの準備操作数
      - field: handler_read_first
        type: 0
        i18n:
          zh-CN: 读取首行操作数
          en-US: Handler Read First
-          ja-JP: ハンドラの最初の行を読む操作数
      - field: handler_read_rnd
        type: 0
        i18n:
          zh-CN: 随机读取操作数
          en-US: Handler Read RND
-          ja-JP: ハンドラのランダムアクセス操作数
      - field: handler_read_next
        type: 0
        i18n:
          zh-CN: 读取下一行操作数
          en-US: Handler Read Next
-          ja-JP: ハンドラの次の行を読む操作数
      - field: handler_read_rnd_next
        type: 0
        i18n:
          zh-CN: 随机读取下一行操作数
          en-US: Handler Read RND Next
-          ja-JP: ハンドラの次の行をランダムに読む操作数
      - field: handler_read_key
        type: 0
        i18n:
          zh-CN: 按索引键读取操作数
          en-US: Handler Read Key
-          ja-JP: ハンドラのインデックスを使用して読み取る操作数
      - field: handler_external_lock
        type: 0
        i18n:
          zh-CN: 外部锁定操作数
          en-US: Handler External Key
-          ja-JP: ハンドラの外部のキーを使用して読み取る操作数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -594,34 +538,29 @@ metrics:
  - name: connection
    priority: 6
    i18n:
-      zh-CN: 连接信息
+      zh-CN: 连接 信息
      en-US: Connection Info
-      ja-JP: 接続情報
    fields:
      - field: connections
        type: 0
        i18n:
          zh-CN: 当前连接数
          en-US: Connections
-          ja-JP: 現在接続数
      - field: max_used_connections
        type: 0
        i18n:
          zh-CN: 历史最大连接数
          en-US: Max Used Connections
-          ja-JP: 最大接続数
      - field: aborted_connects
        type: 0
        i18n:
          zh-CN: 失败连接数
          en-US: Aborted Connects
-          ja-JP: 失敗接続数
      - field: aborted_clients
        type: 0
        i18n:
          zh-CN: 客户端中断数
          en-US: Aborted Clients
-          ja-JP: クライアントの割り込み数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -638,34 +577,29 @@ metrics:
  - name: thread
    priority: 7
    i18n:
-      zh-CN: 线程信息
+      zh-CN: 线程 信息
      en-US: Thread Info
-      ja-JP: スレッド情報
    fields:
      - field: threads_created
        type: 0
        i18n:
          zh-CN: 创建线程数
          en-US: Threads Created
-          ja-JP: スレッド作成数
      - field: threads_connected
        type: 0
        i18n:
          zh-CN: 连接线程数
          en-US: Threads Connected
-          ja-JP: 接続スレッド数
      - field: threads_cached
        type: 0
        i18n:
          zh-CN: 缓存线程数
          en-US: CThreads Cached
-          ja-JP: キャッシュスレッド数
      - field: threads_running
        type: 0
        i18n:
          zh-CN: 运行线程数
          en-US: Threads Running
-          ja-JP: 活動中のスレッド数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -682,28 +616,24 @@ metrics:
  - name: tmp
    priority: 8
    i18n:
-      zh-CN: 临时表信息
+      zh-CN: 临时表 信息
      en-US: TMP Info
-      ja-JP: 一時テーブル情報
    fields:
      - field: created_tmp_tables
        type: 0
        i18n:
          zh-CN: 创建的临时表数量
          en-US: Created TMP Tables
-          ja-JP: 一時テーブル作成数
      - field: created_tmp_disk_tables
        type: 0
        i18n:
          zh-CN: 创建的临时磁盘表数量
          en-US: Created TMP Disk Tables
-          ja-JP: 一時ディスクテーブル作成数
      - field: created_tmp_files
        type: 0
        i18n:
          zh-CN: 创建的临时文件数量
          en-US: Created TMP Files
-          ja-JP: 一時ファイル作成数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -720,40 +650,34 @@ metrics:
  - name: select_type
    priority: 9
    i18n:
-      zh-CN: 查询类型信息
+      zh-CN: 查询类型 信息
      en-US: Select Type Info
-      ja-JP: 検索タイプ情報
    fields:
      - field: select_full_join
        type: 0
        i18n:
          zh-CN: 全表连接数
          en-US: Select Full Join
-          ja-JP: 全件結合数
      - field: select_full_range_join
        type: 0
        i18n:
          zh-CN: 带范围的全表连接数
          en-US: Select Full Range Join
-          ja-JP: 範囲検索付き全件結合数
      - field: select_range
        type: 0
        i18n:
          zh-CN: 索引范围查询数
          en-US: Select Range
-          ja-JP: 範囲検索数
      - field: select_range_check
        type: 0
        i18n:
          zh-CN: 索引范围内二次检查数
          en-US: Select Range Check
-          ja-JP: 範囲内二次検索数
      - field: select_scan
        type: 0
        i18n:
          zh-CN: 全表扫描查询数
          en-US: Select Scan
-          ja-JP: テーブル全体をスキャンする回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -770,34 +694,29 @@ metrics:
  - name: sort
    priority: 10
    i18n:
-      zh-CN: 排序信息
+      zh-CN: 排序 信息
      en-US: Sort Info
-      ja-JP: ソート情報
    fields:
      - field: sort_rows
        type: 0
        i18n:
          zh-CN: 排序总行数
          en-US: Sort Rows
-          ja-JP: ソートされた行数
      - field: sort_range
        type: 0
        i18n:
          zh-CN: 范围条件排序次数
          en-US: Sort Range
-          ja-JP: 範囲付きのソート回数
      - field: sort_merge_passes
        type: 0
        i18n:
          zh-CN: 合并排序段次数
          en-US: Sort Merge Passes
-          ja-JP: マージソート回数
      - field: sort_scan
        type: 0
        i18n:
          zh-CN: 全表扫描排序次数
          en-US: Sort Scan
-          ja-JP: テーブル全体をスキャンしてソートする回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -814,22 +733,19 @@ metrics:
  - name: table_lock
    priority: 11
    i18n:
-      zh-CN: 表级锁信息
+      zh-CN: 表级锁 信息
      en-US: Table Lock Info
-      ja-JP: テーブルロック情報
    fields:
      - field: table_locks_immediate
        type: 0
        i18n:
          zh-CN: 立即获得表锁次数
          en-US: Table Locks Immediate
-          ja-JP: 即座に取得できた回数
      - field: table_locks_waited
        type: 0
        i18n:
          zh-CN: 须等待获取表锁次数
          en-US: Table Locks Waited
-          ja-JP: 取得を待機した回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -846,9 +762,8 @@ metrics:
  - name: process_state
    priority: 12
    i18n:
-      zh-CN: 进程状态信息
+      zh-CN: 进程状态 信息
      en-US: Process State Info
-      ja-JP: プロセス状態情報
    fields:
      - field: state
        type: 1
@@ -856,13 +771,11 @@ metrics:
        i18n:
          zh-CN: 进程状态
          en-US: State
-          ja-JP: プロセス状態
      - field: num
        type: 0
        i18n:
          zh-CN: 该状态进程数量
          en-US: Num
-          ja-JP: プロセス総数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -879,9 +792,8 @@ metrics:
  - name: slow_sql
    priority: 13
    i18n:
-      zh-CN: 慢查询信息
+      zh-CN: 慢查询 信息
      en-US: Slow Sql Info
-      ja-JP: スローSQL情報
    fields:
      - field: id
        type: 1
@@ -889,31 +801,26 @@ metrics:
        i18n:
          zh-CN: ID
          en-US: ID
-          ja-JP: ID
      - field: sql_text
        type: 1
        i18n:
          zh-CN: SQL 文本
          en-US: SQL Text
-          ja-JP: SQL文のテキスト
      - field: start_time
        type: 1
        i18n:
          zh-CN: 开始时间
          en-US: Start Time
-          ja-JP: 開始時間
      - field: db
        type: 1
        i18n:
          zh-CN: 数据库
          en-US: Database
-          ja-JP: データベース
      - field: query_time
        type: 3
        i18n:
          zh-CN: 查询时间
          en-US: Query Time
-          ja-JP: クエリ時間
    aliasFields:
      - sql_text
      - start_time
@@ -21,22 +21,19 @@ app: memcached
 name:
  zh-CN: Memcached
  en-US: Memcached
-  ja-JP: Memcached
 # The description and help of this monitoring type
 help:
  zh-CN: HertzBeat 支持 Memcached 服务监控，通过(stats、stats settings、stats sizes)命令对(服务器进程ID、服务器已运行秒数、版本、当前线程数、item的大小、item的数量、当前存储占用的字节数)等指标进行监测。
  en-US: HertzBeat supports Memcached service monitoring by using commands such as stats, stats settings, and stats sizes to monitor indicators such as server process ID, server running seconds, version, current number of threads, item size, number of items, and current byte storage usage.
  zh-TW: HertzBeat支持Memcached服務監控，通過（stats、stats settings、stats sizes）命令對（服務器行程ID、服務器已運行秒數、版本、當前線程數、item的大小、item的數量、當前存儲佔用的位元組數）等名額進行監測。
-  ja-JP: HertzBeat は Memcached サービスの一般的なメトリクスを監視します。
 # 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: 目標ホスト
+      zh-CN: Memcached服务的Host
+      en-US: Host of Memcached service
    # type-param field type(most mapping the html input type)
    type: host
    # required-true or false
@@ -47,7 +44,6 @@ params:
    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
@@ -63,7 +59,6 @@ metrics:
    i18n:
      zh-CN: 系统信息
      en-US: Server 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
@@ -75,106 +70,89 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: pid
        type: 1
        i18n:
          zh-CN: 服务器进程ID
-          en-US: PID
-          ja-JP: プロセスID
+          en-US: Pid
      - field: uptime
        type: 0
        unit: s
        i18n:
          zh-CN: 已运行秒数
          en-US: Uptime
-          ja-JP: アップタイム
      - field: version
        type: 1
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: curr_connections
        type: 0
        i18n:
          zh-CN: 当前连接数量
          en-US: Curr Connections
-          ja-JP: 現在接続数
      - field: auth_errors
        type: 0
        i18n:
          zh-CN: 认证失败数目
          en-US: Auth Errors
-          ja-JP: 認証失敗回数
      - field: threads
        type: 0
        i18n:
          zh-CN: 当前线程数
          en-US: Threads
-          ja-JP: 現在スレッド数
      - field: item_size
        type: 0
        unit: byte
        i18n:
          zh-CN: Item 大小
          en-US: Item Size
-          ja-JP: Itemサイズ
      - field: item_count
        type: 0
        i18n:
          zh-CN: Item 数量
          en-US: Item Count
-          ja-JP: Item数量
      - field: curr_items
        type: 0
        i18n:
          zh-CN: 当前存储的数据总数
          en-US: Curr Items
-          ja-JP: 現在のItem数
      - field: total_items
        type: 0
        i18n:
          zh-CN: 启动以来存储的数据总数
          en-US: Total Items
-          ja-JP: Item総数
      - field: bytes
        type: 0
        unit: byte
        i18n:
          zh-CN: 当前存储占用的字节数
          en-US: Bytes
-          ja-JP: バイト
      - field: cmd_get
        type: 0
        i18n:
          zh-CN: Get命令请求次数
          en-US: Cmd Get
-          ja-JP: Getコマンドの実行回数
      - field: cmd_set
        type: 0
        i18n:
          zh-CN: Set命令请求次数
          en-US: Cmd Set
-          ja-JP: Setコマンドの実行回数
      - field: cmd_flush
        type: 0
        i18n:
          zh-CN: Flush命令请求次数
          en-US: Cmd Flush
-          ja-JP: Flushコマンドの実行回数
      - field: get_misses
        type: 0
        i18n:
          zh-CN: Get命令未命中次数
          en-US: Get Misses
-          ja-JP: Getコマンドのミス回数
      - field: delete_misses
        type: 0
        i18n:
          zh-CN: Delete命令未命中次数
          en-US: Delete Misses
-          ja-JP: Deleteコマンドのミス回数
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: memcached
    # Specific collection configuration when protocol is telnet protocol
@@ -21,13 +21,11 @@ app: modbus
 name:
  zh-CN: ModBus服务器
  en-US: ModBus Server
-  ja-JP: ModBusサーバー
 # The description and help of this monitoring type
 help:
  zh-CN: HertzBeat对支持Modbus协议的服务进行(保持寄存器和线圈)相关指标进行采集
  en-US: HertzBeat collects metrics related to maintaining registers and coils for services that support Modbus protocol
  zh-TW: HertzBeat對支持Modbus協定的服務進行（保持寄存器和線圈）相關名額進行採集
-  ja-JP: HertzBeatはModbusプロトコルをサポートするサービスのメトリクスを監視します。
 # Input params define for monitoring(render web ui by the definition)
 params:
  # field-param field key
@@ -36,7 +34,6 @@ params:
    name:
      zh-CN: ModBus服务Host
      en-US: ModBus Server Host
-      ja-JP: ModBusサーバーのホスト
    # type-param field type(most mapping the html input type)
    type: host
    # required-true or false
@@ -47,7 +44,6 @@ params:
    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
@@ -61,7 +57,6 @@ params:
    name:
      zh-CN: slaveId
      en-US: slaveId
-      ja-JP: slaveId
    # type-param field type(most mapping the html input type)
    type: text
    # required-true or false
@@ -71,7 +66,6 @@ params:
    name:
      zh-CN: 请求超时时间(ms)
      en-US: Request Timeout(ms)
-      ja-JP: リクエストタイムアウト（ｍｓ）
    type: number
    # when type is number, range is required
    range: '[400,200000]'
@@ -83,25 +77,27 @@ params:
    name:
      zh-CN: 保持寄存器地址
      en-US: Holding Registers address
-      ja-JP: Holdingレジスタのアドレス
    # type-param field type(most mapping the html input type)
    type: array
    # param field input placeholder
    placeholder: 'Input RegisterAddress'
    # required-true or false
    required: true
+    # hide param-true or false
+  #    hide: true
  - field: coilRegisterAddresses
    # name-param field display i18n name
    name:
      zh-CN: 线圈寄存器地址
      en-US: Coil Register address
-      ja-JP: コイルレジスタのアドレス
    # type-param field type(most mapping the html input type)
    type: array
    # param field input placeholder
    placeholder: 'Input RegisterAddress'
    # required-true or false
    required: true
+    # hide param-true or false
+#    hide: true

 # collect metrics config list
 metrics:
@@ -110,7 +106,6 @@ metrics:
    i18n:
      zh-CN: 保持寄存器 统计信息
      en-US: holding-register stats
-      ja-JP: Holdingレジスタの統計情報
    # 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
@@ -122,40 +117,38 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
      - field: address-0
        type: 0
        i18n:
          zh-CN: address-0
          en-US: address-0
-          ja-JP: address-0
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
      - field: address-1-0
        type: 0
        i18n:
          zh-CN: address-1-0
          en-US: address-1-0
-          ja-JP: address-1-0
      - field: address-1-1
        type: 0
        i18n:
          zh-CN: address-1-1
          en-US: address-1-1
-          ja-JP: address-1-1
      - field: address-1-2
        type: 0
        i18n:
          zh-CN: address-1-2
          en-US: address-1-2
-          ja-JP: address-1-2
+    # 指标别名列表，按照寄存器地址来进行命名的
+    # 例如 地址为下标为0 ，值为m  holding-register:0
+    # 地址为下标为1，值为m[2]  holding-register:1-0  holding-register:1-1
    aliasFields:
      - responseTime
      - holding-register:0
      - holding-register:1-0
      - holding-register:1-1
      - holding-register:1-2
-      # mapping and conversion expressions, use the same aliasField above to calculate metrics value# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
+      # mapping and conversion expressions, use thesand aliasField above to calculate metrics value# (可选)指标映射转换计算表达式，与上面的别名一起作用，计算出最终需要的指标值# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
    calculates:
      - responseTime=responseTime
      - address-0=holding-register:0
@@ -180,7 +173,6 @@ metrics:
    i18n:
      zh-CN: 线圈 统计信息
      en-US: coil stats
-      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
@@ -192,40 +184,38 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
      - field: address-0
        type: 0
        i18n:
          zh-CN: address-0
          en-US: address-0
-          ja-JP: address-0
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
      - field: address-1-0
        type: 0
        i18n:
          zh-CN: address-1-0
          en-US: address-1-0
-          ja-JP: address-1-0
      - field: address-1-1
        type: 0
        i18n:
          zh-CN: address-1-1
          en-US: address-1-1
-          ja-JP: address-1-1
      - field: address-1-2
        type: 0
        i18n:
          zh-CN: address-1-2
          en-US: address-1-2
-          ja-JP: address-1-2
+    # 指标别名列表，按照寄存器地址来进行命名的
+    # 例如 地址为下标为0 ，值为m  coil:0
+    # 地址为下标为1，值为m[2]  coil:1-0  coil:1-1
    aliasFields:
      - responseTime
      - coil:0
      - coil:1-0
      - coil:1-1
      - coil:1-2
-      # mapping and conversion expressions, use the same aliasField above to calculate metrics value# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
+      # mapping and conversion expressions, use thesand aliasField above to calculate metrics value# (可选)指标映射转换计算表达式，与上面的别名一起作用，计算出最终需要的指标值# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
    calculates:
      - responseTime=responseTime
      - address-0=coil:0
@@ -22,13 +22,11 @@ app: mongodb
 name:
  zh-CN: MongoDB数据库
  en-US: MongoDB
-  ja-JP: MongoDBデータベース
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat 对 MongoDB 数据库的通用指标进行测量监控。<br>您可以点击 “<i>新建 MongoDB 数据库</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: Hertzbeat monitors MongoDB general performance metrics. You could click the "<i>New MongoDB</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
  zh-TW: Hertzbeat 對 MongoDB 數據庫的通用指標進行測量監控。<br>您可以點擊 “<i>新建 MongoDB 數據庫</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は MongoDBデータベースの一般的なメトリクスを監視します。<br>「<i>新規 MongoDBデータベース</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/mongodb
  en-US: https://hertzbeat.apache.org/docs/help/mongodb
@@ -40,7 +38,6 @@ 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
@@ -51,7 +48,6 @@ params:
    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
@@ -64,7 +60,6 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    type: text
    limit: 50
    required: false
@@ -72,14 +67,12 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    type: password
    required: false
  - field: database
    name:
      zh-CN: 数据库
      en-US: database
-      ja-JP: データベース
    type: text
    # when type is text, use limit to limit string length
    limit: 50
@@ -89,7 +82,6 @@ params:
    name:
      zh-CN: 认证数据库
      en-US: authenticationDatabase
-      ja-JP: 認証データベース
    type: text
    limit: 50
    required: true
@@ -99,7 +91,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -124,7 +115,6 @@ metrics:
    i18n:
      zh-CN: 构建信息
      en-US: Build Info
-      ja-JP: ビルド情報
    # monitoring metrics list
    fields:
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
@@ -133,43 +123,36 @@ metrics:
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: gitVersion
        type: 1
        i18n:
          zh-CN: git版本
          en-US: Git Version
-          ja-JP: Gitバージョン
      - field: sysInfo
        type: 1
        i18n:
          zh-CN: 系统信息
          en-US: Sys Info
-          ja-JP: システム情報
      - field: loaderFlags
        type: 1
        i18n:
          zh-CN: 加载器标志
          en-US: Loader Flags
-          ja-JP: ローダフラグ
      - field: compilerFlags
        type: 1
        i18n:
          zh-CN: 编译器标志
          en-US: Compiler Flags
-          ja-JP: コンパイラフラグ
      - field: allocator
        type: 1
        i18n:
          zh-CN: 分配器
          en-US: Allocator
-          ja-JP: メモリ割り当て器
      - field: javascriptEngine
        type: 1
        i18n:
          zh-CN: JavaScript引擎
          en-US: JavaScript Engine
-          ja-JP: JavaScriptエンジン
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: mongodb
    # the config content when protocol is mongodb
@@ -197,32 +180,27 @@ metrics:
    i18n:
      zh-CN: 服务器文档
      en-US: Server Document
-      ja-JP: サーバードキュメント
    fields:
      - field: deleted
        type: 0
        i18n:
          zh-CN: 已删除数
          en-US: Deleted
-          ja-JP: 削除回数
      - field: inserted
        type: 0
        i18n:
          zh-CN: 已插入数
          en-US: Inserted
-          ja-JP: インサート回数
      - field: returned
        type: 0
        i18n:
          zh-CN: 返回结果数
          en-US: Returned
-          ja-JP: 戻る回数
      - field: updated
        type: 0
        i18n:
          zh-CN: 已更新数
          en-US: Updated
-          ja-JP: 更新回数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -239,20 +217,17 @@ metrics:
    i18n:
      zh-CN: 服务器操作
      en-US: Server Operation
-      ja-JP: サーバー操作
    fields:
      - field: scanAndOrder
        type: 0
        i18n:
          zh-CN: 扫描订购
          en-US: Scan And Order
-          ja-JP: スキャンとオーダー
      - field: writeConflicts
        type: 0
        i18n:
          zh-CN: 写冲突
          en-US: Write And Order
-          ja-JP: 書き込みとオーダー
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -267,22 +242,19 @@ metrics:
  - name: server_ttl
    priority: 3
    i18n:
-      zh-CN: 服务器_TTL
-      en-US: server TTL
-      ja-JP: サーバーTTL
+      zh-CN: 服务器_ttl
+      en-US: Max Connections
    fields:
      - field: deletedDocuments
        type: 0
        i18n:
          zh-CN: 已删除文档数
          en-US: Deleted Documents
-          ja-JP: 削除されたドキュメント数
      - field: passes
        type: 0
        i18n:
          zh-CN: 通过数
          en-US: Passes
-          ja-JP: パス数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -300,58 +272,49 @@ metrics:
    i18n:
      zh-CN: 系统信息
      en-US: System Info
-      ja-JP: システム情報
    fields:
      - field: currentTime
        type: 1
        i18n:
          zh-CN: 当前时间
          en-US: Current Time
-          ja-JP: 現在時刻
      - field: hostname
        type: 1
        i18n:
          zh-CN: 主机名
          en-US: Host Name
-          ja-JP: ホスト名
      - field: cpuAddrSize
        type: 0
        i18n:
          zh-CN: cpu地址大小
          en-US: CPU Address Size
-          ja-JP: CPUアドレスサイズ
      - field: memSizeMB
        type: 0
        unit: MB
        i18n:
          zh-CN: 内存大小（MB）
          en-US: Memory Size MB
-          ja-JP: メモリサイズ（ＭＢ）
      - field: memLimitMB
        type: 0
        unit: MB
        i18n:
          zh-CN: 内存限制（MB）
          en-US: Memory Limit MB
-          ja-JP: メモリ制限（ＭＢ）
      - field: numCores
        type: 0
        i18n:
          zh-CN: CPU 核数
          en-US: Num Cores
-          ja-JP: コア数
      - field: cpuArch
        type: 1
        i18n:
          zh-CN: CPU 架构
          en-US: CPU Architecture
-          ja-JP: CPUアーキテクチャ
      - field: numaEnabled
        type: 1
        i18n:
          zh-CN: numa是否启用
          en-US: Numa Enabled
-          ja-JP: 有効化
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -368,26 +331,22 @@ metrics:
    i18n:
      zh-CN: 操作系统信息
      en-US: OS Info
-      ja-JP: オーエス情報
    fields:
      - field: type
        type: 1
        i18n:
          zh-CN: 操作系统类型
          en-US: Type
-          ja-JP: タイプ
      - field: name
        type: 1
        i18n:
          zh-CN: 名称
          en-US: Name
-          ja-JP: 名前
      - field: version
        type: 1
        i18n:
          zh-CN: Version
          en-US: 版本号
-          ja-JP: バージョン
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -404,56 +363,47 @@ metrics:
    i18n:
      zh-CN: 额外信息
      en-US: Extra Info
-      ja-JP: 追加情報
    fields:
      - field: versionString
        type: 1
        i18n:
          zh-CN: 版本字符串
          en-US: Version String
-          ja-JP: バージョン文字列
      - field: libcVersion
        type: 1
        i18n:
          zh-CN: 标准库版本
          en-US: Libc Version
-          ja-JP: Libcバージョン
      - field: kernelVersion
        type: 1
        i18n:
          zh-CN: 内核版本
          en-US: Kernel Version
-          ja-JP: カーネルバージョン
      - field: cpuFrequencyMHz
        type: 1
        i18n:
          zh-CN: CPU 频率（兆赫兹）
          en-US: CPU Frequency MHz
-          ja-JP: CPU周波数（MHz）
      - field: cpuFeatures
        type: 1
        i18n:
          zh-CN: CPU 特性
          en-US: CPU Features
-          ja-JP: CPU機能
      - field: pageSize
        type: 0
        i18n:
          zh-CN: 内存页大小
          en-US: Page Size
-          ja-JP: ページサイズ
      - field: numPages
        type: 0
        i18n:
          zh-CN: 内存页数量
          en-US: Num Pages
-          ja-JP: ページ数量
      - field: maxOpenFiles
        type: 0
        i18n:
          zh-CN: 最大打开文件数
          en-US: Max Open Files
-          ja-JP: 開けるファイルの最大数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -22,13 +22,11 @@ app: mongodb_atlas
 name:
  zh-CN: MongoDB Atlas 数据库
  en-US: MongoDB Atlas Database
-  ja-JP: MongoDB Atlas データベース
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat 对 MongoDB Atlas 数据库的通用指标进行测量监控。<br>您可以点击 “<i>新建 MongoDB Atlas 数据库</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: Hertzbeat monitors MongoDB Atlas general performance metrics. You could click the "<i>New MongoDB Atlas</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
  zh-TW: Hertzbeat 對 MongoDB Atlas 數據庫的通用指標進行測量監控。<br>您可以點擊 “<i>新建 MongoDB Atlas 數據庫</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は MongoDB Atlas データベースの一般的なメトリクスを監視します。<br>「<i>新規 MongoDB Atlas データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/mongodb
  en-US: https://hertzbeat.apache.org/docs/help/mongodb
@@ -40,7 +38,6 @@ 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
@@ -50,7 +47,6 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    type: text
    limit: 50
    required: false
@@ -58,14 +54,12 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    type: password
    required: false
  - field: database
    name:
      zh-CN: 数据库
      en-US: database
-      ja-JP: データベース
    type: text
    # when type is text, use limit to limit string length
    limit: 50
@@ -75,7 +69,6 @@ params:
    name:
      zh-CN: 认证数据库
      en-US: authenticationDatabase
-      ja-JP: 認証データベース
    type: text
    limit: 50
    required: true
@@ -85,7 +78,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -101,8 +93,7 @@ params:
    # name-param field display i18n name
    name:
      zh-CN: 集群模式
-      en-US: Cluster Mode
-      ja-JP: クラスターモード
+      en-US: Cluster Model
    # type-param field type(most mapping the html input type)
    type: text
 # can get status information and other config params of MongoDB by running Diagnostic Commands
@@ -121,7 +112,6 @@ metrics:
    i18n:
      zh-CN: 构建信息
      en-US: Build Info
-      ja-JP: ビルド情報
    # monitoring metrics list
    fields:
      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
@@ -130,31 +120,26 @@ metrics:
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: gitVersion
        type: 1
        i18n:
          zh-CN: git版本
          en-US: Git Version
-          ja-JP: Gitバージョン
      - field: sysInfo
        type: 1
        i18n:
          zh-CN: 系统信息
          en-US: Sys Info
-          ja-JP: システム情報
      - field: allocator
        type: 1
        i18n:
          zh-CN: 分配器
          en-US: Allocator
-          ja-JP: メモリ割り当て器
      - field: javascriptEngine
        type: 1
        i18n:
          zh-CN: JavaScript引擎
          en-US: JavaScript Engine
-          ja-JP: JavaScriptエンジン
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: mongodb
    # the config content when protocol is mongodb
@@ -184,44 +169,37 @@ metrics:
    i18n:
      zh-CN: 服务器文档
      en-US: Server Document
-      ja-JP: サーバードキュメント
    fields:
      - field: delete
        type: 0
        i18n:
          zh-CN: 已删除数
          en-US: delete
-          ja-JP: 削除回数
      - field: insert
        type: 0
        i18n:
          zh-CN: 已插入数
          en-US: insert
-          ja-JP: インサート回数
      - field: update
        type: 0
        i18n:
          zh-CN: 更新数
          en-US: update
-          ja-JP: 更新回数
      - field: query
        type: 0
        i18n:
          zh-CN: 查询数
          en-US: query
-          ja-JP: クエリ回数
      - field: getmore
        type: 0
        i18n:
          zh-CN: 光标中剩余文档的请求数
          en-US: getmore
-          ja-JP: getmore
      - field: command
        type: 0
        i18n:
          zh-CN: 执行命令操作的总数
          en-US: command
-          ja-JP: 実行されたコマンド数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -239,26 +217,22 @@ metrics:
    i18n:
      zh-CN: 网络操作
      en-US: Network Operation
-      ja-JP: ネットワーク操作
    fields:
      - field: bytesIn
        type: 0
        i18n:
          zh-CN: 读取字节数
          en-US: Bytes In
-          ja-JP: 読み取りバイト数
      - field: bytesOut
        type: 0
        i18n:
          zh-CN: 写入字节数
          en-US: Bytes Out
-          ja-JP: 書き込みバイト数
      - field: numRequests
        type: 0
        i18n:
          zh-CN: 请求数
          en-US: Request Num
-          ja-JP: リクエスト数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -276,26 +250,22 @@ metrics:
    i18n:
      zh-CN: 连接信息
      en-US: Connection Info
-      ja-JP: 接続情報
    fields:
      - field: current
        type: 0
        i18n:
          zh-CN: 当前正在进行连接数
          en-US: Current Connections
-          ja-JP: 現在接続数
      - field: available
        type: 0
        i18n:
          zh-CN: 可用连接数
          en-US: Available Connections
-          ja-JP: 利用可能な接続数
      - field: totalCreated
        type: 0
        i18n:
          zh-CN: 总创建连接数
          en-US: Total Created Connections
-          ja-JP: 作成された接続総数
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -313,66 +283,56 @@ metrics:
    i18n:
      zh-CN: 数据库统计
      en-US: Database Statistics
-      ja-JP: データベース統計
    fields:
      - field: db
        type: 1
        i18n:
          zh-CN: 数据库名称
          en-US: Database Name
-          ja-JP: データベース名
      - field: collections
        type: 0
        i18n:
          zh-CN: 集合数
          en-US: Collections
-          ja-JP: コレクション数
      - field: views
        type: 0
        i18n:
          zh-CN: 视图数
          en-US: Views
-          ja-JP: ビュー数
      - field: objects
        type: 0
        i18n:
          zh-CN: 文档数
          en-US: Objects
-          ja-JP: ドキュメント数
      - field: avgObjSize
        type: 0
        unit: Bytes
        i18n:
          zh-CN: 文档平均大小
          en-US: Document Avg Size
-          ja-JP: ドキュメントの平均サイズ
      - field: dataSize
        type: 0
        unit: Bytes
        i18n:
          zh-CN: 文档大小
          en-US: Document Size
-          ja-JP: ドキュメントサイズ
      - field: storageSize
        type: 0
        unit: Bytes
        i18n:
          zh-CN: 使用存储空间大小
          en-US: Storage Size
-          ja-JP: ストレージサイズ
      - field: indexes
        type: 0
        i18n:
          zh-CN: 索引数
          en-US: Indexes
-          ja-JP: インデックス数
      - field: indexSize
        type: 0
        unit: Bytes
        i18n:
          zh-CN: 索引大小
          en-US: Index Size
-          ja-JP: インデックスサイズ
    protocol: mongodb
    mongodb:
      host: ^_^host^_^
@@ -19,21 +19,19 @@ app: mqtt
 name:
  zh-CN: MQTT 连接
  en-US: MQTT Connection
-  ja-JP: MQTT 接続
 help:
  zh-CN: HertzBeat 对 MQTT 连接进行监测。<br>您可以点击 “<i>新建 MQTT 连接</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat monitors MQTT connections. <br>You can click "<i>New MQTT connection</i>" and configure it, or select "<i>More actions</i>" to import an existing configuration.
  zh-TW: HertzBeat 對 MQTT 連接進行監測。 <br>您可以點選 “<i>新建 MQTT 連線</i>” 並進行配置，或選擇“<i>更多操作</i>”，匯入已有配置。
-  ja-JP: Hertzbeat はMQTT 接続を監視します。<br>「<i>新規 MQTT 接続</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/mqtt
  en-US: https://hertzbeat.apache.org/docs/help/mqtt
 params:
+
  - field: clientId
    name:
      zh-CN: 客户端ID
      en-US: Client Id
-      ja-JP: クライエントID
    type: text
    defaultValue: hertzbeat-mqtt-client
    required: true
@@ -41,28 +39,25 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    type: text
    required: false
  - field: password
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    type: password
    required: false
+
  - field: host
    name:
      zh-CN: MQTT的Host
      en-US: Target Host
-      ja-JP: 目標ホスト
    type: host
    required: true
  - field: port
    name:
      zh-CN: 端口
      en-US: Port
-      ja-JP: ポート
    type: number
    range: '[0,65535]'
    required: true
@@ -71,7 +66,6 @@ params:
    name:
      zh-CN: 连接协议
      en-US: Protocol
-      ja-JP: 接続プロトコル
    type: radio
    options:
      - label: MQTT
@@ -80,11 +74,11 @@ params:
        value: MQTTS
    required: true
    defaultValue: MQTT
+
  - field: timeout
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    type: number
    range: '[0,100000]'
    required: true
@@ -93,16 +87,15 @@ params:
    name:
      zh-CN: 心跳检测时间(s)
      en-US: Keep Alive(s)
-      ja-JP: ハートビート間隔(s)
    type: number
    range: '[0,100000]'
    required: true
    defaultValue: 30
+
  - field: tlsVersion
    name:
      zh-CN: TLS版本
      en-US: TLS Version
-      ja-JP: TLSバージョン
    type: radio
    options:
      - label: TLSv1.2
@@ -116,7 +109,6 @@ params:
    name:
      zh-CN: 跳过证书验证
      en-US: Skip Certificate Verification
-      ja-JP: 証明書の検証をスキップ
    type: boolean
    defaultValue: false
    hide: true
@@ -124,7 +116,6 @@ params:
    name:
      zh-CN: CA证书
      en-US: CA Certificate
-      ja-JP: CA証明書
    type: text
    required: false
    hide: true
@@ -132,7 +123,6 @@ params:
    name:
      zh-CN: 双向认证
      en-US: Enable Mutual Auth
-      ja-JP: 相互認証
    type: boolean
    defaultValue: false
    hide: true
@@ -140,7 +130,6 @@ params:
    name:
      zh-CN: 客户端证书
      en-US: Client Certificate
-      ja-JP: クライエントの証明書
    type: text
    required: false
    hide: true
@@ -148,31 +137,28 @@ params:
    name:
      zh-CN: 客户端私钥
      en-US: Client Private Key
-      ja-JP: クライエントの秘密鍵
    type: text
    required: false
    hide: true
+
+
  - field: topic
    name:
      zh-CN: 主题
      en-US: Topic
-      ja-JP: トピック
    type: text
    required: true
  - field: testMessage
    name:
      zh-CN: 测试消息
      en-US: Test message
-      ja-JP: 試験メッセージ
    type: text
    required: false
-
 metrics:
  - name: summary
    i18n:
      zh-CN: 概要
      en-US: Summary
-      ja-JP: 概要
    priority: 0
    fields:
      - field: responseTime
@@ -181,31 +167,26 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: canSubscribe
        type: 1
        i18n:
          zh-CN: 订阅状态
          en-US: Normal subscribe
-          ja-JP: サブスクライ状態
      - field: canPublish
        type: 1
        i18n:
          zh-CN: 发布状态
          en-US: Normal publish
-          ja-JP: メッセージを転送できる
      - field: canReceive
        type: 1
        i18n:
          zh-CN: 接收数据
          en-US: Receive data
-          ja-JP: 受信されたデータ
      - field: canUnSubscribe
        type: 1
        i18n:
          zh-CN: 取消订阅状态
          en-US: Normal unsubscribe
-          ja-JP: サブスクライブ解除の状態
    protocol: mqtt
    mqtt:
      clientId: ^_^clientId^_^
@@ -21,13 +21,11 @@ app: mysql
 name:
  zh-CN: Mysql数据库
  en-US: Mysql DB
-  ja-JP: Mysql データベース
 # 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-jdbc'> JDBC 协议</a> 通过配置 SQL 对 Mysql 数据库的通用性能指标(系统信息、性能状态、Innodb、缓存、事物、用户线程、慢SQL等)进行采集监控，支持版本为 Mysql5+。<br>您可以点击“<i>新建 Mysql 数据库</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC Protocol</a> to configure SQL for collecting general metrics of Mysql database (system information, performance status, Innodb, cache, things, user threads, slow SQL, etc.). Supported version is Mysql5+. <br>You can click "<i>New Mysql Database</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC 協議</a> 通過配置 SQL 對 Mysql 數據庫的通用性能指標(系統信息、性能狀態、Innodb、緩存、事物、用戶線程、慢SQL等)進行采集監控，支持版本爲 Mysql5+。<br>您可以點擊“<i>新建 Mysql 數據庫</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: HertzBeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC プロトコル</a> を介して Mysql データベースの一般的なパフォーマンスのメトリクス(システム情報、パフォーマンスステータス、Innodb、キャッシュ、オブジェクト、ユーザースレッド、遅いSQLなど)収集監視を行う，サポートバージョンは Mysql5+。<br>クリックすることができます“<i>新規 Mysql データベース</i>”および構成，または“<i>その他の操作</i>”，既存の構成のインポートすることができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/mysql
  en-US: https://hertzbeat.apache.org/docs/help/mysql
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    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
@@ -65,7 +61,6 @@ params:
    name:
      zh-CN: 查询超时时间(ms)
      en-US: Query Timeout(ms)
-      ja-JP: クエリタイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -82,7 +77,6 @@ params:
    name:
      zh-CN: 数据库名称
      en-US: Database Name
-      ja-JP: データベース名
    # type-param field type(most mapping the html input tag)
    type: text
    # required-true or false
@@ -93,7 +87,6 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    # type-param field type(most mapping the html input tag)
    type: text
    # when type is text, use limit to limit string length
@@ -106,7 +99,6 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    # type-param field type(most mapping the html input tag)
    type: password
    # required-true or false
@@ -117,7 +109,6 @@ params:
    name:
      zh-CN: URL
      en-US: URL
-      ja-JP: URL
    # type-param field type(most mapping the html input tag)
    type: text
    # required-true or false
@@ -128,7 +119,6 @@ params:
    name:
      zh-CN: 是否启用SSH隧道
      en-US: Enable SSH Tunnel
-      ja-JP: SSHトンネルを有効にするかどうか
    type: boolean
    required: true
    hide: true
@@ -136,7 +126,6 @@ params:
    name:
      zh-CN: SSH Host
      en-US: SSH Host
-      ja-JP: SSHホスト
    type: text
    required: false
    placeholder: 'When Enable SSH Tunnel'
@@ -145,7 +134,6 @@ params:
    name:
      zh-CN: SSH端口
      en-US: SSH Port
-      ja-JP: SSHポート
    type: number
    range: '[0,65535]'
    required: false
@@ -156,7 +144,6 @@ params:
    name:
      zh-CN: SSH超时时间(ms)
      en-US: SSH Timeout(ms)
-      ja-JP: SSHタイムアウト（ｍｓ）
    type: number
    required: false
    range: '[400,200000]'
@@ -166,7 +153,6 @@ params:
    name:
      zh-CN: SSH用户名
      en-US: SSH Username
-      ja-JP: SSHユーザー名
    type: text
    required: false
    placeholder: 'When Enable SSH tunnel'
@@ -175,7 +161,6 @@ params:
    name:
      zh-CN: SSH密码
      en-US: SSH Password
-      ja-JP: SSHパスワード
    type: password
    required: false
    hide: true
@@ -183,7 +168,6 @@ params:
    name:
      zh-CN: 是否共享SSH连接
      en-US: Share SSH Connection
-      ja-JP: SSH接続を共有するかどうか
    type: boolean
    required: true
    defaultValue: true
@@ -192,7 +176,6 @@ params:
    name:
      zh-CN: SSH私钥
      en-US: SSH PrivateKey
-      ja-JP: SSH秘密鍵
    type: textarea
    placeholder: -----BEGIN RSA PRIVATE KEY-----
    required: false
@@ -201,7 +184,6 @@ params:
    name:
      zh-CN: SSH密钥短语
      en-US: SSH PrivateKey PassPhrase
-      ja-JP: SSH秘密鍵フレーズ
    type: password
    required: false
    hide: true
@@ -214,9 +196,8 @@ metrics:
    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
    priority: 0
    i18n:
-      zh-CN: 基础信息
+      zh-CN: 基础 信息
      en-US: Basic Info
-      ja-JP: 基礎情報
    # 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
@@ -225,38 +206,32 @@ metrics:
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: port
        type: 1
        i18n:
          zh-CN: 端口
          en-US: Port
-          ja-JP: ポート
      - field: datadir
        type: 1
        i18n:
          zh-CN: 存储目录
-          en-US: Data Directory
-          ja-JP: データディレクトリ
+          en-US: DataDir
      - field: max_connections
        type: 0
        i18n:
          zh-CN: 最大连接数
          en-US: Max Connections
-          ja-JP: 最大接続数
      - field: thread_cache_size
        type: 0
        i18n:
          zh-CN: 连接池大小
          en-US: Thread Cache Size
-          ja-JP: 接続プールのサイズ
      - field: innodb_buffer_pool_size
        type: 0
        unit: KB
        i18n:
          zh-CN: InnoDB缓冲池的大小
          en-US: Innodb Buffer Pool Size
-          ja-JP: InnoDBバッファプールのサイズ
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - version
@@ -319,9 +294,8 @@ metrics:
    priority: 1
    # collect metrics content
    i18n:
-      zh-CN: 缓存信息
+      zh-CN: 缓存 信息
      en-US: Cache Info
-      ja-JP: キャッシュ情報
    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: query_cache_hit_rate
@@ -330,32 +304,27 @@ metrics:
        i18n:
          zh-CN: 缓存命中率
          en-US: Query Cache Hit Rate
-          ja-JP: キャッシュ命中率
      - field: cache_hits
        type: 0
        i18n:
          zh-CN: 缓存命中数
          en-US: Cache Hits
-          ja-JP: キャッシュ命中数
      - field: cache_inserts
        type: 0
        i18n:
          zh-CN: 缓存插入数
          en-US: Cache Inserts
-          ja-JP: キャッシュ挿入数
      - field: cache_free_blocks
        type: 0
        i18n:
          zh-CN: 缓存空闲块数量
          en-US: Cache Free Blocks
-          ja-JP: キャッシュの空きブロック数
      - field: cache_free_memory
        type: 0
        unit: KB
        i18n:
          zh-CN: 空闲缓存大小
          en-US: Cache Free Memory
-          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:
      - Qcache_hits
@@ -378,6 +347,7 @@ metrics:
    # the config content when protocol is jdbc
    jdbc:
      # jdbc host
+      # jdbchost
      host: ^_^host^_^
      # port
      port: ^_^port^_^
@@ -410,22 +380,19 @@ metrics:
  - name: performance
    priority: 2
    i18n:
-      zh-CN: 性能信息
+      zh-CN: 性能 信息
      en-US: Performance Info
-      ja-JP: パフォーマンス情報
    fields:
      - field: questions
        type: 0
        i18n:
          zh-CN: 查询总数
          en-US: Questions
-          ja-JP: 合計クエリ数
      - field: qps
        type: 0
        i18n:
          zh-CN: 每秒处理查询数
          en-US: Queries Per Second
-          ja-JP: クエリーの処理数/秒
    aliasFields:
      - uptime
      - questions
@@ -457,9 +424,8 @@ metrics:
  - name: innodb
    priority: 3
    i18n:
-      zh-CN: Innodb信息
+      zh-CN: Innodb 信息
      en-US: Innodb Info
-      ja-JP: Innodb情報
    fields:
      - field: innodb_data_reads
        type: 0
@@ -467,35 +433,30 @@ metrics:
        i18n:
          zh-CN: 磁盘读取次数
          en-US: Innodb Data Reads
-          ja-JP: ディスク読み取り回数
      - field: innodb_data_writes
        type: 0
        unit: Times
        i18n:
          zh-CN: 磁盘写入次数
          en-US: Innodb Data Writes
-          ja-JP: ディスクへの書き込み回数
      - field: innodb_data_read
        type: 0
        unit: KB
        i18n:
          zh-CN: 磁盘读取数据量
          en-US: Innodb Data Read
-          ja-JP: Innodb読み取りデータ量（KB）
      - field: innodb_data_written
        type: 0
        unit: KB
        i18n:
          zh-CN: 磁盘写入数据量
          en-US: Innodb Data Written
-          ja-JP: Innodb書き込みデータ量（KB）
      - field: innodb_buffer_hit_rate
        type: 0
        unit: '%'
        i18n:
          zh-CN: Innodb 缓存命中数
          en-US: Innodb Buffer Hit Rate
-          ja-JP: Innodbバッファーキャッシュ命中率
    aliasFields:
      - Innodb_data_reads
      - Innodb_data_writes
@@ -539,9 +500,8 @@ metrics:
  - name: status
    priority: 4
    i18n:
-      zh-CN: 状态信息
+      zh-CN: 状态 信息
      en-US: Status Info
-      ja-JP: 状態情報
    fields:
      - field: uptime
        type: 0
@@ -549,73 +509,61 @@ metrics:
        i18n:
          zh-CN: 运行时间
          en-US: Uptime
-          ja-JP: 実行時間
      - field: com_select
        type: 0
        i18n:
          zh-CN: 查询次数
          en-US: Com Select
-          ja-JP: セレクト回数
      - field: com_insert
        type: 0
        i18n:
          zh-CN: 插入次数
          en-US: Com Insert
-          ja-JP: 挿入回数
      - field: com_update
        type: 0
        i18n:
          zh-CN: 更新次数
          en-US: Com Update
-          ja-JP: 更新回数
      - field: com_delete
        type: 0
        i18n:
          zh-CN: 删除次数
          en-US: Com Delete
-          ja-JP: 削除回数
      - field: com_commit
        type: 0
        i18n:
          zh-CN: 事务提交次数
          en-US: Com Commit
-          ja-JP: トランザクションのコミット回数
      - field: com_rollback
        type: 0
        i18n:
          zh-CN: 事务回滚次数
          en-US: Com Rollback
-          ja-JP: トランザクションのロールバック回数
      - field: threads_created
        type: 0
        i18n:
          zh-CN: 线程创建数
          en-US: Threads Created
-          ja-JP: スレッド作成数
      - field: threads_connected
        type: 0
        i18n:
          zh-CN: 连接线程数
          en-US: Threads Connected
-          ja-JP: 接続スレッド数
      - field: threads_cached
        type: 0
        i18n:
          zh-CN: 缓存线程数
          en-US: Threads Cached
-          ja-JP: キャッシュされたスレッド数
      - field: threads_running
        type: 0
        i18n:
          zh-CN: 活动线程数
          en-US: Threads Running
-          ja-JP: アクティブなスレッド数
      - field: qps
        type: 0
        i18n:
          zh-CN: 每秒处理查询数
          en-US: Com Insert
-          ja-JP: クエリーの処理数/秒
    aliasFields:
      - uptime
      - com_select
@@ -657,82 +605,69 @@ metrics:
  - name: handler
    priority: 5
    i18n:
-      zh-CN: 处理器信息
+      zh-CN: 处理器 信息
      en-US: Handler Info
-      ja-JP: ハンドラ情報
    fields:
      - field: handler_commit
        type: 0
        i18n:
          zh-CN: 处理的事务提交数
          en-US: Handler Commit
-          ja-JP: ハンドラのコミット操作数
      - field: handler_delete
        type: 0
        i18n:
          zh-CN: 处理的删除操作数
          en-US: Handler Delete
-          ja-JP: ハンドラの削除操作数
      - field: handler_write
        type: 0
        i18n:
          zh-CN: 处理的写入操作数
          en-US: Handler Write
-          ja-JP: ハンドラの書き込み操作数
      - field: handler_update
        type: 0
        i18n:
          zh-CN: 处理的更新操作数
          en-US: Handler Update
-          ja-JP: ハンドラの更新操作数
      - field: handler_discover
        type: 0
        i18n:
          zh-CN: 处理的发现操作数
          en-US: Handler Discover
-          ja-JP: ハンドラのディスカバー操作数
      - field: handler_prepare
        type: 0
        i18n:
          zh-CN: 处理的准备操作数
          en-US: Handler Prepare
-          ja-JP: ハンドラの準備操作数
      - field: handler_read_first
        type: 0
        i18n:
          zh-CN: 读取首行操作数
          en-US: Handler Read First
-          ja-JP: ハンドラの最初の行を読み取り操作数
      - field: handler_read_rnd
        type: 0
        i18n:
          zh-CN: 随机读取操作数
          en-US: Handler Read RND
-          ja-JP: ハンドラのランダム読み取り操作数
      - field: handler_read_next
        type: 0
        i18n:
          zh-CN: 读取下一行操作数
          en-US: Handler Read Next
-          ja-JP: ハンドラの次の行を読み取る操作数
      - field: handler_read_rnd_next
        type: 0
        i18n:
          zh-CN: 随机读取下一行操作数
          en-US: Handler Read RND Next
-          ja-JP: ハンドラの次の行をランダムに読み取る操作数
      - field: handler_read_key
        type: 0
        i18n:
          zh-CN: 按索引键读取操作数
          en-US: Handler Read Key
-          ja-JP: ハンドラのインデックスを使用して読み取る操作数
      - field: handler_external_lock
        type: 0
        i18n:
          zh-CN: 外部锁定操作数
          en-US: Handler External Key
-          ja-JP: ハンドラの外部のキーを使用して読み取る操作数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -759,34 +694,29 @@ metrics:
  - name: connection
    priority: 6
    i18n:
-      zh-CN: 连接信息
+      zh-CN: 连接 信息
      en-US: Connection Info
-      ja-JP: 接続情報
    fields:
      - field: connections
        type: 0
        i18n:
          zh-CN: 连接的总次数
          en-US: Connections
-          ja-JP: 接続の合計回数
      - field: max_used_connections
        type: 0
        i18n:
          zh-CN: 历史最大连接数
          en-US: Max Used Connections
-          ja-JP: 過去最大接続数
      - field: aborted_connects
        type: 0
        i18n:
          zh-CN: 失败连接数
          en-US: Aborted Connects
-          ja-JP: 失敗した接続数
      - field: aborted_clients
        type: 0
        i18n:
          zh-CN: 客户端中断数
          en-US: Aborted Clients
-          ja-JP: クライエントの割り込み数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -813,34 +743,29 @@ metrics:
  - name: thread
    priority: 7
    i18n:
-      zh-CN: 线程信息
+      zh-CN: 线程 信息
      en-US: Thread Info
-      ja-JP: スレッド情報
    fields:
      - field: threads_created
        type: 0
        i18n:
          zh-CN: 创建线程数
          en-US: Threads Created
-          ja-JP: スレッド作成数
      - field: threads_connected
        type: 0
        i18n:
          zh-CN: 连接线程数
          en-US: Threads Connected
-          ja-JP: 接続スレッド数
      - field: threads_cached
        type: 0
        i18n:
          zh-CN: 缓存线程数
          en-US: CThreads Cached
-          ja-JP: キャッシュスレッド数
      - field: threads_running
        type: 0
        i18n:
          zh-CN: 运行线程数
          en-US: Threads Running
-          ja-JP: 活動中のスレッド数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -867,28 +792,24 @@ metrics:
  - name: tmp
    priority: 8
    i18n:
-      zh-CN: 临时表信息
+      zh-CN: 临时表 信息
      en-US: TMP Info
-      ja-JP: 一時テーブル情報
    fields:
      - field: created_tmp_tables
        type: 0
        i18n:
          zh-CN: 创建的临时表数量
          en-US: Created TMP Tables
-          ja-JP: 一時テーブルの作成数
      - field: created_tmp_disk_tables
        type: 0
        i18n:
          zh-CN: 创建的临时磁盘表数量
          en-US: Created TMP Disk Tables
-          ja-JP: 一時ディスクテーブルの作成数
      - field: created_tmp_files
        type: 0
        i18n:
          zh-CN: 创建的临时文件数量
          en-US: Created TMP Files
-          ja-JP: 一時ファイルの作成数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -915,40 +836,34 @@ metrics:
  - name: select_type
    priority: 9
    i18n:
-      zh-CN: 查询类型信息
+      zh-CN: 查询类型 信息
      en-US: Select Type Info
-      ja-JP: 検索タイプ情報
    fields:
      - field: select_full_join
        type: 0
        i18n:
          zh-CN: 全表连接数
          en-US: Select Full Join
-          ja-JP: 全件結合数
      - field: select_full_range_join
        type: 0
        i18n:
          zh-CN: 带范围的全表连接数
          en-US: Select Full Range Join
-          ja-JP: 範囲検索付きの全件結合数
      - field: select_range
        type: 0
        i18n:
          zh-CN: 索引范围查询数
          en-US: Select Range
-          ja-JP: 範囲検索数
      - field: select_range_check
        type: 0
        i18n:
          zh-CN: 索引范围内二次检查数
          en-US: Select Range Check
-          ja-JP: 範囲内の二次検索数
      - field: select_scan
        type: 0
        i18n:
          zh-CN: 全表扫描查询数
          en-US: Select Scan
-          ja-JP: テーブル全体をスキャンする回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -975,34 +890,29 @@ metrics:
  - name: sort
    priority: 10
    i18n:
-      zh-CN: 排序信息
+      zh-CN: 排序 信息
      en-US: Sort Info
-      ja-JP: ソート情報
    fields:
      - field: sort_rows
        type: 0
        i18n:
          zh-CN: 排序总行数
          en-US: Sort Rows
-          ja-JP: ソートの合計行数
      - field: sort_range
        type: 0
        i18n:
          zh-CN: 范围条件排序次数
          en-US: Sort Range
-          ja-JP: 範囲付きのソート回数
      - field: sort_merge_passes
        type: 0
        i18n:
          zh-CN: 合并排序段次数
          en-US: Sort Merge Passes
-          ja-JP: マージソート回数
      - field: sort_scan
        type: 0
        i18n:
          zh-CN: 全表扫描排序次数
          en-US: Sort Scan
-          ja-JP: テーブル全体をスキャンしてソートする回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -1029,22 +939,19 @@ metrics:
  - name: table_lock
    priority: 11
    i18n:
-      zh-CN: 表级锁信息
+      zh-CN: 表级锁 信息
      en-US: Table Lock Info
-      ja-JP: テーブルロック情報
    fields:
      - field: table_locks_immediate
        type: 0
        i18n:
          zh-CN: 立即获得表锁次数
          en-US: Table Locks Immediate
-          ja-JP: テーブルロックの即時取得回数
      - field: table_locks_waited
        type: 0
        i18n:
          zh-CN: 须等待获取表锁次数
          en-US: Table Locks Waited
-          ja-JP: テーブルロック取得待ち回数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -1071,9 +978,8 @@ metrics:
  - name: process_state
    priority: 12
    i18n:
-      zh-CN: 进程状态信息
+      zh-CN: 进程状态 信息
      en-US: Process State Info
-      ja-JP: プロセス状態情報
    fields:
      - field: state
        type: 1
@@ -1081,13 +987,11 @@ metrics:
        i18n:
          zh-CN: 进程状态
          en-US: State
-          ja-JP: プロセス状態
      - field: num
        type: 0
        i18n:
          zh-CN: 该状态进程数量
          en-US: Num
-          ja-JP: プロセス総数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -1114,9 +1018,8 @@ metrics:
  - name: slow_sql
    priority: 13
    i18n:
-      zh-CN: 慢查询信息
+      zh-CN: 慢查询 信息
      en-US: Slow Sql Info
-      ja-JP: スローSQL情報
    fields:
      - field: id
        type: 1
@@ -1124,31 +1027,26 @@ metrics:
        i18n:
          zh-CN: ID
          en-US: ID
-          ja-JP: ID
      - field: sql_text
        type: 1
        i18n:
          zh-CN: SQL 文本
          en-US: SQL Text
-          ja-JP: SQL文のテキスト
      - field: start_time
        type: 1
        i18n:
          zh-CN: 开始时间
          en-US: Start Time
-          ja-JP: 開始時間
      - field: db
        type: 1
        i18n:
          zh-CN: 数据库
          en-US: Database
-          ja-JP: データベース
      - field: query_time
        type: 3
        i18n:
          zh-CN: 查询时间
          en-US: Query Time
-          ja-JP: クエリー時間
    aliasFields:
      - sql_text
      - start_time
@@ -21,13 +21,11 @@ app: nacos
 name:
  zh-CN: Nacos分布式
  en-US: Nacos Server
-  ja-JP: Nacosサーバー
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat 通过调用 <a href="https://nacos.io/zh-cn/docs/monitor-guide.html">Nacos Metrics 接口</a> 对 Nacos 注册配置中心服务的通用指标进行采集监控。<br>注意⚠️：需要您提前 <a href="https://nacos.io/zh-cn/docs/monitor-guide.html">开启暴露 Nacos Metrics 数据</a>，支持 Nacos 版本0.8+，您可以点击 “<i>新建 Nacos</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: Hertzbeat monitors metrics of the Nacos Server by calling the <a href="https://nacos.io/en-us/docs/monitor-guide.html">Nacos Metrics Api</a>. <br>Note⚠️:You need to <a href="https://nacos.io/en-us/docs/monitor-guide.html">enable exposure of Nacos Metrics data</a> in advance, support Nacos version 0.8+ , you can click "<i>New Nacos</i>" and configure it, or select "<i>More Action</i>" to import the existing configuration.
  zh-TW: Hertzbeat 通過調用 <a href="https://nacos.io/zh-cn/docs/monitor-guide.html">Nacos Metrics 接口</a> 對 Nacos 注冊配置中心服務的通用指標進行采集監控。<br>注意⚠️：需要您提前 <a href="https://nacos.io/zh-cn/docs/monitor-guide.html">開啓暴露 Nacos Metrics 數據</a>，支持 Nacos 版本0.8+，您可以點擊 “<i>新建 Nacos</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeatは、<a href="https://nacos.io/zh-cn/docs/monitor-guide.html">Nacos Metricsインタフェース</a>は、Nacosレジストレーション構成センターサービスの共通指標を収集監視します。<br/>注意⚠️：事前に<a href="https://nacos.io/zh-cn/docs/monitor-guide.html「＞Nacos Metricsデータの暴露をオンにし、Nacosバージョン0.8+をサポートします。「<i>新規Nacos</i>」をクリックして構成するか、「<i>その他の操作</i>」を選択して既存の構成をインポートできます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/nacos
  en-US: https://hertzbeat.apache.org/docs/help/nacos
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    name:
      zh-CN: Nacos服务端口
      en-US: Nacos Port
-      ja-JP: Nacosポート
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -66,7 +62,6 @@ metrics:
    i18n:
      zh-CN: CPU 使用率
      en-US: CPU Usage
-      ja-JP: CPU 使用率
    # 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
@@ -77,7 +72,6 @@ metrics:
        i18n:
          zh-CN: 使用率
          en-US: Usage
-          ja-JP: 使用率
    aliasFields:
      - value
    calculates:
@@ -100,7 +94,6 @@ metrics:
    i18n:
      zh-CN: JVM 内存使用
      en-US: JVM Memory Used
-      ja-JP: Java仮想マシンのメモリ使用量
    priority: 1
    fields:
      - field: area
@@ -108,21 +101,18 @@ metrics:
        i18n:
          zh-CN: 区域
          en-US: Area
-          ja-JP: エリア
      - field: id
        type: 1
        label: true
        i18n:
          zh-CN: ID
          en-US: ID
-          ja-JP: ID
      - field: value
        type: 0
        unit: MB
        i18n:
          zh-CN: 大小
          en-US: Size
-          ja-JP: サイズ
    units:
      - value=B->MB
    # The protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
@@ -143,7 +133,6 @@ metrics:
    i18n:
      zh-CN: Nacos 详情
      en-US: Nacos Monitor
-      ja-JP: Nacos 詳細情報
    priority: 2
    fields:
      - field: module
@@ -151,19 +140,16 @@ metrics:
        i18n:
          zh-CN: 模块
          en-US: Module
-          ja-JP: モジュール
      - field: name
        type: 1
        i18n:
          zh-CN: 指标名称
          en-US: Metric Name
-          ja-JP: メトリクス名
      - field: value
        type: 0
        i18n:
          zh-CN: 大小
          en-US: Value
-          ja-JP: サイズ
    # The protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: http
    # The config content when protocol is http
@@ -21,7 +21,6 @@ app: nacos_sd
 name:
  zh-CN: Nacos 服务发现
  en-US: Nacos Service Discovery
-  ja-JP: Nacos サービスディスカバリー
 # Input params define for app api(render web ui by the definition)
 params:
  # field-param field key
@@ -30,7 +29,6 @@ params:
    name:
      zh-CN: Nacos 服务发现 Host
      en-US: Nacos Service Discovery Host
-      ja-JP: ホスト
    # type-param field type(most mapping the html input type)
    type: text
    # required-true or false
@@ -39,16 +37,32 @@ params:
    name:
      zh-CN: Nacos 服务发现 Port
      en-US: Nacos Service Discovery Port
-      ja-JP: ポート
    type: number
    required: true
+#  - field: __nacos_namespace__
+#    name:
+#      zh-CN: Nacos 命名空间
+#      en-US: Nacos Namespace
+#    type: text
+#    required: false
+#  - field: __nacos_username__
+#    name:
+#      zh-CN: Nacos 用户名
+#      en-US: Nacos Username
+#    type: text
+#    required: false
+#  - field: __nacos_password__
+#    name:
+#      zh-CN: Nacos 密码
+#      en-US: Nacos Password
+#    type: password
+#    required: false

 metrics:
  - name: target
    i18n:
      zh-CN: 监控目标
      en-US: Monitor Target
-      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 +74,17 @@ metrics:
        i18n:
          zh-CN: Host
          en-US: Host
-          ja-JP: ホスト
      - field: port
        type: 1
        i18n:
          zh-CN: Port
          en-US: Port
-          ja-JP: ポート
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: nacos_sd
    # the config content when protocol is nacos_sd
    nacos_sd:
      host: ^_^__nacos_sd_host__^_^
-      port: ^_^__nacos_sd_port__^_^
+      port: ^_^__nacos_sd_port__^_^
+#      namespace: ^_^__nacos_namespace__^_^
+#      username: ^_^__nacos_username__^_^
+#      password: ^_^__nacos_password__^_^
@@ -21,13 +21,11 @@ app: nebula_graph
 name:
  zh-CN: NebulaGraph
  en-US: NebulaGraph
-  ja-JP: NebulaGraph
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat 将调用NebulaGraph提供的 HTTP API 监控接口，对nebulaGraph及存储数据的rocksdb的指标进行监测。
  en-US: Hertzbeat will call the HTTP API monitoring interface provided by NebulaGraph to monitor the indicators of NebulaGraph and the Rocksdb that stores data.
  zh-TW: Hertzbeat將調用NebulaGraph提供的HTTP API監控介面，對nebulaGraph及存儲數據的rocksdb的名額進行監測。
-  ja-JP: Hertzbeatは、NebulaGraphが提供されたHTTP APIを呼び出してnebulaGraphとrocksdbのメトリクスを監視します。
 # The description and help of this monitoring type
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/nebulaGraph
@@ -40,7 +38,6 @@ 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
@@ -51,7 +48,6 @@ params:
    name:
      zh-CN: graph端口
      en-US: graphPort
-      ja-JP: graphポート
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -65,7 +61,6 @@ params:
    name:
      zh-CN: graph指标统计的时间范围(s)
      en-US: graph indicator statistics time range (s)
-      ja-JP: graph統計情報の時間範囲(s)
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -79,7 +74,6 @@ params:
    name:
      zh-CN: storage端口
      en-US: storagePort
-      ja-JP: ストレージポート
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -94,7 +88,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -112,7 +105,6 @@ metrics:
    i18n:
      zh-CN: nebulaGraph 统计信息
      en-US: nebulaGraph stats
-      ja-JP: nebulaGraph統計情報
    # 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
@@ -123,337 +115,282 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: num_queries_hit_memory_watermark_rate
        type: 0
        i18n:
          zh-CN: 达到内存水位线的语句的数量(rate)
          en-US: num_queries_hit_memory_watermark.rate
-          ja-JP: メモリーウォーターマークに達したクエリ数(rate)
      - field: num_queries_hit_memory_watermark_sum
        type: 0
        i18n:
          zh-CN: 达到内存水位线的语句的数量(sum)
          en-US: num_queries_hit_memory_watermark.sum
-          ja-JP: メモリーウォーターマークに達したクエリ数(sum)
      - field: num_reclaimed_expired_sessions_rate
        type: 0
        i18n:
          zh-CN: 服务端主动回收的过期的会话数量(rate)
          en-US: num_reclaimed_expired_sessions.rate
-          ja-JP: 期限切れセッションのリサイクル数(rate)
      - field: num_reclaimed_expired_sessions_sum
        type: 0
        i18n:
          zh-CN: 服务端主动回收的过期的会话数量(sum)
          en-US: num_reclaimed_expired_sessions.sum
-          ja-JP: 期限切れセッションのリサイクル数(sum)
      - field: slow_query_latency_us_avg
        type: 0
        i18n:
          zh-CN: 慢查询延迟时间(avg)
          en-US: slow_query_latency_us.avg
-          ja-JP: スロークエリーの平均レイテンシー
      - field: slow_query_latency_us_p75
        type: 0
        i18n:
          zh-CN: 慢查询延迟时间(p75)
          en-US: slow_query_latency_us.p75
-          ja-JP: スロークエリーのレイテンシー(p75)
      - field: slow_query_latency_us_p95
        type: 0
        i18n:
          zh-CN: 慢查询延迟时间(p95)
          en-US: slow_query_latency_us.p95
-          ja-JP: スロークエリーのレイテンシー(p95)
      - field: slow_query_latency_us_p99
        type: 0
        i18n:
          zh-CN: 慢查询延迟时间(p99)
          en-US: slow_query_latency_us.p99
-          ja-JP: スロークエリーのレイテンシー(p99)
      - field: slow_query_latency_us_p999
        type: 0
        i18n:
          zh-CN: 慢查询延迟时间(p999)
          en-US: slow_query_latency_us.p999
-          ja-JP: スロークエリーのレイテンシー(p999)
      - field: query_latency_us_avg
        type: 0
        i18n:
          zh-CN: 查询延迟时间(avg)
          en-US: query_latency_us.avg
-          ja-JP: クエリーの平均レイテンシー
      - field: query_latency_us_p75
        type: 0
        i18n:
          zh-CN: 查询延迟时间(p75)
          en-US: query_latency_us.p75
-          ja-JP: クエリーのレイテンシー(p75)
      - field: query_latency_us_p95
        type: 0
        i18n:
          zh-CN: 查询延迟时间(p95)
          en-US: query_latency_us.p95
-          ja-JP: クエリーのレイテンシー(p95)
      - field: query_latency_us_p99
        type: 0
        i18n:
          zh-CN: 查询延迟时间(p99)
          en-US: query_latency_us.p99
-          ja-JP: クエリーのレイテンシー(p99)
      - field: query_latency_us_p999
        type: 0
        i18n:
          zh-CN: 查询延迟时间(p999)
          en-US: query_latency_us_p999
-          ja-JP: クエリーのレイテンシー(p999)
      - field: num_auth_failed_sessions_bad_username_password_rate
        type: 0
        i18n:
          zh-CN: 因用户名密码错误导验证失败的会话数量(rate)
          en-US: num_auth_failed_sessions_bad_username_password.rate
-          ja-JP: ユーザー名とパスワードのエラーにより認証に失敗したセッション数(rate)
      - field: num_auth_failed_sessions_bad_username_password_sum
        type: 0
        i18n:
          zh-CN: 因用户名密码错误导验证失败的会话数量(sum)
          en-US: num_auth_failed_sessions_bad_username_password.sum
-          ja-JP: ユーザー名とパスワードのエラーにより認証に失敗したセッション数(sum)
      - field: num_queries_rate
        type: 0
        i18n:
          zh-CN: 查询次数(rate)
          en-US: num_queries.rate
-          ja-JP: クエリ回数(rate)
      - field: num_queries_sum
        type: 0
        i18n:
          zh-CN: 查询次数(sum)
          en-US: num_queries.sum
-          ja-JP: クエリ回数(sum)
      - field: num_sort_executors_rate
        type: 0
        i18n:
          zh-CN: 排序（Sort）算子执行时间(rate)
          en-US: num_sort_executors.rate
-          ja-JP: ソート実行時間(rate)
      - field: num_sort_executors_sum
        type: 0
        i18n:
          zh-CN: 排序（Sort）算子执行时间(sum)
          en-US: num_sort_executors.sum
-          ja-JP: ソート実行時間(sum)
      - field: num_rpc_sent_to_storaged_failed_rate
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Storaged 服务的 RPC 请求失败的数量(rate)
          en-US: num_rpc_sent_to_storaged_failed.rate
-          ja-JP: GraphdサービスからStoragedサービスへのRPCリクエスト失敗数(rate)
      - field: num_rpc_sent_to_storaged_failed_sum
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Storaged 服务的 RPC 请求失败的数量(sum)
          en-US: num_rpc_sent_to_storaged_failed.sum
-          ja-JP: GraphdサービスからStoragedサービスへのRPCリクエスト失敗数(sum)
      - field: num_auth_failed_sessions_rate
        type: 0
        i18n:
          zh-CN: 登录验证失败的会话数量(rate)
          en-US: num_auth_failed_sessions.rate
-          ja-JP: 権限認証に失敗したセッション数(rate)
      - field: num_auth_failed_sessions_sum
        type: 0
        i18n:
          zh-CN: 登录验证失败的会话数量(sum)
          en-US: num_auth_failed_sessions.sum
-          ja-JP: 権限認証に失敗したセッション数(sum)
      - field: num_query_errors_rate
        type: 0
        i18n:
          zh-CN: 查询报错语句数量(rate)
          en-US: num_query_errors_rate
-          ja-JP: クエリエラー数(rate)
      - field: num_query_errors_sum
        type: 0
        i18n:
          zh-CN: 查询报错语句数量(sum)
          en-US: num_query_errors.sum
-          ja-JP: クエリエラー数(sum)
      - field: num_killed_queries_rate
        type: 0
        i18n:
          zh-CN: 被终止的查询数量(rate)
          en-US: num_killed_queries.rate
-          ja-JP: 終了したクエリ数(rate)
      - field: num_killed_queries_sum
        type: 0
        i18n:
          zh-CN: 被终止的查询数量(sum)
          en-US: num_killed_queries.sum
-          ja-JP: 終了したクエリ数(sum)
      - field: num_query_errors_leader_changes_rate
        type: 0
        i18n:
          zh-CN: 因查询错误而导致的 Leader 变更的次数(rate)
          en-US: num_query_errors_leader_changes.rate
-          ja-JP: クエリーエラーによるリーダーの変更数(rate)
      - field: num_query_errors_leader_changes_sum
        type: 0
        i18n:
          zh-CN: 因查询错误而导致的 Leader 变更的次数(sum)
          en-US: num_query_errors_leader_changes.sum
-          ja-JP: クエリーエラーによるリーダーの変更数(sum)
      - field: num_rpc_sent_to_metad_rate
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Metad 服务的 RPC 请求数量(rate)
          en-US: num_rpc_sent_to_metad.rate
-          ja-JP: GraphdサービスがMetadサービスへのRPCリクエスト数(rate)
      - field: num_rpc_sent_to_metad_sum
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Metad 服务的 RPC 请求数量(sum)
          en-US: num_rpc_sent_to_metad.sum
-          ja-JP: GraphdサービスがMetadサービスへのRPCリクエスト数(sum)
      - field: num_slow_queries_rate
        type: 0
        i18n:
          zh-CN: 慢查询次数(rate)
          en-US: num_slow_queries.rate
-          ja-JP: スロークエリ回数(rate)
      - field: num_slow_queries_sum
        type: 0
        i18n:
          zh-CN: 慢查询次数(sum)
          en-US: num_slow_queries.sum
-          ja-JP: スロークエリ回数(sum)
      - field: num_active_sessions_sum
        type: 0
        i18n:
-          zh-CN: 活跃的会话数的变化数(rate)
-          en-US: num_active_sessions.rate
-          ja-JP: アクティブなセッション数(rate)
+          zh-CN: 活跃的会话数的变化数(sum)
+          en-US: num_active_sessions.sum
      - field: num_active_queries_sum
        type: 0
        i18n:
          zh-CN: 活跃的查询语句数的变化数(sum)
          en-US: num_active_queries.sum
-          ja-JP: アクティブなセッション数(sum)
      - field: num_sentences_rate
        type: 0
        i18n:
          zh-CN: Graphd 服务接收的语句数(rate)
          en-US: num_sentences.rate
-          ja-JP: 文数(rate)
      - field: num_sentences_sum
        type: 0
        i18n:
          zh-CN: Graphd 服务接收的语句数(sum)
          en-US: num_sentences.sum
-          ja-JP: 文数(sum)
      - field: num_aggregate_executors_rate
        type: 0
        i18n:
          zh-CN: 聚合（Aggregate）算子执行时间(rate)
          en-US: num_aggregate_executors.rate
-          ja-JP: アグリゲート実行時間(rate)
      - field: num_aggregate_executors_sum
        type: 0
        i18n:
          zh-CN: 聚合（Aggregate）算子执行时间(sum)
          en-US: num_aggregate_executors.sum
-          ja-JP: アグリゲート実行時間(sum)
      - field: optimizer_latency_us_avg
        type: 0
        i18n:
          zh-CN: 优化器阶段延迟时间(avg)
          en-US: optimizer_latency_us.avg
-          ja-JP: オプティマイザの平均レイテンシー
      - field: optimizer_latency_us_p75
        type: 0
        i18n:
          zh-CN: 优化器阶段延迟时间(p75)
          en-US: optimizer_latency_us.p75
-          ja-JP: オプティマイザのレイテンシー(p75)
      - field: optimizer_latency_us_p95
        type: 0
        i18n:
          zh-CN: 优化器阶段延迟时间(p95)
          en-US: optimizer_latency_us.p95
-          ja-JP: オプティマイザのレイテンシー(p95)
      - field: optimizer_latency_us_p99
        type: 0
        i18n:
          zh-CN: 优化器阶段延迟时间(p99)
          en-US: optimizer_latency_us.p99
-          ja-JP: オプティマイザのレイテンシー(p99)
      - field: optimizer_latency_us_p999
        type: 0
        i18n:
          zh-CN: 优化器阶段延迟时间(p999)
          en-US: optimizer_latency_us.p999
-          ja-JP: オプティマイザのレイテンシー(p999)
      - field: num_rpc_sent_to_metad_failed_rate
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Metad 的 RPC 请求失败的数量(rate)
          en-US: num_rpc_sent_to_metad_failed.rate
-          ja-JP: GraphdサービスがMetadサービスへのRPCリクエスト失敗数(rate)
      - field: num_rpc_sent_to_metad_failed_sum
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Metad 的 RPC 请求失败的数量(sum)
          en-US: num_rpc_sent_to_metad_failed.sum
-          ja-JP: GraphdサービスがMetadサービスへのRPCリクエスト失敗数(sum)
      - field: num_indexscan_executors_rate
        type: 0
        i18n:
          zh-CN: 索引扫描（IndexScan）算子执行时间(rate)
          en-US: num_indexscan_executors.rate
-          ja-JP: 索引スキャン実行時間(rate)
      - field: num_indexscan_executors_sum
        type: 0
        i18n:
          zh-CN: 索引扫描（IndexScan）算子执行时间(sum)
          en-US: num_indexscan_executors.sum
-          ja-JP: 索引スキャン実行時間(sum)
      - field: num_opened_sessions_rate
        type: 0
        i18n:
          zh-CN: 服务端建立过的会话数量(rate)
          en-US: num_opened_sessions.rate
-          ja-JP: 開かれたセッション数(rate)
      - field: num_opened_sessions_sum
        type: 0
        i18n:
          zh-CN: 服务端建立过的会话数量(sum)
          en-US: num_opened_sessions.sum
-          ja-JP: 開かれたセッション数(sum)
      - field: num_auth_failed_sessions_out_of_max_allowed_rate
        type: 0
        i18n:
-          zh-CN: 因为超过FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONS参数导致的验证登录失败的会话数量(rate)
+          zh-CN: 因为超过FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONS参数导致的验证登录的失败的会话数量(rate)
          en-US: num_auth_failed_sessions_out_of_max_allowed.rate
-          ja-JP: FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONSが超過したため、認証ログインに失敗したセッション数(rate)
      - field: num_auth_failed_sessions_out_of_max_allowed_sum
        type: 0
        i18n:
-          zh-CN: 因为超过FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONS参数导致的验证登录失败的会话数量(sum)
+          zh-CN: 因为超过FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONS参数导致的验证登录的失败的会话数量(sum)
          en-US: num_auth_failed_sessions_out_of_max_allowed.sum
-          ja-JP: FLAG_OUT_OF_MAX_ALLOWED_CONNECTIONSが超過したため、認証ログインに失敗したセッション数(sum)
      - field: num_rpc_sent_to_storaged_rate
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Storaged 服务的 RPC 请求数量(rate)
          en-US: num_rpc_sent_to_storaged.rate
-          ja-JP: GraphdサービスがStoragedサービスへのRPCリクエスト数(rate)
      - field: num_rpc_sent_to_storaged_sum
        type: 0
        i18n:
          zh-CN: Graphd 服务发给 Storaged 服务的 RPC 请求数量(sum)
          en-US: num_rpc_sent_to_storaged.sum
-          ja-JP: GraphdサービスがStoragedサービスへのRPCリクエスト数(sum)
+    # 指标别名列表，用于在查询结果中识别指标
    aliasFields:
      - responseTime
      - num_queries_hit_memory_watermark.rate
@@ -511,7 +448,7 @@ metrics:
      - num_auth_failed_sessions_out_of_max_allowed.sum
      - num_rpc_sent_to_storaged.rate
      - num_rpc_sent_to_storaged.sum
-      # mapping and conversion expressions, use thesand aliasField above to calculate metrics value# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
+      # mapping and conversion expressions, use thesand aliasField above to calculate metrics value# (可选)指标映射转换计算表达式，与上面的别名一起作用，计算出最终需要的指标值# eg: cores=core1+core2, usage=usage, waitTimeallTime-runningTime
    calculates:
      - responseTime=responseTime
      - num_queries_hit_memory_watermark_rate=num_queries_hit_memory_watermark.rate
@@ -586,7 +523,6 @@ metrics:
    i18n:
      zh-CN: rocksdb 统计数据
      en-US: rocksdb stats
-      ja-JP: rocksdb統計
    # 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
@@ -597,7 +533,6 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: rocksdb.backup.read.bytes
      - field: rocksdb.backup.write.bytes
      - field: rocksdb.blobdb.blob.file.bytes.read
@@ -21,13 +21,11 @@ app: nebula_graph_cluster
 name:
  zh-CN: NebulaGraph集群
  en-US: NebulaGraph Cluster
-  ja-JP: NebulaGraphクラスター
 # The description and help of this monitoring type
 help:
  zh-CN: Hertzbeat通过查询使用NGQL或OpenCypher查询 NebulaGraph 集群的基础信息，节点信息等指标。
  en-US: Hertzbeat uses NGQL or OpenCypher to query the basic information, node information and other metrics of the NebulaGraph cluster.
  zh-TW: Hertzbeat透過查詢使用NGQL或OpenCypher查詢 NebulaGraph 叢集的基礎訊息，節點資訊等指標。
-  ja-JP: Hertzbeatは、NGQLかOpenCypherをクエリしてNebulaGraphクラスターのメトリクスを監視します。
 # The description and help of this monitoring type
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/nebulagraph_cluster
@@ -40,7 +38,6 @@ 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
@@ -51,7 +48,6 @@ params:
    name:
      zh-CN: graph端口
      en-US: graphPort
-      ja-JP: graphポート
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -66,7 +62,6 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    # type-param field type(most mapping the html input type)
    type: text
    # when type is number, range is required
@@ -77,7 +72,6 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    # type-param field type(most mapping the html input type)
    type: password
    # when type is number, range is required
@@ -89,7 +83,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -107,7 +100,6 @@ metrics:
    i18n:
      zh-CN: 基础信息
      en-US: Base info
-      ja-JP: 基礎情報
    priority: 0
    fields:
      - field: responseTime
@@ -116,25 +108,21 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: charset
        type: 1
        i18n:
          zh-CN: 字符集
          en-US: Charset
-          ja-JP: 文字セット
      - field: Collation
        type: 1
        i18n:
          zh-CN: 排序规则
          en-US: collation
-          ja-JP: 照合
      - field: metaLeader
        type: 1
        i18n:
          zh-CN: Meta Leader
          en-US: Meta Leader
-          ja-JP: Metaリーダー

    aliasFields:
      - responseTime
@@ -161,7 +149,6 @@ metrics:
    i18n:
      zh-CN: Session
      en-US: Session
-      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
@@ -171,14 +158,13 @@ metrics:
        i18n:
          zh-CN: Session数量
          en-US: Session
-          ja-JP: セッション数量
      - field: running_query_count
        type: 1
        i18n:
          zh-CN: 正在执行的查询数量
          en-US: Running query
-          ja-JP: 実行中のクエリ数

+    # 指标别名列表，用于在查询结果中识别指标
    aliasFields:
      - session
      - running_query_count
@@ -202,7 +188,6 @@ metrics:
    i18n:
      zh-CN: 后台任务
      en-US: Jobs
-      ja-JP: タスク
    priority: 2
    fields:
      - field: queue_jobs
@@ -210,13 +195,11 @@ metrics:
        i18n:
          zh-CN: 等待中的任务
          en-US: Queue jobs
-          ja-JP: 待機中のタスク数
      - field: running_jobs
        type: 0
        i18n:
          zh-CN: 执行中的任务
          en-US: Running jobs
-          ja-JP: 実行中のタスク数

    aliasFields:
      - queue_jobs
@@ -236,7 +219,6 @@ metrics:
    i18n:
      zh-CN: 节点信息
      en-US: Cluster node info
-      ja-JP: クラスターノード情報
    priority: 3
    fields:
      - field: total_storage_node
@@ -244,39 +226,33 @@ metrics:
        i18n:
          zh-CN: Storage节点
          en-US: Total storage node
-          ja-JP: ストレージノード総数
      - field: offline_storage_node
        type: 0
        i18n:
          zh-CN: 离线Storage节点
          en-US: Offline storage node
-          ja-JP: オフラインのストレージノード

      - field: total_meta_node
        type: 0
        i18n:
          zh-CN: Meta节点
          en-US: Total meta node
-          ja-JP: Metaノード総数
      - field: offline_meta_node
        type: 0
        i18n:
          zh-CN: 离线Meta节点
          en-US: Offline meta node
-          ja-JP: オフラインのMetaノード

      - field: total_graph_node
        type: 0
        i18n:
          zh-CN: Graph节点
          en-US: Total graph node
-          ja-JP: Graphノード総数
      - field: offline_graph_node
        type: 0
        i18n:
          zh-CN: 离线Graph节点
          en-US: Offline graph node
-          ja-JP: オフラインのGraphノード

    aliasFields:
      - total_storage_node
@@ -307,7 +283,6 @@ metrics:
    i18n:
      zh-CN: Storage节点
      en-US: Storage Nodes
-      ja-JP: ストレージノード
    priority: 4
    fields:
      - field: host
@@ -315,43 +290,36 @@ metrics:
        i18n:
          zh-CN: Host
          en-US: Host
-          ja-JP: ホスト
      - field: port
        type: 0
        i18n:
          zh-CN: Port
          en-US: Port
-          ja-JP: ポート
      - field: status
        type: 1
        i18n:
          zh-CN: 状态
          en-US: STATUS
-          ja-JP: ステータス
      - field: leaderCount
        type: 0
        i18n:
          zh-CN: Leader数量
          en-US: Leader Count
-          ja-JP: リーダー数量
      - field: leaderDistribution
        type: 1
        i18n:
          zh-CN: Leader分布
          en-US: Leader Distribution
-          ja-JP: リーダー分布
      - field: partitionDistribution
        type: 1
        i18n:
          zh-CN: Partition分布
          en-US: Partition Distribution
-          ja-JP: パーティション分布
      - field: version
        type: 1
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン

    aliasFields:
      - Host
@@ -384,7 +352,6 @@ metrics:
    i18n:
      zh-CN: Meta节点
      en-US: Meta Nodes
-      ja-JP: Metaノード
    priority: 5
    fields:
      - field: host
@@ -392,25 +359,21 @@ metrics:
        i18n:
          zh-CN: Host
          en-US: Host
-          ja-JP: ホスト
      - field: port
        type: 0
        i18n:
          zh-CN: Port
          en-US: Port
-          ja-JP: ポート
      - field: status
        type: 1
        i18n:
          zh-CN: 状态
          en-US: STATUS
-          ja-JP: ステータス
      - field: version
        type: 1
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン

    aliasFields:
      - Host
@@ -437,7 +400,6 @@ metrics:
    i18n:
      zh-CN: Graph节点
      en-US: Graph Nodes
-      ja-JP: Graphノード
    priority: 6
    fields:
      - field: host
@@ -445,25 +407,21 @@ metrics:
        i18n:
          zh-CN: Host
          en-US: Host
-          ja-JP: ホスト
      - field: port
        type: 0
        i18n:
          zh-CN: Port
          en-US: Port
-          ja-JP: ポート
      - field: status
        type: 1
        i18n:
          zh-CN: 状态
          en-US: STATUS
-          ja-JP: ステータス
      - field: version
        type: 1
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン

    aliasFields:
      - Host
@@ -21,13 +21,11 @@ app: netease_mailbox
 name:
  zh-CN: 网易邮箱监控
  en-US: NetEase Mailbox
-  ja-JP: NetEase電子メール
 # The description and help of this monitoring type
 help:
-  zh-CN: HertzBeat 使用 IMAP 协议对网易邮箱的详细信息进行采集监控。<br>您可以点击“<i>新建 网易邮箱</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
-  en-US: HertzBeat uses IMAP protocol to collect detailed metrics of NetEase mailbox. <br>You can click "<i>New NetEase Mailbox</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
-  zh-TW: HertzBeat 使用 IMAP 協議對網易郵箱的詳細信息進行採集監控。<br>您可以點擊“<i>新建 网易邮箱</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: HertzBeat は IMAP プロトコルを介してNetEase電子メールの詳細情報を監視します。<br>「<i>新規 NetEase電子メール</i>」をクリックしてパラメタを設定した後、新規することができます。
+  zh-CN: HertzBeat 使用 IMAP 协议对网易邮箱的详细信息进行采集监控。<br>您可以点击“<i>新建 POP3</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
+  en-US: HertzBeat uses IMAP protocol to collect detailed metrics of NetEase mailbox. <br>You can click "<i>New POP3</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
+  zh-TW: HertzBeat 使用 IMAP 協議對網易郵箱的詳細信息進行採集監控。<br>您可以點擊“<i>新建 POP3</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/imap
  en-US: https://hertzbeat.apache.org/docs/help/imap
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    name:
      zh-CN: 启动SSL
      en-US: SSL
-      ja-JP: SSL
    # When the type is boolean, the frontend will display a switch for it.
    type: boolean
    # required-true or false
@@ -60,7 +56,6 @@ params:
    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
@@ -73,7 +68,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -87,8 +81,7 @@ params:
    # name-param field display i18n name
    name:
      zh-CN: IMAP 邮箱地址
-      en-US: IMAP Address
-      ja-JP: IMAPアドレス
+      en-US: Email
    # type-param field type(most mapping the html input type) The type "text" belongs to a text input field.
    type: text
    # required-true or false
@@ -99,7 +92,6 @@ params:
    name:
      zh-CN: 授权码
      en-US: Authorize Code
-      ja-JP: 認証コード
    # type-param field type(most mapping the html input type) The type "text" belongs to a text input field.
    type: text
    # required-true or false
@@ -112,7 +104,6 @@ metrics:
    i18n:
      zh-CN: 可用性
      en-US: Available
-      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
@@ -125,7 +116,6 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: imap
    # Specific collection configuration when protocol is http protocol
@@ -149,7 +139,6 @@ metrics:
    i18n:
      zh-CN: 收件箱信息
      en-US: Inbox 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: 1
@@ -161,19 +150,16 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          ja-JP: メッセージ総数
      - field: recentMessageCount
        type: 0
        i18n:
          zh-CN: 最近收到邮件总数
          en-US: Recent message count
-          ja-JP: 最新メッセージ総数
      - field: unseenMessageCount
        type: 0
        i18n:
          zh-CN: 未读邮件总数
-          en-US: Unread message count
-          ja-JP: 未読メッセージ総数
+          en-US: Unseen message count
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - INBOXTotalMessageCount
@@ -207,7 +193,6 @@ metrics:
    i18n:
      zh-CN: 已发送信息
      en-US: Sent 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: 1
@@ -219,7 +204,6 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          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:
      - 已发送TotalMessageCount
@@ -249,7 +233,6 @@ metrics:
    i18n:
      zh-CN: 草稿箱信息
      en-US: Drafts 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: 1
@@ -261,7 +244,6 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          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:
      - 草稿箱TotalMessageCount
@@ -291,7 +273,6 @@ metrics:
    i18n:
      zh-CN: 已删除信息
      en-US: Deleted Messages 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: 1
@@ -303,7 +284,6 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          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:
      - 已删除TotalMessageCount
@@ -333,7 +313,6 @@ metrics:
    i18n:
      zh-CN: 垃圾箱信息
      en-US: Junk 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: 1
@@ -345,19 +324,16 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          ja-JP: 迷惑メッセージ総数
      - field: recentMessageCount
        type: 0
        i18n:
          zh-CN: 最近收到邮件总数
          en-US: Recent message count
-          ja-JP: 最新の迷惑メッセージ総数
      - field: unseenMessageCount
        type: 0
        i18n:
          zh-CN: 未读邮件总数
-          en-US: Unread message count
-          ja-JP: 未読の迷惑メッセージ総数
+          en-US: Unseen message count
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - 垃圾邮件TotalMessageCount
@@ -391,7 +367,6 @@ metrics:
    i18n:
      zh-CN: 病毒邮件信息
      en-US: Virus 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: 1
@@ -403,19 +378,16 @@ metrics:
        i18n:
          zh-CN: 邮件总数
          en-US: Total message count
-          ja-JP: ウイルスメッセージ総数
      - field: recentMessageCount
        type: 0
        i18n:
          zh-CN: 最近收到邮件总数
          en-US: Recent message count
-          ja-JP: 最新のウイルスメッセージ総数
      - field: unseenMessageCount
        type: 0
        i18n:
          zh-CN: 未读邮件总数
-          en-US: Unread message count
-          ja-JP: 未読のウイルスメッセージ総数
+          en-US: Unseen message count
    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
    aliasFields:
      - 病毒邮件TotalMessageCount
@@ -21,13 +21,11 @@ app: nginx
 name:
  zh-CN: Nginx服务器
  en-US: Nginx Server
-  ja-JP: Nginxサーバー
 # The description and help of this monitoring type
 help:
  zh-CN: HertzBeat 使用 <a class='help_module_content' href='https://www.tecmint.com/enable-nginx-status-page/'> Nginx </a> 通过配置 ngx_http_stub_status_module 对 nginx 的通用性能指标(nginx_status、req_status等)进行采集监控。<br>您可以点击“<i>新建 nginx</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses <a class='help_module_content' href='https://www.tecmint.com/enable-nginx-status-page/'> Nginx </a> to configure ngx_http_stub_status_module for collecting general metrics of Nginx (nginx_status, req_status.). <br>You can click "<i>New Nginx</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://www.tecmint.com/enable-nginx-status-page/'> Nginx </a> 通過配置 ngx_http_stub_status_module 對 Nginx 數據庫的通用性能指標(nginx信息、请求信息等)進行采集監控。<br>您可以點擊“<i>新建 Nginx</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: HertzBeat は、<a class='help_module_content' href='https://www.tecmint.com/enable-nginx-status-page/'>Nginx</a> の ngx_http_stub_status_module を設定することで、nginx_status や req_status などの一般的なパフォーマンス指標を収集・監視します。<br>「<i>新規 nginx 作成</i>」をクリックして設定を行うか、「<i>その他の操作</i>」から既存の設定をインポートすることができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/nginx
  en-US: https://hertzbeat.apache.org/docs/help/nginx
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    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
@@ -65,7 +61,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -80,7 +75,6 @@ params:
    name:
      zh-CN: 启动SSL
      en-US: SSL
-      ja-JP: SSL利用
    # When the type is boolean, the frontend will display a switch for it.
    type: boolean
    # required-true or false
@@ -93,7 +87,6 @@ metrics:
    i18n:
      zh-CN: 可用性
      en-US: Available
-      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
@@ -106,7 +99,6 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: nginx
    # Specific collection configuration when protocol is http protocol
@@ -124,7 +116,6 @@ metrics:
    i18n:
      zh-CN: Nginx 状态信息
      en-US: Nginx Status
-      ja-JP: Nginx 状態情報
    # 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
@@ -134,49 +125,41 @@ metrics:
        i18n:
          zh-CN: 接受连接数
          en-US: Accepts
-          ja-JP: 受けたクライアント接続の総数
      - field: handled
        type: 0
        i18n:
          zh-CN: 成功处理连接数
          en-US: Handled
-          ja-JP: 処理された接続の総数
      - field: active
        type: 0
        i18n:
          zh-CN: 当前活跃连接数
          en-US: Active
-          ja-JP: 現在アクティブなクライアント接続数
      - field: dropped
        type: 0
        i18n:
          zh-CN: 已丢弃连接数
          en-US: Dropped
-          ja-JP: 中断したクライアント接続数
      - field: requests
        type: 0
        i18n:
          zh-CN: 客户端请求数
          en-US: Requests
-          ja-JP: クライアントリクエストの総数
      - field: reading
        type: 0
        i18n:
          zh-CN: 正在执行读操作的连接数
          en-US: Reading
-          ja-JP: 読み込み中の接続数
      - field: writing
        type: 0
        i18n:
          zh-CN: 正在执行写操作的连接数
          en-US: Writing
-          ja-JP: 書き込み中の接続数
      - field: waiting
        type: 0
        i18n:
          zh-CN: 正在等待的连接数
          en-US: Waiting
-          ja-JP: 待機中の接続数
    # Alias field list, used to identify metrics in the query result
    aliasFields:
      - accepts
@@ -209,7 +192,6 @@ metrics:
    i18n:
      zh-CN: 请求详细信息
      en-US: Req Status
-      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
@@ -219,52 +201,44 @@ metrics:
        i18n:
          zh-CN: 分组类别
          en-US: Zone Name
-          ja-JP: ゾーン名
      - field: key
        type: 1
        i18n:
          zh-CN: 分组名称
          en-US: Key
-          ja-JP: グループの識別名
      - field: max_active
        type: 0
        i18n:
          zh-CN: 最大并发连接数
          en-US: Max Active
-          ja-JP: 最大の同時実行の接続数
      - field: max_bw
        type: 0
        unit: KB
        i18n:
          zh-CN: 最大带宽
          en-US: Max BW
-          ja-JP: 最大帯域幅
      - field: traffic
        type: 0
        unit: KB
        i18n:
          zh-CN: 总流量
          en-US: Traffic
-          ja-JP: 通信量
      - field: requests
        type: 0
        i18n:
          zh-CN: 总请求数
          en-US: Requests
-          ja-JP: 累積したリクエストの合計
      - field: active
        type: 0
        i18n:
          zh-CN: 当前并发连接数
          en-US: Active
-          ja-JP: 現在のアクティブな同時実行接続数
      - field: bandwidth
        type: 0
        unit: KB
        i18n:
          zh-CN: 当前带宽
          en-US: Bandwidth
-          ja-JP: 現在の帯域幅
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: nginx
    # the config content when protocol is http
@@ -21,13 +21,11 @@ app: ntp
 name:
  zh-CN: NTP服务器
  en-US: NTP Server
-  ja-JP: NTPサーバー
 # The description and help of this monitoring type
 help:
-  zh-CN: HertzBeat 对 NTP 服务的(响应时间、时间戳、时间、偏移量、延迟、版本号、模式、层级、参考ID、精度)相关指标进行监测。<br>您可以点击 “<i>新建 NTP服务器</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
-  en-US: HertzBeat monitors the relevant metrics of NTP services, including response time, timestamp, time, offset, delay, version number, mode, hierarchy, reference ID, and accuracy. <br>You can click "<i>New NTP Server</i>" and configure it, or select "<i>More Action</i>" to import the existing configuration.
-  zh-TW: HertzBeat 對 NTP 服務的(響應時間、時間戳、時間、偏移量、延遲、版本號、模式、層級、參考ID、精度)相關指標進行監測。<br>您可以點擊 “<i>新建 NTP服務器</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は NTPサーバーの一般的なメトリクスを監視します。<br>「<i>新規 NTPサーバー</i>」をクリックしてパラメタを設定した後、新規することができます。
+  zh-CN: HertzBeat 对 NTP 服务的(响应时间、时间戳、时间、偏移量、延迟、版本号、模式、层级、参考ID、精度)相关指标进行监测。<br>您可以点击 “<i>新建 NTP</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
+  en-US: HertzBeat monitors the relevant metrics of NTP services, including response time, timestamp, time, offset, delay, version number, mode, hierarchy, reference ID, and accuracy. <br>You can click "<i>New NTP</i>" and configure it, or select "<i>More Action</i>" to import the existing configuration.
+  zh-TW: HertzBeat 對 NTP 服務的(響應時間、時間戳、時間、偏移量、延遲、版本號、模式、層級、參考ID、精度)相關指標進行監測。<br>您可以點擊 “<i>新建 NTP</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
 # Input params define for monitoring(render web ui by the definition)
 params:
  # field-param field key
@@ -36,7 +34,6 @@ params:
    name:
      zh-CN: NTP服务Host
      en-US: NTP Host
-      ja-JP: NTPホスト
    # type-param field type(most mapping the html input type)
    type: host
    # required-true or false
@@ -47,7 +44,6 @@ params:
    name:
      zh-CN: 连接超时时间(ms)
      en-US: Connect Timeout(ms)
-      ja-JP: 接続タイムアウト（ｍｓ）
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -63,7 +59,6 @@ metrics:
    i18n:
      zh-CN: 概要
      en-US: Summary
-      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
@@ -75,64 +70,54 @@ metrics:
        i18n:
          zh-CN: 响应时间
          en-US: Response Time
-          ja-JP: 応答時間
      - field: time
        type: 0
        unit: ms
        i18n:
          zh-CN: 时间戳
          en-US: Timestamp
-          ja-JP: タイムスタンプ
      - field: date
        type: 1
        i18n:
          zh-CN: 时间
          en-US: Date
-          ja-JP: 時間
      - field: offset
        type: 0
        unit: ms
        i18n:
          zh-CN: 偏移量
          en-US: Offset
-          ja-JP: オフセット
      - field: delay
        type: 0
        unit: ms
        i18n:
          zh-CN: 延迟
          en-US: Delay
-          ja-JP: 遅延
      - field: version
        type: 0
        i18n:
          zh-CN: 版本号
          en-US: Version
-          ja-JP: バージョン
      - field: mode
        type: 0
        i18n:
          zh-CN: 模式
          en-US: Mode
-          ja-JP: モード
      - field: stratum
        type: 0
        i18n:
          zh-CN: 层级
          en-US: Stratum
-          ja-JP: 階層
      - field: referenceId
        type: 1
        i18n:
          zh-CN: 参考ID
          en-US: ReferenceId
-          ja-JP: 参照ID
      - field: precision
        type: 0
        i18n:
          zh-CN: 精度
          en-US: Precision
-          ja-JP: 精度

    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: ntp
@@ -21,13 +21,11 @@ app: nvidia
 name:
  zh-CN: NVIDIA
  en-US: NVIDIA
-  ja-JP: NVIDIA
 # 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> 对 NVIDIA GPU显卡的通用性能指标进行采集监控。<br>您可以点击“<i>新建 NVIDIA</i>”并配置HOST端口账户等相关参数进行添加，支持SSH账户密码或密钥认证。或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: Hertzbeat uses the <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'>SSH protocol</a> to collect and monitor general performance metrics of NVIDIA GPUs. <br> You can click " <i>Create NVIDIA</i> " to add and configure parameters such as HOST, port, account, etc., supporting SSH account password or key authentication. Alternatively, you can select " <i>More Actions</i> " to import an existing configuration.
  zh-TW: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'>SSH 協議</a> 對 NVIDIA GPU 顯卡的通用性能指標進行採集監控。<br>您可以點擊“<i>新建 NVIDIA</i>”並配置 HOST、端口、帳戶等相關參數進行添加，支持 SSH 帳戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> NVIDIAの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 NVIDIA</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/nvidia/
  en-US: https://hertzbeat.apache.org/docs/help/nvidia/
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    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
@@ -65,7 +61,6 @@ params:
    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
@@ -73,6 +68,7 @@ params:
    # required-true or false
    required: false
    # default value
+    # 默认值
    defaultValue: 6000
  # field-param field key
  - field: reuseConnection
@@ -80,7 +76,6 @@ params:
    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
@@ -92,7 +87,6 @@ params:
    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
@@ -104,7 +98,6 @@ params:
    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
@@ -117,7 +110,6 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    # type-param field type(most mapping the html input tag)
    type: password
    # required-true or false
@@ -128,7 +120,6 @@ params:
    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-----
@@ -143,7 +134,6 @@ params:
    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
@@ -155,7 +145,6 @@ params:
    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
@@ -172,7 +161,6 @@ params:
    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
@@ -187,7 +175,6 @@ params:
    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
@@ -200,7 +187,6 @@ params:
    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-----
@@ -214,7 +200,6 @@ params:
    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
@@ -226,7 +211,6 @@ params:
    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
@@ -243,7 +227,6 @@ params:
    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
@@ -258,7 +241,6 @@ params:
    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
@@ -271,7 +253,6 @@ params:
    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-----
@@ -286,7 +267,6 @@ metrics:
    i18n:
      zh-CN: 显卡基本信息
      en-US: Basic Information
-      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
@@ -299,55 +279,47 @@ metrics:
        i18n:
          zh-CN: 显卡索引
          en-US: Host Name
-          ja-JP: 番号
      - field: name
        type: 1
        i18n:
          zh-CN: 显卡名称
          en-US: System Version
-          ja-JP: 名前
      - field: utilization.gpu [%]
        type: 0
        unit: '%'
        i18n:
          zh-CN: GPU利用率
          en-US: GPU Utilization
-          ja-JP: GPU使用率
      - field: utilization.memory [%]
        type: 0
        unit: '%'
        i18n:
          zh-CN: 显存利用率
          en-US: Memory Utilization
-          ja-JP: メモリ使用率
      - field: memory.total [MiB]
        type: 1
        unit: 'MiB'
        i18n:
          zh-CN: 总显存
          en-US: Total Memory
-          ja-JP: メモリ容量
      - field: memory.used [MiB]
        type: 0
        unit: 'MiB'
        i18n:
          zh-CN: 已用显存
          en-US: Used Memory
-          ja-JP: 使用したメモリ
      - field: memory.free [MiB]
        type: 0
        unit: 'MiB'
        i18n:
          zh-CN: 空闲显存
          en-US: Free Memory
-          ja-JP: 利用可能メモリ
      - field: temperature.gpu
        type: 1
        unit: '°C'
        i18n:
          zh-CN: 显卡温度
          en-US: GPU Temperature
-          ja-JP: GPU温度
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: ssh
    # the config content when protocol is ssh
@@ -21,13 +21,11 @@ app: oceanbase
 name:
  zh-CN: OceanBase数据库
  en-US: OceanBase DB
-  ja-JP: OceanBaseデータベース
 # 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-jdbc'> JDBC 协议</a> 通过配置 SQL 对 OceanBase 数据库的通用性能指标(系统信息、性能状态、Innodb、缓存、事物、用户线程、慢SQL等)进行采集监控，支持版本为 OceanBase 4.0+。<br>您可以点击“<i>新建 OceanBase 数据库</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
  en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC Protocol</a> to configure SQL for collecting general metrics of OceanBase database (system information, performance status, Innodb, cache, things, user threads, slow SQL, etc.). Supported version is OceanBase 4.0+. <br>You can click "<i>New OceanBase Database</i>" and configure it, or select "<i>More Operations</i>" to import the existing configuration.
  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC 協議</a> 通過配置 SQL 對 OceanBase 數據庫的通用性能指標(系統信息、性能狀態、Innodb、緩存、事物、用戶線程、慢SQL等)進行采集監控，支持版本爲 OceanBase 4.0+。<br>您可以點擊“<i>新建 OceanBase 數據庫</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: HertzBeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jdbc'> JDBC プロトコル</a> を使用して、SQL を設定することで OceanBase データベースの一般的なパフォーマンスのメトリクス（システム情報、パフォーマンス状態、Innodb、キャッシュ、トランザクション、ユーザー スレッド、スロー SQL など）を収集および監視します。対応バージョンは OceanBase 4.0+ です。<br>「<i>新規 OceanBase データベース</i>」をクリックして設定するか、「<i>その他の操作</i>」を選択して既存の設定をインポートすることができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/oceanbase
  en-US: https://hertzbeat.apache.org/docs/help/oceanbase
@@ -39,7 +37,6 @@ 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
@@ -50,7 +47,6 @@ params:
    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
@@ -65,7 +61,6 @@ params:
    name:
      zh-CN: 查询超时时间(ms)
      en-US: Query Timeout(ms)
-      ja-JP: クエリタイムアウト(ms)
    # type-param field type(most mapping the html input type)
    type: number
    # when type is number, range is required
@@ -82,7 +77,6 @@ params:
    name:
      zh-CN: 数据库名称
      en-US: Database Name
-      ja-JP: データベース名
    # type-param field type(most mapping the html input tag)
    type: text
    # required-true or false
@@ -93,7 +87,6 @@ params:
    name:
      zh-CN: 用户名
      en-US: Username
-      ja-JP: ユーザー名
    # type-param field type(most mapping the html input tag)
    type: text
    # when type is text, use limit to limit string length
@@ -106,7 +99,6 @@ params:
    name:
      zh-CN: 密码
      en-US: Password
-      ja-JP: パスワード
    # type-param field type(most mapping the html input tag)
    type: password
    # required-true or false
@@ -117,7 +109,6 @@ params:
    name:
      zh-CN: URL
      en-US: URL
-      ja-JP: URL
    # type-param field type(most mapping the html input tag)
    type: text
    # required-true or false
@@ -135,7 +126,6 @@ metrics:
    i18n:
      zh-CN: 基础 信息
      en-US: Basic Info
-      ja-JP: 基本情報
    # 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
@@ -145,19 +135,16 @@ metrics:
        i18n:
          zh-CN: 版本
          en-US: Version
-          ja-JP: バージョン
      - field: datadir
        type: 1
        i18n:
          zh-CN: 存储目录
          en-US: DataDir
-          ja-JP: データディレクトリ
      - field: max_connections
        type: 0
        i18n:
          zh-CN: 最大连接数
          en-US: Max 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:
      - version
@@ -203,7 +190,6 @@ metrics:
    i18n:
      zh-CN: 租户 信息
      en-US: Tenant Info
-      ja-JP: テナント情報
    # 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
@@ -213,19 +199,16 @@ metrics:
        i18n:
          zh-CN: 租户id
          en-US: TenantId
-          ja-JP: テナントID
      - field: tenant_name
        type: 1
        i18n:
          zh-CN: 租户名称
          en-US: tenantName
-          ja-JP: テナント名
      - field: status
        type: 1
        i18n:
          zh-CN: 状态
          en-US: status
-          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:
      - tenant_id
@@ -261,13 +244,12 @@ metrics:
      sql: select tenant_id, tenant_name, info, status from oceanbase.__all_tenant;
      # JDBC url
      url: ^_^url^_^
-
+      
  - name: sql
    priority: 2
    i18n:
      zh-CN: Sql 信息
      en-US: Sql Info
-      ja-JP: Sql情報
    fields:
      - field: con_id
        type: 1
@@ -275,43 +257,36 @@ metrics:
        i18n:
          zh-CN: 租户id
          en-US: TenantId
-          ja-JP: テナントID
      - field: sql_select_count
        type: 0
        i18n:
          zh-CN: select 语句执行次数
          en-US: sql select count
-          ja-JP: sql select 回数
      - field: sql_insert_count
        type: 0
        i18n:
          zh-CN: insert 语句执行次数
          en-US: sql insert count
-          ja-JP: sql insert 回数
      - field: sql_update_count
        type: 0
        i18n:
          zh-CN: update 语句执行次数
          en-US: sql update count
-          ja-JP: sql update 回数
      - field: sql_delete_count
        type: 0
        i18n:
          zh-CN: delete 语句执行次数
          en-US: sql delete count
-          ja-JP: sql delete 回数
 #      - field: com_commit
 #        type: 0
 #        i18n:
 #          zh-CN: 事务提交次数
 #          en-US: trans commit count
-#          ja-JP: trans commit 回数
 #      - field: com_rollback
 #        type: 0
 #        i18n:
 #          zh-CN: 事务回滚次数
 #          en-US: trans rollback count
-#          ja-JP: trans rollback 回数
    aliasFields:
      - con_id
      - sql_select_count
@@ -360,7 +335,6 @@ metrics:
    i18n:
      zh-CN: 进程状态 信息
      en-US: Process State Info
-      ja-JP: プロセス状態情報
    fields:
      - field: state
        type: 1
@@ -368,13 +342,11 @@ metrics:
        i18n:
          zh-CN: 进程状态
          en-US: State
-          ja-JP: 状態
      - field: num
        type: 0
        i18n:
          zh-CN: 该状态进程数量
          en-US: Num
-          ja-JP: プロセス総数
    protocol: jdbc
    jdbc:
      host: ^_^host^_^
@@ -21,13 +21,11 @@ app: openai
 name:
  zh-CN: OpenAI 监控
  en-US: OpenAI
-  ja-JP: OpenAI
 # The description and help of this monitoring type
 help:
  zh-CN: HertzBeat 将调用 OpenAI API 接口，监测账户、账单、大模型 API 使用情况等数据。会话密钥获取请见使用指南。<br>您可以先点击“新增 OpenAI API”按钮并进行配置，或在“更多操作”中导入已有配置。
  en-US: HertzBeat will call the OpenAI API interface to monitor account, billing, and usage data of LLM API, etc. Please refer to the user guide for session key acquisition.<br>You can click the "Add OpenAI API" button to configure it first, or import existing configurations in the "More Actions" section.
  zh-TW: HertzBeat 將調用 OpenAI API 接口，監測帳戶、帳單、大模型 API 使用情況等數據。請參閱使用指南以獲取會話密鑰。<br>您可以先點擊“新增 OpenAI API”按鈕並進行配置，或在“更多操作”中導入已有配置。
-  ja-JP: Hertzbeatは、OpenAI APIを呼び出してメトリクスを監視します。<br>「<i>新規 OpenAI API</i>」をクリックして設定した後、新規することができます。
 helpLink:
  zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/openai
  en-US: https://hertzbeat.apache.org/docs/help/openai
@@ -39,7 +37,6 @@ params:
    name:
      zh-CN: 会话密钥
      en-US: Session Key
-      ja-JP: セッションキー
    # type-param field type(most mapping the html input type)
    type: text
    # required-true or false
@@ -52,7 +49,6 @@ metrics:
    i18n:
      zh-CN: 信用额度授予
      en-US: Credit Grants
-      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
@@ -64,28 +60,24 @@ metrics:
        i18n:
          zh-CN: 总授予额度
          en-US: Total Granted
-          ja-JP: 与信額合計
        unit: $
      - field: total_used
        type: 0
        i18n:
          zh-CN: 总使用额度
          en-US: Total Used
-          ja-JP: 使用した与信額
        unit: $
      - field: total_available
        type: 0
        i18n:
          zh-CN: 总可用额度
          en-US: Total Available
-          ja-JP: 使用可能な与信額
        unit: $
      - field: total_paid_available
        type: 0
        i18n:
          zh-CN: 总付费可用额度
          en-US: Total Paid Available
-          ja-JP: 使用可能な与信額合計
        unit: $
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: http
@@ -115,7 +107,6 @@ metrics:
    i18n:
      zh-CN: 模型花费
      en-US: Model Cost
-      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
@@ -127,14 +118,12 @@ metrics:
        i18n:
          zh-CN: 模型名称
          en-US: Model Name
-          ja-JP: モデル名
        label: true
      - field: cost
        type: 0
        i18n:
          zh-CN: 花费
          en-US: Cost
-          ja-JP: コスト
        unit: $
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: http
@@ -167,7 +156,6 @@ metrics:
    i18n:
      zh-CN: 订阅计费
      en-US: Billing Subscription
-      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
@@ -179,164 +167,138 @@ metrics:
        i18n:
          zh-CN: 是否有支付方式
          en-US: Has Payment Method
-          ja-JP: 支払い方法の有無
      - field: canceled
        type: 1
        i18n:
          zh-CN: 订阅是否已取消
          en-US: Canceled
-          ja-JP: 購読がキャンセルされた
      - field: canceled_at
        type: 1
        i18n:
          zh-CN: 订阅取消时间
          en-US: Canceled At
-          ja-JP: 購読キャンセル時間
      - field: delinquent
        type: 1
        i18n:
          zh-CN: 订阅是否拖欠
          en-US: Delinquent
-          ja-JP: 購読料滞納の有無
      - field: soft_limit
        type: 0
        i18n:
          zh-CN: 一定时间内最大使用量限制
          en-US: Soft Limit
-          ja-JP: 一定期間の最大使用量制限
      - field: hard_limit
        type: 0
        i18n:
          zh-CN: 最大使用量限制
          en-US: Hard Limit
-          ja-JP: 最大使用量制限
      - field: system_hard_limit
        type: 0
        i18n:
          zh-CN: 系统硬限制使用量
          en-US: System Hard Limit
-          ja-JP: システムの最大使用量制限
      - field: soft_limit_usd
        type: 0
        i18n:
          zh-CN: 软限制费用
          en-US: Soft Limit USD
-          ja-JP: 一定期間の最大使用量制限の費用
        unit: $
      - field: hard_limit_usd
        type: 0
        i18n:
          zh-CN: 硬限制费用
          en-US: Hard Limit USD
-          ja-JP: 最大使用量制限の費用
        unit: $
      - field: system_hard_limit_usd
        type: 0
        i18n:
          zh-CN: 系统硬限制费用
          en-US: System Hard Limit USD
-          ja-JP: システムの最大使用量制限の費用
        unit: $
      - field: plan
        type: 1
        i18n:
          zh-CN: 订阅计划
          en-US: Plan
-          ja-JP: 購読プラン
      - field: primary
        type: 1
        i18n:
          zh-CN: 是否是主要订阅
          en-US: Primary
-          ja-JP: プライマリー購読
        unit: $
      - field: billing_mechanism
        type: 1
        i18n:
          zh-CN: 结算机制
          en-US: Billing Mechanism
-          ja-JP: 課金仕組み
      - field: is_arrears_eligible
        type: 1
        i18n:
          zh-CN: 是否符合拖欠资格
          en-US: Is Arrears Eligible
-          ja-JP: 延滞の対象
      - field: max_balance
        type: 0
        i18n:
          zh-CN: 最大余额
          en-US: Max Balance
-          ja-JP: 最大バランス
        unit: $
      - field: auto_recharge_eligible
        type: 1
        i18n:
          zh-CN: 是否符合自动充值资格
          en-US: Auto Recharge Eligible
-          ja-JP: オートリチャージ対象
      - field: auto_recharge_enabled
        type: 1
        i18n:
          zh-CN: 是否启用自动充值
          en-US: Auto Recharge Enabled
-          ja-JP: オートリチャージ有効
      - field: auto_recharge_threshold
        type: 0
        i18n:
          zh-CN: 自动充值阈值
          en-US: Auto Recharge Threshold
-          ja-JP: オートリチャージしきい値
        unit: $
      - field: auto_recharge_to_balance
        type: 0
        i18n:
          zh-CN: 自动充值金额
          en-US: Auto Recharge To Balance
-          ja-JP: オートリチャージ金額
        unit: $
      - field: trust_tier
        type: 1
        i18n:
          zh-CN: 信用等级
          en-US: Trust Tier
-          ja-JP: 信託層
      - field: account_name
        type: 1
        i18n:
          zh-CN: 账户名称
          en-US: Account Name
-          ja-JP: アカウント名
      - field: po_number
        type: 1
        i18n:
          zh-CN: 采购号
          en-US: Po Number
-          ja-JP: 購入番号
      - field: billing_email
        type: 1
        i18n:
          zh-CN: 账单邮箱
          en-US: Billing Email
-          ja-JP: 請求先メール
      - field: tax_ids
        type: 1
        i18n:
          zh-CN: 税务ID
          en-US: Tax IDs
-          ja-JP: 納税者番号
      - field: billing_address
        type: 1
        i18n:
          zh-CN: 结算地址
          en-US: Billing Address
-          ja-JP: 請求先住所
      - field: business_address
        type: 1
        i18n:
          zh-CN: 业务地址
          en-US: Business Address
-          ja-JP: ビジネスアドレス
    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
    protocol: http
    # the config content when protocol is http
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Logic	2f991f13ac	docs(help): add FAQs about monitoring intervals and task limits - Add troubleshooting steps for incorrect monitoring intervals in Kubernetes - Include information on task limits for a single collector - Address issues with token authentication in HTTP API monitoring - Update existing FAQs with more detailed solutions	2025-07-17 10:01:39 +08:00
Logic	3fe6db1723	Merge branch 'master' of github.com:apache/hertzbeat	2025-07-17 09:32:00 +08:00
Logic	4a8d664c93	Merge branch 'master' of github.com:apache/hertzbeat	2025-07-14 08:56:20 +08:00
Logic	1f1aafc70e	Merge branch 'master' of github.com:apache/hertzbeat	2025-06-25 10:45:49 +08:00
Logic	ea5b678af5	Merge branch 'master' of github.com:apache/hertzbeat	2025-06-19 15:42:13 +08:00
Logic	fa24e5000f	Merge branch 'master' of github.com:apache/hertzbeat	2025-05-23 09:56:17 +08:00
Logic	f242ead7a9	Merge branch 'master' of github.com:apache/hertzbeat	2025-05-21 10:30:09 +08:00
Logic	5402437eac	Merge branch 'master' of github.com:apache/hertzbeat	2025-05-16 09:21:13 +08:00
Logic	ce61c7d456	Merge branch 'master' of github.com:apache/hertzbeat	2025-05-06 10:47:33 +08:00
Logic	320766a48e	Merge branch 'master' of github.com:apache/hertzbeat	2025-04-17 16:57:54 +08:00
Logic	efb2ac02df	Merge branch 'master' of github.com:apache/hertzbeat	2025-04-07 10:14:36 +08:00
Logic	06c939c810	Merge branch 'master' of github.com:apache/hertzbeat	2025-04-03 15:57:12 +08:00
Logic	e56823b240	Merge branch 'master' of github.com:apache/hertzbeat	2025-03-27 10:20:45 +08:00
Logic	3b18d1ddaf	Merge branch 'master' of github.com:apache/hertzbeat	2025-03-06 16:21:20 +08:00
Logic	d44fe43eb0	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-24 08:12:57 +08:00
Logic	a221ddfba2	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-23 15:29:18 +08:00
Logic	8e31a3147b	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-10 08:47:21 +08:00
Logic	d2f9a56fe7	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-08 10:33:11 +08:00
Logic	a0b41dc7bb	Merge branch 'master' of github.com:apache/hertzbeat	2024-12-27 08:24:42 +08:00
Logic	3f572a1ddc	Merge branch 'master' of github.com:apache/hertzbeat	2024-11-26 11:22:35 +08:00
Logic	767deccee5	Merge branch 'master' of github.com:apache/hertzbeat	2024-10-26 10:42:23 +08:00
Logic	9221e2f6c1	Merge branch 'master' of github.com:apache/hertzbeat	2024-10-22 17:29:48 +08:00
Logic	0a36b3df90	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-24 11:20:58 +08:00
zqr10159	f3202133d8	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-12 15:48:50 +08:00
zqr10159	6ee458c521	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-11 15:04:01 +08:00
zqr10159	cbc1caf4ac	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-06 08:55:12 +08:00
zqr10159	86db630fc7	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-04 08:25:56 +08:00
zqr10159	145c4d1d5e	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-31 09:05:14 +08:00
zqr10159	0217cbb7f9	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-30 08:54:44 +08:00
zqr10159	9f5df95f29	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-29 11:35:20 +08:00
zqr10159	0f955019bf	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-29 08:36:55 +08:00
zqr10159	129b6282d3	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-23 10:28:34 +08:00
zqr10159	36c5d8f518	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-17 14:55:40 +08:00
zqr10159	de8a473e24	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-16 09:09:47 +08:00
zqr10159	ffc4641dc9	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-09 15:45:37 +08:00
zqr10159	d0cb9f8bf3	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-05 11:36:50 +08:00
zqr10159	0d4ff33f19	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-05 11:15:02 +08:00
zqr10159	86f40e5e15	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-03 08:06:25 +08:00
zqr10159	dbbbc045d4	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-02 15:41:38 +08:00
zqr10159	b0fdd5e11d	Merge branch 'master' of github.com:apache/hertzbeat	2024-06-18 11:30:05 +08:00
zqr10159	9c5ea20b15	[doc]HertzBeat 1.6.0 Upgrade Guide.	2024-06-11 14:57:35 +08:00
zqr10159	7a74f80906	Merge branch 'master' of github.com:apache/hertzbeat	2024-06-11 14:36:25 +08:00
zqr10159	ee32a890eb	Merge branch 'master' of github.com:dromara/hertzbeat	2024-06-01 10:08:28 +08:00
zqr10159	ec1c04194b	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-18 15:52:12 +08:00
zqr10159	55d8dfdede	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-14 08:15:58 +08:00
zqr10159	918073dca7	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-11 08:45:53 +08:00
zqr10159	2defaecd93	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-10 08:39:59 +08:00
zqr10159	641ba47f4c	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-09 17:08:47 +08:00
zqr10159	ccbc2151ae	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-07 09:05:40 +08:00
zqr10159	1cb919a301	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-29 10:47:25 +08:00
zqr10159	7351a03c81	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-28 11:47:27 +08:00
zqr10159	26c3a802d1	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-25 09:17:04 +08:00
zqr10159	47dbe2fd2a	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-24 08:13:26 +08:00
zqr10159	f4943e9d89	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-23 14:53:04 +08:00
zqr10159	1f6614d1a1	[remove]Remove optional comments.	2024-04-23 10:36:58 +08:00
zqr10159	4a96c02b9a	[remove]Remove optional comments.	2024-04-23 10:35:21 +08:00