[refactor] optimize code

[refactor] update class and method comments
2026-09-17 18:19:02 +00:00 · 2025-08-23 00:57:19 +08:00 · 2025-08-23 00:38:52 +08:00 · 2025-08-20 02:14:50 +08:00 · 2025-08-20 00:11:22 +08:00 · 2025-08-19 23:44:29 +08:00
526 changed files with 3790 additions and 22412 deletions
@@ -1270,10 +1270,10 @@
      ]
    },
    {
-      "login": "lynx009",
-      "name": "lynx009",
+      "login": "a-little-fool",
+      "name": "小笨蛋",
      "avatar_url": "https://avatars.githubusercontent.com/u/105542329?v=4",
-      "profile": "https://github.com/lynx009",
+      "profile": "https://github.com/a-little-fool",
      "contributions": [
        "code",
        "doc",
@@ -1442,7 +1442,7 @@
    },
    {
      "login": "Calvin979",
-      "name": "Calvin",
+      "name": "Naruse",
      "avatar_url": "https://avatars.githubusercontent.com/u/131688897?v=4",
      "profile": "https://github.com/Calvin979",
      "contributions": [
@@ -2523,84 +2523,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "yy549159265",
-      "name": "yy549159265",
-      "avatar_url": "https://avatars.githubusercontent.com/u/40821310?v=4",
-      "profile": "https://github.com/yy549159265",
-      "contributions": [
-        "code",
-        "test",
-        "design"
-      ]
-    },
-    {
-      "login": "cto-huhang",
-      "name": "cto-huhang",
-      "avatar_url": "https://avatars.githubusercontent.com/u/53338629?v=4",
-      "profile": "https://github.com/cto-huhang",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "Saramanda9988",
-      "name": "LunaRain_079",
-      "avatar_url": "https://avatars.githubusercontent.com/u/176664901?v=4",
-      "profile": "https://github.com/Saramanda9988",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "delei",
-      "name": "DeleiGuo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/17263766?v=4",
-      "profile": "https://github.com/delei",
-      "contributions": [
-        "doc",
-        "code",
-        "test",
-        "bug"
-      ]
-    },
-    {
-      "login": "chingjustwe",
-      "name": "Rocky, Chi",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13643747?v=4",
-      "profile": "https://github.com/chingjustwe",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "rowankid",
-      "name": "Wenqi Luo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/18652781?v=4",
-      "profile": "https://github.com/rowankid",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "tuzuy",
-      "name": "tuzuy",
-      "avatar_url": "https://avatars.githubusercontent.com/u/95274591?v=4",
-      "profile": "https://github.com/tuzuy",
-      "contributions": [
-        "code",
-        "design"
-      ]
-    },
-    {
-      "login": "carlpinto25",
-      "name": "carl pinto",
-      "avatar_url": "https://avatars.githubusercontent.com/u/117299909?v=4",
-      "profile": "https://github.com/carlpinto25",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -16,7 +16,7 @@
 #

 github:
-  description: Real-time observability 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
@@ -67,7 +67,6 @@ header:
    - 'karma.conf.js'
    - 'proxy.conf.js'
    - '.helmignore'
-    - 'script/helm/**'
    - 'web-app/src/app/core/**'
    - 'web-app/src/app/layout/**'
    - 'web-app/src/app/routes/exception/**'
@@ -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
@@ -9,7 +9,7 @@
 <b><a href="README.md">English</a></b> | <a href="README_CN.md">中文</a> | <a href="README_JP.md">日本語</a>
 </p>

-> A real-time observability system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
+> A real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.

 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
 [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
@@ -28,7 +28,7 @@

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

-[Apache HertzBeat™](https://github.com/apache/hertzbeat) is an easy-to-use, open source, real-time observability system with agentless, high performance cluster, prometheus-compatible, offers powerful custom monitoring and status page building capabilities.   
+[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

@@ -572,8 +572,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
-CNCF Observability And Analysis - Observability Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
+CNCF Observability And Analysis - Monitoring Landscape.</a>
 </p>

 ## 🛡️ License
@@ -9,7 +9,7 @@
 <a href="README.md">English</a> | <b><a href="README_CN.md">中文</a></b> | <a href="README_JP.md">日本語</a>
 </p>

-> 实时观测系统，无需 Agent，性能集群，兼容 Prometheus，自定义监控和状态页构建能力。
+> 实时监控系统，无需 Agent，性能集群，兼容 Prometheus，自定义监控和状态页构建能力。

 [![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr)
 [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/)
@@ -28,7 +28,7 @@

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

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

 ### 特点

@@ -572,8 +572,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
-CNCF Observability And Analysis - Observability Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
+CNCF Observability And Analysis - Monitoring Landscape.</a>
 </p>

 ## 🛡️ License
@@ -576,8 +576,8 @@ HertzBeat is built on so many great open source projects, thanks to them!
 <p align="left">
 <img src="./home/static/img/home/cncf-landscape-left-logo.svg" width="300">&nbsp;&nbsp;<img src="./home/static/img/home/cncf-right-logo.svg" width="345" />
 <br /><br />
-HertzBeat has been included in the <a href="https://landscape.cncf.io/?item=observability-and-analysis--observability--hertzbeat">
-CNCF Observability And Analysis - Observability Landscape.</a>
+HertzBeat has been included in the <a href="https://landscape.cncf.io/guide?item=observability-and-analysis--monitoring--hertzbeat#observability-and-analysis--monitoring">
+CNCF Observability And Analysis - Monitoring Landscape.</a>
 </p>

 ## 🛡️ License
@@ -1,6 +1,6 @@
 # Security Policy

-Apache HertzBeat™ follows the [ASF vulnerability handling process](https://apache.org/security/#vulnerability-handling)
+Apache HertzBeat follows the [ASF vulnerability handling process](https://apache.org/security/#vulnerability-handling)

 ## Supported Versions

@@ -17,6 +17,6 @@ To report a new vulnerability you have discovered please follow the [ASF vulnera

 ## Extra Information  

- [Apache HertzBeat™ Security Model](https://hertzbeat.apache.org/docs/help/security_model)
+- [Apache HertzBeat Security Model](https://hertzbeat.apache.org/docs/help/security_model)
 - [ASF Security](https://www.apache.org/security/)
- [Apache HertzBeat™ Document](https://hertzbeat.apache.org/docs/)
+- [Apache HertzBeat Document](https://hertzbeat.apache.org/docs/)
@@ -35,10 +35,6 @@
 			<groupId>org.springframework.ai</groupId>
 			<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webflux</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -57,10 +53,6 @@
 			<groupId>org.apache.hertzbeat</groupId>
 			<artifactId>hertzbeat-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.hertzbeat</groupId>
-			<artifactId>hertzbeat-alerter</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.usthe.sureness</groupId>
 			<artifactId>spring-boot3-starter-sureness</artifactId>
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.ai.agent.adapters;
-
-import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.springframework.data.domain.Page;
-
-import java.util.List;
-
-/**
- * Interface that provides access to alert definition information by retrieving data
- * through the underlying alert define service.
- */
-public interface AlertDefineServiceAdapter {
-
-    /**
-     * Add a new alert rule definition
-     * @param alertDefine Alert definition to add
-     * @return Created alert definition with ID
-     */
-    AlertDefine addAlertDefine(AlertDefine alertDefine);
-
-    /**
-     * Get alert definitions with filtering and pagination
-     * @param search Search term
-     * @param app Monitor type filter
-     * @param enabled Enabled status filter
-     * @param sort Sort field
-     * @param order Sort order
-     * @param pageIndex Page index
-     * @param pageSize Page size
-     * @return Page of alert definitions
-     */
-    Page<AlertDefine> getAlertDefines(String search, String app, Boolean enabled, String sort, String order, int pageIndex, int pageSize);
-
-    /**
-     * Get alert definition by ID
-     * @param id Alert definition ID
-     * @return Alert definition if found
-     */
-    AlertDefine getAlertDefine(Long id);
-
-    /**
-     * Enable or disable alert definition
-     * @param id Alert definition ID
-     * @param enabled Whether to enable
-     */
-    void toggleAlertDefineStatus(Long id, boolean enabled);
-
-    /**
-     * Modify/update an existing alert definition
-     * @param alertDefine Alert definition to update
-     * @return Updated alert definition
-     */
-    AlertDefine modifyAlertDefine(AlertDefine alertDefine);
-
-    /**
-     * Get specific app hierarchy structure
-     * @param app App type
-     * @param lang Language for localization
-     * @return List of hierarchy objects for specific app
-     */
-
-    List<Hierarchy> getAppHierarchy(String app, String lang);
-}
@@ -1,60 +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.apache.hertzbeat.alert.dto.AlertSummary;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.springframework.data.domain.Page;
-
-/**
- * Interface that provides access to alert information by retrieving alert data
- * through the underlying alert service.
- */
-public interface AlertServiceAdapter {
-
-    /**
-     * Get single alerts with filtering and pagination
-     * @param status Alert status
-     * @param search Search term
-     * @param sort Sort field
-     * @param order Sort order
-     * @param pageIndex Page index
-     * @param pageSize Page size
-     * @return Page of single alerts
-     */
-    Page<SingleAlert> getSingleAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize);
-
-    /**
-     * Get group alerts with filtering and pagination
-     * @param status Alert status
-     * @param search Search term
-     * @param sort Sort field
-     * @param order Sort order
-     * @param pageIndex Page index
-     * @param pageSize Page size
-     * @return Page of group alerts
-     */
-    Page<GroupAlert> getGroupAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize);
-
-    /**
-     * Get alerts summary statistics
-     * @return Alert summary information
-     */
-    AlertSummary getAlertsSummary();
-}
@@ -1,55 +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.apache.hertzbeat.common.entity.dto.MetricsData;
-import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData;
-
-/**
- * Interface that provides access to metrics information by retrieving metrics data
- * through the underlying metrics service.
- */
-public interface MetricsServiceAdapter {
-
-    /**
-     * Check warehouse storage server status
-     * @return true if warehouse is available, false otherwise
-     */
-    Boolean getWarehouseStorageServerStatus();
-
-    /**
-     * Query real-time metrics data
-     * @param monitorId Monitor ID
-     * @param metrics Metrics name
-     * @return Real-time metrics data
-     */
-    MetricsData getMetricsData(Long monitorId, String metrics);
-
-    /**
-     * Query historical metrics data
-     * @param monitorId Monitor ID
-     * @param app Monitor type
-     * @param metrics Metrics name
-     * @param metric Metric field name
-     * @param label Label filter
-     * @param history Query historical time period
-     * @param interval Whether to aggregate data
-     * @return Historical metrics data
-     */
-    MetricsHistoryData getMetricHistoryData(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval);
-}
@@ -20,10 +20,7 @@ package org.apache.hertzbeat.ai.agent.adapters;

 import org.springframework.data.domain.Page;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
-import org.apache.hertzbeat.common.entity.manager.Param;
-import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import java.util.List;
-import java.util.Map;

 /**
 * Interface that provides access to monitor information by retrieving monitor data
@@ -31,41 +28,14 @@ import java.util.Map;
 */
 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
+        List<Long> ids,
+        String app,
+        String search,
+        Byte status,
+        String sort,
+        String order,
+        Integer pageIndex,
+        Integer pageSize,
+        String labels
    );
-
-    /**
-     * Add a new monitor
-     *
-     * @param monitor The monitor entity to create
-     * @param params List of parameters for the monitor
-     * @param collector Optional collector assignment
-     * @return The created monitor ID
-     */
-    Long addMonitor(Monitor monitor, List<Param> params, String collector);
-
-    /**
-     * Get all available monitor types with their display names
-     *
-     * @param language Language code (e.g., "en-US", "zh-CN")
-     * @return Map of monitor type key to display name
-     */
-    Map<String, String> getAvailableMonitorTypes(String language);
-
-    /**
-     * Get parameter definitions for a specific monitor type
-     *
-     * @param app Monitor type/application name (e.g., "linux", "mysql", "redis")
-     * @return List of parameter definitions for the monitor type
-     */
-    List<ParamDefine> getMonitorParamDefines(String app);
-}
-
+} 
@@ -1,257 +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.AlertDefineServiceAdapter;
-import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
-import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy;
-import org.apache.hertzbeat.ai.agent.utils.UtilityClass;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-/**
- * Implementation of the AlertDefineServiceAdapter interface that provides access to alert definition information
- * through reflection by invoking the underlying alert define service implementation.
- */
-@Slf4j
-@Component
-public class AlertDefineServiceAdapterImpl implements AlertDefineServiceAdapter {
-
-    @Override
-    public AlertDefine addAlertDefine(AlertDefine alertDefine) {
-        try {
-            Object alertDefineService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for addAlertDefine: {}", subjectSum);
-
-            try {
-                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
-            }
-
-            assert alertDefineService != null;
-            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
-            
-            Method method = alertDefineService.getClass().getMethod("addAlertDefine", AlertDefine.class);
-
-            method.invoke(alertDefineService, alertDefine);
-            
-            log.debug("Successfully added alert define with ID: {}", alertDefine.getId());
-            return alertDefine;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: addAlertDefine", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke addAlertDefine via adapter", e);
-            throw new RuntimeException("Failed to invoke addAlertDefine via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Page<AlertDefine> getAlertDefines(String search, String app, Boolean enabled, String sort, String order, int pageIndex, int pageSize) {
-        try {
-            Object alertDefineService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getAlertDefines: {}", subjectSum);
-
-            try {
-                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
-            }
-
-            assert alertDefineService != null;
-            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
-            
-            Method method = alertDefineService.getClass().getMethod(
-                    "getAlertDefines",
-                    List.class, String.class, String.class, String.class, int.class, int.class);
-
-            @SuppressWarnings("unchecked")
-            Page<AlertDefine> result = (Page<AlertDefine>) method.invoke(
-                    alertDefineService, null, search, sort, order, pageIndex, pageSize);
-            
-            log.debug("Successfully retrieved {} alert defines", result.getContent().size());
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getAlertDefines", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getAlertDefines via adapter", e);
-            throw new RuntimeException("Failed to invoke getAlertDefines via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public AlertDefine getAlertDefine(Long id) {
-        try {
-            Object alertDefineService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getAlertDefine: {}", subjectSum);
-
-            try {
-                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
-            }
-
-            assert alertDefineService != null;
-            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
-            
-            Method method = alertDefineService.getClass().getMethod("getAlertDefine", long.class);
-
-            AlertDefine result = (AlertDefine) method.invoke(alertDefineService, id);
-            
-            log.debug("Successfully retrieved alert define with ID: {}", id);
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getAlertDefine", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getAlertDefine via adapter for ID: {}", id, e);
-            throw new RuntimeException("Failed to invoke getAlertDefine via adapter: " + e.getMessage(), e);
-        }
-    }
-
-
-    @Override
-    public void toggleAlertDefineStatus(Long id, boolean enabled) {
-        try {
-            Object alertDefineService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for toggleAlertDefineStatus: {}", subjectSum);
-
-            try {
-                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
-            }
-
-            assert alertDefineService != null;
-            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
-            
-            // First get the existing AlertDefine
-            Method getMethod = alertDefineService.getClass().getMethod("getAlertDefine", long.class);
-            AlertDefine alertDefine = (AlertDefine) getMethod.invoke(alertDefineService, id);
-            
-            if (alertDefine == null) {
-                throw new RuntimeException("AlertDefine with ID " + id + " not found");
-            }
-            
-            // Update the enable status
-            alertDefine.setEnable(enabled);
-            
-            // Use modifyAlertDefine to save the changes
-            Method modifyMethod = alertDefineService.getClass().getMethod("modifyAlertDefine", AlertDefine.class);
-            modifyMethod.invoke(alertDefineService, alertDefine);
-            
-            log.debug("Successfully toggled alert define status for ID: {} to enabled: {}", id, enabled);
-
-        } catch (Exception e) {
-            log.error("Failed to invoke toggleAlertDefineStatus via adapter for ID: {}", id, e);
-            throw new RuntimeException("Failed to invoke toggleAlertDefineStatus via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public AlertDefine modifyAlertDefine(AlertDefine alertDefine) {
-        try {
-            Object alertDefineService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for modifyAlertDefine: {}", subjectSum);
-
-            try {
-                alertDefineService = SpringContextHolder.getBean("alertDefineServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertDefineServiceImpl'");
-            }
-
-            assert alertDefineService != null;
-            log.debug("AlertDefineService bean found: {}", alertDefineService.getClass().getSimpleName());
-            
-            Method method = alertDefineService.getClass().getMethod("modifyAlertDefine", AlertDefine.class);
-
-            method.invoke(alertDefineService, alertDefine);
-            
-            log.debug("Successfully modified alert define with ID: {}", alertDefine.getId());
-            return alertDefine;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: modifyAlertDefine", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke modifyAlertDefine via adapter", e);
-            throw new RuntimeException("Failed to invoke modifyAlertDefine via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Retrieves the application hierarchy for a given app and language.
-     * Uses reflection to call the underlying app service method.
-     *
-     * @param app  The application name
-     * @param lang The language code (optional, defaults to "en-US")
-     * @return List of Hierarchy objects representing the app hierarchy
-     */
-
-    @Override
-    public List<Hierarchy> getAppHierarchy(String app, String lang) {
-        try {
-            Object appService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getAppHierarchy: {}", subjectSum);
-
-            try {
-                appService = SpringContextHolder.getBean("appServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
-            }
-
-            assert appService != null;
-            log.debug("AppService bean found for getAppHierarchy: {}", appService.getClass().getSimpleName());
-
-            // Provide default language if not specified
-            if (lang == null || lang.trim().isEmpty()) {
-                lang = "en-US";
-            }
-
-            // Call getAppHierarchy method: getAppHierarchy(String app, String lang)
-            Method method = appService.getClass().getMethod("getAppHierarchy", String.class, String.class);
-
-            List<?> managerHierarchies = (List<?>) method.invoke(appService, app, lang);
-
-            // Convert manager DTOs to ai-agent DTOs
-            List<Hierarchy> result = UtilityClass.convertToAgentHierarchies(managerHierarchies);
-
-            log.debug("Successfully retrieved and converted {} hierarchies for app '{}'", result.size(), app);
-            return result;
-
-        } catch (Exception e) {
-            log.error("Failed to get app hierarchy for app '{}': {}", app, e.getMessage(), e);
-            throw new RuntimeException("Failed to get app hierarchy for " + app, e);
-        }
-    }
-
-}
@@ -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.ai.agent.adapters.impl;
-
-import com.usthe.sureness.subject.SubjectSum;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.adapters.AlertServiceAdapter;
-import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
-import org.apache.hertzbeat.alert.dto.AlertSummary;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.springframework.data.domain.Page;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-
-/**
- * Implementation of the AlertServiceAdapter interface that provides access to alert information
- * through reflection by invoking the underlying alert service implementation.
- */
-@Slf4j
-@Component
-public class AlertServiceAdapterImpl implements AlertServiceAdapter {
-
-    @Override
-    public Page<SingleAlert> getSingleAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize) {
-        try {
-            Object alertService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getSingleAlerts: {}", subjectSum);
-
-            try {
-                alertService = SpringContextHolder.getBean("alertServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertServiceImpl'");
-            }
-
-            assert alertService != null;
-            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
-            
-            Method method = alertService.getClass().getMethod(
-                    "getSingleAlerts",
-                    String.class, String.class, String.class, String.class, int.class, int.class);
-
-            @SuppressWarnings("unchecked")
-            Page<SingleAlert> result = (Page<SingleAlert>) method.invoke(
-                    alertService, status, search, sort, order, pageIndex, pageSize);
-            
-            log.debug("Successfully retrieved {} single alerts", result.getContent().size());
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getSingleAlerts", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getSingleAlerts via adapter", e);
-            throw new RuntimeException("Failed to invoke getSingleAlerts via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Page<GroupAlert> getGroupAlerts(String status, String search, String sort, String order, int pageIndex, int pageSize) {
-        try {
-            Object alertService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getGroupAlerts: {}", subjectSum);
-
-            try {
-                alertService = SpringContextHolder.getBean("alertServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertServiceImpl'");
-            }
-
-            assert alertService != null;
-            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
-            
-            Method method = alertService.getClass().getMethod(
-                    "getGroupAlerts",
-                    String.class, String.class, String.class, String.class, int.class, int.class);
-
-            @SuppressWarnings("unchecked")
-            Page<GroupAlert> result = (Page<GroupAlert>) method.invoke(
-                    alertService, status, search, sort, order, pageIndex, pageSize);
-            
-            log.debug("Successfully retrieved {} group alerts", result.getContent().size());
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getGroupAlerts", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getGroupAlerts via adapter", e);
-            throw new RuntimeException("Failed to invoke getGroupAlerts via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public AlertSummary getAlertsSummary() {
-        try {
-            Object alertService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getAlertsSummary: {}", subjectSum);
-
-            try {
-                alertService = SpringContextHolder.getBean("alertServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'alertServiceImpl'");
-            }
-
-            assert alertService != null;
-            log.debug("AlertService bean found: {}", alertService.getClass().getSimpleName());
-            
-            Method method = alertService.getClass().getMethod("getAlertsSummary");
-
-            AlertSummary result = (AlertSummary) method.invoke(alertService);
-            
-            log.debug("Successfully retrieved alerts summary");
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getAlertsSummary", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getAlertsSummary via adapter", e);
-            throw new RuntimeException("Failed to invoke getAlertsSummary via adapter: " + e.getMessage(), e);
-        }
-    }
-}
@@ -1,136 +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.MetricsServiceAdapter;
-import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
-import org.apache.hertzbeat.common.entity.dto.MetricsData;
-import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData;
-import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-
-/**
- * Implementation of the MetricsServiceAdapter interface that provides access to metrics information
- * through reflection by invoking the underlying metrics service implementation.
- */
-@Slf4j
-@Component
-public class MetricsServiceAdapterImpl implements MetricsServiceAdapter {
-
-    @Override
-    public Boolean getWarehouseStorageServerStatus() {
-        try {
-            Object metricsDataService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getWarehouseStorageServerStatus: {}", subjectSum);
-
-            try {
-                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
-            }
-
-            assert metricsDataService != null;
-            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
-            
-            Method method = metricsDataService.getClass().getMethod("getWarehouseStorageServerStatus");
-
-            Boolean result = (Boolean) method.invoke(metricsDataService);
-            
-            log.debug("Successfully retrieved warehouse storage server status: {}", result);
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getWarehouseStorageServerStatus", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getWarehouseStorageServerStatus via adapter", e);
-            throw new RuntimeException("Failed to invoke getWarehouseStorageServerStatus via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public MetricsData getMetricsData(Long monitorId, String metrics) {
-        try {
-            Object metricsDataService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getMetricsData: {}", subjectSum);
-
-            try {
-                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
-            }
-
-            assert metricsDataService != null;
-            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
-            
-            Method method = metricsDataService.getClass().getMethod(
-                    "getMetricsData",
-                    Long.class, String.class);
-
-            MetricsData result = (MetricsData) method.invoke(metricsDataService, monitorId, metrics);
-            
-            log.debug("Successfully retrieved metrics data for monitor {} and metrics {}", monitorId, metrics);
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getMetricsData", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getMetricsData via adapter for monitor {} and metrics {}", monitorId, metrics, e);
-            throw new RuntimeException("Failed to invoke getMetricsData via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public MetricsHistoryData getMetricHistoryData(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval) {
-        try {
-            Object metricsDataService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getMetricHistoryData: {}", subjectSum);
-
-            try {
-                metricsDataService = SpringContextHolder.getBean("metricsDataServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'metricsDataServiceImpl'");
-            }
-
-            assert metricsDataService != null;
-            log.debug("MetricsDataService bean found: {}", metricsDataService.getClass().getSimpleName());
-            
-            Method method = metricsDataService.getClass().getMethod(
-                    "getMetricHistoryData",
-                    Long.class, String.class, String.class, String.class, String.class, String.class, Boolean.class);
-
-            MetricsHistoryData result = (MetricsHistoryData) method.invoke(
-                    metricsDataService, monitorId, app, metrics, metric, label, history, interval);
-            
-            log.debug("Successfully retrieved historical metrics data for monitor {} and metrics {}", monitorId, metrics);
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getMetricHistoryData", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getMetricHistoryData via adapter for monitor {} and metrics {}", monitorId, metrics, e);
-            throw new RuntimeException("Failed to invoke getMetricHistoryData via adapter: " + e.getMessage(), e);
-        }
-    }
-}
@@ -24,14 +24,11 @@ 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.entity.manager.Param;
-import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
 import org.springframework.stereotype.Component;

 import java.lang.reflect.Method;
 import java.util.List;
-import java.util.Map;

 /**
 * Implementation of the MonitorServiceAdapter interface that provides access to monitor information
@@ -66,7 +63,7 @@ public class MonitorServiceAdapterImpl implements MonitorServiceAdapter {
            if (pageSize == null) {
                pageSize = 8;
            }
-
+            
            Object monitorService = null;
            SubjectSum subjectSum = McpContextHolder.getSubject();
            log.debug("Current security subject: {}", subjectSum);
@@ -100,115 +97,4 @@ public class MonitorServiceAdapterImpl implements MonitorServiceAdapter {
        }
    }

-    @Override
-    public Long addMonitor(Monitor monitor, List<Param> params, String collector) {
-        try {
-            Object monitorService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for addMonitor: {}", subjectSum);
-
-            try {
-                monitorService = SpringContextHolder.getBean("monitorServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'monitorServiceImpl', trying by class name");
-            }
-
-            assert monitorService != null;
-            log.debug("MonitorService bean found for addMonitor: {}", monitorService.getClass().getSimpleName());
-
-            // Call addMonitor method: addMonitor(Monitor monitor, List<Param> params, String collector, GrafanaDashboard dashboard)
-            Method method = monitorService.getClass().getMethod(
-                    "addMonitor",
-                    Monitor.class, List.class, String.class,
-                    Class.forName("org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard"));
-
-            // Call the method with null dashboard
-            method.invoke(monitorService, monitor, params, collector, null);
-
-            log.debug("Successfully added monitor: {} with ID: {}", monitor.getName(), monitor.getId());
-            return monitor.getId();
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: addMonitor", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke addMonitor via adapter", e);
-            throw new RuntimeException("Failed to invoke addMonitor via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public Map<String, String> getAvailableMonitorTypes(String language) {
-        try {
-            Object appService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getAvailableMonitorTypes: {}", subjectSum);
-
-            try {
-                appService = SpringContextHolder.getBean("appServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
-            }
-
-            assert appService != null;
-            log.debug("AppService bean found for getAvailableMonitorTypes: {}", appService.getClass().getSimpleName());
-
-            // Provide default language if not specified
-            if (language == null || language.trim().isEmpty()) {
-                language = "en-US";
-            }
-
-            // Call getI18nApps method: getI18nApps(String lang)
-            Method method = appService.getClass().getMethod("getI18nApps", String.class);
-
-            @SuppressWarnings("unchecked")
-            Map<String, String> result = (Map<String, String>) method.invoke(appService, language);
-
-            log.debug("Successfully retrieved {} monitor types", result.size());
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getI18nApps", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getI18nApps via adapter", e);
-            throw new RuntimeException("Failed to invoke getI18nApps via adapter: " + e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public List<ParamDefine> getMonitorParamDefines(String app) {
-        try {
-            Object appService = null;
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current security subject for getMonitorParamDefines: {}", subjectSum);
-
-            try {
-                appService = SpringContextHolder.getBean("appServiceImpl");
-            } catch (Exception e) {
-                log.debug("Could not find bean by name 'appServiceImpl', trying by class name");
-            }
-
-            assert appService != null;
-            log.debug("AppService bean found for getMonitorParamDefines: {}", appService.getClass().getSimpleName());
-
-            // Validate app parameter
-            if (app == null || app.trim().isEmpty()) {
-                throw new IllegalArgumentException("Monitor type/app parameter is required");
-            }
-
-            // Call getAppParamDefines method: getAppParamDefines(String app)
-            Method method = appService.getClass().getMethod("getAppParamDefines", String.class);
-
-            @SuppressWarnings("unchecked")
-            List<ParamDefine> result = (List<ParamDefine>) method.invoke(appService, app.toLowerCase().trim());
-
-            log.debug("Successfully retrieved {} parameter definitions for monitor type: {}", result.size(), app);
-            return result;
-
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException("Method not found: getAppParamDefines", e);
-        } catch (Exception e) {
-            log.error("Failed to invoke getAppParamDefines via adapter for app: {}", app, e);
-            throw new RuntimeException("Failed to invoke getAppParamDefines via adapter: " + e.getMessage(), e);
-        }
-    }
-}
+}
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.ai.agent.config;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.pojo.dto.OpenAiConfigDto;
-import org.apache.hertzbeat.ai.agent.service.OpenAiConfigService;
-import org.springframework.ai.model.ApiKey;
-import org.springframework.stereotype.Component;
-
-/**
- * Dynamic OpenAI API Key implementation that retrieves the API key
- * from our configuration service (database first, then YAML fallback)
- */
-@Slf4j
-@Component
-public class DynamicOpenAiApiKey implements ApiKey {
-
-    private final OpenAiConfigService openAiConfigService;
-
-    public DynamicOpenAiApiKey(OpenAiConfigService openAiConfigService) {
-        this.openAiConfigService = openAiConfigService;
-    }
-
-    @Override
-    public String getValue() {
-        try {
-            OpenAiConfigDto effectiveConfig = openAiConfigService.getEffectiveConfig();
-            
-            if (effectiveConfig != null && effectiveConfig.isEnable() && effectiveConfig.getApiKey() != null) {
-                log.debug("Retrieved OpenAI API key from configuration service");
-                return effectiveConfig.getApiKey();
-            } else {
-                log.warn("No valid OpenAI API key found in configuration");
-                return null;
-            }
-        } catch (Exception e) {
-            log.error("Error retrieving OpenAI API key from configuration", e);
-            return null;
-        }
-    }
-}
@@ -20,9 +20,6 @@ package org.apache.hertzbeat.ai.agent.config;

 import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.ai.openai.OpenAiChatModel;
-import org.springframework.ai.openai.OpenAiChatOptions;
-import org.springframework.ai.openai.api.OpenAiApi;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

@@ -32,45 +29,9 @@ import org.springframework.context.annotation.Configuration;

@Configuration
 public class LlmConfig {
-
-    @Value("${spring.ai.openai.chat.options.model}")
-    private String model;
-
-    /**
-     * Create OpenAI API instance with dynamic API key
-     */
    @Bean
-    public OpenAiApi openAiApi(DynamicOpenAiApiKey dynamicApiKey) {
-        return OpenAiApi.builder()
-                .apiKey(dynamicApiKey)
-                .build();
+    public ChatClient openAiChatClient(OpenAiChatModel chatModel) {
+        return ChatClient.create(chatModel);
    }

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

+
 package org.apache.hertzbeat.ai.agent.controller;

-import com.usthe.sureness.subject.SubjectSum;
-import com.usthe.sureness.util.SurenessContextHolder;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.config.McpContextHolder;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto;
-import org.apache.hertzbeat.ai.agent.service.ConversationService;
-import org.apache.hertzbeat.common.entity.dto.Message;
+import org.springframework.ai.chat.client.ChatClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.codec.ServerSentEvent;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import reactor.core.publisher.Flux;
+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;

-import javax.validation.Valid;
-import java.util.List;
-
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-import static org.springframework.http.MediaType.TEXT_EVENT_STREAM_VALUE;

 /**
- * Controller class for handling AI chat requests and conversation management.
+ * Controller class for handling chat-related HTTP requests.
 */
-@Slf4j
-@Tag(name = "AI Chat API")
@RestController
-@RequestMapping(path = "/api/chat", produces = {APPLICATION_JSON_VALUE})
+@RequestMapping("/api/chat")
 public class ChatController {

-    private final ConversationService conversationService;
+    private final ChatClientProviderService chatClientProviderService;

    @Autowired
-    public ChatController(ConversationService conversationService) {
-        this.conversationService = conversationService;
+    public ChatController(@Qualifier("openAiChatClient") ChatClient openAiChatClient,
+            ChatClientProviderService chatClientProviderService) {
+        this.chatClientProviderService = chatClientProviderService;
    }

    /**
-     * Create a new conversation
-     *
-     * @return Created conversation details
+     * 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(path = "/conversations")
-    @Operation(summary = "Create a new conversation", description = "Create a new conversation")
-    public ResponseEntity<Message<ConversationDto>> createConversation() {
-        try {
-            ConversationDto conversation = conversationService.createConversation();
-            return ResponseEntity.ok(Message.success(conversation));
-        } catch (Exception e) {
-            log.error("Error creating conversation: ", e);
-            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to create conversation"));
-        }
-    }
-
-    /**
-     * Send a message and get a streaming response with conversation tracking
-     *
-     * @param context The chat request context containing message and optional conversationId
-     * @return Flux of ServerSentEvent for streaming response
-     */
-    @PostMapping(value = "/stream", produces = TEXT_EVENT_STREAM_VALUE)
-    @Operation(summary = "Send a chat message with streaming response", description = "Send a message to AI and get a streaming response with conversation tracking")
-    public Flux<ServerSentEvent<ChatResponseDto>> streamChat(@Valid @RequestBody ChatRequestContext context) {
-        try {
-            // Validate message is not empty
-            SubjectSum subject = SurenessContextHolder.getBindSubject();
-            log.info(subject.toString());
-            McpContextHolder.setSubject(subject);
-            if (context.getMessage() == null || context.getMessage().trim().isEmpty()) {
-                ChatResponseDto errorResponse = ChatResponseDto.builder()
-                        .conversationId(context.getConversationId())
-                        .response("Error: Message cannot be empty")
-                        .build();
-                return Flux.just(ServerSentEvent.builder(errorResponse)
-                        .event("error")
-                        .build());
+    @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);
            }
-
-            log.info("Received streaming chat request for conversation: {}", context.getConversationId());
-            return conversationService.streamChat(context.getMessage(), context.getConversationId());
-
-        } catch (Exception e) {
-            log.error("Error in stream chat endpoint: ", e);
-            ChatResponseDto errorResponse = ChatResponseDto.builder()
-                    .conversationId(context.getConversationId())
-                    .response("An error occurred: " + e.getMessage())
-                    .build();
-            return Flux.just(ServerSentEvent.builder(errorResponse)
-                    .event("error")
-                    .build());
-        }
+        }).start();
+        return emitter;
    }
-
-    /**
-     * Get all conversations
-     *
-     * @return List of all conversations
-     */
-    @GetMapping(path = "/conversations")
-    @Operation(summary = "List all conversations", description = "Get a list of all conversations")
-    public ResponseEntity<Message<List<ConversationDto>>> listConversations() {
-        try {
-            List<ConversationDto> conversations = conversationService.getAllConversations();
-            return ResponseEntity.ok(Message.success(conversations));
-        } catch (Exception e) {
-            log.error("Error listing conversations: ", e);
-            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to retrieve conversations"));
-        }
-    }
-
-    /**
-     * Get conversation history
-     *
-     * @param conversationId The conversation ID
-     * @return Conversation details with message history
-     */
-    @GetMapping(path = "/conversations/{conversationId}")
-    @Operation(summary = "Get conversation history", description = "Get detailed information and message history for a specific conversation")
-    public ResponseEntity<Message<ConversationDto>> getConversation(
-            @Parameter(description = "Conversation ID", example = "conv-12345678") @PathVariable("conversationId") String conversationId) {
-        try {
-            // Validate conversation ID
-            if (conversationId == null || conversationId.trim().isEmpty()) {
-                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation ID is required"));
-            }
-
-            ConversationDto conversation = conversationService.getConversation(conversationId);
-
-            if (conversation == null) {
-                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation not found: " + conversationId));
-            }
-
-            return ResponseEntity.ok(Message.success(conversation));
-
-        } catch (Exception e) {
-            log.error("Error getting conversation: ", e);
-            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to retrieve conversation"));
-        }
-    }
-
-    /**
-     * Delete a conversation
-     *
-     * @param conversationId The conversation ID to delete
-     * @return Success or error message
-     */
-    @DeleteMapping(path = "/conversations/{conversationId}")
-    @Operation(summary = "Delete conversation", description = "Delete a specific conversation and all its messages")
-    public ResponseEntity<Message<Void>> deleteConversation(
-            @Parameter(description = "Conversation ID", example = "conv-12345678") @PathVariable("conversationId") String conversationId) {
-        try {
-            // Validate conversation ID
-            if (conversationId == null || conversationId.trim().isEmpty()) {
-                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation ID is required"));
-            }
-
-            boolean deleted = conversationService.deleteConversation(conversationId);
-            if (!deleted) {
-                return ResponseEntity.ok(Message.fail((byte) -1, "Conversation not found: " + conversationId));
-            }
-
-            return ResponseEntity.ok(Message.success("Conversation deleted successfully"));
-        } catch (Exception e) {
-            log.error("Error deleting conversation: ", e);
-            return ResponseEntity.ok(Message.fail((byte) -1, "Failed to delete conversation"));
-        }
-
-    }
-}
+}
@@ -15,17 +15,12 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.ai.agent.event;

-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
+package org.apache.hertzbeat.ai.agent.controller;

 /**
- * OpenAI configuration change event
+ * Controller for managing conversations.
 */
-public class OpenAiConfigChangeEvent extends ApplicationEvent {
+public class ConversationController {

-    public OpenAiConfigChangeEvent(ApplicationContext source) {
-        super(source);
-    }
-}
+}
@@ -1,160 +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 io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.pojo.dto.OpenAiConfigDto;
-import org.apache.hertzbeat.ai.agent.service.OpenAiConfigService;
-import org.springframework.http.ResponseEntity;
-
-import jakarta.validation.Valid;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
-/**
- * OpenAI Configuration API
- */
-@RestController
-@RequestMapping(value = "/api/ai-agent/config", produces = {APPLICATION_JSON_VALUE})
-@Tag(name = "OpenAI Configuration API")
-@Slf4j
-public class OpenAiConfigController {
-
-    private final OpenAiConfigService openAiConfigService;
-
-    public OpenAiConfigController(OpenAiConfigService openAiConfigService) {
-        this.openAiConfigService = openAiConfigService;
-    }
-
-    @PostMapping("/openai")
-    @Operation(summary = "Save OpenAI configuration", description = "Save or update OpenAI configuration")
-    public ResponseEntity<Map<String, Object>> saveOpenAiConfig(@Valid @RequestBody OpenAiConfigDto config) {
-        try {
-            Map<String, Object> response = new HashMap<>();
-            
-            // Validate API key if enabled
-            if (config.isEnable() && config.getApiKey() != null && !config.getApiKey().trim().isEmpty()) {
-                OpenAiConfigService.ValidationResult validationResult = openAiConfigService.validateApiKey(config.getApiKey());
-                
-                if (!validationResult.isValid()) {
-                    log.warn("API key validation failed during save: {}", validationResult.getMessage());
-                    response.put("code", 1);
-                    response.put("msg", "API key validation failed: " + validationResult.getMessage());
-                    return ResponseEntity.ok(response);
-                }
-                log.info("API key validation successful during save");
-            }
-            
-            // Save the configuration
-            openAiConfigService.saveConfig(config);
-            
-            response.put("code", 0);
-            response.put("msg", "OpenAI configuration saved successfully");
-            
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            log.error("Failed to save OpenAI configuration", e);
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("code", 1);
-            response.put("msg", "Failed to save configuration: " + e.getMessage());
-            
-            return ResponseEntity.ok(response);
-        }
-    }
-
-    @GetMapping("/openai")
-    @Operation(summary = "Get OpenAI configuration", description = "Get current OpenAI configuration")
-    public ResponseEntity<Map<String, Object>> getOpenAiConfig() {
-        try {
-            OpenAiConfigDto config = openAiConfigService.getConfig();
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("code", 0);
-            response.put("data", config);
-            response.put("msg", "Success");
-            
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            log.error("Failed to get OpenAI configuration", e);
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("code", 1);
-            response.put("msg", "Failed to get configuration: " + e.getMessage());
-            
-            return ResponseEntity.ok(response);
-        }
-    }
-
-    @GetMapping("/openai/status")
-    @Operation(summary = "Check OpenAI configuration status", description = "Check if OpenAI is properly configured")
-    public ResponseEntity<Map<String, Object>> getOpenAiConfigStatus() {
-        try {
-            boolean configured = openAiConfigService.isConfigured();
-            OpenAiConfigDto effectiveConfig = openAiConfigService.getEffectiveConfig();
-            boolean hasDbConfig = openAiConfigService.getConfig() != null;
-            boolean hasYamlConfig = effectiveConfig != null && !hasDbConfig;
-            
-            // Validate the effective configuration
-            boolean validationPassed = false;
-            String validationMessage = "No configuration found";
-            
-            if (effectiveConfig != null && effectiveConfig.isEnable() && effectiveConfig.getApiKey() != null && !effectiveConfig.getApiKey().trim().isEmpty()) {
-                OpenAiConfigService.ValidationResult validationResult = openAiConfigService.validateApiKey(effectiveConfig.getApiKey());
-                validationPassed = validationResult.isValid();
-                validationMessage = validationResult.getMessage();
-                
-                if (!validationPassed) {
-                    log.warn("OpenAI API key validation failed during status check: {}", validationMessage);
-                }
-            }
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("code", 0);
-            response.put("data", Map.of(
-                "configured", configured && validationPassed,
-                "hasDbConfig", hasDbConfig,
-                "hasYamlConfig", hasYamlConfig,
-                "validationPassed", validationPassed,
-                "validationMessage", validationMessage
-            ));
-            response.put("msg", "Success");
-            
-            return ResponseEntity.ok(response);
-        } catch (Exception e) {
-            log.error("Failed to get OpenAI configuration status", e);
-            
-            Map<String, Object> response = new HashMap<>();
-            response.put("code", 1);
-            response.put("msg", "Failed to get status: " + e.getMessage());
-            
-            return ResponseEntity.ok(response);
-        }
-    }
-
-}
@@ -15,23 +15,11 @@
 * limitations under the License.
 */

+
 package org.apache.hertzbeat.ai.agent.dao;

-import org.apache.hertzbeat.ai.agent.entity.OpenAiConfig;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
 /**
- * OpenAI Agent Configuration Dao
+ * Data Access Object interface for Conversation entities.
 */
-@Repository
-public interface OpenAiConfigDao extends JpaRepository<OpenAiConfig, String>, JpaSpecificationExecutor<OpenAiConfig> {
-    
-    /**
-     * Query by type
-     * @param type type
-     * @return Return the queried configuration information
-     */
-    OpenAiConfig findByType(String type);
-}
+public interface ConversationDao {
+}
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hertzbeat.ai.agent.dao;
+
+/**
+ * Data Access Object interface for Message entities.
+ */
+public interface MessageDao {
+}
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package org.apache.hertzbeat.ai.agent.dao;
+
+/**
+ * Data Access Object interface for UserPreference entities.
+ */
+public interface UserPreferenceDao {
+}
@@ -1,80 +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.entity;
-
-import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
-import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.time.LocalDateTime;
-
-/**
- * OpenAI Agent Config Entity
- */
-@Entity
-@Table(name = "hzb_ai_agent_config")
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "OpenAI Agent config entity")
-@EntityListeners(AuditingEntityListener.class)
-public class OpenAiConfig {
-
-    @Id
-    @Schema(title = "Config type: openai, primary key", description = "Config type: openai, primary key",
-            accessMode = READ_WRITE)
-    @NotBlank(message = "type can not null")
-    private String type;
-
-    @Schema(title = "Config content", description = "Config content，format json", accessMode = READ_WRITE)
-    @Column(length = 8192)
-    private String content;
-
-    @Schema(title = "The creator of this record", example = "tom", accessMode = READ_ONLY)
-    @CreatedBy
-    private String creator;
-
-    @Schema(title = "This record was last modified by", example = "tom", accessMode = READ_ONLY)
-    @LastModifiedBy
-    private String modifier;
-
-    @Schema(title = "This record creation time (millisecond timestamp)", accessMode = READ_ONLY)
-    @CreatedDate
-    private LocalDateTime gmtCreate;
-
-    @Schema(title = "Record the latest modification time (timestamp in milliseconds)", accessMode = READ_ONLY)
-    @LastModifiedDate
-    private LocalDateTime gmtUpdate;
-}
@@ -19,17 +19,13 @@
 package org.apache.hertzbeat.ai.agent.pojo.dto;

 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import java.util.List;
-
 /**
 * Chat request context for AI chat endpoint.
 */
@Data
-@Builder
@NoArgsConstructor
@AllArgsConstructor
 public class ChatRequestContext {
@@ -41,9 +37,4 @@ public class ChatRequestContext {
     * Optional conversation ID for context
     */
    private String conversationId;
-
-    /**
-     * Conversation history messages for context
-     */
-    private List<MessageDto> conversationHistory;
-}
+}
@@ -1,47 +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 io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Chat response DTO for AI responses.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(description = "Chat response")
-public class ChatResponseDto {
-
-    @Schema(description = "Conversation ID", example = "conv-123")
-    private String conversationId;
-
-    @Schema(description = "AI response message", example = "Here are your monitors...")
-    private String response;
-
-    @Schema(description = "User message ID", example = "msg-user-123")
-    private String userMessageId;
-
-    @Schema(description = "Assistant message ID", example = "msg-assistant-123")
-    private String assistantMessageId;
-}
@@ -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.pojo.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * Conversation DTO for AI chat conversations.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(description = "Conversation information")
-public class ConversationDto {
-
-    @Schema(description = "Conversation ID", example = "conv-123")
-    private String conversationId;
-
-    @Schema(description = "Creation time")
-    private LocalDateTime createdAt;
-
-    @Schema(description = "Last updated time")
-    private LocalDateTime updatedAt;
-
-    @Schema(description = "Messages in this conversation")
-    private List<MessageDto> messages;
-
-    @Schema(description = "Message count")
-    private Integer messageCount;
-}
@@ -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.pojo.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE;
-
-/**
- * Hierarchical structure
- * eg: Monitoring Type metrics Information Hierarchy Relationship
- */
-@AllArgsConstructor
-@NoArgsConstructor
-@Data
-@Schema(description = "Monitor Hierarchy")
-public class Hierarchy {
-
-    /**
-     * Category value
-     */
-    @Schema(description = "Category Value", example = "os", accessMode = READ_WRITE)
-    String category;
-
-    /**
-     * Attribute value
-     */
-    @Schema(description = "Attribute value", example = "linux", accessMode = READ_WRITE)
-    String value;
-
-    /**
-     * Attribute internationalization tag
-     */
-    @Schema(description = "Attribute internationalization tag", example = "Linux system", accessMode = READ_WRITE)
-    String label;
-
-    /**
-     * Is it a leaf node
-     */
-    @Schema(description = "Is it a leaf node", example = "true", accessMode = READ_WRITE)
-    Boolean isLeaf = false;
-
-    /**
-     * Is hide this app type in main menus layout
-     */
-    @Schema(description = "Is hide this app in main menus layout, only for app type, default true.", example = "true")
-    Boolean hide = true;
-    
-    /**
-     * For leaf metric
-     * metric type 0-number: number 1-string: string
-     */
-    @Schema(description = "metric type 0-number: number 1-string: string")
-    private Byte type;
-    
-    /**
-     * metric unit
-     */
-    @Schema(description = "metric unit")
-    private String unit;
-
-    /**
-     * Next level of association
-     */
-    @Schema(description = "Next Hierarchy", accessMode = READ_WRITE)
-    private List<Hierarchy> children;
-}
@@ -1,52 +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 io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-/**
- * Message DTO for chat messages.
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Schema(description = "Chat message")
-public class MessageDto {
-
-    @Schema(description = "Message ID", example = "msg-123")
-    private String messageId;
-
-    @Schema(description = "Conversation ID", example = "conv-123")
-    private String conversationId;
-
-    @Schema(description = "Message content", example = "List all monitors")
-    private String content;
-
-    @Schema(description = "Message role", example = "user", allowableValues = {"user", "assistant"})
-    private String role;
-
-    @Schema(description = "Message timestamp")
-    private LocalDateTime timestamp;
-}
@@ -1,47 +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 io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * OpenAI Configuration DTO - simplified to handle only API key
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "OpenAI configuration")
-public class OpenAiConfigDto {
-
-    /**
-     * Whether to enable OpenAI, default is false
-     */
-    @Schema(title = "Enable OpenAI", description = "Whether OpenAI is enabled", example = "true")
-    private boolean enable = false;
-
-    /**
-     * OpenAI API key
-     */
-    @Schema(title = "API Key", description = "OpenAI API key", example = "sk-...")
-    @NotBlank(message = "API Key cannot be empty when enabled")
-    private String apiKey;
-}
@@ -15,27 +15,12 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.pojo.dto;

-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+package org.apache.hertzbeat.ai.agent.service;

 /**
- * Metrics Information with favorite status
+ * Service interface for agent operations.
 */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "Metrics information with favorite status")
-public class MetricsInfo {
+public interface AgentService {

-    @Schema(description = "Metrics name", example = "cpu")
-    private String name;
-
-    @Schema(description = "Whether the metrics is favorited by current user")
-    private Boolean favorited;
-}
+}
@@ -19,18 +19,13 @@
 package org.apache.hertzbeat.ai.agent.service;

 import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
-import reactor.core.publisher.Flux;

 /**
 * Service for interacting with LLM providers (like OpenAI, Anthropic, etc.)
 */
 public interface ChatClientProviderService {

-    /**
-     * Stream chat response from the LLM
-     *
-     * @param context Chat request context containing message and conversation history
-     * @return Flux of string chunks from the LLM response
-     */
-    Flux<String> streamChat(ChatRequestContext context);
-}
+    String complete(String message);
+
+    String streamChat(ChatRequestContext context);
+}
@@ -18,34 +18,34 @@

 package org.apache.hertzbeat.ai.agent.service;

-import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto;
-import org.springframework.http.codec.ServerSentEvent;
-import reactor.core.publisher.Flux;
+
+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 {

-    /**
-     * Create a new conversation
-     *
-     * @return Created conversation data
-     */
-    ConversationDto createConversation();
-
    /**
     * Send a message and receive a streaming response
     *
     * @param message The user's message
     * @param conversationId Optional conversation ID for continuing a chat
-     * @return Flux of ServerSentEvent for streaming the response
+     * @return SseEmitter for streaming the response
     */
-    Flux<ServerSentEvent<ChatResponseDto>> streamChat(String message, String conversationId);
+    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
@@ -53,28 +53,19 @@ public interface ConversationService {
     * @param conversationId Conversation ID
     * @return Conversation data including messages
     */
-    ConversationDto getConversation(String conversationId);
+    Map<String, Object> getConversation(String conversationId);

    /**
     * Get all conversations for the current user
     *
     * @return List of conversations
     */
-    List<ConversationDto> getAllConversations();
+    List<Map<String, Object>> getAllConversations();

    /**
     * Delete a conversation
     *
     * @param conversationId Conversation ID to delete
-     * @return true if deleted, false if conversation not found
     */
-    boolean deleteConversation(String conversationId);
-
-    /**
-     * Check if a conversation exists
-     *
-     * @param conversationId Conversation ID to check
-     * @return true if conversation exists, false otherwise
-     */
-    boolean conversationExists(String conversationId);
-}
+    void deleteConversation(String conversationId);
+}
@@ -18,39 +18,11 @@

 package org.apache.hertzbeat.ai.agent.service;

-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hertzbeat.ai.agent.config.CustomSseServerTransport;
-import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
 import org.springframework.ai.tool.ToolCallbackProvider;
-import org.springframework.web.servlet.function.RouterFunction;
-import org.springframework.web.servlet.function.ServerResponse;

 /**
 * Service interface for MCP server operations.
 */
 public interface McpServerService {
-    
-    /**
-     * Provides the HertzBeat tools for the MCP server
-     * @return ToolCallbackProvider with all HertzBeat monitoring tools
-     */
    ToolCallbackProvider hertzbeatTools();
-
-    /**
-     * Provides a custom SSE server transport for the MCP server
-     * @param objectMapper the ObjectMapper instance for JSON serialization
-     * @param serverProperties the properties for the MCP server configuration
-     * @return a CustomSseServerTransport instance configured with the provided properties
-     */
-    CustomSseServerTransport webMvcSseServerTransportProvider(
-            ObjectMapper objectMapper,
-            McpServerProperties serverProperties
-    );
-
-    /**
-     * Provides the MCP server router function for web MVC
-     * @param transport Custom SSE server transport
-     * @return RouterFunction for handling MCP server requests
-     */
-    RouterFunction<ServerResponse> mvcMcpRouterFunction(CustomSseServerTransport transport);
 }
@@ -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.service;
-
-import org.apache.hertzbeat.ai.agent.event.OpenAiConfigChangeEvent;
-import org.apache.hertzbeat.ai.agent.pojo.dto.OpenAiConfigDto;
-
-/**
- * OpenAI Configuration Service
- * Consolidated service for OpenAI configuration, validation, and client factory management
- */
-public interface OpenAiConfigService {
-
-    /**
-     * Save OpenAI configuration
-     * @param config OpenAI configuration
-     */
-    void saveConfig(OpenAiConfigDto config);
-
-    /**
-     * Get OpenAI configuration
-     * @return OpenAI configuration
-     */
-    OpenAiConfigDto getConfig();
-
-    /**
-     * Check if OpenAI is properly configured
-     * @return true if configured and enabled
-     */
-    boolean isConfigured();
-
-    /**
-     * Get effective OpenAI configuration (DB first, then YAML fallback)
-     * @return effective configuration or null if not configured
-     */
-    OpenAiConfigDto getEffectiveConfig();
-
-    /**
-     * Validate OpenAI API key by calling the OpenAI API
-     * @param apiKey the API key to validate
-     * @return validation result with success status and message
-     */
-    ValidationResult validateApiKey(String apiKey);
-
-    /**
-     * Force reload of OpenAI configuration cache
-     * This method is typically called when configuration changes
-     */
-    void reloadConfig();
-
-    /**
-     * Handle OpenAI configuration change events
-     * @param event OpenAI configuration change event
-     */
-    void onOpenAiConfigChange(OpenAiConfigChangeEvent event);
-
-    /**
-     * Validation result class
-     */
-    class ValidationResult {
-        private final boolean valid;
-        private final String message;
-
-        private ValidationResult(boolean valid, String message) {
-            this.valid = valid;
-            this.message = message;
-        }
-
-        public static ValidationResult success(String message) {
-            return new ValidationResult(true, message);
-        }
-
-        public static ValidationResult failure(String message) {
-            return new ValidationResult(false, message);
-        }
-
-        public boolean isValid() {
-            return valid;
-        }
-
-        public String getMessage() {
-            return message;
-        }
-    }
-}
@@ -15,29 +15,16 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.ai.agent.config;

-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
+package org.apache.hertzbeat.ai.agent.service.impl;
+
+import org.apache.hertzbeat.ai.agent.service.AgentService;
+import org.springframework.stereotype.Service;

 /**
- * OpenAI YAML Configuration - reads from spring.ai.openai.api-key
+ * Implementation of the AgentService interface.
+ * This service provides functionality for handling AI agent operations.
 */
-@Data
-@Component
-@ConfigurationProperties(prefix = "spring.ai.openai")
-public class OpenAiYamlConfig {
-
-    /**
-     * OpenAI API key from spring.ai.openai.api-key
-     */
-    private String apiKey;
-
-    /**
-     * Check if OpenAI is enabled (has API key)
-     */
-    public boolean isEnable() {
-        return apiKey != null && !apiKey.trim().isEmpty();
-    }
-}
+@Service
+public class AgentServiceImpl implements AgentService {
+}
@@ -18,30 +18,20 @@

 package org.apache.hertzbeat.ai.agent.service.impl;

-import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.ai.agent.config.PromptProvider;
-import org.apache.hertzbeat.ai.agent.pojo.dto.MessageDto;
 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.chat.messages.AssistantMessage;
-import org.springframework.ai.chat.messages.Message;
-import org.springframework.ai.chat.messages.UserMessage;
 import org.springframework.ai.tool.ToolCallbackProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import reactor.core.publisher.Flux;
-
-import java.util.ArrayList;
-import java.util.List;

 /**
 * Implementation of the {@link ChatClientProviderService}.
 * Provides functionality to interact with the ChatClient for handling chat
 * messages.
 */
-@Slf4j
@Service
 public class ChatClientProviderServiceImpl implements ChatClientProviderService {

@@ -52,10 +42,11 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
    private ToolCallbackProvider toolCallbackProvider;

    @Autowired
-    public ChatClientProviderServiceImpl(ChatClient openAiChatClient) {
+    public ChatClientProviderServiceImpl(@Qualifier("openAiChatClient") ChatClient openAiChatClient) {
        this.chatClient = openAiChatClient;
    }

+    @Override
    public String complete(String message) {
        return this.chatClient.prompt()
                .user(message)
@@ -64,37 +55,16 @@ public class ChatClientProviderServiceImpl implements ChatClientProviderService
    }

    @Override
-    public Flux<String> streamChat(ChatRequestContext context) {
+    public String streamChat(ChatRequestContext context) {
        try {
-            List<Message> messages = new ArrayList<>();
-
-            // Add conversation history if available
-            if (context.getConversationHistory() != null && !context.getConversationHistory().isEmpty()) {
-                for (MessageDto historyMessage : context.getConversationHistory()) {
-                    if ("user".equals(historyMessage.getRole())) {
-                        messages.add(new UserMessage(historyMessage.getContent()));
-                    } else if ("assistant".equals(historyMessage.getRole())) {
-                        messages.add(new AssistantMessage(historyMessage.getContent()));
-                    }
-                }
-            }
-
-            messages.add(new UserMessage(context.getMessage()));
-
-            log.info("Starting streaming chat for conversation: {}", context.getConversationId());
-
-            return this.chatClient.prompt()
-                    .messages(messages)
-                    .system(PromptProvider.HERTZBEAT_SYSTEM_PROMPT)
+            return this.chatClient.prompt(PromptProvider.HERTZBEAT_MONITORING_PROMPT)
+                    .user(context.getMessage())
                    .toolCallbacks(toolCallbackProvider)
-                    .stream()
-                    .content()
-                    .doOnComplete(() -> log.info("Streaming completed for conversation: {}", context.getConversationId()))
-                    .doOnError(error -> log.error("Error in streaming chat: {}", error.getMessage(), error));
-
+                    .call()
+                    .content();
        } catch (Exception e) {
-            log.error("Error setting up streaming chat: {}", e.getMessage(), e);
-            return Flux.error(e);
+            return "Error: " + e.getMessage();
        }
+
    }
-}
+}
@@ -15,262 +15,15 @@
 * limitations under the License.
 */

+
 package org.apache.hertzbeat.ai.agent.service.impl;

-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto;
-import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto;
-import org.apache.hertzbeat.ai.agent.pojo.dto.MessageDto;
-import org.apache.hertzbeat.ai.agent.service.ChatClientProviderService;
-import org.apache.hertzbeat.ai.agent.service.ConversationService;
-import org.apache.hertzbeat.ai.agent.service.OpenAiConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.codec.ServerSentEvent;
 import org.springframework.stereotype.Service;
-import reactor.core.publisher.Flux;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;

 /**
 * Implementation of the ConversationService interface for managing chat conversations.
 */
-@Slf4j
@Service
-public class ConversationServiceImpl implements ConversationService {
+public class ConversationServiceImpl {

-    private final Map<String, Map<String, Object>> conversations = new ConcurrentHashMap<>();
-    private final Map<String, List<Map<String, Object>>> conversationMessages = new ConcurrentHashMap<>();
-
-    @Autowired
-    private ChatClientProviderService chatClientProviderService;
-
-    @Autowired
-    private OpenAiConfigService openAiConfigService;
-
-    @Override
-    public ConversationDto createConversation() {
-        String conversationId = createNewConversation();
-        return getConversation(conversationId);
-    }
-
-    @Override
-    public Flux<ServerSentEvent<ChatResponseDto>> streamChat(String message, String conversationId) {
-        // Validate conversation exists
-        if (!conversationExists(conversationId)) {
-            ChatResponseDto errorResponse = ChatResponseDto.builder()
-                    .conversationId(conversationId)
-                    .response("Error: Conversation not found: " + conversationId)
-                    .build();
-            return Flux.just(ServerSentEvent.builder(errorResponse)
-                    .event("error")
-                    .build());
-        }
-
-        // Check if OpenAI is properly configured
-        if (!openAiConfigService.isConfigured()) {
-            ChatResponseDto errorResponse = ChatResponseDto.builder()
-                    .conversationId(conversationId)
-                    .response("OpenAI is not configured. Please configure your OpenAI API key in the settings or application.yml file.")
-                    .build();
-            return Flux.just(ServerSentEvent.builder(errorResponse)
-                    .event("error")
-                    .build());
-        }
-
-        log.info("Starting streaming conversation: {}", conversationId);
-
-        // Add user message to conversation
-        String userMessageId = addMessageToConversation(conversationId, message, "user");
-
-        // Get conversation history for context
-        List<Map<String, Object>> messagesList = conversationMessages.get(conversationId);
-        List<MessageDto> conversationHistory = new ArrayList<>();
-
-        if (messagesList != null && messagesList.size() > 1) {
-            // Get all messages except the last one (which is the current user message we just added)
-            for (int i = 0; i < messagesList.size() - 1; i++) {
-                Map<String, Object> msgMap = messagesList.get(i);
-                conversationHistory.add(mapToMessageDto(msgMap));
-            }
-        }
-
-        ChatRequestContext context = ChatRequestContext.builder()
-                .message(message)
-                .conversationId(conversationId)
-                .conversationHistory(conversationHistory)
-                .build();
-
-        // Stream response from AI service
-        StringBuilder fullResponse = new StringBuilder();
-        return chatClientProviderService.streamChat(context)
-                .map(chunk -> {
-                    fullResponse.append(chunk);
-                    ChatResponseDto responseDto = ChatResponseDto.builder()
-                            .conversationId(conversationId)
-                            .response(chunk)
-                            .userMessageId(userMessageId)
-                            .build();
-
-                    return ServerSentEvent.builder(responseDto)
-                            .event("message")
-                            .build();
-                })
-                .concatWith(Flux.defer(() -> {
-                    // Add the complete AI response to conversation
-                    String assistantMessageId = addMessageToConversation(conversationId, fullResponse.toString(), "assistant");
-
-                    ChatResponseDto finalResponse = ChatResponseDto.builder()
-                            .conversationId(conversationId)
-                            .response("")
-                            .userMessageId(userMessageId)
-                            .assistantMessageId(assistantMessageId)
-                            .build();
-
-                    return Flux.just(ServerSentEvent.builder(finalResponse)
-                            .event("complete")
-                            .build());
-                }))
-                .doOnComplete(() -> log.info("Streaming completed for conversation: {}", conversationId))
-                .doOnError(error -> log.error("Error in streaming chat for conversation {}: {}", conversationId, error.getMessage(), error))
-                .onErrorResume(error -> {
-                    ChatResponseDto errorResponse = ChatResponseDto.builder()
-                            .conversationId(conversationId)
-                            .response("An error occurred: " + error.getMessage())
-                            .userMessageId(userMessageId)
-                            .build();
-                    return Flux.just(ServerSentEvent.builder(errorResponse)
-                            .event("error")
-                            .build());
-                });
-    }
-
-    @Override
-    public ConversationDto getConversation(String conversationId) {
-        if (conversationId == null || conversationId.isEmpty()) {
-            return null;
-        }
-
-        Map<String, Object> conversation = conversations.get(conversationId);
-        if (conversation == null) {
-            return null;
-        }
-
-        List<Map<String, Object>> messagesList = conversationMessages.get(conversationId);
-        List<MessageDto> messages = messagesList != null
-                ? messagesList.stream().map(this::mapToMessageDto).collect(Collectors.toList()) :
-                new ArrayList<>();
-
-        return ConversationDto.builder()
-                .conversationId((String) conversation.get("conversationId"))
-                .createdAt((LocalDateTime) conversation.get("createdAt"))
-                .updatedAt((LocalDateTime) conversation.get("updatedAt"))
-                .messages(messages)
-                .build();
-    }
-
-    @Override
-    public List<ConversationDto> getAllConversations() {
-        List<ConversationDto> result = new ArrayList<>();
-
-        for (Map.Entry<String, Map<String, Object>> entry : conversations.entrySet()) {
-            Map<String, Object> conv = entry.getValue();
-            List<Map<String, Object>> messages = conversationMessages.get(entry.getKey());
-
-            ConversationDto dto = ConversationDto.builder()
-                    .conversationId((String) conv.get("conversationId"))
-                    .createdAt((LocalDateTime) conv.get("createdAt"))
-                    .updatedAt((LocalDateTime) conv.get("updatedAt"))
-                    .messages(new ArrayList<>()) // Don't include messages in list view for performance
-                    .build();
-            result.add(dto);
-        }
-
-        result.sort((a, b) -> b.getUpdatedAt().compareTo(a.getUpdatedAt()));
-
-        return result;
-    }
-
-    @Override
-    public boolean deleteConversation(String conversationId) {
-        if (conversationId == null || conversationId.isEmpty()) {
-            return false;
-        }
-
-        boolean existed = conversations.containsKey(conversationId);
-        if (existed) {
-            conversations.remove(conversationId);
-            conversationMessages.remove(conversationId);
-            log.info("Deleted conversation: {}", conversationId);
-        }
-        return existed;
-    }
-
-    @Override
-    public boolean conversationExists(String conversationId) {
-        return conversationId != null && !conversationId.isEmpty() && conversations.containsKey(conversationId);
-    }
-
-    private String createNewConversation() {
-        String conversationId = "conv-" + UUID.randomUUID().toString().substring(0, 8);
-        LocalDateTime now = LocalDateTime.now();
-
-        Map<String, Object> conversation = new HashMap<>();
-        conversation.put("conversationId", conversationId);
-        conversation.put("createdAt", now);
-        conversation.put("updatedAt", now);
-
-        conversations.put(conversationId, conversation);
-        conversationMessages.put(conversationId, new ArrayList<>());
-
-        log.info("Created new conversation: {}", conversationId);
-        return conversationId;
-    }
-
-    private MessageDto mapToMessageDto(Map<String, Object> messageMap) {
-        return MessageDto.builder()
-                .messageId((String) messageMap.get("messageId"))
-                .conversationId((String) messageMap.get("conversationId"))
-                .content((String) messageMap.get("content"))
-                .role((String) messageMap.get("role"))
-                .timestamp((LocalDateTime) messageMap.get("timestamp"))
-                .build();
-    }
-
-    private String addMessageToConversation(String conversationId, String content, String role) {
-        List<Map<String, Object>> messages = conversationMessages.computeIfAbsent(conversationId, k -> new ArrayList<>());
-
-        String messageId = "msg-" + UUID.randomUUID().toString().substring(0, 8);
-        Map<String, Object> message = new HashMap<>();
-        message.put("messageId", messageId);
-        message.put("conversationId", conversationId);
-        message.put("content", content);
-        message.put("role", role);
-        message.put("timestamp", LocalDateTime.now());
-
-        messages.add(message);
-
-        // Update conversation timestamp
-        Map<String, Object> conversation = conversations.get(conversationId);
-        if (conversation != null) {
-            conversation.put("updatedAt", LocalDateTime.now());
-            // Auto-generate title from first user message
-            if ("user".equals(role) && messages.stream().filter(m -> "user".equals(m.get("role"))).count() == 1) {
-                String title = content.length() > 30 ? content.substring(0, 27) + "..." : content;
-                conversation.put("title", title);
-            }
-        }
-
-        return messageId;
-    }
-
-
-
-}
+}
@@ -20,18 +20,15 @@ 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.apache.hertzbeat.ai.agent.tools.AlertDefineTools;
-import org.apache.hertzbeat.ai.agent.tools.AlertTools;
-import org.apache.hertzbeat.ai.agent.tools.MetricsTools;
-import org.apache.hertzbeat.ai.agent.tools.MonitorTools;
 import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
+import org.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;
@@ -44,17 +41,11 @@ import org.springframework.web.servlet.function.ServerResponse;
@Configuration
 public class McpServerServiceImpl implements McpServerService {
    @Autowired
-    private MonitorTools monitorTools;
-    @Autowired
-    private AlertTools alertTools;
-    @Autowired
-    private MetricsTools metricsTools;
-    @Autowired
-    private AlertDefineTools alertDefineTools;
+    private MonitorToolsImpl monitorTools;

    @Bean
    public ToolCallbackProvider hertzbeatTools() {
-        return MethodToolCallbackProvider.builder().toolObjects(monitorTools, alertTools, alertDefineTools, metricsTools).build();
+        return MethodToolCallbackProvider.builder().toolObjects(monitorTools).build();
    }
    /**
     * Provides a custom SSE server transport for the MCP server.
@@ -1,200 +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 com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.ai.agent.config.OpenAiYamlConfig;
-import org.apache.hertzbeat.ai.agent.dao.OpenAiConfigDao;
-import org.apache.hertzbeat.ai.agent.entity.OpenAiConfig;
-import org.apache.hertzbeat.ai.agent.event.OpenAiConfigChangeEvent;
-import org.apache.hertzbeat.ai.agent.pojo.dto.OpenAiConfigDto;
-import org.apache.hertzbeat.ai.agent.service.OpenAiConfigService;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.event.EventListener;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import org.springframework.web.client.RestTemplate;
-
-/**
- * OpenAI Configuration Service Implementation
- * Consolidated service for OpenAI configuration, validation, and client factory management
- */
-@Slf4j
-@Service
-public class OpenAiConfigServiceImpl implements OpenAiConfigService {
-
-    private static final String CONFIG_TYPE = "openai";
-    private static final String OPENAI_MODELS_ENDPOINT = "https://api.openai.com/v1/models";
-    
-    private final OpenAiConfigDao openAiConfigDao;
-    private final ObjectMapper objectMapper;
-    private final ApplicationContext applicationContext;
-    private final OpenAiYamlConfig yamlConfig;
-    private final RestTemplate restTemplate;
-    
-    // Client factory cache
-    private volatile OpenAiConfigDto currentConfig;
-
-    public OpenAiConfigServiceImpl(OpenAiConfigDao openAiConfigDao, 
-                                  ObjectMapper objectMapper,
-                                  ApplicationContext applicationContext,
-                                  OpenAiYamlConfig yamlConfig) {
-        this.openAiConfigDao = openAiConfigDao;
-        this.objectMapper = objectMapper;
-        this.applicationContext = applicationContext;
-        this.yamlConfig = yamlConfig;
-        this.restTemplate = new RestTemplate();
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void saveConfig(OpenAiConfigDto config) {
-        try {
-            String contentJson = objectMapper.writeValueAsString(config);
-            
-            OpenAiConfig openAiConfig = OpenAiConfig.builder()
-                    .type(CONFIG_TYPE)
-                    .content(contentJson)
-                    .build();
-            
-            openAiConfigDao.save(openAiConfig);
-            log.info("OpenAI configuration saved successfully");
-            
-            applicationContext.publishEvent(new OpenAiConfigChangeEvent(applicationContext));
-            
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Failed to save OpenAI configuration: " + e.getMessage());
-        }
-    }
-
-    @Override
-    public OpenAiConfigDto getConfig() {
-        OpenAiConfig config = openAiConfigDao.findByType(CONFIG_TYPE);
-        if (config == null || !StringUtils.hasText(config.getContent())) {
-            return null;
-        }
-        
-        try {
-            return objectMapper.readValue(config.getContent(), OpenAiConfigDto.class);
-        } catch (JsonProcessingException e) {
-            throw new IllegalArgumentException("Failed to parse OpenAI configuration: " + e.getMessage());
-        }
-    }
-
-    @Override
-    public boolean isConfigured() {
-        OpenAiConfigDto effective = getEffectiveConfig();
-        return effective != null && effective.isEnable() && StringUtils.hasText(effective.getApiKey());
-    }
-
-    @Override
-    public OpenAiConfigDto getEffectiveConfig() {
-        OpenAiConfigDto dbConfig = getConfig();
-        if (dbConfig != null && dbConfig.isEnable() && StringUtils.hasText(dbConfig.getApiKey())) {
-            log.debug("Using database OpenAI configuration");
-            return dbConfig;
-        }
-        
-        if (yamlConfig != null && yamlConfig.isEnable() && StringUtils.hasText(yamlConfig.getApiKey())) {
-            log.debug("Using YAML OpenAI configuration from spring.ai.openai.api-key");
-            OpenAiConfigDto yamlDto = new OpenAiConfigDto();
-            yamlDto.setEnable(true);
-            yamlDto.setApiKey(yamlConfig.getApiKey());
-            return yamlDto;
-        }
-        
-        log.debug("No valid OpenAI configuration found");
-        return null;
-    }
-
-    @Override
-    public ValidationResult validateApiKey(String apiKey) {
-        if (!StringUtils.hasText(apiKey)) {
-            return ValidationResult.failure("API key cannot be empty");
-        }
-
-        if (!apiKey.startsWith("sk-")) {
-            return ValidationResult.failure("Invalid API key format. OpenAI API keys should start with 'sk-'");
-        }
-
-        try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.set("Authorization", "Bearer " + apiKey);
-            headers.set("Content-Type", "application/json");
-            
-            HttpEntity<String> entity = new HttpEntity<>(headers);
-            
-            log.debug("Validating OpenAI API key by calling models endpoint");
-            ResponseEntity<String> response = restTemplate.exchange(
-                OPENAI_MODELS_ENDPOINT,
-                HttpMethod.GET,
-                entity,
-                String.class
-            );
-
-            if (response.getStatusCode() == HttpStatus.OK) {
-                log.info("OpenAI API key validation successful");
-                return ValidationResult.success("API key is valid");
-            } else {
-                log.warn("OpenAI API key validation failed with status: {}", response.getStatusCode());
-                return ValidationResult.failure("API key validation failed: " + response.getStatusCode());
-            }
-
-        } catch (Exception e) {
-            log.error("Error validating OpenAI API key", e);
-            String errorMessage = e.getMessage();
-            
-            // Parse common error messages
-            if (errorMessage.contains("401")) {
-                return ValidationResult.failure("Invalid API key - authentication failed");
-            } else if (errorMessage.contains("403")) {
-                return ValidationResult.failure("API key does not have permission to access models");
-            } else if (errorMessage.contains("429")) {
-                return ValidationResult.failure("Rate limit exceeded - please try again later");
-            } else if (errorMessage.contains("timeout") || errorMessage.contains("connect")) {
-                return ValidationResult.failure("Network error - unable to connect to OpenAI API");
-            } else {
-                return ValidationResult.failure("API key validation failed: " + errorMessage);
-            }
-        }
-    }
-
-    @Override
-    public void reloadConfig() {
-        synchronized (this) {
-            currentConfig = null; // Force reload
-        }
-    }
-
-    /**
-     * OpenAI configuration change event listener
-     */
-    @EventListener(OpenAiConfigChangeEvent.class)
-    public void onOpenAiConfigChange(OpenAiConfigChangeEvent event) {
-        log.info("[OpenAiConfigService] OpenAI configuration change event received");
-        reloadConfig();
-    }
-}
@@ -1,91 +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 definition and threshold configuration operations
- */
-public interface AlertDefineTools {
-
-    /**
-     * Create a new alert rule with HertzBeat's expression format based on app hierarchy
-
-     * 
-     * @param name Alert rule name (required, must be unique)
-     * @param app App name from hierarchy (must match exact hierarchy app value)
-     * @param metrics Metrics name from hierarchy (must match exact hierarchy metrics value)
-     * @param fieldConditions Field-specific conditions from metric's children (e.g., "VmName = 'arora'", "total_granted > 1000", 
-     *                       "total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556)")
-     * @param type Alert rule type: 'realtime' (default) or 'periodic'
-     * @param period Execution period in seconds (only for periodic rules, default: 300)
-     * @param times Number of consecutive violations before triggering (default: 3)
-     * @param priority Alert priority as integer: 0=critical, 1=warning, 2=info (default: 1)
-     * @param description Alert rule description (optional)
-     * @param template Alert message template with variables (optional)
-     * @param datasource Data source type: 'promql' (default)
-     * @param labels Labels as key:value pairs separated by commas
-     * @param annotations Annotations as key:value pairs separated by commas
-     * @param enable Whether to enable the rule immediately (default: true)
-     * @return Result message with rule ID if successful
-     */
-    String createAlertRule(String name, String app, String metrics, String fieldConditions,
-                          String type, Integer period, Integer times, Integer priority, String description,
-                          String template, String datasource, String labels, String annotations, Boolean enable);
-
-    /**
-     * List existing alert rules with filtering
-     * @param search Search term for rule name or description
-     * @param monitorType Filter by monitor type
-     * @param enabled Filter by enabled status
-     * @param pageIndex Page index
-     * @param pageSize Page size
-     * @return Formatted list of alert rules
-     */
-    String listAlertRules(String search, String monitorType, Boolean enabled, Integer pageIndex, Integer pageSize);
-
-    /**
-     * Enable or disable an alert rule
-     * @param ruleId Alert rule ID
-     * @param enabled Whether to enable the rule
-     * @return Result message
-     */
-    String toggleAlertRule(Long ruleId, Boolean enabled);
-
-    /**
-     * Get detailed information about an alert rule
-     * @param ruleId Alert rule ID
-     * @return Detailed rule information
-     */
-    String getAlertRuleDetails(Long ruleId);
-
-
-    /**
-     * Get the hierarchical structure of available apps and metrics for alert rule creation
-     * @param app App type to get hierarchy for (optional, gets all if not specified)
-     * @return Hierarchical structure showing apps and their available metrics
-     */
-    String getAppsMetricsHierarchy(String app);
-
-    /**
-     * Bind monitors to an alert rule by modifying the alert expression
-     * @param ruleId Alert rule ID to bind monitors to
-     * @param monitorIds Comma-separated list of monitor IDs to bind
-     * @return Result message indicating success or failure
-     */
-    String bindMonitorsToAlertRule(Long ruleId, String monitorIds);
-}
@@ -19,28 +19,7 @@
 package org.apache.hertzbeat.ai.agent.tools;

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

 /**
- * Tools for metrics data operations and queries
+ * Tools for metrics operations
 */
 public interface MetricsTools {
-
-    /**
-     * Get real-time metrics data for a monitor
-     * @param monitorId Monitor ID
-     * @param metrics Metrics name (e.g., "system", "cpu", "memory")
-     * @return Formatted real-time metrics data
-     */
-    String getRealtimeMetrics(Long monitorId, String metrics);
-
-    /**
-     * Get historical metrics data for a monitor
-     * @param monitorId Monitor ID
-     * @param app Monitor type (e.g., "linux", "mysql", "http")
-     * @param metrics Metrics name (e.g., "system", "cpu", "memory")
-     * @param metric Specific metric field (e.g., "usage", "used", "available")
-     * @param label Label filter for specific instances
-     * @param history Time range (e.g., "1h", "6h", "24h", "7d")
-     * @param interval Whether to aggregate data with intervals
-     * @return Historical metrics data formatted for display
-     */
-    String getHistoricalMetrics(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval);
-
-    /**
-     * Check warehouse storage server status
-     * @return Status of the metrics storage system
-     */
-    String getWarehouseStatus();
-
 }
@@ -18,6 +18,8 @@

 package org.apache.hertzbeat.ai.agent.tools;

+import org.springframework.ai.chat.model.ToolContext;
+
 import java.util.List;

 /**
@@ -25,57 +27,15 @@ import java.util.List;
 */
 public interface MonitorTools {

-    /**
-     * Add a new monitor with comprehensive configuration
-     * 
-     * @param name Monitor name
-     * @param app Monitor type/application (e.g., 'linux', 'mysql', 'http')
-     * @param host Target host (IP address or domain name)
-     * @param port Target port (optional, depends on monitor type)
-     * @param intervals Collection interval in seconds (default: 600)
-     * @param username Username for authentication (optional)
-     * @param password Password for authentication (optional)
-     * @param database Database name (for database monitors)
-     * @param additionalParams Additional app-specific parameters as JSON string (optional)
-     * @param description Monitor description (optional)
-     * @return Result message with monitor ID if successful
-     */
-    String addMonitor(
-            String name, 
-            String app, 
-            String host,
-            Integer port,
-            Integer intervals,
-            String username,
-            String password,
-            String database,
-            String additionalParams,
-            String description
-    );
-    
-    /**
-     * List all available monitor types that can be added
-     * 
-     * @param language Language code for localized names (e.g., 'en-US', 'zh-CN')
-     * @return Formatted string list of available monitor types with descriptions
-     */
-    String listMonitorTypes(String language);
+    String addMonitor(String name, ToolContext context);

    /**
-     * Comprehensive monitor querying with flexible filtering, pagination, and specialized views
-     * @param ids Specific monitor IDs to retrieve (optional)
-     * @param app Monitor type filter (linux, mysql, http, etc.)
-     * @param status Monitor status (1=online, 2=offline, 3=unreachable, 0=paused, 9=all)
-     * @param search Search in monitor names or hosts (partial matching)
-     * @param labels Label filters, format: 'key1:value1,key2:value2'
-     * @param sort Sort field (name, gmtCreate, gmtUpdate, status, app)
-     * @param order Sort order (asc, desc)
-     * @param pageIndex Page number starting from 0
-     * @param pageSize Items per page (1-100 recommended)
-     * @param includeStats Include status statistics summary
-     * @return Comprehensive monitor information with optional statistics
+     * 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 queryMonitors(
+    String listMonitors(
            List<Long> ids,
            String app,
            Byte status,
@@ -85,13 +45,6 @@ public interface MonitorTools {
            String order,
            Integer pageIndex,
            Integer pageSize,
-            Boolean includeStats);
+            ToolContext context);

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

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

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

-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;

 /**
 * Implementation of Monitoring Tools functionality
@@ -42,6 +38,7 @@ import java.util.Map;
@Slf4j
@Service
 public class MonitorToolsImpl implements MonitorTools {
+
    @Autowired
    private MonitorServiceAdapter monitorServiceAdapter;

@@ -50,442 +47,41 @@ public class MonitorToolsImpl implements MonitorTools {
     * Tool to query monitor information with flexible filtering and pagination.
     * Supports filtering by monitor IDs, type, status, host, labels, sorting, and
     * pagination.
-     * Returns detailed monitor information including ID, name, type, host, and status.
+     * Returns monitor names as string.
     */
    @Override
-    @Tool(name = "query_monitors", description = """ 
-            Query Existing/configured monitors in HertzBeat.
-            This tool retrieves monitors based on various filters and parameters.
-            Comprehensive monitor querying with flexible filtering, pagination, and specialized views.
-            
-            MONITOR STATUSES:
-            - status=1: Online/Active monitors (healthy, responding normally)
-            - status=2: Offline monitors (not responding, connection failed)
-            - status=3: Unreachable monitors (network/connectivity issues)
-            - status=0: Paused monitors (manually disabled/suspended)
-            - status=9 or null: All monitors regardless of status (default)
-            
-            COMMON USE CASES & PARAMETER COMBINATIONS:
-            
-            1. BASIC MONITOR LISTING:
-               - Default: No parameters (shows all monitors, 8 per page)
-               - By type: app='linux' (show only Linux monitors)
-               - Search: search='web' (find monitors with 'web' in name/host)
-            
-            2. STATUS-BASED QUERIES:
-               - Healthy monitors: status=1, pageSize=50
-               - Problem monitors: status=2 or status=3, pageSize=50
-               - Offline monitors only: status=2
-               - Unreachable monitors only: status=3
-               - Paused monitors: status=0
-            
-            3. MONITORING HEALTH OVERVIEW:
-               - All statuses with statistics: status=9, includeStats=true, pageSize=100
-               - Unhealthy monitors: Pass both status=2 AND status=3 (make 2 separate calls)
-            
-            4. ADVANCED FILTERING:
-               - Specific monitor types: app='mysql', status=1 (healthy MySQL monitors)
-               - Label-based: labels='env:prod,critical:true'
-               - Host search: search='192.168' (find by IP pattern)
-               - Monitor IDs: ids=[1,2,3] (specific monitors by ID)
-            
-            5. SORTING & PAGINATION:
-               - Recently updated: sort='gmtUpdate', order='desc'
-               - Alphabetical: sort='name', order='asc'
-               - By creation: sort='gmtCreate', order='desc' (newest first)
-               - Large datasets: pageSize=50-100 for bulk operations
-            
-            RESPONSE FORMAT:
-            - includeStats=true: Adds status distribution summary at top
-            - Default: Simple list with ID, name, type, host, status
-            - Shows total count and pagination info
+    @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 queryMonitors(
-            @ToolParam(description = "Specific monitor IDs to retrieve (optional)", required = false) List<Long> ids,
-            @ToolParam(description = "Monitor type filter: 'linux', 'mysql', 'http', 'redis', etc. (optional)", required = false) String app,
-            @ToolParam(description = "Monitor status: 1=online, 2=offline, 3=unreachable, 0=paused, 9=all (default: 9)", required = false) Byte status,
-            @ToolParam(description = "Search in monitor names or hosts (partial matching)", required = false) String search,
-            @ToolParam(description = "Label filters, format: 'key1:value1,key2:value2'", required = false) String labels,
-            @ToolParam(description = "Sort field: 'name', 'gmtCreate', 'gmtUpdate', 'status', 'app' (default: gmtCreate)", required = false) String sort,
-            @ToolParam(description = "Sort order: 'asc' (ascending) or 'desc' (descending, default)", required = false) String order,
-            @ToolParam(description = "Page number starting from 0 (default: 0)", required = false) Integer pageIndex,
-            @ToolParam(description = "Items per page: 1-100 recommended (default: 20)", required = false) Integer pageSize,
-            @ToolParam(description = "Include status statistics summary (default: false)", required = false) Boolean includeStats) {
+    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 {
-            // Set defaults
-            if (pageSize == null || pageSize <= 0) {
-                pageSize = 20;
-            }
-            if (pageIndex == null) {
-                pageIndex = 0;
-            }
-            if (includeStats == null) {
-                includeStats = false;
-            }
-            
            Page<Monitor> result = monitorServiceAdapter.getMonitors(ids, app, search, status, sort, order, pageIndex, pageSize, labels);
            log.debug("MonitorServiceAdapter.getMonitors result: {}", result);
-            
-            StringBuilder response = new StringBuilder();
-            response.append("MONITOR QUERY RESULTS\n");
-            response.append("====================\n\n");
-            
-            // Include statistics if requested
-            if (includeStats) {
-                // Get status distribution by calling with different status values
-                long onlineCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 1, null, null, 0, 1000, labels).getTotalElements();
-                long offlineCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 2, null, null, 0, 1000, labels).getTotalElements();
-                long unreachableCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 3, null, null, 0, 1000, labels).getTotalElements();
-                long pausedCount = monitorServiceAdapter.getMonitors(null, app, search, (byte) 0, null, null, 0, 1000, labels).getTotalElements();
-                
-                response.append("STATUS OVERVIEW:\n");
-                response.append("- Online: ").append(onlineCount).append("\n");
-                response.append("- Offline: ").append(offlineCount).append("\n"); 
-                response.append("- Unreachable: ").append(unreachableCount).append("\n");
-                response.append("- Paused: ").append(pausedCount).append("\n");
-                
-                long total = onlineCount + offlineCount + unreachableCount + pausedCount;
-                if (total > 0) {
-                    double healthPercentage = (onlineCount * 100.0) / total;
-                    response.append("- Health Rate: ").append(String.format("%.1f", healthPercentage)).append("%\n");
-                }
-                response.append("\n");
-            }
-            
-            response.append("Query Results: ").append(result.getContent().size())
-                   .append(" monitors (Total: ").append(result.getTotalElements()).append(")\n");
-            
-            if (result.getTotalPages() > 1) {
-                response.append("Page ").append(pageIndex + 1).append(" of ").append(result.getTotalPages()).append("\n");
-            }
-            response.append("\n");
-            
-            for (Monitor monitor : result.getContent()) {
-                response.append("ID: ").append(monitor.getId())
-                       .append(" | Name: ").append(monitor.getName())
-                       .append(" | Type: ").append(monitor.getApp())
-                       .append(" | Host: ").append(monitor.getHost())
-                       .append(" | Status: ").append(UtilityClass.getStatusText(monitor.getStatus()));
-                       
-                // Add creation date for better context
-                if (monitor.getGmtCreate() != null) {
-                    response.append(" | Created: ").append(monitor.getGmtCreate().toString(), 0, 10);
-                }
-                response.append("\n");
-            }
-            
-            if (result.getContent().isEmpty()) {
-                response.append("No monitors found matching the specified criteria.\n");
-                response.append("Try adjusting your filters or search terms.");
-            }
-            
-            return response.toString();
+            return result.getContent().stream().map(Monitor::getName).toList().toString();
        } catch (Exception e) {
-            return "Error retrieving monitors: " + e.getMessage();
+            return "error is" + e.getMessage();
        }
    }

-
    @Override
-    @Tool(name = "add_monitor", description = """
-            Add a new monitoring target to HertzBeat with comprehensive configuration.
-            This tool dynamically handles different parameter requirements for each monitor type.
-            
-            This tool creates monitors with proper app-specific parameters.
-            
-            *********
-            VERY IMPORTANT:
-            ALWAYS use get_monitor_additional_params to check the additional required parameters for the chosen type before adding a monitor or even mentioning it.
-            Use list_monitor_types tool to see available monitor type names to use here in the app parameter.
-            Use the information obtained from this to query user for parameters.
-            If the User has not given any parameters, ask them to provide the necessary parameters, until all the necessary parameters are provided.
-            **********
-            
-            Examples of natural language requests this tool handles:
-            - "Monitor website example.com with HTTPS on port 443"
-            - "Add MySQL monitoring for database server at 192.168.1.10 with user admin"
-            - "Monitor Linux server health on host server.company.com via SSH"
-            - "Set up Redis monitoring on localhost port 6379 with password"
-            
-            PARAMETER MAPPING: The tool intelligently maps common parameters:
-            - host: Target server/domain
-            - port: Service port (auto-detected if not specified)
-            - username: Authentication username
-            - password: Authentication password
-            - database: Database name (for DB monitors)
-            - additionalParams: JSON string for app-specific parameters (to be obtained from get_monitor_param_defines)
-            
-            ADDITIONAL PARAMETERS EXAMPLES:
-            - Website: {"uri":"/api/health", "ssl":"true", "method":"POST"}
-            - Linux: {"privateKey":"ssh-key-content", "script":"custom-script"}
-            - Database: {"url":"jdbc:mysql://custom", "timeout":"10000"}
-            """)
-    public String addMonitor(
-            @ToolParam(description = "Monitor name (required)", required = true) String name,
-            @ToolParam(description = "Monitor type: website, mysql, postgresql, redis, linux, windows, etc.", required = true) String app,
-            @ToolParam(description = "Target host: IP address or domain name", required = true) String host,
-            @ToolParam(description = "Target port (optional, auto-detected if not specified)", required = false) Integer port,
-            @ToolParam(description = "Collection interval in seconds (default: 600)", required = false) Integer intervals,
-            @ToolParam(description = "Username for authentication (optional)", required = false) String username,
-            @ToolParam(description = "Password for authentication (optional)", required = false) String password,
-            @ToolParam(description = "Database name (for database monitors)", required = false) String database,
-            @ToolParam(description = "Additional app-specific parameters as JSON: {\"uri\":\"/api\", \"ssl\":\"true\", \"method\":\"POST\"}", required = false) String additionalParams,
-            @ToolParam(description = "Monitor description (optional)", required = false) String description) {
-        
-        try {
-            log.info("Adding monitor: name={}, app={}, host={}", name, app, host);
-            
-            // Validate required parameters
-            if (name == null || name.trim().isEmpty()) {
-                return "Error: Monitor name is required";
-            }
-            if (app == null || app.trim().isEmpty()) {
-                return "Error: Monitor type/application is required";
-            }
-            if (host == null || host.trim().isEmpty()) {
-                return "Error: Host is required";
-            }
-            
-            // Set defaults
-            if (intervals == null || intervals < 10) {
-                intervals = 600;
-            }
-            
-            // Create Monitor entity
-            Monitor monitor = Monitor.builder()
-                    .name(name.trim())
-                    .app(app.toLowerCase().trim())
-                    .host(host.trim())
-                    .intervals(intervals)
-                    .status((byte) 1)
-                    .type((byte) 0)
-                    .description(description != null ? description.trim() : "")
-                    .build();
-            
-            List<Param> params = createBasicParams(host, port, username, password, database, additionalParams);
-            
-            // Validate that all required parameters for this monitor type are provided
-            try {
-                List<ParamDefine> requiredParams = monitorServiceAdapter.getMonitorParamDefines(app);
-                log.info("Checking required parameters for monitor type '{}': {}", app, requiredParams);
-                List<String> missingParams = new ArrayList<>();
-                
-                for (ParamDefine paramDefine : requiredParams) {
-                    if (paramDefine.isRequired()) {
-                        String fieldName = paramDefine.getField();
-                        boolean hasParam = params.stream()
-                                .anyMatch(param -> fieldName.equals(param.getField()));
-                        if (!hasParam) {
-                            missingParams.add(fieldName);
-                        }
-                    }
-                }
-                
-                if (!missingParams.isEmpty()) {
-                    return String.format("Error: Missing required parameters for monitor type '%s': %s. "
-                            + "Use get_monitor_additional_params tool to see all required parameters.", 
-                            app, String.join(", ", missingParams));
-                }
-            } catch (Exception e) {
-                log.warn("Could not validate required parameters for monitor type '{}': {}", app, e.getMessage());
-            }
-            
-            // Call adapter - it handles all the complexity (validation, defaults, app-specific logic)
-            Long monitorId = monitorServiceAdapter.addMonitor(monitor, params, null);
-            
-            log.info("Successfully added monitor '{}' with ID: {}", name, monitorId);
-            return String.format("Successfully added %s monitor '%s' with ID: %d (Host: %s, Interval: %d seconds)", 
-                    app.toUpperCase(), name, monitorId, host, intervals);
-            
-        } catch (Exception e) {
-            log.error("Failed to add monitor '{}': {}", name, e.getMessage(), e);
-            return "Error adding monitor '" + name + "': " + e.getMessage();
-        }
+    @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;
    }
-    
-    /**
-     * Create basic parameter list from user inputs
-     */
-    private List<Param> createBasicParams(String host, Integer port, String username, 
-                                         String password, String database, String additionalParams) {
-        List<Param> params = new ArrayList<>();
-        
-        // Add host (always required)
-        params.add(Param.builder().field("host").paramValue(host.trim()).type((byte) 1).build());
-        
-        // Add optional common parameters
-        if (port != null) {
-            params.add(Param.builder().field("port").paramValue(port.toString()).type((byte) 0).build());
-        }
-        if (username != null && !username.trim().isEmpty()) {
-            params.add(Param.builder().field("username").paramValue(username.trim()).type((byte) 1).build());
-        }
-        if (password != null && !password.trim().isEmpty()) {
-            params.add(Param.builder().field("password").paramValue(password.trim()).type((byte) 2).build());
-        }
-        if (database != null && !database.trim().isEmpty()) {
-            params.add(Param.builder().field("database").paramValue(database.trim()).type((byte) 1).build());
-        }
-        
-        // Parse additional parameters if provided
-        if (additionalParams != null && !additionalParams.trim().isEmpty()) {
-            try {
-                String cleaned = additionalParams.trim().replaceAll("[{}]", "");
-                String[] pairs = cleaned.split(",");
-                for (String pair : pairs) {
-                    String[] keyValue = pair.split(":");
-                    if (keyValue.length == 2) {
-                        String key = keyValue[0].trim().replaceAll("\"", "");
-                        String value = keyValue[1].trim().replaceAll("\"", "");
-                        params.add(Param.builder().field(key).paramValue(value).type((byte) 1).build());
-                    }
-                }
-            } catch (Exception e) {
-                log.warn("Failed to parse additionalParams: {}", e.getMessage());
-            }
-        }
-        
-        return params;
-    }
-    
-    @Override
-    @Tool(name = "list_monitor_types", description = """
-            List all available monitor types that can be added to HertzBeat.
-            This tool shows all supported monitor types with their display names.
-            Use this to see what types of monitors you can create with the add_monitor tool.
-            """)
-    public String listMonitorTypes(
-            @ToolParam(description = "Language code for localized names (en-US, zh-CN, etc.). Default: en-US", required = false) String language) {
-        
-        try {
-            log.info("Listing available monitor types for language: {}", language);
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current subject in list_monitor_types tool: {}", subjectSum);
-            
-            // Set default language if not provided
-            if (language == null || language.trim().isEmpty()) {
-                language = "en-US";
-            }
-            
-            // Get available monitor types from adapter
-            Map<String, String> monitorTypes = monitorServiceAdapter.getAvailableMonitorTypes(language);
-            
-            if (monitorTypes == null || monitorTypes.isEmpty()) {
-                return "No monitor types are currently available.";
-            }
-            
-            // Format the response as a nice list
-            StringBuilder response = new StringBuilder();
-            response.append("Available Monitor Types (Total: ").append(monitorTypes.size()).append("):\n\n");
-            
-            // Sort monitor types alphabetically by key
-            List<Map.Entry<String, String>> sortedTypes = monitorTypes.entrySet().stream()
-                    .sorted(Map.Entry.comparingByKey())
-                    .toList();
-            
-            for (Map.Entry<String, String> entry : sortedTypes) {
-                String typeKey = entry.getKey();
-                String displayName = entry.getValue();
-                response.append("• ").append(typeKey)
-                       .append(" - ").append(displayName)
-                       .append("\n");
-            }
-            
-            response.append("\nTo add a monitor, use the add_monitor tool with one of these types as the 'app' parameter.");
-
-            log.info("Successfully listed {} monitor types", monitorTypes);
-            return response.toString();
-            
-        } catch (Exception e) {
-            log.error("Failed to list monitor types: {}", e.getMessage(), e);
-            return "Error retrieving monitor types: " + e.getMessage();
-        }
-    }
-    
-    @Override
-    @Tool(name = "get_monitor_additional_params", description = """
-            Get the parameter definitions required for a specific monitor type.
-            This tool shows what parameters are needed when adding a monitor of the specified type,
-            ALWAYS use this before adding a monitor to understand what parameters the user needs to provide.
-            Use the app parameter to specify the monitor type/application name (e.g., 'linux', 'mysql', 'redis') this can be obtained from the list_monitor_types tool.
-            """)
-    public String getMonitorAdditionalParams(
-            @ToolParam(description = "Monitor type/application name (e.g., 'linux', 'mysql', 'redis')", required = true) String app) {
-        
-        try {
-            log.info("Getting parameter definitions for monitor type: {}", app);
-            SubjectSum subjectSum = McpContextHolder.getSubject();
-            log.debug("Current subject in get_monitor_param_defines tool: {}", subjectSum);
-            
-            // Validate required parameter
-            if (app == null || app.trim().isEmpty()) {
-                return "Error: Monitor type/application parameter is required";
-            }
-            
-            // Get parameter definitions from adapter
-            List<ParamDefine> paramDefines = monitorServiceAdapter.getMonitorParamDefines(app);
-            
-            if (paramDefines == null || paramDefines.isEmpty()) {
-                return String.format("No parameter definitions found for monitor type '%s'. "
-                   + "This monitor type may not exist or may not require additional parameters.", app);
-            }
-            
-            // Format the response
-            StringBuilder response = new StringBuilder();
-            response.append(String.format("Parameter Definitions for Monitor Type '%s' (Total: %d):\n\n", 
-                app, paramDefines.size()));
-            
-            for (ParamDefine paramDefine : paramDefines) {
-                response.append("• Field: ").append(paramDefine.getField()).append("\n");
-                
-                // Add display name if available
-                if (paramDefine.getName() != null && !paramDefine.getName().toString().trim().isEmpty()) {
-                    response.append("  Name: ").append(paramDefine.getName()).append("\n");
-                }
-                
-                // Add type
-                if (paramDefine.getType() != null && !paramDefine.getType().trim().isEmpty()) {
-                    response.append("  Type: ").append(paramDefine.getType()).append("\n");
-                }
-                
-                // Add required status
-                response.append("  Required: ").append(paramDefine.isRequired() ? "Yes" : "No").append("\n");
-                
-                // Add default value if present
-                if (paramDefine.getDefaultValue() != null && !paramDefine.getDefaultValue().trim().isEmpty()) {
-                    response.append("  Default: ").append(paramDefine.getDefaultValue()).append("\n");
-                }
-                
-                // Add validation range if present
-                if (paramDefine.getRange() != null && !paramDefine.getRange().trim().isEmpty()) {
-                    response.append("  Range: ").append(paramDefine.getRange()).append("\n");
-                }
-                
-                // Add limit if present
-                if (paramDefine.getLimit() != null) {
-                    response.append("  Limit: ").append(paramDefine.getLimit()).append("\n");
-                }
-                
-                // Add placeholder text if present
-                if (paramDefine.getPlaceholder() != null && !paramDefine.getPlaceholder().trim().isEmpty()) {
-                    response.append("  Placeholder: ").append(paramDefine.getPlaceholder()).append("\n");
-                }
-                
-                response.append("\n");
-            }
-            
-            response.append("To add a monitor of this type, use the add_monitor tool with these parameters.\n");
-            response.append(String.format("Example: add_monitor(name='my-monitor', app='%s', host='your-host', ...)", app));
-            
-            log.info("Successfully retrieved {} parameter definitions for monitor type: {}", paramDefines.size(), app);
-            return response.toString();
-            
-        } catch (Exception e) {
-            log.error("Failed to get parameter definitions for monitor type '{}': {}", app, e.getMessage(), e);
-            return "Error retrieving parameter definitions for monitor type '" + app + "': " + e.getMessage();
-        }
-    }
-
-

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

 import java.io.IOException;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;

 /**
@@ -56,24 +54,16 @@ public class AlertSseManager {
                        .name("ALERT_EVENT")
                        .data(data));
            } catch (IOException | IllegalStateException e) {
-                tryCompleteAndClean(clientId, emitter);
+                emitter.complete();
+                removeEmitter(clientId);
            } catch (Exception exception) {
                log.error("Failed to broadcast alert data to client: {}", exception.getMessage());
-                tryCompleteAndClean(clientId, emitter);
+                emitter.complete();
+                removeEmitter(clientId);
            }
        });
    }

-    private void tryCompleteAndClean(Long clientId, SseEmitter emitter) {
-        try {
-            Optional.ofNullable(emitter).ifPresent(ResponseBodyEmitter::complete);
-        } catch (Throwable e) {
-            log.debug("Failed to complete emitter for client {}: {}", clientId, e.getMessage());
-        }
-        // execute clear
-        removeEmitter(clientId);
-    }
-
    private void removeEmitter(Long clientId) {
        emitters.remove(clientId);
    }
@@ -60,7 +60,7 @@ public class ServerChanAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            String webHookUrl = String.format(alerterProperties.getServerChanWebhookUrl(), sanitizedToken);
            
            // Validate the constructed URL against a whitelist
-            List<String> allowedBaseUrls = List.of("https://api.serverchan.com", "https://serverchan.example.com", "https://sctapi.ftqq.com");
+            List<String> allowedBaseUrls = List.of("https://api.serverchan.com", "https://serverchan.example.com");
            boolean isValidUrl = allowedBaseUrls.stream().anyMatch(webHookUrl::startsWith);
            if (!isValidUrl) {
                throw new AlertNoticeException("Invalid webhook URL: " + webHookUrl);
@@ -1,69 +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.config;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-
-/**
- * alert sse manager test
- */
-public class AlertSseManagerTest {
-
-    private AlertSseManager alertSseManager;
-
-    @BeforeEach
-    void setUp() {
-        alertSseManager = new AlertSseManager();
-    }
-
-    @Test
-    void testCompleteThrowsException() throws Exception {
-        SseEmitter emitter = alertSseManager.createEmitter(1L);
-        assertNotNull(emitter);
-
-        Map<Long, SseEmitter> emitters = new HashMap<>();
-        SseEmitter spyEmitter = mock(SseEmitter.class);
-        
-        doThrow(new IllegalStateException("Simulated output stream error")).when(spyEmitter).send(any(SseEmitter.SseEventBuilder.class));
-        doThrow(new RuntimeException("Complete failed")).when(spyEmitter).complete();
-        
-        emitters.put(1L, spyEmitter);
-
-        Field emittersField = AlertSseManager.class.getDeclaredField("emitters");
-        emittersField.setAccessible(true);
-        emittersField.set(alertSseManager, emitters);
-
-        assertThrows(RuntimeException.class, () -> alertSseManager.broadcast("{\"id\":1,\"content\":\"Test alert\"}"));
-        Map<Long, SseEmitter> currentEmitters = (Map<Long, SseEmitter>) emittersField.get(alertSseManager);
-        assertFalse(currentEmitters.containsKey(1L), "Emitter should still exist because complete() threw exception");
-    }
-
-}
@@ -640,13 +640,11 @@ public class HttpCollectImpl extends AbstractCollect {
                        .collect(Collectors.toMap(MetricFamily.Label::getName, MetricFamily.Label::getValue));
                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                for (String aliasField : aliasFields) {
-                    String columnValue = labelMap.get(aliasField);
-                    if (columnValue != null) {
-                        valueRowBuilder.addColumn(columnValue);
-                    } else if (CommonConstants.PROM_VALUE.equals(aliasField) || CommonConstants.PROM_METRIC_VALUE.equals(aliasField)) {
+                    if ("value".equals(aliasField)) {
                        valueRowBuilder.addColumn(String.valueOf(metric.getValue()));
                    } else {
-                        valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
+                        String columnValue = labelMap.get(aliasField);
+                        valueRowBuilder.addColumn(columnValue == null ? CommonConstants.NULL_VALUE : columnValue);
                    }
                }
                builder.addValueRow(valueRowBuilder.build());
@@ -60,7 +60,7 @@ public class PrometheusMatrixParser extends AbstractPrometheusParse {
                boolean setValueFlag = false;
                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                for (String aliasField : aliasFields) {
-                    if (!CollectUtil.assertPromRequireField(aliasField) || CollectUtil.isValueAsLabel(aliasField, r.getMetric())) {
+                    if (!CollectUtil.assertPromRequireField(aliasField)) {
                        JsonElement jsonElement = r.getMetric().get(aliasField);
                        if (jsonElement != null) {
                            valueRowBuilder.addColumn(jsonElement.getAsString());
@@ -93,6 +93,7 @@ public class PrometheusMatrixParser extends AbstractPrometheusParse {
                }
                builder.addValueRow(valueRowBuilder.build());
            }
+
        }
    }
 }
@@ -59,7 +59,7 @@ public class PrometheusVectorParser extends AbstractPrometheusParse {
        for (PromVectorOrMatrix.Result r : result) {
            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
            for (String aliasField : aliasFields) {
-                if (!CollectUtil.assertPromRequireField(aliasField) || CollectUtil.isValueAsLabel(aliasField, r.getMetric())) {
+                if (!CollectUtil.assertPromRequireField(aliasField)) {
                    JsonElement jsonElement = r.getMetric().get(aliasField);
                    if (jsonElement != null) {
                        valueRowBuilder.addColumn(jsonElement.getAsString());
@@ -69,10 +69,6 @@ public class OnlineParser {
                    parseMetric(inputStream, metricFamilyMap, stringBuilder);
                }
                i = getChar(inputStream);
-                // To address the `\n\r` scenario, it is necessary to skip
-                if (i == '\r') {
-                    i = getChar(inputStream);
-                }
            }
        } catch (FormatException e) {
            log.error("prometheus parser failed because of wrong input format. {}", e.getMessage());
@@ -189,10 +185,6 @@ public class OnlineParser {
            stringBuilder.append((char) i);
            i = getChar(inputStream);
        }
-        // Skip \r character to handle Windows line endings
-        if (i == '\r') {
-            i = getChar(inputStream);
-        }
        return new CharChecker(i);
    }

@@ -201,10 +193,6 @@ public class OnlineParser {
        while (i >= '0' && i <= '9') {
            i = getChar(inputStream);
        }
-        // Skip \r character to handle Windows line endings
-        if (i == '\r') {
-            i = getChar(inputStream);
-        }
        return new CharChecker(i);
    }

@@ -227,27 +215,20 @@ public class OnlineParser {
    }

    private static CharChecker parseLabelValue(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = inputStream.read();
+        int i = getChar(inputStream);
        while (i != '"' && i != -1) {
            if (i == '\\') {
-                i = inputStream.read();
+                i = getChar(inputStream);
                switch (i) {
                    case 'n' -> stringBuilder.append('\n');
                    case '\\' -> stringBuilder.append('\\');
                    case '\"' -> stringBuilder.append('\"');
-                    default -> {
-                        // Unknown escape, keep as-is
-                        // https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/lib/protoparser/prometheus/parser.go#L419
-                        stringBuilder.append('\\');
-                        if (i != -1) {
-                            stringBuilder.append((char) i);
-                        }
-                    }
+                    default -> throw new FormatException();
                }
            } else {
                stringBuilder.append((char) i);
            }
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }
@@ -25,10 +25,7 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
 import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -292,253 +289,4 @@ class HttpCollectImplTest {
        firstRow = capturedRows.get(0);
        assertEquals("0.268751364291017", firstRow.getColumns(0));
    }
-
-    @Test
-    void testParsePromQlLabelValue() throws Exception {
-        // Create Prometheus format test data
-        String prometheusData = """
-                {
-                  "status": "success",
-                  "data": {
-                    "resultType": "vector",
-                    "result": [
-                      {
-                        "metric": {
-                          "__name__": "taos_cluster_info_first_ep",
-                          "cluster_id": "590779086215866783",
-                          "instance": "host.docker.internal:6043",
-                          "job": "tdengine",
-                          "value": "localhost:6030"
-                        },
-                        "value": [
-                          1756233177.048,
-                          "1"
-                        ]
-                      }
-                    ]
-                  }
-                }""";
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-
-            @Override
-            public String getMetrics() {
-                return "jvm_memory_used_bytes";
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByPromQl",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class);
-        parseMethod.setAccessible(true);
-
-        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value"), new HttpProtocol(), builder);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("590779086215866783", firstRow.getColumns(0));
-        assertEquals("localhost:6030", firstRow.getColumns(1));
-    }
-
-    @Test
-    void testParsePromQlMetricValue() throws Exception {
-        // Create Prometheus format test data
-        String prometheusData = """
-                {
-                  "status": "success",
-                  "data": {
-                    "resultType": "vector",
-                    "result": [
-                      {
-                        "metric": {
-                          "__name__": "taos_cluster_info_first_ep",
-                          "cluster_id": "590779086215866783",
-                          "instance": "host.docker.internal:6043",
-                          "job": "tdengine",
-                          "value": "localhost:6030"
-                        },
-                        "value": [
-                          1756233177.048,
-                          "1"
-                        ]
-                      }
-                    ]
-                  }
-                }""";
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-
-            @Override
-            public String getMetrics() {
-                return "jvm_memory_used_bytes";
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByPromQl",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class);
-        parseMethod.setAccessible(true);
-
-        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value", "metric_value"), new HttpProtocol(), builder);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("590779086215866783", firstRow.getColumns(0));
-        assertEquals("localhost:6030", firstRow.getColumns(1));
-        assertEquals("1", firstRow.getColumns(2));
-    }
-
-    @Test
-    void testParsePromQlValue() throws Exception {
-        // Create Prometheus format test data
-        String prometheusData = """
-                {
-                  "status": "success",
-                  "data": {
-                    "resultType": "vector",
-                    "result": [
-                      {
-                        "metric": {
-                          "__name__": "taos_cluster_info_first_ep",
-                          "cluster_id": "590779086215866783",
-                          "instance": "host.docker.internal:6043",
-                          "job": "tdengine"
-                        },
-                        "value": [
-                          1756233177.048,
-                          "1"
-                        ]
-                      }
-                    ]
-                  }
-                }""";
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-
-            @Override
-            public String getMetrics() {
-                return "jvm_memory_used_bytes";
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByPromQl",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class);
-        parseMethod.setAccessible(true);
-
-        parseMethod.invoke(httpCollectImpl, prometheusData, Lists.newArrayList("cluster_id", "value"), new HttpProtocol(), builder);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("590779086215866783", firstRow.getColumns(0));
-        assertEquals("1", firstRow.getColumns(1));
-    }
-
-    @Test
-    void testParsePrometheusLabelValue() throws Exception {
-        // Create Prometheus format test data
-        String prometheusData = """
-                # HELP jvm_memory_used_bytes The amount of used memory in bytes
-                # TYPE jvm_memory_used_bytes gauge
-                jvm_memory_used_bytes{area="heap",value="G1 Survivor Space"} 1048576
-                """;
-        InputStream inputStream = new ByteArrayInputStream(prometheusData.getBytes(StandardCharsets.UTF_8));
-        
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-
-            @Override
-            public String getMetrics() {
-                return "jvm_memory_used_bytes";
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByPrometheusExporter",
-                InputStream.class,
-                List.class,
-                CollectRep.MetricsData.Builder.class);
-        parseMethod.setAccessible(true);
-
-        parseMethod.invoke(httpCollectImpl, inputStream, Lists.newArrayList("area", "value"), builder);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("heap", firstRow.getColumns(0));
-        assertEquals("G1 Survivor Space", firstRow.getColumns(1));
-    }
-
-    @Test
-    void testParsePrometheus() throws Exception {
-        // Create Prometheus format test data
-        String prometheusData = """
-                # HELP jvm_memory_used_bytes The amount of used memory
-                # TYPE jvm_memory_used_bytes gauge
-                jvm_memory_used_bytes{area="heap",id="G1 Eden Space"} 1.63577856E8
-                jvm_memory_used_bytes{area="heap",id="G1 Old Gen"} 2.7874304E7
-                jvm_memory_used_bytes{area="heap",id="G1 Survivor Space"} 512032.0
-                jvm_memory_used_bytes{area="nonheap",id="CodeCache"} 1.460288E7
-                jvm_memory_used_bytes{area="nonheap",id="Compressed Class Space"} 5844504.0
-                jvm_memory_used_bytes{area="nonheap",id="Metaspace"} 4.1576344E7
-                """;
-        InputStream inputStream = new ByteArrayInputStream(prometheusData.getBytes(StandardCharsets.UTF_8));
-
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-
-            @Override
-            public String getMetrics() {
-                return "jvm_memory_used_bytes";
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByPrometheusExporter",
-                InputStream.class,
-                List.class,
-                CollectRep.MetricsData.Builder.class);
-        parseMethod.setAccessible(true);
-
-        parseMethod.invoke(httpCollectImpl, inputStream, Lists.newArrayList("area", "id"), builder);
-
-        // Verify the results
-        assertEquals(6, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("heap", firstRow.getColumns(0));
-        assertEquals("G1 Eden Space", firstRow.getColumns(1));
-        capturedRows.forEach(t -> assertEquals(2, t.getColumnsList().size()));
-    }
 }
@@ -43,16 +43,6 @@ class OnlineParserTest {
        assertNotNull(metricFamilyMap);
    }

-    @Disabled // because unless you have already saved the locally tested files
-    @Test
-    void parseTestFile() throws Exception {
-        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("test_file.txt");
-        assertNotNull(inputStream, "Failed to load test_file.txt resource");
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
-    }
-
-
    @Test
    void parseMetrics2() throws Exception {
        String str = """
@@ -115,348 +105,4 @@ class OnlineParserTest {
            });
        });
    }
-
-    @Test
-    void testParseMetricsWithCrLf() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\r\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0\r\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139\r\n";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-
-        str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\r\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0 1234567890\r\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139 1234567890\r\n";
-        inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithLf() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139\n";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-
-        str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0 1234567890\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139 1234567890\n";
-        inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithoutFinalNewline() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\r\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0\r\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-
-        str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 1.0\n"
-                + "jvm_gc_pause_seconds_sum{action=\"end of major GC\",cause=\"Metadata GC Threshold\",} 0.139";
-
-        inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithEmptyLabelsAndCrLf() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\r\n"
-                + "jvm_gc_pause_seconds_count 1.0\r\n"
-                + "jvm_gc_pause_seconds_sum{} 0.139";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-
-    }
-
-    @Test
-    void testParseMetricsWithEmptyLabelsAndLf() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count 1.0\n"
-                + "jvm_gc_pause_seconds_sum{} 0.139";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithMixedLineEndings() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count 1.0\n"
-                + "jvm_gc_pause_seconds_sum{} 0.139\r\n";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithLfCrLineEnding() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\n\r"
-                + "# TYPE go_gc_duration_seconds summary\n\r"
-                + "jvm_gc_pause_seconds_count 1.0\n\r"
-                + "jvm_gc_pause_seconds_sum{} 0.139\n\r";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(2, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithMixedLineEndingsIncludingLfCr() throws Exception {
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "jvm_gc_pause_seconds_count 1.0\n\r"
-                + "jvm_gc_pause_seconds_sum{} 0.139\r\n"
-                + "jvm_gc_pause_seconds_max{} 0.139\n";
-
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(3, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_count");
-        assertEquals("jvm_gc_pause_seconds_count", metricFamily.getName());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily1 = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily1.getName());
-        assertEquals(0.139, metricFamily1.getMetricList().get(0).getValue());
-
-        MetricFamily metricFamily2 = metricFamilyMap.get("jvm_gc_pause_seconds_max");
-        assertEquals("jvm_gc_pause_seconds_max", metricFamily2.getName());
-        assertEquals(0.139, metricFamily2.getMetricList().get(0).getValue());
-    }
-
-    @Test
-    void testParseMetricsWithOnlyLfCr() throws Exception {
-        String str = "jvm_gc_pause_seconds_sum 42.0\n\r";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(1, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("jvm_gc_pause_seconds_sum");
-        assertEquals("jvm_gc_pause_seconds_sum", metricFamily.getName());
-        assertEquals(42.0, metricFamily.getMetricList().get(0).getValue());
-    }
-
-
-    @Test
-    void testParseMetricEscape1() throws Exception {
-        // test  escape '\\'
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "windows_service_info{display_name=\"\\\\Application Layer \nGateway Service\",name=\"alg\\\\\",process_id=\"0\",run_as=\"NT AUTHORITY\\\\LocalService\"} 1\n";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(1, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("windows_service_info");
-        assertEquals("windows_service_info", metricFamily.getName());
-        assertNotNull(metricFamily.getMetricList().get(0).getLabels());
-        assertEquals(4, metricFamily.getMetricList().get(0).getLabels().size());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        assertEquals("display_name", metricFamily.getMetricList().get(0).getLabels().get(0).getName());
-        assertEquals("\\Application Layer \nGateway Service", metricFamily.getMetricList().get(0).getLabels().get(0).getValue());
-
-        assertEquals("name", metricFamily.getMetricList().get(0).getLabels().get(1).getName());
-        assertEquals("alg\\", metricFamily.getMetricList().get(0).getLabels().get(1).getValue());
-
-        assertEquals("process_id", metricFamily.getMetricList().get(0).getLabels().get(2).getName());
-        assertEquals("0", metricFamily.getMetricList().get(0).getLabels().get(2).getValue());
-
-        assertEquals("run_as", metricFamily.getMetricList().get(0).getLabels().get(3).getName());
-        assertEquals("NT AUTHORITY\\LocalService", metricFamily.getMetricList().get(0).getLabels().get(3).getValue());
-    }
-
-    @Test
-    void testParseMetricEscape2() throws Exception {
-        // test  escape '\"'
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "windows_service_info{display_name=\"\\\"Application Layer \\\"Gateway Service\",name=\"alg\\\"\",process_id=\"0\",run_as=\"NT AUTHORITY\\\"LocalService\"} 1\n";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(1, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("windows_service_info");
-        assertEquals("windows_service_info", metricFamily.getName());
-        assertNotNull(metricFamily.getMetricList().get(0).getLabels());
-        assertEquals(4, metricFamily.getMetricList().get(0).getLabels().size());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        assertEquals("display_name", metricFamily.getMetricList().get(0).getLabels().get(0).getName());
-        assertEquals("\"Application Layer \"Gateway Service", metricFamily.getMetricList().get(0).getLabels().get(0).getValue());
-
-        assertEquals("name", metricFamily.getMetricList().get(0).getLabels().get(1).getName());
-        assertEquals("alg\"", metricFamily.getMetricList().get(0).getLabels().get(1).getValue());
-
-        assertEquals("process_id", metricFamily.getMetricList().get(0).getLabels().get(2).getName());
-        assertEquals("0", metricFamily.getMetricList().get(0).getLabels().get(2).getValue());
-
-        assertEquals("run_as", metricFamily.getMetricList().get(0).getLabels().get(3).getName());
-        assertEquals("NT AUTHORITY\"LocalService", metricFamily.getMetricList().get(0).getLabels().get(3).getValue());
-
-
-    }
-
-    @Test
-    void testParseMetricEscape3() throws Exception {
-        // test  escape '\n'
-        String str = "# HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.\r\n"
-                + "# TYPE go_gc_duration_seconds summary\n"
-                + "windows_service_info{display_name=\"\nApplication Layer \nGateway Service\",name=\"alg\n\",process_id=\"0\",run_as=\"NT AUTHORITY\nLocalService\"} 1\n";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-
-        assertNotNull(metricFamilyMap);
-        assertEquals(1, metricFamilyMap.values().size());
-
-        MetricFamily metricFamily = metricFamilyMap.get("windows_service_info");
-        assertEquals("windows_service_info", metricFamily.getName());
-        assertNotNull(metricFamily.getMetricList().get(0).getLabels());
-        assertEquals(4, metricFamily.getMetricList().get(0).getLabels().size());
-        assertEquals(1.0, metricFamily.getMetricList().get(0).getValue());
-
-        assertEquals("display_name", metricFamily.getMetricList().get(0).getLabels().get(0).getName());
-        assertEquals("\nApplication Layer \nGateway Service", metricFamily.getMetricList().get(0).getLabels().get(0).getValue());
-
-        assertEquals("name", metricFamily.getMetricList().get(0).getLabels().get(1).getName());
-        assertEquals("alg\n", metricFamily.getMetricList().get(0).getLabels().get(1).getValue());
-
-        assertEquals("process_id", metricFamily.getMetricList().get(0).getLabels().get(2).getName());
-        assertEquals("0", metricFamily.getMetricList().get(0).getLabels().get(2).getValue());
-
-        assertEquals("run_as", metricFamily.getMetricList().get(0).getLabels().get(3).getName());
-        assertEquals("NT AUTHORITY\nLocalService", metricFamily.getMetricList().get(0).getLabels().get(3).getValue());
-    }
 }
@@ -345,4 +345,4 @@
            </build>
        </profile>
    </profiles>
-</project>
+</project>
@@ -55,7 +55,7 @@ spring:

 collector:
  info:
-    version: ${COLLECTOR_VERSION:1.7.3}
+    version: ${COLLECTOR_VERSION:1.7.2}
    ip: ${COLLECTOR_IP:}
  dispatch:
    entrance:
@@ -171,16 +171,7 @@ public final class CollectUtil {
     * assert prom field
     */
    public static Boolean assertPromRequireField(String aliasField) {
-        return CommonConstants.PROM_TIME.equals(aliasField)
-            || CommonConstants.PROM_VALUE.equals(aliasField)
-            || CommonConstants.PROM_METRIC_VALUE.equals(aliasField);
-    }
-
-    /**
-     * Check if "value" field should be treated as a label instead of special field
-     */
-    public static Boolean isValueAsLabel(String aliasField, JsonObject metric) {
-        return CommonConstants.PROM_VALUE.equals(aliasField) && null != metric && metric.has(aliasField);
+        return CommonConstants.PROM_TIME.equals(aliasField) || CommonConstants.PROM_VALUE.equals(aliasField);
    }

    /**
@@ -83,10 +83,13 @@
            <groupId>org.apache.hertzbeat</groupId>
            <artifactId>hertzbeat-common</artifactId>
        </dependency>
+
    </dependencies>

    <build>
        <finalName>apache-${project.artifactId}-${hzb.version}</finalName>
    </build>

+
+
 </project>
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.constants;
+
+/**
+ * Enum representing the possible statuses of a collector.
+ */
+public enum CollectorStatus {
+    ONLINE, OFFLINE;
+}
@@ -197,11 +197,6 @@ public interface CommonConstants {
     */
    String PROM_VALUE = "value";

-    /**
-     * prometheus metric value alias
-     */
-    String PROM_METRIC_VALUE = "metric_value";
-
    /**
     * Parameter Type Number
     */
@@ -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.common.entity.manager;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.persistence.UniqueConstraint;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-import java.time.LocalDateTime;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedDate;
-
-/**
- * Metrics Favorite Entity
- */
-@Entity
-@Table(name = "hzb_metrics_favorite", 
-    uniqueConstraints = @UniqueConstraint(columnNames = {"creator", "monitor_id", "metrics_name"}))
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class MetricsFavorite {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @NotBlank(message = "Creator cannot be null or blank")
-    @Size(max = 255, message = "Creator length cannot exceed 255 characters")
-    @Column(name = "creator", nullable = false)
-    private String creator;
-
-    @NotNull(message = "Monitor ID cannot be null")
-    @Column(name = "monitor_id", nullable = false)
-    private Long monitorId;
-
-    @NotBlank(message = "Metrics name cannot be null or blank")
-    @Size(max = 255, message = "Metrics name length cannot exceed 255 characters")
-    @Column(name = "metrics_name", nullable = false)
-    private String metricsName;
-
-    @CreatedDate
-    @Column(name = "create_time", updatable = false)
-    private LocalDateTime createTime;
-}
@@ -1,323 +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.manager;
-
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.Validation;
-import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
-import org.junit.jupiter.api.Test;
-
-import java.time.LocalDateTime;
-import java.util.Set;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Test case for {@link MetricsFavorite}
- */
-class MetricsFavoriteTest {
-
-    private final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-    private final Validator validator = factory.getValidator();
-
-    @Test
-    void testBuilder() {
-        String creator = "testUser";
-        Long monitorId = 1L;
-        String metricsName = "cpu";
-        LocalDateTime createTime = LocalDateTime.now();
-
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .id(1L)
-                .creator(creator)
-                .monitorId(monitorId)
-                .metricsName(metricsName)
-                .createTime(createTime)
-                .build();
-
-        assertNotNull(favorite);
-        assertEquals(1L, favorite.getId());
-        assertEquals(creator, favorite.getCreator());
-        assertEquals(monitorId, favorite.getMonitorId());
-        assertEquals(metricsName, favorite.getMetricsName());
-        assertEquals(createTime, favorite.getCreateTime());
-    }
-
-    @Test
-    void testBuilderWithoutOptionalFields() {
-        String creator = "testUser";
-        Long monitorId = 1L;
-        String metricsName = "cpu";
-
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator(creator)
-                .monitorId(monitorId)
-                .metricsName(metricsName)
-                .build();
-
-        assertNotNull(favorite);
-        assertNull(favorite.getId());
-        assertEquals(creator, favorite.getCreator());
-        assertEquals(monitorId, favorite.getMonitorId());
-        assertEquals(metricsName, favorite.getMetricsName());
-        assertNull(favorite.getCreateTime());
-    }
-
-    @Test
-    void testDefaultConstructor() {
-        MetricsFavorite favorite = new MetricsFavorite();
-
-        assertNotNull(favorite);
-        assertNull(favorite.getId());
-        assertNull(favorite.getCreator());
-        assertNull(favorite.getMonitorId());
-        assertNull(favorite.getMetricsName());
-        assertNull(favorite.getCreateTime());
-    }
-
-    @Test
-    void testSettersAndGetters() {
-        MetricsFavorite favorite = new MetricsFavorite();
-        String creator = "testUser";
-        Long monitorId = 1L;
-        String metricsName = "cpu";
-        LocalDateTime createTime = LocalDateTime.now();
-
-        favorite.setId(1L);
-        favorite.setCreator(creator);
-        favorite.setMonitorId(monitorId);
-        favorite.setMetricsName(metricsName);
-        favorite.setCreateTime(createTime);
-
-        assertEquals(1L, favorite.getId());
-        assertEquals(creator, favorite.getCreator());
-        assertEquals(monitorId, favorite.getMonitorId());
-        assertEquals(metricsName, favorite.getMetricsName());
-        assertEquals(createTime, favorite.getCreateTime());
-    }
-
-    @Test
-    void testValidation_ValidEntity() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertTrue(violations.isEmpty());
-    }
-
-    @Test
-    void testValidation_NullCreator() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator(null)
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("creator")));
-    }
-
-    @Test
-    void testValidation_BlankCreator() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("   ")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("creator")));
-    }
-
-    @Test
-    void testValidation_CreatorTooLong() {
-        String longCreator = "a".repeat(256);
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator(longCreator)
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("creator")));
-    }
-
-    @Test
-    void testValidation_NullMonitorId() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(null)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("monitorId")));
-    }
-
-    @Test
-    void testValidation_NullMetricsName() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName(null)
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("metricsName")));
-    }
-
-    @Test
-    void testValidation_BlankMetricsName() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("   ")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("metricsName")));
-    }
-
-    @Test
-    void testValidation_MetricsNameTooLong() {
-        String longMetricsName = "a".repeat(256);
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName(longMetricsName)
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertFalse(violations.isEmpty());
-        assertTrue(violations.stream().anyMatch(v -> v.getPropertyPath().toString().equals("metricsName")));
-    }
-
-    @Test
-    void testEqualsAndHashCode() {
-        LocalDateTime now = LocalDateTime.now();
-        MetricsFavorite favorite1 = MetricsFavorite.builder()
-                .id(1L)
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(now)
-                .build();
-
-        MetricsFavorite favorite2 = MetricsFavorite.builder()
-                .id(1L)
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(now)
-                .build();
-
-        MetricsFavorite favorite3 = MetricsFavorite.builder()
-                .id(2L)
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(now)
-                .build();
-
-        assertEquals(favorite1, favorite2);
-        assertEquals(favorite1.hashCode(), favorite2.hashCode());
-        assertNotEquals(favorite1, favorite3);
-        assertNotEquals(favorite1.hashCode(), favorite3.hashCode());
-    }
-
-    @Test
-    void testToString() {
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .id(1L)
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        String toString = favorite.toString();
-
-        assertNotNull(toString);
-        assertTrue(toString.contains("MetricsFavorite"));
-        assertTrue(toString.contains("testUser"));
-        assertTrue(toString.contains("cpu"));
-    }
-
-    @Test
-    void testCreatorMaxLength() {
-        String maxLengthCreator = "a".repeat(255);
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator(maxLengthCreator)
-                .monitorId(1L)
-                .metricsName("cpu")
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertTrue(violations.isEmpty());
-        assertEquals(255, favorite.getCreator().length());
-    }
-
-    @Test
-    void testMetricsNameMaxLength() {
-        String maxLengthMetricsName = "a".repeat(255);
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator("testUser")
-                .monitorId(1L)
-                .metricsName(maxLengthMetricsName)
-                .createTime(LocalDateTime.now())
-                .build();
-
-        Set<ConstraintViolation<MetricsFavorite>> violations = validator.validate(favorite);
-
-        assertTrue(violations.isEmpty());
-        assertEquals(255, favorite.getMetricsName().length());
-    }
-}
@@ -293,21 +293,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-->
@@ -18,6 +18,8 @@
 package org.apache.hertzbeat.manager;

 import javax.annotation.PostConstruct;
+
+import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.manager.nativex.HertzbeatRuntimeHintsRegistrar;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -36,10 +38,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;

@SpringBootApplication
@EnableJpaAuditing
-@EnableJpaRepositories(basePackages = {"org.apache.hertzbeat"})
-@EntityScan(basePackages = {"org.apache.hertzbeat"})
-@ComponentScan(basePackages = {"org.apache.hertzbeat"})
-@ConfigurationPropertiesScan(basePackages = {"org.apache.hertzbeat"})
+@EnableJpaRepositories(basePackages = {ConfigConstants.PkgConstant.PKG})
+@EntityScan(basePackages = {ConfigConstants.PkgConstant.PKG})
+@ComponentScan(basePackages = {ConfigConstants.PkgConstant.PKG})
+@ConfigurationPropertiesScan(basePackages = {ConfigConstants.PkgConstant.PKG})
@ImportRuntimeHints(HertzbeatRuntimeHintsRegistrar.class)
@EnableAsync
@EnableScheduling
@@ -40,7 +40,7 @@ import org.apache.hertzbeat.common.entity.manager.Monitor;
 import org.apache.hertzbeat.common.entity.manager.StatusPageComponent;
 import org.apache.hertzbeat.common.entity.manager.StatusPageHistory;
 import org.apache.hertzbeat.common.entity.manager.StatusPageOrg;
-import org.apache.hertzbeat.manager.config.StatusProperties;
+import org.apache.hertzbeat.manager.properties.StatusProperties;
 import org.apache.hertzbeat.manager.dao.MonitorDao;
 import org.apache.hertzbeat.manager.dao.StatusPageComponentDao;
 import org.apache.hertzbeat.manager.dao.StatusPageHistoryDao;
@@ -26,12 +26,10 @@ import org.apache.hertzbeat.common.entity.dto.ManagerMessage;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;

 import java.io.IOException;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;

 /**
@@ -59,24 +57,16 @@ public class ManagerSseManager {
                        .name(eventName)
                        .data(data));
            } catch (IOException | IllegalStateException e) {
-                tryCompleteAndClean(clientId, emitter);
+                emitter.complete();
+                removeEmitter(clientId);
            } catch (Exception exception) {
                log.error("Failed to broadcast manager message data to client: {}", exception.getMessage());
-                tryCompleteAndClean(clientId, emitter);
+                emitter.complete();
+                removeEmitter(clientId);
            }
        });
    }

-    private void tryCompleteAndClean(Long clientId, SseEmitter emitter) {
-        try {
-            Optional.ofNullable(emitter).ifPresent(ResponseBodyEmitter::complete);
-        } catch (Throwable e) {
-            log.debug("Failed to complete emitter for client {}: {}", clientId, e.getMessage());
-        }
-        // execute clear
-        removeEmitter(clientId);
-    }
-
    public void broadcastImportTaskInProgress(String taskName, Integer progress){
        ManagerMessage managerMessage = ImportTaskMessage.createInProgressMessage(taskName, progress);
        broadcast(ManagerEventTypeEnum.IMPORT_TASK_EVENT.getValue(), JsonUtil.toJson(managerMessage));
@@ -18,8 +18,8 @@
 package org.apache.hertzbeat.manager.config;

 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.manager.scheduler.ConsistentHash;
-import org.apache.hertzbeat.manager.scheduler.SchedulerProperties;
+import org.apache.hertzbeat.manager.scheduler.ConsistentHashCollectorKeeper;
+import org.apache.hertzbeat.manager.properties.SchedulerProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,8 +33,8 @@ import org.springframework.context.annotation.Configuration;
 public class SchedulerConfig {
    
    @Bean
-    public ConsistentHash consistentHasInstance() {
-        return new ConsistentHash();
+    public ConsistentHashCollectorKeeper consistentHasInstance() {
+        return new ConsistentHashCollectorKeeper();
    }

 }
@@ -1,105 +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.manager.controller;
-
-import com.usthe.sureness.subject.SubjectSum;
-import com.usthe.sureness.util.SurenessContextHolder;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.manager.service.MetricsFavoriteService;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Set;
-
-import static org.apache.hertzbeat.common.constants.CommonConstants.LOGIN_FAILED_CODE;
-
-/**
- * Metrics Favorite Controller
- */
-@Tag(name = "Metrics Favorite API")
-@RestController
-@RequestMapping(path = "/api/metrics/favorite")
-@RequiredArgsConstructor
-@Slf4j
-public class MetricsFavoriteController {
-
-    private final MetricsFavoriteService metricsFavoriteService;
-
-    @PostMapping("/{monitorId}/{metricsName}")
-    @Operation(summary = "Add metrics to favorites", description = "Add specific metrics to user's favorites")
-    public ResponseEntity<Message<Void>> addMetricsFavorite(
-            @Parameter(description = "Monitor ID", example = "6565463543") @PathVariable Long monitorId,
-            @Parameter(description = "Metrics name", example = "cpu") @PathVariable String metricsName) {
-        String user = getCurrentUser();
-        if (user == null) {
-            return ResponseEntity.ok(Message.fail(LOGIN_FAILED_CODE, "User not authenticated"));
-        }
-        metricsFavoriteService.addMetricsFavorite(user, monitorId, metricsName);
-        return ResponseEntity.ok(Message.success("Metrics added to favorites successfully"));
-    }
-
-    @DeleteMapping("/{monitorId}/{metricsName}")
-    @Operation(summary = "Remove metrics from favorites", description = "Remove specific metrics from user's favorites")
-    public ResponseEntity<Message<Void>> removeMetricsFavorite(
-            @Parameter(description = "Monitor ID", example = "6565463543") @PathVariable Long monitorId,
-            @Parameter(description = "Metrics name", example = "cpu") @PathVariable String metricsName) {
-
-        String user = getCurrentUser();
-        if (user == null) {
-            return ResponseEntity.ok(Message.fail(LOGIN_FAILED_CODE, "User not authenticated"));
-        }
-        metricsFavoriteService.removeMetricsFavorite(user, monitorId, metricsName);
-        return ResponseEntity.ok(Message.success("Metrics removed from favorites successfully"));
-    }
-
-    @GetMapping("/{monitorId}")
-    @Operation(summary = "Get user's all favorited metrics", description = "Get all favorited metrics for current user")
-    public ResponseEntity<Message<Set<String>>> getUserFavoritedMetrics(@Parameter(description = "Monitor ID", example = "6565463543") @PathVariable Long monitorId) {
-        String user = getCurrentUser();
-        if (user == null) {
-            return ResponseEntity.ok(Message.fail(LOGIN_FAILED_CODE, "User not authenticated"));
-        }
-        Set<String> favoritedMetrics = metricsFavoriteService.getUserFavoritedMetrics(user, monitorId);
-        return ResponseEntity.ok(Message.success(favoritedMetrics));
-    }
-
-    /**
-     * Get current user ID for favorite status
-     *
-     * @return user id
-     */
-    private String getCurrentUser() {
-        try {
-            SubjectSum subjectSum = SurenessContextHolder.getBindSubject();
-            return String.valueOf(subjectSum.getPrincipal());
-        } catch (Exception e) {
-            log.error("No user found, favorites will be disabled");
-            return null;
-        }
-    }
-}
@@ -17,14 +17,10 @@

 package org.apache.hertzbeat.manager.controller;

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

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

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

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

 package org.apache.hertzbeat.manager.controller;

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

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

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

    @GetMapping("/incident")
    @Operation(summary = "Query Status Page Incidents")
-    public ResponseEntity<Message<Page<StatusPageIncident>>> queryStatusPageIncident(
-            @Parameter(description = "Search-Target", example = "x") @RequestParam(required = false) String search,
-            @Parameter(description = "Start Time", example = "1756384301907") @RequestParam(required = false) Long startTime,
-            @Parameter(description = "End Time", example = "1756384301907") @RequestParam(required = false) Long endTime,
-            @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
-            @Parameter(description = "Number of list pages", example = "10") @RequestParam(defaultValue = "10") int pageSize) {
-        Page<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents(search, startTime, endTime, pageIndex, pageSize);
+    public ResponseEntity<Message<List<StatusPageIncident>>> queryStatusPageIncident() {
+        List<StatusPageIncident> incidents = statusPageService.queryStatusPageIncidents();
        return ResponseEntity.ok(Message.success(incidents));
    }
 }
@@ -1,75 +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.manager.dao;
-
-import org.apache.hertzbeat.common.entity.manager.MetricsFavorite;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * MetricsFavorite dao
- */
-public interface MetricsFavoriteDao extends JpaRepository<MetricsFavorite, Long> {
-
-    /**
-     * Find metrics favorite by creator and monitor id and metrics name
-     * 
-     * @param creator user id
-     * @param monitorId monitor id
-     * @param metricsName metrics name
-     * @return optional metrics favorite
-     */
-    Optional<MetricsFavorite> findByCreatorAndMonitorIdAndMetricsName(String creator, Long monitorId, String metricsName);
-
-    /**
-     * Find all metrics favorites by user id and monitor id
-     * 
-     * @param creator user id
-     * @param monitorId monitor id
-     * @return list of metrics favorites
-     */
-    List<MetricsFavorite> findByCreatorAndMonitorId(String creator, Long monitorId);
-
-    /**
-     * Delete metrics favorite by user id and monitor id and metrics name
-     * 
-     * @param creator user id
-     * @param monitorId monitor id
-     * @param metricsName metrics name
-     */
-    @Modifying
-    @Query("DELETE FROM MetricsFavorite mf WHERE mf.creator = :creator AND mf.monitorId = :monitorId AND mf.metricsName = :metricsName")
-    void deleteByUserIdAndMonitorIdAndMetricsName(@Param("creator") String creator,
-                                                   @Param("monitorId") Long monitorId, 
-                                                   @Param("metricsName") String metricsName);
-
-    /**
-     * Delete metrics favorites by monitor ids
-     *
-     * @param monitorIds monitor ids
-     */
-    @Modifying
-    @Query("DELETE FROM MetricsFavorite mf WHERE mf.monitorId IN :monitorIds")
-    void deleteFavoritesByMonitorIdIn(@Param("monitorIds") Set<Long> monitorIds);
-}
@@ -19,7 +19,6 @@

 package org.apache.hertzbeat.manager.nativex;

-import java.lang.reflect.Constructor;
 import java.util.Set;
 import org.apache.sshd.common.channel.ChannelListener;
 import org.apache.sshd.common.forward.PortForwardingEventListener;
@@ -28,7 +27,6 @@ import org.apache.sshd.common.io.nio2.Nio2ServiceFactoryFactory;
 import org.apache.sshd.common.session.SessionListener;
 import org.apache.sshd.common.util.security.bouncycastle.BouncyCastleSecurityProviderRegistrar;
 import org.apache.sshd.common.util.security.eddsa.EdDSASecurityProviderRegistrar;
-import org.springframework.aot.hint.ExecutableMode;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.RuntimeHintsRegistrar;
@@ -60,11 +58,4 @@ public class HertzbeatRuntimeHintsRegistrar implements RuntimeHintsRegistrar {
                    TypeReference.of(PortForwardingEventListener.class), TypeReference.of(SessionListener.class));
        }
    }
-
-    private void registerConstructor(RuntimeHints hints, Class<?> clazz) {
-        Constructor<?>[] declaredConstructors = clazz.getDeclaredConstructors();
-        for (Constructor<?> declaredConstructor : declaredConstructors) {
-            hints.reflection().registerConstructor(declaredConstructor, ExecutableMode.INVOKE);
-        }
-    }
 }
@@ -0,0 +1,156 @@
+/*
+ * 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.manager.pojo;
+
+import lombok.Data;
+import org.apache.hertzbeat.common.constants.CollectorStatus;
+import org.apache.hertzbeat.manager.scheduler.AssignJobs;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Collector Node
+ */
+@Data
+public class CollectorNode {
+    /**
+     * Default number of VM nodes
+     */
+    private static final byte VIRTUAL_NODE_DEFAULT_SIZE = 10;
+
+    /**
+     * collector identity
+     */
+    private final String identity;
+
+    /**
+     * collector mode: public or private
+     */
+    private String mode;
+
+    /**
+     * ip
+     */
+    private String ip;
+
+    /**
+     * collector On-line time stamp
+     */
+    private long uptime;
+
+    /**
+     * collector's own performance service quality score 0 - 127
+     * The number of virtual nodes will be calculated based on this service quality score
+     *
+     */
+    private Byte quality;
+
+    private CollectorStatus collectorStatus;
+
+    /**
+     * use this collector's collect job ID list
+     * jobId,jobVersion
+     */
+    private AssignJobs assignJobs;
+
+    /**
+     * the collection task ID list mapped by each virtual node corresponding to this node
+     * Long[] [0]-jobId, [1]-dispatchHash
+     */
+    private Map<Integer, Set<Long[]>> virtualNodeMap;
+
+    public CollectorNode(String identity, String mode, String ip, long uptime, Byte quality) {
+        this.identity = identity;
+        this.mode = mode;
+        this.ip = ip;
+        this.uptime = uptime;
+        this.quality = quality;
+        assignJobs = new AssignJobs();
+        virtualNodeMap = new ConcurrentHashMap<>(VIRTUAL_NODE_DEFAULT_SIZE);
+    }
+
+    public synchronized void addJob(Integer virtualNodeKey, Integer dispatchHash, Long jobId, boolean isFlushed) {
+        if (virtualNodeMap == null) {
+            virtualNodeMap = new ConcurrentHashMap<>(VIRTUAL_NODE_DEFAULT_SIZE);
+        }
+        if (assignJobs == null) {
+            assignJobs = new AssignJobs();
+        }
+        Set<Long[]> virtualNodeJob = virtualNodeMap.computeIfAbsent(virtualNodeKey, k -> ConcurrentHashMap.newKeySet(16));
+        virtualNodeJob.add(new Long[]{jobId, dispatchHash.longValue()});
+        if (isFlushed) {
+            assignJobs.addAssignJob(jobId);
+        } else {
+            assignJobs.addAddingJob(jobId);
+        }
+    }
+
+    /**
+     * obtain the collection task routed by the specified virtual node according to virtualNodeKey
+     * @param virtualNodeKey virtualNodeKey
+     * @return collection task
+     */
+    public Set<Long[]> clearVirtualNodeJobs(Integer virtualNodeKey) {
+        if (virtualNodeMap == null || virtualNodeMap.isEmpty()) {
+            return null;
+        }
+        Set<Long[]> virtualNodeJobs = virtualNodeMap.remove(virtualNodeKey);
+        virtualNodeMap.put(virtualNodeKey, ConcurrentHashMap.newKeySet(16));
+        return virtualNodeJobs;
+    }
+
+    public void addVirtualNodeJobs(Integer virtualHashKey, Set<Long[]> reDispatchJobs) {
+        if (reDispatchJobs == null) {
+            return;
+        }
+        if (virtualNodeMap == null) {
+            virtualNodeMap = new ConcurrentHashMap<>(16);
+        }
+        virtualNodeMap.computeIfPresent(virtualHashKey, (k, v) -> {
+            reDispatchJobs.addAll(v);
+            return v;
+        });
+        virtualNodeMap.put(virtualHashKey, reDispatchJobs);
+    }
+
+    public void removeVirtualNodeJob(Long jobId) {
+        if (jobId == null || virtualNodeMap == null) {
+            return;
+        }
+        for (Set<Long[]> jobSet : virtualNodeMap.values()) {
+            Optional<Long[]> optional = jobSet.stream().filter(item -> Objects.equals(item[0], jobId)).findFirst();
+            if (optional.isPresent()) {
+                jobSet.remove(optional.get());
+                break;
+            }
+        }
+    }
+
+    public void destroy() {
+        if (assignJobs != null) {
+            assignJobs.clear();
+        }
+        if (virtualNodeMap != null) {
+            virtualNodeMap.clear();
+        }
+    }
+}
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo;
+
+import org.apache.hertzbeat.common.entity.job.Job;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Utility class for caching {@link Job} objects in memory.
+ * <p>
+ * This class provides static methods to store, retrieve, and remove {@code Job} instances
+ * using a thread-safe {@link ConcurrentHashMap}. It is intended to be used as a simple
+ * in-memory cache for job data within the manager component.
+ * <p>
+ * Usage:
+ * <pre>
+ *     JobCache.put(job);
+ *     Job job = JobCache.get(jobId);
+ *     JobCache.remove(jobId);
+ * </pre>
+ */
+public class JobCache {
+    private static final Map<Long, Job> jobContentCache = new ConcurrentHashMap<>(16);
+
+    public static Job get(Long jobId) {
+        return jobContentCache.get(jobId);
+    }
+
+    public static void put(Job job) {
+        jobContentCache.put(job.getId(), job);
+    }
+
+    public static void remove(Long jobId) {
+        jobContentCache.remove(jobId);
+    }
+}
@@ -47,7 +47,7 @@ public class MonitorDto {
    private List<Param> params;
    
    @Schema(description = "Monitor Metrics", accessMode = READ_ONLY)
-    private List<MetricsInfo> metrics;
+    private List<String> metrics;
    
    @Schema(description = "pinned collector, default null if system dispatch", accessMode = READ_WRITE)
    private String collector;
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.scheduler;
+package org.apache.hertzbeat.manager.properties;

 import lombok.Getter;
 import lombok.Setter;
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.config;
+package org.apache.hertzbeat.manager.properties;

 import lombok.Getter;
 import lombok.Setter;
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Slf4j
@Data
 public class AssignJobs {
+    private static final Integer DEFAULT_CAPACITY = 16;

    /**
     * current assign jobIds
@@ -51,10 +52,10 @@ public class AssignJobs {
    private Set<Long> pinnedJobs;

    public AssignJobs() {
-        jobs = ConcurrentHashMap.newKeySet(16);
-        addingJobs = ConcurrentHashMap.newKeySet(16);
-        removingJobs = ConcurrentHashMap.newKeySet(16);
-        pinnedJobs = ConcurrentHashMap.newKeySet(16);
+        jobs = ConcurrentHashMap.newKeySet(DEFAULT_CAPACITY);
+        addingJobs = ConcurrentHashMap.newKeySet(DEFAULT_CAPACITY);
+        removingJobs = ConcurrentHashMap.newKeySet(DEFAULT_CAPACITY);
+        pinnedJobs = ConcurrentHashMap.newKeySet(DEFAULT_CAPACITY);
    }

    public void addAssignJob(Long jobId) {
@@ -29,11 +29,14 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+
+import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService;
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener;
+import org.apache.hertzbeat.common.constants.CollectorStatus;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
 import org.apache.hertzbeat.common.entity.dto.ServerInfo;
@@ -53,6 +56,10 @@ import org.apache.hertzbeat.manager.dao.CollectorDao;
 import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao;
 import org.apache.hertzbeat.manager.dao.MonitorDao;
 import org.apache.hertzbeat.manager.dao.ParamDao;
+import org.apache.hertzbeat.manager.pojo.CollectorNode;
+import org.apache.hertzbeat.manager.pojo.JobCache;
+import org.apache.hertzbeat.manager.properties.SchedulerProperties;
+import org.apache.hertzbeat.manager.scheduler.collector.CollectorKeeper;
 import org.apache.hertzbeat.manager.scheduler.netty.ManageServer;
 import org.apache.hertzbeat.manager.service.AppService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,9 +72,7 @@ import org.springframework.stereotype.Component;
@Component
@AutoConfigureAfter(value = {SchedulerProperties.class})
@Slf4j
-public class CollectorJobScheduler implements CollectorScheduling, CollectJobScheduling {
-
-    private final Map<Long, Job> jobContentCache = new ConcurrentHashMap<>(16);
+public class CollectorJobScheduler implements CollectorOperation, CollectorOperationReceiver, JobOperation {

    private final Map<Long, CollectResponseEventListener> eventListeners = new ConcurrentHashMap<>(16);

@@ -77,9 +82,6 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
    @Autowired
    private CollectorMonitorBindDao collectorMonitorBindDao;

-    @Autowired
-    private ConsistentHash consistentHash;
-
    @Autowired
    private CollectJobService collectJobService;

@@ -92,6 +94,10 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
    @Autowired
    private ParamDao paramDao;

+    @Autowired
+    private CollectorKeeper collectorKeeper;
+
+    @Setter
    private ManageServer manageServer;

    @Override
@@ -125,15 +131,18 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
                    .build();
        }
        collectorDao.save(collector);
-        ConsistentHash.Node node = new ConsistentHash.Node(identity, collector.getMode(),
-                collector.getIp(), System.currentTimeMillis(), null);
-        consistentHash.addNode(node);
-        reBalanceCollectorAssignJobs();
+
+        CollectorNode node = new CollectorNode(identity, collector.getMode(), collector.getIp(), System.currentTimeMillis(), null);
+        collectorKeeper.addNode(node);
+        collectorKeeper.changeStatus(identity, CollectorStatus.ONLINE);
+        collectorKeeper.rebalanceJobs(this::doRebalanceJobs);
+
        // Read database The fixed collection tasks at this collector are delivered
        List<CollectorMonitorBind> binds = collectorMonitorBindDao.findCollectorMonitorBindsByCollector(identity);
        if (CollectionUtils.isEmpty(binds)){
            return;
        }
+
        List<Monitor> monitors = monitorDao.findMonitorsByIdIn(binds.stream().map(CollectorMonitorBind::getMonitorId).collect(Collectors.toSet()));
        for (Monitor monitor : monitors) {
            if (Objects.isNull(monitor) || monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE) {
@@ -189,56 +198,10 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        }
        collector.setStatus(CommonConstants.COLLECTOR_STATUS_OFFLINE);
        collectorDao.save(collector);
-        consistentHash.removeNode(identity);
-        reBalanceCollectorAssignJobs();
-        log.info("the collector: {} go offline success.", identity);
-    }

-    @Override
-    public void reBalanceCollectorAssignJobs() {
-        consistentHash.getAllNodes().entrySet().parallelStream().forEach(entry -> {
-            String collectorName = entry.getKey();
-            AssignJobs assignJobs = entry.getValue().getAssignJobs();
-            if (StringUtils.isBlank(collectorName) || Objects.isNull(assignJobs)) {
-                return;
-            }
-            if (CollectionUtils.isNotEmpty(assignJobs.getAddingJobs())) {
-                Set<Long> addedJobIds = new HashSet<>(8);
-                for (Long addingJobId : assignJobs.getAddingJobs()) {
-                    Job job = jobContentCache.get(addingJobId);
-                    if (Objects.isNull(job)) {
-                        log.error("assigning job {} content is null.", addingJobId);
-                        continue;
-                    }
-                    addedJobIds.add(addingJobId);
-                    if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorName)) {
-                        collectJobService.addAsyncCollectJob(job);
-                    } else {
-                        ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
-                                .setDirection(ClusterMsg.Direction.REQUEST)
-                                .setType(ClusterMsg.MessageType.ISSUE_CYCLIC_TASK)
-                                .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
-                                .build();
-                        this.manageServer.sendMsg(collectorName, message);
-                    }
-                }
-                assignJobs.addAssignJobs(addedJobIds);
-                assignJobs.removeAddingJobs(addedJobIds);
-            }
-            if (CollectionUtils.isNotEmpty(assignJobs.getRemovingJobs())) {
-                if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorName)) {
-                    assignJobs.getRemovingJobs().forEach(jobId -> collectJobService.cancelAsyncCollectJob(jobId));
-                } else {
-                    ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
-                            .setDirection(ClusterMsg.Direction.REQUEST)
-                            .setType(ClusterMsg.MessageType.DELETE_CYCLIC_TASK)
-                            .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(assignJobs.getRemovingJobs())))
-                            .build();
-                    this.manageServer.sendMsg(collectorName, message);
-                }
-                assignJobs.clearRemovingJobs();
-            }
-        });
+        collectorKeeper.changeStatus(identity, CollectorStatus.OFFLINE);
+        collectorKeeper.rebalanceJobs(this::doRebalanceJobs);
+        log.info("the collector: {} go offline success.", identity);
    }

    @Override
@@ -285,56 +248,11 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        return true;
    }

-    @Override
-    public List<CollectRep.MetricsData> collectSyncJobData(Job job) {
-        // todo dispatchKey ip+port or id
-        String dispatchKey = String.valueOf(job.getMonitorId());
-        ConsistentHash.Node node = consistentHash.preDispatchJob(dispatchKey);
-        if (Objects.isNull(node)) {
-            log.error("there is no collector online to assign job.");
-            CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder()
-                    .setCode(CollectRep.Code.FAIL)
-                    .setMsg("no collector online to assign job")
-                    .build();
-            return Collections.singletonList(metricsData);
-        }
-        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(node.getIdentity())) {
-            return collectJobService.collectSyncJobData(job);
-        } else {
-            List<CollectRep.MetricsData> metricsData = new LinkedList<>();
-            CountDownLatch countDownLatch = new CountDownLatch(1);
-
-            ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
-                    .setType(ClusterMsg.MessageType.ISSUE_ONE_TIME_TASK)
-                    .setDirection(ClusterMsg.Direction.REQUEST)
-                    .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
-                    .build();
-            boolean result = this.manageServer.sendMsg(node.getIdentity(), message);
-
-            if (result) {
-                CollectResponseEventListener listener = new CollectResponseEventListener() {
-                    @Override
-                    public void response(List<CollectRep.MetricsData> responseMetrics) {
-                        if (responseMetrics != null) {
-                            metricsData.addAll(responseMetrics);
-                        }
-                        countDownLatch.countDown();
-                    }
-                };
-                eventListeners.put(job.getMonitorId(), listener);
-            }
-            try {
-                countDownLatch.await(120, TimeUnit.SECONDS);
-            } catch (Exception e) {
-                log.info("The sync task runs for 120 seconds with no response and returns");
-            }
-            return metricsData;
-        }
-    }
-
    @Override
    public List<CollectRep.MetricsData> collectSyncJobData(Job job, String collector) {
-        ConsistentHash.Node node = consistentHash.getNode(collector);
+        CollectorNode node = StringUtils.isBlank(collector)
+                ? collectorKeeper.determineNode(job.getMonitorId())
+                : collectorKeeper.getNode(collector);
        if (Objects.isNull(node)) {
            log.error("there is no collector online to assign job.");
            CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder()
@@ -343,9 +261,11 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
                    .build();
            return Collections.singletonList(metricsData);
        }
+
        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(node.getIdentity())) {
            return collectJobService.collectSyncJobData(job);
        }
+
        List<CollectRep.MetricsData> metricsData = new LinkedList<>();
        ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
                .setType(ClusterMsg.MessageType.ISSUE_ONE_TIME_TASK)
@@ -378,25 +298,10 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
    public long addAsyncCollectJob(Job job, String collector) {
        long jobId = SnowFlakeIdGenerator.generateId();
        job.setId(jobId);
-        jobContentCache.put(jobId, job);
-        ConsistentHash.Node node;
-        if (StringUtils.isBlank(collector)) {
-            // todo dispatchKey ip+port or id
-            String dispatchKey = String.valueOf(job.getMonitorId());
-            node = consistentHash.dispatchJob(dispatchKey, jobId);
-            if (node == null) {
-                log.error("there is no collector online to assign job.");
-                return jobId;
-            }
-        } else {
-            node = consistentHash.getNode(collector);
-            if (node == null) {
-                log.error("there is no collector name: {} online to assign job.", collector);
-                return jobId;
-            }
-            node.getAssignJobs().addPinnedJob(jobId);
-        }
-        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(node.getIdentity())) {
+
+        CollectorNode collectorNode = collectorKeeper.addJob(job, collector);
+
+        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorNode.getIdentity())) {
            collectJobService.addAsyncCollectJob(job);
        } else {
            ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
@@ -404,27 +309,16 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
                    .setDirection(ClusterMsg.Direction.REQUEST)
                    .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
                    .build();
-            this.manageServer.sendMsg(node.getIdentity(), message);
+            this.manageServer.sendMsg(collectorNode.getIdentity(), message);
        }
        return jobId;
    }

-    @Override
-    public long updateAsyncCollectJob(Job modifyJob) {
-        // delete and add
-        long preJobId = modifyJob.getId();
-        long newJobId = addAsyncCollectJob(modifyJob, null);
-        jobContentCache.remove(preJobId);
-        cancelAsyncCollectJob(preJobId);
-        return newJobId;
-    }
-
    @Override
    public long updateAsyncCollectJob(Job modifyJob, String collector) {
        // delete and add
        long preJobId = modifyJob.getId();
        long newJobId = addAsyncCollectJob(modifyJob, collector);
-        jobContentCache.remove(preJobId);
        cancelAsyncCollectJob(preJobId);
        return newJobId;
    }
@@ -434,24 +328,21 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        if (jobId == null) {
            return;
        }
-        jobContentCache.remove(jobId);
-        for (ConsistentHash.Node node : consistentHash.getAllNodes().values()) {
-            AssignJobs assignJobs = node.getAssignJobs();
-            if (assignJobs.getPinnedJobs().remove(jobId)
-                    || assignJobs.getJobs().remove(jobId) || assignJobs.getAddingJobs().remove(jobId)) {
-                node.removeVirtualNodeJob(jobId);
-                if (CommonConstants.MAIN_COLLECTOR_NODE.equals(node.getIdentity())) {
-                    collectJobService.cancelAsyncCollectJob(jobId);
-                } else {
-                    ClusterMsg.Message deleteMessage = ClusterMsg.Message.newBuilder()
-                            .setType(ClusterMsg.MessageType.DELETE_CYCLIC_TASK)
-                            .setDirection(ClusterMsg.Direction.REQUEST)
-                            .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(List.of(jobId))))
-                            .build();
-                    this.manageServer.sendMsg(node.getIdentity(), deleteMessage);
-                }
-                // break; if is there jod exist in multi collector?
-            }
+
+        CollectorNode collectorNode = collectorKeeper.removeJob(jobId);
+        if (collectorNode == null) {
+            return;
+        }
+
+        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorNode.getIdentity())) {
+            collectJobService.cancelAsyncCollectJob(jobId);
+        } else {
+            ClusterMsg.Message deleteMessage = ClusterMsg.Message.newBuilder()
+                    .setType(ClusterMsg.MessageType.DELETE_CYCLIC_TASK)
+                    .setDirection(ClusterMsg.Direction.REQUEST)
+                    .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(List.of(jobId))))
+                    .build();
+            this.manageServer.sendMsg(collectorNode.getIdentity(), deleteMessage);
        }
    }

@@ -468,7 +359,55 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        }
    }

-    public void setManageServer(ManageServer manageServer) {
-        this.manageServer = manageServer;
+    private void doRebalanceJobs(AssignJobs assignJobs, String collectorName) {
+        handleAddingJobs(assignJobs, collectorName);
+
+        handleRemovingJobs(assignJobs, collectorName);
+    }
+
+    private void handleAddingJobs(AssignJobs assignJobs, String collectorName) {
+        if (CollectionUtils.isEmpty(assignJobs.getAddingJobs())) {
+            return;
+        }
+
+        Set<Long> addedJobIds = new HashSet<>(8);
+        for (Long addingJobId : assignJobs.getAddingJobs()) {
+            Job job = JobCache.get(addingJobId);
+            if (Objects.isNull(job)) {
+                log.error("assigning job {} content is null.", addingJobId);
+                continue;
+            }
+            addedJobIds.add(addingJobId);
+            if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorName)) {
+                collectJobService.addAsyncCollectJob(job);
+            } else {
+                ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
+                        .setDirection(ClusterMsg.Direction.REQUEST)
+                        .setType(ClusterMsg.MessageType.ISSUE_CYCLIC_TASK)
+                        .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(job)))
+                        .build();
+                this.manageServer.sendMsg(collectorName, message);
+            }
+        }
+        assignJobs.addAssignJobs(addedJobIds);
+        assignJobs.removeAddingJobs(addedJobIds);
+    }
+
+    private void handleRemovingJobs(AssignJobs assignJobs, String collectorName) {
+        if (CollectionUtils.isEmpty(assignJobs.getRemovingJobs())) {
+            return;
+        }
+
+        if (CommonConstants.MAIN_COLLECTOR_NODE.equals(collectorName)) {
+            assignJobs.getRemovingJobs().forEach(jobId -> collectJobService.cancelAsyncCollectJob(jobId));
+        } else {
+            ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
+                    .setDirection(ClusterMsg.Direction.REQUEST)
+                    .setType(ClusterMsg.MessageType.DELETE_CYCLIC_TASK)
+                    .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(assignJobs.getRemovingJobs())))
+                    .build();
+            this.manageServer.sendMsg(collectorName, message);
+        }
+        assignJobs.clearRemovingJobs();
    }
 }
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.scheduler;
+
+/**
+ * Interface defining operations for managing collector.
+ * Implementations of this interface provide functionality to control the operation state
+ * of collectors in the system.
+ */
+public interface CollectorOperation {
+
+    /**
+     * Takes a collector offline by stopping its collection operations.
+     * This is typically used for maintenance, updates, or when the collector is no longer needed.
+     *
+     * @param identity The unique identifier of the collector to be taken offline
+     * @return true if the collector was successfully taken offline,
+     *         false if the operation failed or the collector wasn't found
+     */
+    boolean offlineCollector(String identity);
+
+    /**
+     * Brings a collector online by starting its collection operations.
+     * This is used to activate a collector that was previously offline.
+     *
+     * @param identity The unique identifier of the collector to be brought online
+     * @return true if the collector was successfully brought online,
+     *         false if the operation failed or the collector wasn't found
+     */
+    boolean onlineCollector(String identity);
+}
@@ -20,39 +20,25 @@ package org.apache.hertzbeat.manager.scheduler;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;

 /**
- * slave collector service
+ * Interface defining operations for receiving collector status updates from remote collectors.
+ * This interface serves as a callback mechanism for handling collector online/offline events.
 */
-public interface CollectorScheduling {
-    
+public interface CollectorOperationReceiver {
    /**
-     * register collector go online
-     * @param identity collector identity name
-     * @param collectorInfo collector information
+     * Notifies the system when a collector comes online.
+     * This method should be called when a collector establishes connection and becomes available.
+     *
+     * @param identity The unique identifier of the collector (e.g., hostname, IP, or custom ID)
+     * @param collectorInfo Detailed information about the collector including capabilities,
+     *                      configuration, and status metadata
     */
    void collectorGoOnline(String identity, CollectorInfo collectorInfo);
-    
-    /**
-     * register collector go offline
-     * @param identity collector identity name
-     */
-    void collectorGoOffline(String identity);
-    
-    /**
-     * reBalance dispatch monitoring jobs when collector go online or offline or timeout
-     */
-    void reBalanceCollectorAssignJobs();
-    
-    /**
-     * offline collector(stop collector collect operation)
-     * @param identity collector identity name
-     * @return true/false
-     */
-    boolean offlineCollector(String identity);

    /**
-     * online collector(start collector collect operation)
-     * @param identity collector identity name
-     * @return true/false
+     * Notifies the system when a collector goes offline.
+     * This method should be called when a collector disconnects or becomes unavailable.
+     *
+     * @param identity The unique identifier of the collector to be marked as offline
     */
-    boolean onlineCollector(String identity);
+    void collectorGoOffline(String identity);
 }
@@ -23,46 +23,149 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.common.constants.CollectorStatus;
 import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.job.Job;
+import org.apache.hertzbeat.manager.pojo.CollectorNode;
+import org.apache.hertzbeat.manager.pojo.JobCache;
+import org.apache.hertzbeat.manager.scheduler.collector.CollectorKeeper;

 /**
 *  Collector and task mapping scheduling implemented by consistent hashing
 */
@Slf4j
-public class ConsistentHash {
+public class ConsistentHashCollectorKeeper implements CollectorKeeper {

    /**
     * consistent hash circle
     */
-    private final ConcurrentTreeMap<Integer, Node> hashCircle;
+    private final ConcurrentTreeMap<Integer, CollectorNode> hashCircle = new ConcurrentTreeMap<>();

    /**
     * collector node
     */
-    private final Map<String, Node> existNodeMap;
+    private final Map<String, CollectorNode> existNodeMap = new ConcurrentHashMap<>(16);

    /**
-     * not dispatched job cache
+     * not dispatched job cache, in order to obtain the cached collection scheduling task
     */
-    private final List<DispatchJob> dispatchJobCache;
+    @Getter
+    private final List<DispatchJob> dispatchJobCache = Collections.synchronizedList(new LinkedList<>());

    /**
     * Default number of VM nodes
     */
    private static final byte VIRTUAL_NODE_DEFAULT_SIZE = 10;

-    public ConsistentHash() {
-        hashCircle  = new ConcurrentTreeMap<>();
-        existNodeMap = new ConcurrentHashMap<>(16);
-        dispatchJobCache = Collections.synchronizedList(new LinkedList<>());
+    /**
+     * add collector node
+     * @param newNode node
+     */
+    @Override
+    public void addNode(CollectorNode newNode) {
+        // when mode is cluster public, need reBalance dispatch jobs. else not when is cloud-edge private
+        if (!CommonConstants.MODE_PRIVATE.equals(newNode.getMode())) {
+            byte virtualNodeNum = newNode.getQuality() == null ? VIRTUAL_NODE_DEFAULT_SIZE : newNode.getQuality();
+            for (byte i = 0; i < virtualNodeNum; i++) {
+                addVirtualNode(newNode, newNode.getIdentity() + i);
+            }
+        }
+        existNodeMap.put(newNode.getIdentity(), newNode);
+        dispatchJobInCache();
+    }
+
+    @Override
+    public CollectorNode addJob(Job job, String collectorId) {
+        JobCache.put(job);
+        CollectorNode collectorNode;
+
+        if (StringUtils.isBlank(collectorId)) {
+            // todo dispatchKey ip+port or id
+            String dispatchKey = String.valueOf(job.getMonitorId());
+            collectorNode = this.dispatchJob(dispatchKey, job.getId());
+            if (collectorNode == null) {
+                log.error("there is no collector online to assign job.");
+            }
+        } else {
+            collectorNode = getNode(collectorId);
+            if (collectorNode == null) {
+                log.error("there is no collector name: {} online to assign job.", collectorId);
+                return null;
+            }
+            collectorNode.getAssignJobs().addPinnedJob(job.getId());
+        }
+
+        return collectorNode;
+    }
+
+    /**
+     * get node
+     * @param collectorName collector name
+     * @return node
+     */
+    @Override
+    public CollectorNode getNode(String collectorName) {
+        return existNodeMap.get(collectorName);
+    }
+
+    @Override
+    public CollectorNode determineNode(Long jobId) {
+        String dispatchKey = String.valueOf(jobId);
+        if (dispatchKey == null || StringUtils.isBlank(dispatchKey)) {
+            log.error("The dispatch key can not null.");
+            return null;
+        }
+        int dispatchHash = hash(dispatchKey);
+        return preDispatchJob(dispatchHash);
+    }
+
+    @Override
+    public void changeStatus(String collectorId, CollectorStatus collectorStatus) {
+        switch (collectorStatus) {
+            case ONLINE -> this.getNode(collectorId).setCollectorStatus(collectorStatus);
+            case OFFLINE -> this.removeNode(collectorId);
+            default -> {}
+        }
+    }
+
+    @Override
+    public void rebalanceJobs(BiConsumer<AssignJobs, String> assignJobCollectorConsumer) {
+        existNodeMap.entrySet().parallelStream().forEach(entry -> {
+            String collectorName = entry.getKey();
+            AssignJobs assignJobs = entry.getValue().getAssignJobs();
+            if (StringUtils.isBlank(collectorName) || Objects.isNull(assignJobs)) {
+                return;
+            }
+
+            assignJobCollectorConsumer.accept(assignJobs, collectorName);
+        });
+    }
+
+    @Override
+    public CollectorNode removeJob(Long jobId) {
+        JobCache.remove(jobId);
+
+        for (CollectorNode node : existNodeMap.values()) {
+            AssignJobs assignJobs = node.getAssignJobs();
+            if (assignJobs.getPinnedJobs().remove(jobId)
+                    || assignJobs.getJobs().remove(jobId) || assignJobs.getAddingJobs().remove(jobId)) {
+                node.removeVirtualNodeJob(jobId);
+
+                return node;
+                // break; if is there jod exist in multi collector?
+            }
+        }
+
+        return null;
    }

    /**
@@ -70,15 +173,15 @@ public class ConsistentHash {
     * @param newNode node
     * @param identity virtual node identity
     */
-    public synchronized void addVirtualNode(Node newNode, String identity){
+    private synchronized void addVirtualNode(CollectorNode newNode, String identity){
        int virtualHashKey = hash(identity);
        hashCircle.put(virtualHashKey, newNode);
        newNode.addVirtualNodeJobs(virtualHashKey, ConcurrentHashMap.newKeySet(16));
-        Map.Entry<Integer, Node> higherVirtualNode = hashCircle.higherOrFirstEntry(virtualHashKey);
+        Map.Entry<Integer, CollectorNode> higherVirtualNode = hashCircle.higherOrFirstEntry(virtualHashKey);
        // Reassign tasks that are routed to the higherVirtualNode virtual node
        // Tasks are either on the original virtual node or on the new virtual node
        Integer higherVirtualNodeKey = higherVirtualNode.getKey();
-        Node higherNode = higherVirtualNode.getValue();
+        CollectorNode higherNode = higherVirtualNode.getValue();
        Set<Long[]> dispatchJobs = higherNode.clearVirtualNodeJobs(higherVirtualNodeKey);
        if (dispatchJobs != null && !dispatchJobs.isEmpty()) {
            Set<Long[]> reDispatchJobs = ConcurrentHashMap.newKeySet(dispatchJobs.size());
@@ -91,53 +194,37 @@ public class ConsistentHash {
                    iterator.remove();
                }
            }
-            higherNode.virtualNodeMap.put(higherVirtualNodeKey, dispatchJobs);
+            higherNode.getVirtualNodeMap().put(higherVirtualNodeKey, dispatchJobs);
            Set<Long> jobIds = reDispatchJobs.stream().map(item -> item[0]).collect(Collectors.toSet());
            newNode.addVirtualNodeJobs(virtualHashKey, reDispatchJobs);
            if (higherNode != newNode) {
-                higherNode.assignJobs.removeAssignJobs(jobIds);
-                higherNode.assignJobs.addRemovingJobs(jobIds);
-                newNode.assignJobs.addAddingJobs(jobIds);
+                higherNode.getAssignJobs().removeAssignJobs(jobIds);
+                higherNode.getAssignJobs().addRemovingJobs(jobIds);
+                newNode.getAssignJobs().addAddingJobs(jobIds);
            }
        }
    }

-    /**
-     * add collector node
-     * @param newNode node
-     */
-    public void addNode(Node newNode) {
-        // when mode is cluster public, need reBalance dispatch jobs. else not when is cloud-edge private
-        if (!CommonConstants.MODE_PRIVATE.equals(newNode.mode)) {
-            byte virtualNodeNum = newNode.quality == null ? VIRTUAL_NODE_DEFAULT_SIZE : newNode.quality;
-            for (byte i = 0; i < virtualNodeNum; i++) {
-                addVirtualNode(newNode, newNode.identity + i);
-            }
-        }
-        existNodeMap.put(newNode.identity, newNode);
-        dispatchJobInCache();
-    }
-
    /**
     * remove virtual node
     * @param deletedNode node
     * @param virtualNodeHash virtual node hash key
     */
-    public synchronized void removeVirtualNode(Node deletedNode, Integer virtualNodeHash) {
-        Set<Long[]> removeJobHashSet = deletedNode.virtualNodeMap.get(virtualNodeHash);
+    private synchronized void removeVirtualNode(CollectorNode deletedNode, Integer virtualNodeHash) {
+        Set<Long[]> removeJobHashSet = deletedNode.getVirtualNodeMap().get(virtualNodeHash);
        // Migrate the virtualNodeEntry collection task to the nearest virtual node that is larger than it
        hashCircle.remove(virtualNodeHash);
        if (removeJobHashSet == null || removeJobHashSet.isEmpty()) {
            return;
        }
-        Map.Entry<Integer, Node> higherVirtualEntry = hashCircle.higherOrFirstEntry(virtualNodeHash);
+        Map.Entry<Integer, CollectorNode> higherVirtualEntry = hashCircle.higherOrFirstEntry(virtualNodeHash);
        if (higherVirtualEntry == null || higherVirtualEntry.getValue() == deletedNode) {
            higherVirtualEntry = null;
        }
        // jobId
        Set<Long> removeJobIds = removeJobHashSet.stream().map(item -> item[0]).collect(Collectors.toSet());
-        deletedNode.assignJobs.removeAssignJobs(removeJobIds);
-        deletedNode.assignJobs.addRemovingJobs(removeJobIds);
+        deletedNode.getAssignJobs().removeAssignJobs(removeJobIds);
+        deletedNode.getAssignJobs().addRemovingJobs(removeJobIds);
        if (higherVirtualEntry == null) {
            // jobId-dispatchHash
            removeJobHashSet.forEach(value -> {
@@ -150,9 +237,9 @@ public class ConsistentHash {
                }
            });
        } else {
-            Node higherVirtualNode = higherVirtualEntry.getValue();
+            CollectorNode higherVirtualNode = higherVirtualEntry.getValue();
            higherVirtualNode.addVirtualNodeJobs(higherVirtualEntry.getKey(), removeJobHashSet);
-            higherVirtualNode.assignJobs.addAddingJobs(removeJobIds);
+            higherVirtualNode.getAssignJobs().addAddingJobs(removeJobIds);
        }
    }

@@ -160,20 +247,19 @@ public class ConsistentHash {
     * deleted collector node
     * @param name collector name
     */
-    public Node removeNode(String name) {
-        Node deletedNode = existNodeMap.remove(name);
+    private void removeNode(String name) {
+        CollectorNode deletedNode = existNodeMap.remove(name);
        if (deletedNode == null) {
-            return null;
-        }
-        for (Integer virtualNodeHash : deletedNode.virtualNodeMap.keySet()) {
-            removeVirtualNode(deletedNode, virtualNodeHash);
+            return;
        }
+
+        deletedNode.getVirtualNodeMap().keySet()
+                .forEach(virtualNodeHash -> removeVirtualNode(deletedNode, virtualNodeHash));
        deletedNode.destroy();
        dispatchJobInCache();
-        return deletedNode;
    }

-    public synchronized void dispatchJobInCache() {
+    private synchronized void dispatchJobInCache() {
        if (!dispatchJobCache.isEmpty()) {
            int size = dispatchJobCache.size();
            for (int index = 0; index < size; index++) {
@@ -183,31 +269,6 @@ public class ConsistentHash {
        }
    }

-    /**
-     * get all collector nodes
-     * @return nodes
-     */
-    public Map<String, Node> getAllNodes() {
-        return existNodeMap;
-    }
-
-    /**
-     * get node
-     * @param collectorName collector name
-     * @return node
-     */
-    public Node getNode(String collectorName) {
-        return existNodeMap.get(collectorName);
-    }
-
-    /**
-     * Obtain the cached collection scheduling task
-     * @return cache task
-     */
-    public List<DispatchJob> getDispatchJobCache() {
-        return dispatchJobCache;
-    }
-
    /**
     * obtain the collector node according to the collection task information
     *
@@ -215,7 +276,7 @@ public class ConsistentHash {
     * @param jobId jobId
     * @return collector node
     */
-    public Node dispatchJob(String dispatchKey, Long jobId) {
+    private CollectorNode dispatchJob(String dispatchKey, Long jobId) {
        if (dispatchKey == null || StringUtils.isBlank(dispatchKey)) {
            log.error("The dispatch key can not null.");
            return null;
@@ -224,38 +285,23 @@ public class ConsistentHash {
        return dispatchJob(dispatchHash, jobId, true);
    }

-    /**
-     * The collector node to which the collector is assigned is obtained in advance based on the collection task information
-     *
-     * @param dispatchKey collector task route key: ip+appId
-     * @return collector node
-     */
-    public Node preDispatchJob(String dispatchKey) {
-        if (dispatchKey == null || StringUtils.isBlank(dispatchKey)) {
-            log.error("The dispatch key can not null.");
-            return null;
-        }
-        int dispatchHash = hash(dispatchKey);
-        return preDispatchJob(dispatchHash);
-    }
-
    /**
     * Obtain the collector node to which the collector is assigned based on the collection task information
     *
     * @param dispatchHash The task route hash is collected
     * @param jobId jobId
-     * @param isFlushed is has flush this job or wait to dispatch
+     * @param isFlushed if it has flushed this job or wait to dispatch
     * @return collector node
     */
-    public Node dispatchJob(Integer dispatchHash, Long jobId, boolean isFlushed) {
+    private CollectorNode dispatchJob(Integer dispatchHash, Long jobId, boolean isFlushed) {
        if (dispatchHash == null || hashCircle == null || hashCircle.isEmpty()) {
            log.warn("There is no available collector registered. Cache the job {}.", jobId);
            dispatchJobCache.add(new DispatchJob(dispatchHash, jobId));
            return null;
        }
-        Map.Entry<Integer, Node> ceilEntry = hashCircle.ceilingOrFirstEntry(dispatchHash);
+        Map.Entry<Integer, CollectorNode> ceilEntry = hashCircle.ceilingOrFirstEntry(dispatchHash);
        int virtualKey = ceilEntry.getKey();
-        Node curNode = ceilEntry.getValue();
+        CollectorNode curNode = ceilEntry.getValue();

        curNode.addJob(virtualKey, dispatchHash, jobId, isFlushed);
        return curNode;
@@ -267,25 +313,15 @@ public class ConsistentHash {
     * @param dispatchHash The task route hash is collected
     * @return collector node
     */
-    public Node preDispatchJob(Integer dispatchHash) {
+    private CollectorNode preDispatchJob(Integer dispatchHash) {
        if (dispatchHash == null || hashCircle == null || hashCircle.isEmpty()) {
            log.warn("There is no available collector registered.");
            return null;
        }
-        Map.Entry<Integer, Node> ceilEntry = hashCircle.ceilingOrFirstEntry(dispatchHash);
+        Map.Entry<Integer, CollectorNode> ceilEntry = hashCircle.ceilingOrFirstEntry(dispatchHash);
        return ceilEntry.getValue();
    }

-    /**
-     * hash long
-     * @param key long value
-     * @return hash value
-     */
-    private int hash(long key) {
-        String keyStr = String.valueOf(key);
-        return hash(keyStr);
-    }
-
    /**
     * FNV1_32_HASH algorithm
     * @param key the key
@@ -314,7 +350,7 @@ public class ConsistentHash {
     * dispatch job summary
     */
    @AllArgsConstructor
-    public static class DispatchJob {
+    private static class DispatchJob {

        /**
         * dispatch task route key
@@ -327,130 +363,4 @@ public class ConsistentHash {
        @Getter
        private Long jobId;
    }
-
-    /**
-     * collector node machine address
-     */
-    public static class Node {
-
-        /**
-         * collector identity
-         */
-        @Getter
-        private final String identity;
-
-        /**
-         * collector mode: public or private
-         */
-        private final String mode;
-
-        /**
-         * ip
-         */
-        private final String ip;
-
-        /**
-         * collector On-line time stamp
-         */
-        private final long uptime;
-
-        /**
-         * collector's own performance service quality score 0 - 127
-         * The number of virtual nodes will be calculated based on this service quality score
-         *
-         */
-        private final Byte quality;
-
-        /**
-         * use this collector's collect job ID list
-         * jobId,jobVersion
-         */
-        private AssignJobs assignJobs;
-
-        /**
-         * the collection task ID list mapped by each virtual node corresponding to this node
-         * Long[] [0]-jobId, [1]-dispatchHash
-         */
-        private Map<Integer, Set<Long[]>> virtualNodeMap;
-
-        public Node(String identity, String mode, String ip, long uptime, Byte quality) {
-            this.identity = identity;
-            this.mode = mode;
-            this.ip = ip;
-            this.uptime = uptime;
-            this.quality = quality;
-            assignJobs = new AssignJobs();
-            virtualNodeMap = new ConcurrentHashMap<>(VIRTUAL_NODE_DEFAULT_SIZE);
-        }
-
-        private synchronized void addJob(Integer virtualNodeKey, Integer dispatchHash, Long jobId, boolean isFlushed) {
-            if (virtualNodeMap == null) {
-                virtualNodeMap = new ConcurrentHashMap<>(VIRTUAL_NODE_DEFAULT_SIZE);
-            }
-            if (assignJobs == null) {
-                assignJobs = new AssignJobs();
-            }
-            Set<Long[]> virtualNodeJob = virtualNodeMap.computeIfAbsent(virtualNodeKey, k -> ConcurrentHashMap.newKeySet(16));
-            virtualNodeJob.add(new Long[]{jobId, dispatchHash.longValue()});
-            if (isFlushed) {
-                assignJobs.addAssignJob(jobId);
-            } else {
-                assignJobs.addAddingJob(jobId);
-            }
-        }
-
-        /**
-         * obtain the collection task routed by the specified virtual node according to virtualNodeKey
-         * @param virtualNodeKey virtualNodeKey
-         * @return collection task
-         */
-        private Set<Long[]> clearVirtualNodeJobs(Integer virtualNodeKey) {
-            if (virtualNodeMap == null || virtualNodeMap.isEmpty()) {
-                return null;
-            }
-            Set<Long[]> virtualNodeJobs = virtualNodeMap.remove(virtualNodeKey);
-            virtualNodeMap.put(virtualNodeKey, ConcurrentHashMap.newKeySet(16));
-            return virtualNodeJobs;
-        }
-
-        private void addVirtualNodeJobs(Integer virtualHashKey, Set<Long[]> reDispatchJobs) {
-            if (reDispatchJobs == null) {
-                return;
-            }
-            if (virtualNodeMap == null) {
-                virtualNodeMap = new ConcurrentHashMap<>(16);
-            }
-            virtualNodeMap.computeIfPresent(virtualHashKey, (k, v) -> {
-                reDispatchJobs.addAll(v);
-                return v;
-            });
-            virtualNodeMap.put(virtualHashKey, reDispatchJobs);
-        }
-
-        public void removeVirtualNodeJob(Long jobId) {
-            if (jobId == null || virtualNodeMap == null) {
-                return;
-            }
-            for (Set<Long[]> jobSet : virtualNodeMap.values()) {
-                Optional<Long[]> optional = jobSet.stream().filter(item -> Objects.equals(item[0], jobId)).findFirst();
-                if (optional.isPresent()) {
-                    jobSet.remove(optional.get());
-                    break;
-                }
-            }
-        }
-
-        public AssignJobs getAssignJobs() {
-            return assignJobs;
-        }
-
-        public void destroy() {
-            if (assignJobs != null) {
-                assignJobs.clear();
-            }
-            if (virtualNodeMap != null) {
-                virtualNodeMap.clear();
-            }
-        }
-    }
 }
@@ -24,15 +24,8 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 /**
 * Collection job management provides api interface
 */
-public interface CollectJobScheduling {
+public interface JobOperation {

-    /**
-     * Execute a one-time collection task and get the collected data response
-     * @param job Collect task details
-     * @return Collection results
-     */
-    List<CollectRep.MetricsData> collectSyncJobData(Job job);
-    
    /**
     * Execute a one-time collection task and get the collected data response
     * @param job Collect task details
@@ -49,13 +42,6 @@ public interface CollectJobScheduling {
     */
    long addAsyncCollectJob(Job job, String collector);

-    /**
-     * Update the periodic asynchronous collection tasks that have been delivered
-     * @param modifyJob Collect task details
-     * @return long Job ID
-     */
-    long updateAsyncCollectJob(Job modifyJob);
-    
    /**
     * Update the periodic asynchronous collection tasks that have been delivered
     * @param modifyJob Collect task details
@@ -52,10 +52,10 @@ import org.springframework.util.StringUtils;
 public class SchedulerInit implements CommandLineRunner {
    
    @Autowired
-    private CollectorScheduling collectorScheduling;
+    private CollectorOperationReceiver collectorOperationReceiver;
    
    @Autowired
-    private CollectJobScheduling collectJobScheduling;
+    private JobOperation jobOperation;
   
    private static final String MAIN_COLLECTOR_NODE_IP = "127.0.0.1";
    private static final String DEFAULT_COLLECTOR_VERSION = "DEBUG";
@@ -91,7 +91,7 @@ public class SchedulerInit implements CommandLineRunner {
                .ip(MAIN_COLLECTOR_NODE_IP)
                .version(DEFAULT_COLLECTOR_VERSION)
                .build();
-        collectorScheduling.collectorGoOnline(CommonConstants.MAIN_COLLECTOR_NODE, collectorInfo);
+        collectorOperationReceiver.collectorGoOnline(CommonConstants.MAIN_COLLECTOR_NODE, collectorInfo);
        // init jobs
        List<Monitor> monitors = monitorDao.findMonitorsByStatusNotInAndJobIdNotNull(List.of(CommonConstants.MONITOR_PAUSED_CODE));
        List<CollectorMonitorBind> monitorBinds = collectorMonitorBindDao.findAll();
@@ -136,7 +136,7 @@ public class SchedulerInit implements CommandLineRunner {
                });
                appDefine.setConfigmap(configmaps);
                String collector = monitorIdCollectorMap.get(monitor.getId());
-                long jobId = collectJobScheduling.addAsyncCollectJob(appDefine, collector);
+                long jobId = jobOperation.addAsyncCollectJob(appDefine, collector);
                monitor.setJobId(jobId);
                monitorDao.save(monitor);
            } catch (Exception e) {
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.scheduler.collector;
+
+import org.apache.hertzbeat.common.constants.CollectorStatus;
+import org.apache.hertzbeat.common.entity.job.Job;
+import org.apache.hertzbeat.manager.pojo.CollectorNode;
+import org.apache.hertzbeat.manager.scheduler.AssignJobs;
+
+import java.util.function.BiConsumer;
+
+/**
+ * Interface for managing collector nodes and their associated jobs.
+ * Maintains all collector information and provides operations for managing collectors and job assignments.
+ */
+public interface CollectorKeeper {
+
+    /**
+     * Adds a new collector node to the keeper's management pool.
+     * @param newNode The collector node to be added to the management system
+     */
+    void addNode(CollectorNode newNode);
+
+    /**
+     * Assigns a monitoring job to a specific collector node.
+     * @param job The monitoring job to be assigned
+     * @param collectorId The unique identifier of the target collector node
+     * @return The collector node that received the job assignment
+     */
+    CollectorNode addJob(Job job, String collectorId);
+
+    /**
+     * Retrieves a collector node by its unique identifier.
+     * @param collectorId The unique identifier of the collector node
+     * @return The collector node matching the given ID, or null if not found
+     */
+    CollectorNode getNode(String collectorId);
+
+    /**
+     * Determines the most appropriate collector node for a given job based on scheduling logic.
+     * @param jobId The unique identifier of the job to be assigned
+     * @return The collector node selected to handle this job
+     */
+    CollectorNode determineNode(Long jobId);
+
+    /**
+     * Updates the operational status of a collector node.
+     * @param collectorId The unique identifier of the collector node
+     * @param collectorStatus The new status to assign to the collector
+     */
+    void changeStatus(String collectorId, CollectorStatus collectorStatus);
+
+    /**
+     * Rebalances job assignments across collector nodes, typically triggered by status changes.
+     * Uses a callback mechanism to handle job reassignments.
+     * @param assignJobCollectorConsumer A biconsumer that handles the job reassignment process,
+     *                                   taking the job assignment logic and collector ID as parameters
+     */
+    void rebalanceJobs(BiConsumer<AssignJobs, String> assignJobCollectorConsumer);
+
+    /**
+     * Removes a job from whichever collector node it is currently assigned to.
+     * @param jobId The unique identifier of the job to be removed
+     * @return The collector node from which the job was removed, or null if job wasn't found
+     */
+    CollectorNode removeJob(Long jobId);
+}
@@ -28,7 +28,7 @@ import org.apache.hertzbeat.alert.calculate.CollectorAlertHandler;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.CommonThreadPool;
 import org.apache.hertzbeat.manager.scheduler.CollectorJobScheduler;
-import org.apache.hertzbeat.manager.scheduler.SchedulerProperties;
+import org.apache.hertzbeat.manager.properties.SchedulerProperties;
 import org.apache.hertzbeat.manager.scheduler.netty.process.CollectCyclicDataResponseProcessor;
 import org.apache.hertzbeat.manager.scheduler.netty.process.CollectCyclicServiceDiscoveryDataResponseProcessor;
 import org.apache.hertzbeat.manager.scheduler.netty.process.CollectOneTimeDataResponseProcessor;
@@ -45,6 +45,8 @@ import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;

+import javax.annotation.PreDestroy;
+
 /**
 * manage server
 */
@@ -112,6 +114,7 @@ public class ManageServer implements CommandLineRunner {
        }, 10, 3, TimeUnit.SECONDS);
    }

+    @PreDestroy
    public void shutdown() {
        this.remotingServer.shutdown();

@@ -1,60 +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.manager.service;
-
-import java.util.Set;
-
-/**
- * Metrics Favorite Service
- */
-public interface MetricsFavoriteService {
-
-    /**
-     * Add metrics to favorites
-     * 
-     * @param creator user id
-     * @param monitorId monitor id
-     * @param metricsName metrics name
-     */
-    void addMetricsFavorite(String creator, Long monitorId, String metricsName);
-
-    /**
-     * Remove metrics from favorites
-     * 
-     * @param userId user id
-     * @param monitorId monitor id
-     * @param metricsName metrics name
-     */
-    void removeMetricsFavorite(String userId, Long monitorId, String metricsName);
-
-    /**
-     * Get user's favorited metrics names for a specific monitor
-     * 
-     * @param userId user id
-     * @param monitorId monitor id
-     * @return set of favorited metrics names
-     */
-    Set<String> getUserFavoritedMetrics(String userId, Long monitorId);
-
-    /**
-     * Remove metrics from monitor ids
-     *
-     * @param monitorIds monitor ids
-     */
-    void deleteFavoritesByMonitorIdIn(Set<Long> monitorIds);
-}
@@ -18,12 +18,10 @@
 package org.apache.hertzbeat.manager.service;

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

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

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

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

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

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

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

    /**
     * query status page component status.
-     *
     * @param id status page component id
     * @return status page component status
     */
    ComponentStatus queryComponentStatus(long id);
-
+    
    /**
     * query status page incidents.
-     *
-     * @param search    Search Target
-     * @param startTime Start Time
-     * @param endTime   End Time
-     * @param pageIndex List current page
-     * @param pageSize  Number of list pages
-     * @return The query results
+     * @return status page incidents
     */
-    Page<StatusPageIncident> queryStatusPageIncidents(String search, Long startTime, Long endTime, int pageIndex, int pageSize);
-
+    List<StatusPageIncident> queryStatusPageIncidents();
+    
    /**
     * query status page incident.
-     *
     * @param id status page incident id
     * @return status page incident
     */
    StatusPageIncident queryStatusPageIncident(long id);
-
+    
    /**
     * save status page incident.
-     *
     * @param statusPageIncident status page incident
     */
    void newStatusPageIncident(StatusPageIncident statusPageIncident);
-
+    
    /**
     * update status page incident.
-     *
     * @param statusPageIncident status page incident
     */
    void updateStatusPageIncident(StatusPageIncident statusPageIncident);
-
+    
    /**
     * delete status page incident.
-     *
     * @param id status page incident id
     */
    void deleteStatusPageIncident(long id);
@@ -212,7 +212,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
            var name = job.getName();
            var i18nName = CommonUtil.getLangMappingValueFromI18nMap(lang, name);
            if (i18nName != null) {
-                i18nMap.put("monitor.app." + job.getApp(), i18nName);
+                i18nMap.put("monitor.app." + job.getApp().toLowerCase(), i18nName);
            }
            var help = job.getHelp();
            var i18nHelp = CommonUtil.getLangMappingValueFromI18nMap(lang, help);
@@ -31,8 +31,9 @@ import org.apache.hertzbeat.common.support.exception.CommonException;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
 import org.apache.hertzbeat.manager.dao.CollectorDao;
 import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao;
+import org.apache.hertzbeat.manager.pojo.CollectorNode;
 import org.apache.hertzbeat.manager.scheduler.AssignJobs;
-import org.apache.hertzbeat.manager.scheduler.ConsistentHash;
+import org.apache.hertzbeat.manager.scheduler.ConsistentHashCollectorKeeper;
 import org.apache.hertzbeat.manager.scheduler.netty.ManageServer;
 import org.apache.hertzbeat.manager.service.CollectorService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +58,7 @@ public class CollectorServiceImpl implements CollectorService {
    private CollectorMonitorBindDao collectorMonitorBindDao;
    
    @Autowired
-    private ConsistentHash consistentHash;
+    private ConsistentHashCollectorKeeper consistentHashCollectorKeeper;
    
    @Autowired(required = false)
    private ManageServer manageServer;
@@ -81,7 +82,7 @@ public class CollectorServiceImpl implements CollectorService {
        List<CollectorSummary> collectorSummaryList = new LinkedList<>();
        for (Collector collector : collectors.getContent()) {
            CollectorSummary.CollectorSummaryBuilder summaryBuilder = CollectorSummary.builder().collector(collector);
-            ConsistentHash.Node node = consistentHash.getNode(collector.getName());
+            CollectorNode node = consistentHashCollectorKeeper.getNode(collector.getName());
            if (node != null && node.getAssignJobs() != null) {
                AssignJobs assignJobs = node.getAssignJobs();
                summaryBuilder.pinMonitorNum(assignJobs.getPinnedJobs().size());
@@ -1,91 +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.manager.service.impl;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.common.entity.manager.MetricsFavorite;
-import org.apache.hertzbeat.manager.dao.MetricsFavoriteDao;
-import org.apache.hertzbeat.manager.service.MetricsFavoriteService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Metrics Favorite Service Implementation
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-@Transactional(rollbackFor = Exception.class)
-public class MetricsFavoriteServiceImpl implements MetricsFavoriteService {
-
-    private final MetricsFavoriteDao metricsFavoriteDao;
-
-    @Override
-    public void addMetricsFavorite(String creator, Long monitorId, String metricsName) {
-        Optional<MetricsFavorite> existing = metricsFavoriteDao
-                .findByCreatorAndMonitorIdAndMetricsName(creator, monitorId, metricsName);
-        if (existing.isPresent()) {
-            throw new RuntimeException("Metrics favorite already exists: " + metricsName);
-        }
-        MetricsFavorite favorite = MetricsFavorite.builder()
-                .creator(creator)
-                .monitorId(monitorId)
-                .metricsName(metricsName)
-                .createTime(LocalDateTime.now())
-                .build();
-        metricsFavoriteDao.save(favorite);
-    }
-
-    @Override
-    public void removeMetricsFavorite(String userId, Long monitorId, String metricsName) {
-        metricsFavoriteDao.deleteByUserIdAndMonitorIdAndMetricsName(userId, monitorId, metricsName);
-    }
-
-    @Override
-    @Transactional(readOnly = true)
-    public Set<String> getUserFavoritedMetrics(String userId, Long monitorId) {
-        if (null == userId || null == monitorId) {
-            return Set.of();
-        }
-        List<MetricsFavorite> favorites = metricsFavoriteDao.findByCreatorAndMonitorId(userId, monitorId);
-        if (null == favorites || favorites.isEmpty()) {
-            return Set.of();
-        }
-        return favorites.stream()
-                .map(MetricsFavorite::getMetricsName)
-                .filter(StringUtils::isNotBlank)
-                .collect(Collectors.toSet());
-    }
-
-    @Override
-    public void deleteFavoritesByMonitorIdIn(Set<Long> monitorIds) {
-        if (null == monitorIds || monitorIds.isEmpty()) {
-            return;
-        }
-        metricsFavoriteDao.deleteFavoritesByMonitorIdIn(monitorIds);
-    }
-
-}
@@ -19,9 +19,6 @@ package org.apache.hertzbeat.manager.service.impl;

 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Sets;
-import com.google.common.primitives.Longs;
-import com.usthe.sureness.subject.SubjectSum;
-import com.usthe.sureness.util.SurenessContextHolder;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletResponse;
@@ -47,6 +44,7 @@ import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.support.event.MonitorDeletedEvent;
 import org.apache.hertzbeat.common.util.AesUtil;
+import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.FileUtil;
 import org.apache.hertzbeat.common.util.IntervalExpressionUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
@@ -61,13 +59,11 @@ import org.apache.hertzbeat.manager.dao.MonitorBindDao;
 import org.apache.hertzbeat.manager.dao.MonitorDao;
 import org.apache.hertzbeat.manager.dao.ParamDao;
 import org.apache.hertzbeat.manager.pojo.dto.AppCount;
-import org.apache.hertzbeat.manager.pojo.dto.MetricsInfo;
 import org.apache.hertzbeat.manager.pojo.dto.MonitorDto;
-import org.apache.hertzbeat.manager.scheduler.CollectJobScheduling;
+import org.apache.hertzbeat.manager.scheduler.JobOperation;
 import org.apache.hertzbeat.manager.service.AppService;
 import org.apache.hertzbeat.manager.service.ImExportService;
 import org.apache.hertzbeat.manager.service.LabelService;
-import org.apache.hertzbeat.manager.service.MetricsFavoriteService;
 import org.apache.hertzbeat.manager.service.MonitorService;
 import org.apache.hertzbeat.manager.support.exception.MonitorDatabaseException;
 import org.apache.hertzbeat.manager.support.exception.MonitorDetectException;
@@ -117,7 +113,7 @@ public class MonitorServiceImpl implements MonitorService {
    @Autowired
    private AppService appService;
    @Autowired
-    private CollectJobScheduling collectJobScheduling;
+    private JobOperation jobOperation;
    @Autowired
    private MonitorDao monitorDao;
    @Autowired
@@ -142,8 +138,6 @@ public class MonitorServiceImpl implements MonitorService {
    private LabelDao labelDao;
    @Autowired
    private LabelService labelService;
-    @Autowired
-    private MetricsFavoriteService metricsFavoriteService;

    public MonitorServiceImpl(List<ImExportService> imExportServiceList) {
        imExportServiceList.forEach(it -> imExportServiceMap.put(it.type(), it));
@@ -199,11 +193,10 @@ public class MonitorServiceImpl implements MonitorService {
            return new Configmap(param.getField(), param.getParamValue(), param.getType());
        }).collect(Collectors.toList());
        appDefine.setConfigmap(configmaps);
-        long jobId = collector == null ? collectJobScheduling.addAsyncCollectJob(appDefine, null) :
-                collectJobScheduling.addAsyncCollectJob(appDefine, collector);
-        try {
-            detectMonitor(monitor, params, collector);
-        } catch (Exception ignored) {}
+        long jobId = jobOperation.addAsyncCollectJob(appDefine, collector);
+
+
+        detectMonitorSafely(monitor, params, collector);

        try {
            if (collector != null) {
@@ -223,7 +216,7 @@ public class MonitorServiceImpl implements MonitorService {
            paramDao.saveAll(params);
        } catch (Exception e) {
            log.error("Error while adding monitor: {}", e.getMessage(), e);
-            collectJobScheduling.cancelAsyncCollectJob(jobId);
+            jobOperation.cancelAsyncCollectJob(jobId);
            throw new MonitorDatabaseException(e.getMessage());
        }
    }
@@ -516,18 +509,11 @@ public class MonitorServiceImpl implements MonitorService {
            List<Configmap> configmaps = params.stream().map(param ->
                    new Configmap(param.getField(), param.getParamValue(), param.getType())).collect(Collectors.toList());
            appDefine.setConfigmap(configmaps);
-            long newJobId;
-            if (collector == null) {
-                newJobId = collectJobScheduling.updateAsyncCollectJob(appDefine);
-            } else {
-                newJobId = collectJobScheduling.updateAsyncCollectJob(appDefine, collector);
-            }
+            long newJobId = jobOperation.updateAsyncCollectJob(appDefine, collector);
            monitor.setJobId(newJobId);

            // execute only in non paused status
-            try {
-                detectMonitor(monitor, params, collector);
-            } catch (Exception ignored) {}
+            detectMonitorSafely(monitor, params, collector);
        }

        // After the update is successfully released, refresh the database
@@ -554,7 +540,7 @@ public class MonitorServiceImpl implements MonitorService {
        } catch (Exception e) {
            log.error(e.getMessage(), e);
            // Repository brushing abnormally cancels the previously delivered task
-            collectJobScheduling.cancelAsyncCollectJob(monitor.getJobId());
+            jobOperation.cancelAsyncCollectJob(monitor.getJobId());
            throw new MonitorDatabaseException(e.getMessage());
        }
    }
@@ -581,11 +567,10 @@ public class MonitorServiceImpl implements MonitorService {
            Set<Long> monitorIds = monitors.stream().map(Monitor::getId).collect(Collectors.toSet());
            alertDefineBindDao.deleteAlertDefineMonitorBindsByMonitorIdIn(monitorIds);
            monitorBindDao.deleteMonitorBindByBizIdIn(monitorIds);
-            metricsFavoriteService.deleteFavoritesByMonitorIdIn(monitorIds);
            for (Monitor monitor : monitors) {
                monitorBindDao.deleteByMonitorId(monitor.getId());
                collectorMonitorBindDao.deleteCollectorMonitorBindsByMonitorId(monitor.getId());
-                collectJobScheduling.cancelAsyncCollectJob(monitor.getJobId());
+                jobOperation.cancelAsyncCollectJob(monitor.getJobId());
                applicationContext.publishEvent(new MonitorDeletedEvent(applicationContext, monitor.getId()));
            }
        }
@@ -596,37 +581,24 @@ public class MonitorServiceImpl implements MonitorService {
    public MonitorDto getMonitorDto(long id) throws RuntimeException {
        Optional<Monitor> monitorOptional = monitorDao.findById(id);
        if (monitorOptional.isPresent()) {
-            // Get current user ID for favorite status
-            String currentUserId = null;
-            try {
-                SubjectSum subjectSum = SurenessContextHolder.getBindSubject();
-                currentUserId = String.valueOf(subjectSum.getPrincipal());
-            } catch (Exception e) {
-                log.debug("No user context found, favorites will be disabled");
-            }
-            Set<String> favoritedMetrics = metricsFavoriteService.getUserFavoritedMetrics(currentUserId, id);
-
            Monitor monitor = monitorOptional.get();
            MonitorDto monitorDto = new MonitorDto();
            List<Param> params = paramDao.findParamsByMonitorId(id);
            monitorDto.setParams(params);
-            List<MetricsInfo> metricsInfos;
            if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(monitor.getApp()) || monitor.getType() == CommonConstants.MONITOR_TYPE_PUSH_AUTO_CREATE) {
                List<CollectRep.MetricsData> metricsDataList = warehouseService.queryMonitorMetricsData(id);
-                metricsInfos = metricsDataList.stream()
-                        .map(t -> MetricsInfo.builder().name(t.getMetrics()).favorited(favoritedMetrics.contains(t.getMetrics())).build())
-                        .collect(Collectors.toList());
+                List<String> metrics = metricsDataList.stream().map(CollectRep.MetricsData::getMetrics).collect(Collectors.toList());
+                monitorDto.setMetrics(metrics);
                monitorDto.setGrafanaDashboard(dashboardService.getDashboardByMonitorId(id));
            } else {
                boolean isStatic = CommonConstants.SCRAPE_STATIC.equals(monitor.getScrape()) || !StringUtils.hasText(monitor.getScrape());
                String type = isStatic ? monitor.getApp() : monitor.getScrape();
                Job job = appService.getAppDefine(type);
-                metricsInfos = job.getMetrics().stream()
+                List<String> metrics = job.getMetrics().stream()
                        .filter(Metrics::isVisible)
-                        .map(t -> MetricsInfo.builder().name(t.getName()).favorited(favoritedMetrics.contains(t.getName())).build())
-                        .collect(Collectors.toList());
+                        .map(Metrics::getName).collect(Collectors.toList());
+                monitorDto.setMetrics(metrics);
            }
-            monitorDto.setMetrics(metricsInfos);
            monitorDto.setMonitor(monitor);
            Optional<CollectorMonitorBind> bindOptional = collectorMonitorBindDao.findCollectorMonitorBindByMonitorId(monitor.getId());
            bindOptional.ifPresent(bind -> monitorDto.setCollector(bind.getCollector()));
@@ -662,9 +634,9 @@ public class MonitorServiceImpl implements MonitorService {
            if (StringUtils.hasText(search)) {
                Predicate predicateHost = criteriaBuilder.like(root.get("host"), "%" + search + "%");
                Predicate predicateName = criteriaBuilder.like(criteriaBuilder.lower(root.get("name")), "%" + search.toLowerCase() + "%");
-                Long id = Longs.tryParse(search);
-                if (id != null) {
-                    orList.add(criteriaBuilder.equal(root.get("id"), id));
+                if (CommonUtil.isNumeric(search)){
+                    Predicate predicateId = criteriaBuilder.equal(root.get("id"), Long.parseLong(search));
+                    orList.add(predicateId);
                }
                orList.add(predicateHost);
                orList.add(predicateName);
@@ -712,17 +684,17 @@ public class MonitorServiceImpl implements MonitorService {
        // The jobId is not deleted, and the jobId is reused again after the management is started.
        Set<Long> subMonitorIds = monitorBindDao.findMonitorBindsByBizIdIn(ids).stream().map(MonitorBind::getMonitorId).collect(Collectors.toSet());
        ids.addAll(subMonitorIds);
-        List<Monitor> managedMonitors = monitorDao.findMonitorsByIdIn(ids)
-                .stream().filter(monitor ->
-                        monitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE)
+        List<Monitor> managedMonitors = monitorDao.findMonitorsByIdIn(ids).stream()
+                .filter(monitor -> monitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE)
                .peek(monitor -> monitor.setStatus(CommonConstants.MONITOR_PAUSED_CODE))
                .collect(Collectors.toList());
-        if (!CollectionUtils.isEmpty(managedMonitors)) {
-            for (Monitor monitor : managedMonitors) {
-                collectJobScheduling.cancelAsyncCollectJob(monitor.getJobId());
-            }
-            monitorDao.saveAll(managedMonitors);
+
+        if (CollectionUtils.isEmpty(managedMonitors)) {
+            return;
        }
+
+        managedMonitors.forEach(monitor -> jobOperation.cancelAsyncCollectJob(monitor.getJobId()));
+        monitorDao.saveAll(managedMonitors);
    }

    @Override
@@ -730,9 +702,8 @@ public class MonitorServiceImpl implements MonitorService {
        // Update monitoring status Add corresponding monitoring periodic task
        Set<Long> subMonitorIds = monitorBindDao.findMonitorBindsByBizIdIn(ids).stream().map(MonitorBind::getMonitorId).collect(Collectors.toSet());
        ids.addAll(subMonitorIds);
-        List<Monitor> unManagedMonitors = monitorDao.findMonitorsByIdIn(ids)
-                .stream().filter(monitor ->
-                        monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE)
+        List<Monitor> unManagedMonitors = monitorDao.findMonitorsByIdIn(ids).stream()
+                .filter(monitor -> monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE)
                .peek(monitor -> monitor.setStatus(CommonConstants.MONITOR_UP_CODE))
                .collect(Collectors.toList());
        if (unManagedMonitors.isEmpty()) {
@@ -777,13 +748,11 @@ public class MonitorServiceImpl implements MonitorService {
            Optional<CollectorMonitorBind> bindOptional =
                    collectorMonitorBindDao.findCollectorMonitorBindByMonitorId(monitor.getId());
            String collector = bindOptional.map(CollectorMonitorBind::getCollector).orElse(null);
-            long newJobId = collectJobScheduling.addAsyncCollectJob(appDefine, collector);
+            long newJobId = jobOperation.addAsyncCollectJob(appDefine, collector);
            monitor.setJobId(newJobId);
            applicationContext.publishEvent(new MonitorDeletedEvent(applicationContext, monitor.getId()));
-            try {
-                detectMonitor(monitor, params, collector);
-            } catch (Exception ignored) {
-            }
+
+            detectMonitorSafely(monitor, params, collector);
        }
        monitorDao.saveAll(unManagedMonitors);
    }
@@ -872,7 +841,7 @@ public class MonitorServiceImpl implements MonitorService {
                // if is pinned collector
                String collector = monitorIdCollectorMap.get(monitor.getId());
                // Delivering a collection task
-                long newJobId = collectJobScheduling.updateAsyncCollectJob(appDefine, collector);
+                long newJobId = jobOperation.updateAsyncCollectJob(appDefine, collector);
                monitor.setJobId(newJobId);
                monitorDao.save(monitor);
            } catch (Exception e) {
@@ -952,12 +921,8 @@ public class MonitorServiceImpl implements MonitorService {
                new Configmap(param.getField(), param.getParamValue(), param.getType())).collect(Collectors.toList());
        appDefine.setConfigmap(configmaps);
        appDefine.setSd(true);
-        List<CollectRep.MetricsData> collectRep;
-        if (collector != null) {
-            collectRep = collectJobScheduling.collectSyncJobData(appDefine, collector);
-        } else {
-            collectRep = collectJobScheduling.collectSyncJobData(appDefine);
-        }
+        List<CollectRep.MetricsData> collectRep = jobOperation.collectSyncJobData(appDefine, collector);
+
        monitor.setStatus(CommonConstants.MONITOR_UP_CODE);
        // If the detection result fails, a detection exception is thrown
        if (collectRep == null || collectRep.isEmpty()) {
@@ -995,12 +960,7 @@ public class MonitorServiceImpl implements MonitorService {
        List<Metrics> availableMetrics = appDefine.getMetrics().stream()
                .filter(item -> item.getPriority() == 0).collect(Collectors.toList());
        appDefine.setMetrics(availableMetrics);
-        List<CollectRep.MetricsData> collectRep;
-        if (collector != null) {
-            collectRep = collectJobScheduling.collectSyncJobData(appDefine, collector);
-        } else {
-            collectRep = collectJobScheduling.collectSyncJobData(appDefine);
-        }
+        List<CollectRep.MetricsData> collectRep = jobOperation.collectSyncJobData(appDefine, collector);
        monitor.setStatus(CommonConstants.MONITOR_UP_CODE);

        // If the detection result fails, a detection exception is thrown
@@ -1014,4 +974,10 @@ public class MonitorServiceImpl implements MonitorService {
        }
        collectRep.forEach(CollectRep.MetricsData::close);
    }
+
+    private void detectMonitorSafely(Monitor monitor, List<Param> params, String collector) {
+        try {
+            detectMonitor(monitor, params, collector);
+        } catch (Exception ignored) {}
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Calvin	b69612923f	[refactor] optimize code	2025-08-23 00:57:19 +08:00
Calvin	22897e4360	[refactor] optimize code	2025-08-23 00:38:52 +08:00
Calvin	8a705c9ced	[refactor] update class and method comments	2025-08-20 02:14:50 +08:00
CalvinandCopilot	2276937b72	Update hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/JobCache.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Calvin <zhengqiwei@apache.org>	2025-08-20 00:11:22 +08:00
tomsun28	553bc1edae	Merge branch 'master' into refactor_manager	2025-08-19 23:44:29 +08:00
Calvin	2d95df374a	[refactor] optimize code structure about collector and job within Manager	2025-08-18 21:21:14 +08:00