Potential fix for code scanning alert no. 79: Server-side request forgery

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: aias00 <liuhongyu@apache.org>
2026-09-17 18:19:02 +00:00 · 2025-05-17 14:30:52 +08:00
572 changed files with 3926 additions and 25302 deletions
@@ -6,7 +6,6 @@
  "files": [
    "README.md",
    "README_CN.md",
-    "README_JP.md"
    "home/src/pages/team/index.jsx"
  ],
  "imageSize": 100,
@@ -2486,43 +2485,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "Duansg",
-      "name": "Duansg",
-      "avatar_url": "https://avatars.githubusercontent.com/u/112607719?v=4",
-      "profile": "https://github.com/Duansg",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "xiaomizhou2",
-      "name": "zhangyaxi",
-      "avatar_url": "https://avatars.githubusercontent.com/u/47807926?v=4",
-      "profile": "https://github.com/xiaomizhou2",
-      "contributions": [
-        "code",
-        "test"
-      ]
-    },
-    {
-      "login": "RainBondsongyg",
-      "name": "songyg",
-      "avatar_url": "https://avatars.githubusercontent.com/u/94501396?v=4",
-      "profile": "https://github.com/RainBondsongyg",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "lx1229",
-      "name": "Liuxin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/44620005?v=4",
-      "profile": "https://github.com/lx1229",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -52,9 +52,6 @@ github:
      required_pull_request_reviews:
        dismiss_stale_reviews: true
        required_approving_review_count: 1
-  # enable GitHub Dependabot to create PRs for security alerts but not for every dependency update
-  dependabot_alerts:  true
-  dependabot_updates: false
 notifications:
  commits: notifications@hertzbeat.apache.org
  issues: notifications@hertzbeat.apache.org
@@ -53,5 +53,4 @@ body:
  validations:
    required: false
 - type: markdown
-  attributes:
-    value: "Please read the [Contribution Guideline](https://hertzbeat.apache.org/docs/community/contribution) before submitting the PR"
+  value: "Please read the [Contribution Guideline](https://hertzbeat.apache.org/docs/community/contribution) before submitting the PR"
@@ -46,7 +46,7 @@ jobs:
      - uses: ./script/ci/github-actions/setup-deps

      - name: Build with Maven
-        run: mvnd clean -B package -Prelease -Dmaven.test.skip=false --file pom.xml
+        run: mvn clean -B package -Prelease -Dmaven.test.skip=false --file pom.xml

      - name: Upload coverage reports to Codecov
        uses: codecov/codecov-action@v4.0.1
@@ -49,9 +49,11 @@ jobs:
      - name: Dead Link Check
        run: |
          sudo npm install -g markdown-link-check@3.8.7
-          find ./home -name "*.md" > all_md_files.txt
-          grep -vFf ./script/ci/exclude_files.txt all_md_files.txt > to_check.txt
-          xargs -P 8 -a to_check.txt -I{} markdown-link-check -c ./script/ci/link_check.json -q "{}"
+          for file in $(find ./home -name "*.md"); do
+            if ! grep -Fxq "$file" ./script/ci/exclude_files.txt; then
+              markdown-link-check -c ./script/ci/link_check.json -q "$file"
+            fi
+          done

      - name: NPM INSTALL
        working-directory: home
@@ -523,12 +523,6 @@ Thanks to these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Duansg"><img src="https://avatars.githubusercontent.com/u/112607719?v=4?s=100" width="100px;" alt="Duansg"/><br /><sub><b>Duansg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Duansg" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -33,11 +33,11 @@
 ### 特点

 - 集 **监控+告警+通知** 为一体，支持对应用服务，应用程序，数据库，缓存，操作系统，大数据，中间件，Web 服务器，云原生，网络，自定义等监控阈值告警通知一步到位。
- 易用友好，无需 `Agent`，全 `WEB` 页面操作，鼠标点一点就能监控告警，无需学习成本。    
- 将 `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` 等协议规范可配置化，只需在浏览器配置监控模板 `YML` 就能使用这些协议去自定义采集想要的指标。您相信只需简单配置即可快速适配一款 `K8s` 或 `Docker` 等新的监控类型吗？  
+- 易用友好，无需 `Agent`，全 `WEB` 页面操作，鼠标点一点就能监控告警，零上手学习成本。    
+- 将 `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` 等协议规范可配置化，只需在浏览器配置监控模版 `YML` 就能使用这些协议去自定义采集想要的指标。您相信只需配置下就能立刻适配一款 `K8s` 或 `Docker` 等新的监控类型吗？  
 - 兼容 `Prometheus` 的系统生态并且更多，只需页面操作就可以监控 `Prometheus` 所能监控的。
 - 高性能，支持多采集器集群横向扩展，支持多隔离网络监控，云边协同。
- 灵活的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
+- 自由的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
 - 提供强大的状态页构建能力，轻松向用户传达您产品服务的实时状态。


@@ -59,8 +59,8 @@

 ## ⛄ 已支持    

-> 我们将监控采集类型（mysql,jvm,k8s）都定义为 `yml` 监控模板，用户可以导入这些模板来支持对应类型的监控!    
-> 欢迎大家一起贡献你使用过程中自定义的通用监控类型监控模板。
+> 我们将监控采集类型（mysql,jvm,k8s）都定义为 `yml` 监控模版，用户可以导入这些模版来支持对应类型的监控!    
+> 欢迎大家一起贡献你使用过程中自定义的通用监控类型监控模版。

 - [Website](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-port.yml),
  [Http Api](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-api.yml), [Ping Connect](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-ping.yml),
@@ -98,7 +98,7 @@
 - [CiscoSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-cisco_switch.yml), [HpeSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-hpe_switch.yml),
  [HuaweiSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-huawei_switch.yml), [TpLinkSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-tplink_switch.yml),
  [H3cSwitch](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-h3c_switch.yml)
- 和更多自定义监控模板。
+- 和更多自定义监控模版。
 - 通知支持 `Discord` `Slack` `Telegram` `邮件` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱`。

 ## 🐕 快速开始  
@@ -126,7 +126,7 @@

   - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。
    - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。
-    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertzBeat 服务的对外 IP。
+    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertaBeat 服务的对外 IP。
    - `-e MANAGER_PORT=1158` : 配置连接主 HertzBeat 服务的对外端口，默认1158。


@@ -521,12 +521,6 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Duansg"><img src="https://avatars.githubusercontent.com/u/112607719?v=4?s=100" width="100px;" alt="Duansg"/><br /><sub><b>Duansg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Duansg" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -525,12 +525,6 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Duansg"><img src="https://avatars.githubusercontent.com/u/112607719?v=4?s=100" width="100px;" alt="Duansg"/><br /><sub><b>Duansg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Duansg" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -17,9 +17,6 @@

 package org.apache.hertzbeat.alert.calculate;

-import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -27,6 +24,7 @@ import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.springframework.stereotype.Component;

 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

 /**
@@ -35,83 +33,49 @@ import java.util.concurrent.ConcurrentHashMap;
@Component
 public class AlarmCacheManager {

-    private static final String CUSTOM_FIRING_ROW_KEY = "CUSTOM_FIRING_";
-
    /**
     * The alarm in the process is triggered
-     * rowKey - define id
-     * columnKey - labels fingerprint
+     * key - labels fingerprint
     */
-    private final Table<String, String, SingleAlert> pendingAlertMap;
-
+    private final Map<String, SingleAlert> pendingAlertMap;
    /**
     * The not recover alert
-     * rowKey - define id
-     * columnKey - labels fingerprint
+     * key - labels fingerprint
     */
-    private final Table<String, String, SingleAlert> firingAlertMap;
+    private final Map<String, SingleAlert> firingAlertMap;

    public AlarmCacheManager(SingleAlertDao singleAlertDao) {
-        this.pendingAlertMap = Tables.newCustomTable(new ConcurrentHashMap<>(8), ConcurrentHashMap::new);
-        this.firingAlertMap = Tables.newCustomTable(new ConcurrentHashMap<>(8), ConcurrentHashMap::new);
+        this.pendingAlertMap = new ConcurrentHashMap<>(8);
+        this.firingAlertMap = new ConcurrentHashMap<>(8);
        List<SingleAlert> singleAlerts = singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING);
        for (SingleAlert singleAlert : singleAlerts) {
            String fingerprint = AlertUtil.calculateFingerprint(singleAlert.getLabels());
-            String defineId = singleAlert.getLabels().get(CommonConstants.LABEL_DEFINE_ID);
-            if (StringUtils.isBlank(defineId)) {
-                defineId = getCustomKey(fingerprint);
-            }
            singleAlert.setId(null);
-            this.firingAlertMap.put(defineId, fingerprint, singleAlert);
+            this.firingAlertMap.put(fingerprint, singleAlert);
        }
    }

-    public void putPending(Long defineId, String fingerPrint, SingleAlert alert) {
-        this.pendingAlertMap.put(String.valueOf(defineId), fingerPrint, alert);
+    public void putPending(String fingerPrint, SingleAlert alert) {
+        this.pendingAlertMap.put(fingerPrint, alert);
    }

-    public SingleAlert getPending(Long defineId, String fingerPrint) {
-        return this.pendingAlertMap.get(String.valueOf(defineId), fingerPrint);
+    public SingleAlert getPending(String fingerPrint) {
+        return this.pendingAlertMap.get(fingerPrint);
    }

-    public void removePending(Long defineId, String fingerPrint) {
-        this.pendingAlertMap.remove(String.valueOf(defineId), fingerPrint);
-    }
-
-    public void putFiring(Long defineId, String fingerPrint, SingleAlert alert) {
-        this.firingAlertMap.put(String.valueOf(defineId), fingerPrint, alert);
+    public SingleAlert removePending(String fingerPrint) {
+        return this.pendingAlertMap.remove(fingerPrint);
    }

    public void putFiring(String fingerPrint, SingleAlert alert) {
-        this.firingAlertMap.put(getCustomKey(fingerPrint), fingerPrint, alert);
-    }
-
-    public SingleAlert getFiring(Long defineId, String fingerPrint) {
-        SingleAlert singleAlert = this.firingAlertMap.get(String.valueOf(defineId), fingerPrint);
-        if (null != singleAlert) {
-            return singleAlert;
-        }
-        return getFiring(fingerPrint);
-    }
-
-    public SingleAlert removeFiring(Long defineId, String fingerPrint) {
-        SingleAlert singleAlert = this.firingAlertMap.remove(String.valueOf(defineId), fingerPrint);
-        if (null == singleAlert) {
-            return this.firingAlertMap.remove(getCustomKey(fingerPrint), fingerPrint);
-        }
-        return singleAlert;
+        this.firingAlertMap.put(fingerPrint, alert);
    }

    public SingleAlert getFiring(String fingerPrint) {
-        return this.firingAlertMap.get(getCustomKey(fingerPrint), fingerPrint);
+        return this.firingAlertMap.get(fingerPrint);
    }

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

 package org.apache.hertzbeat.alert.calculate;

+import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
@@ -27,11 +26,11 @@ import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;

 /**
 * Periodic Alert Calculator
@@ -55,9 +54,9 @@ public class PeriodicAlertCalculator {
        this.alarmCacheManager = alarmCacheManager;
    }
    
-    public void calculate(AlertDefine define) {
-        if (!define.isEnable() || StringUtils.isEmpty(define.getExpr())) {
-            log.error("Periodic define {} is disabled or expression is empty", define.getName());
+    public void calculate(AlertDefine rule) {
+        if (!rule.isEnable() || StringUtils.isEmpty(rule.getExpr())) {
+            log.error("Periodic rule {} is disabled or expression is empty", rule.getName());
            return;
        }
        long currentTimeMilli = System.currentTimeMillis();
@@ -67,8 +66,8 @@ public class PeriodicAlertCalculator {
            // the return result should be matched with threshold
            try {
                List<Map<String, Object>> results = dataSourceService.calculate(
-                        define.getDatasource(),
-                        define.getExpr()
+                        rule.getDatasource(),
+                        rule.getExpr()
                );
                // if no match the expr threshold, the results item map {'value': null} should be null and others field keep
                // if results has multi list, should trigger multi alert
@@ -78,9 +77,8 @@ public class PeriodicAlertCalculator {
                for (Map<String, Object> result : results) {
                    Map<String, String> fingerPrints = new HashMap<>(8);
                    // here use the alert name as finger, not care the alert name may be changed
-                    fingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
-                    fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                    fingerPrints.putAll(define.getLabels());
+                    fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, rule.getName());
+                    fingerPrints.putAll(rule.getLabels());
                    for (Map.Entry<String, Object> entry : result.entrySet()) {
                        if (entry.getValue() != null && !VALUE.equals(entry.getKey())
                                && !TIMESTAMP.equals(entry.getKey())) {
@@ -89,33 +87,32 @@ public class PeriodicAlertCalculator {
                    }
                    if (result.get(VALUE) == null) {
                        // recovery the alert
-                        handleRecoveredAlert(define.getId(), fingerPrints);
+                        handleRecoveredAlert(fingerPrints);
                        continue;
                    }
                    Map<String, Object> fieldValueMap = new HashMap<>(8);
-                    fieldValueMap.putAll(define.getLabels());
-                    fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                    fieldValueMap.putAll(rule.getLabels());
+                    fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, rule.getName());
                    for (Map.Entry<String, Object> entry : result.entrySet()) {
                        if (entry.getValue() != null) {
                            fieldValueMap.put(entry.getKey(), entry.getValue());
                        }
                    }
-                    afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
+                    afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, rule);
                }
            } catch (Exception ignored) {
                // ignore the query exception eg: no result, timeout, etc
                return;
            }
        } catch (Exception e) {
-            log.error("Calculate periodic define {} failed: {}", define.getName(), e.getMessage());
+            log.error("Calculate periodic rule {} failed: {}", rule.getName(), e.getMessage());
        }
    }

    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
                                         Map<String, Object> fieldValueMap, AlertDefine define) {
-        Long defineId = define.getId();
        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
+        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
        Map<String, String> labels = new HashMap<>(8);
        fieldValueMap.putAll(define.getLabels());
        labels.putAll(fingerPrints);
@@ -136,11 +133,11 @@ public class PeriodicAlertCalculator {
            // If required trigger times is 1, set to firing status directly
            if (requiredTimes <= 1) {
                newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, newAlert);
+                alarmCacheManager.putFiring(fingerprint, newAlert);
                alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
            } else {
                // Otherwise put into pending queue first
-                alarmCacheManager.putPending(defineId, fingerprint, newAlert);
+                alarmCacheManager.putPending(fingerprint, newAlert);
            }
        } else {
            // Update existing alert
@@ -150,17 +147,17 @@ public class PeriodicAlertCalculator {
            // Check if required trigger times reached
            if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(defineId, fingerprint);
+                alarmCacheManager.removePending(fingerprint);
                existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, existingAlert);
+                alarmCacheManager.putFiring(fingerprint, existingAlert);
                alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
            }
        }
    }

-    private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
+    private void handleRecoveredAlert(Map<String, String> fingerprints) {
        String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
        if (firingAlert != null) {
            // todo consider multi times to tig for resolved alert
            firingAlert.setTriggerTimes(1);
@@ -168,7 +165,7 @@ public class PeriodicAlertCalculator {
            firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
            alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
        }
-        alarmCacheManager.removePending(defineId, fingerprint);
+        alarmCacheManager.removePending(fingerprint);
    }

 } 
@@ -139,9 +139,6 @@ public class RealTimeAlertCalculator {
        String instanceHost = metricsData.getInstanceHost();
        String app = metricsData.getApp();
        String metrics = metricsData.getMetrics();
-        if ((CommonConstants.PROMETHEUS_APP_PREFIX + instanceName).equals(metricsData.getApp())) {
-            app = CommonConstants.PROMETHEUS;
-        }
        int priority = metricsData.getPriority();
        int code = metricsData.getCode().getNumber();
        Map<String, String> labels = metricsData.getLabels();
@@ -183,11 +180,9 @@ public class RealTimeAlertCalculator {
            if (StringUtils.isBlank(expr)) {
                continue;
            }
-            Long defineId = define.getId();
            Map<String, String> commonFingerPrints = new HashMap<>(8);
            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
            // here use the alert name as finger, not care the alert name may be changed
-            commonFingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
            commonFingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_NAME, instanceName);
            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_HOST, instanceHost);
@@ -202,9 +197,9 @@ public class RealTimeAlertCalculator {
                    try {
                        if (match) {
                            // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
-                            afterThresholdRuleMatch(defineId, currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
                        } else {
-                            handleRecoveredAlert(defineId, commonFingerPrints);
+                            handleRecoveredAlert(commonFingerPrints);
                        }
                        // if this threshold pre compile success, ignore blew
                        continue;
@@ -256,9 +251,9 @@ public class RealTimeAlertCalculator {
                    boolean match = execAlertExpression(fieldValueMap, expr, false);
                    try {
                        if (match) {
-                            afterThresholdRuleMatch(defineId, currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
                        } else {
-                            handleRecoveredAlert(defineId, fingerPrints);
+                            handleRecoveredAlert(fingerPrints);
                        }
                    } catch (Exception e) {
                        log.error(e.getMessage(), e);
@@ -336,9 +331,9 @@ public class RealTimeAlertCalculator {
                .collect(Collectors.toList());
    }

-    private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
+    private void handleRecoveredAlert(Map<String, String> fingerprints) {
        String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
        if (firingAlert != null) {
            // todo consider multi times to tig for resolved alert
            firingAlert.setTriggerTimes(1);
@@ -346,14 +341,13 @@ public class RealTimeAlertCalculator {
            firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
            alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
        }
-        alarmCacheManager.removePending(defineId, fingerprint);
+        alarmCacheManager.removePending(fingerprint);
    }

-    private void afterThresholdRuleMatch(long defineId, long currentTimeMilli, Map<String, String> fingerPrints,
-                                         Map<String, Object> fieldValueMap, AlertDefine define,
-                                         Map<String, String> annotations) {
+    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
+                                         Map<String, Object> fieldValueMap, AlertDefine define, Map<String, String> annotations) {
        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
+        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
        fieldValueMap.putAll(define.getLabels());
        int requiredTimes = define.getTimes() == null ? 1 : define.getTimes();
        if (existingAlert == null) {
@@ -385,11 +379,11 @@ public class RealTimeAlertCalculator {
            // If required trigger times is 1, set to firing status directly
            if (requiredTimes <= 1) {
                newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, newAlert);
+                alarmCacheManager.putFiring(fingerprint, newAlert);
                alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
            } else {
                // Otherwise put into pending queue first
-                alarmCacheManager.putPending(define.getId(), fingerprint, newAlert);
+                alarmCacheManager.putPending(fingerprint, newAlert);
            }
        } else {
            // Update existing alert
@@ -399,9 +393,9 @@ public class RealTimeAlertCalculator {
            // Check if required trigger times reached
            if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(defineId, fingerprint);
+                alarmCacheManager.removePending(fingerprint);
                existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, existingAlert);
+                alarmCacheManager.putFiring(fingerprint, existingAlert);
                alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
            }
        }
@@ -17,16 +17,17 @@

 package org.apache.hertzbeat.alert.controller;

+import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+import java.util.Objects;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,17 +36,8 @@ 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;

-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE;
-import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 /**
 * Alarm definition management API
 */
@@ -98,18 +90,4 @@ public class AlertDefineController {
        return ResponseEntity.ok(Message.success("Delete success"));
    }

-    @GetMapping(path = "/preview/{datasource}")
-    @Operation(summary = "Alarm definition expression preview",
-            description = "If the expression is formal, then the result of the query will be returned, otherwise it will respond with an error")
-    public ResponseEntity<Message<List<Map<String, Object>>>> getDefinePreview(
-            @Parameter(description = "Data Source Type", example = "promql") @PathVariable("datasource") String datasource,
-            @Parameter(description = "alert threshold type:realtime,periodic") @RequestParam String type,
-            @Parameter(description = "alert threshold expression") @RequestParam String expr) {
-        try {
-            return ResponseEntity.ok(Message.successWithData(alertDefineService.getDefinePreview(datasource, type, expr)));
-        } catch (AlertExpressionException ae) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Message.fail(FAIL_CODE, ae.getMessage()));
-        }
-    }
-
 }
@@ -1,184 +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.dto;
-
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-
-/**
- * Alibaba Cloud 'Simple Log Service(SLS)' alert content entity.
- *
- * @see <a href="https://help.aliyun.com/zh/sls/user-guide/variables-in-new-alert-templates"/>
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AlibabaCloudSlsExternAlert {
-
-    /**
-     * The id of the instance on which the alarm was triggered
-     */
-    @JsonProperty("alert_instance_id")
-    private String alertInstanceId;
-
-    /**
-     * Alarm rule id, unique within project
-     */
-    @JsonProperty("alert_id")
-    private String alertId;
-
-    /**
-     * Alarm rule name
-     */
-    @JsonProperty("alert_name")
-    private String alertName;
-
-    /**
-     * Region
-     */
-    private String region;
-
-    /**
-     * Alarm rule belongs to Project
-     */
-    private String project;
-
-    /**
-     * Time of this evaluation
-     */
-    @JsonProperty("alert_time")
-    private int alertTime;
-
-    /**
-     * First trigger time
-     */
-    @JsonProperty("fire_time")
-    private int fireTime;
-
-    /**
-     * Alarm recovery time
-     * If the alarm status is firing, the value is 0.
-     * If the alarm state is resolved, the value is the specific recovery time.
-     */
-    @JsonProperty("resolve_time")
-    private int resolveTime;
-
-    /**
-     * Alarm status.
-     * firing: Triggers an alarm.
-     * resolved: Notification of resumption.
-     */
-    private String status;
-
-    /**
-     * The total number of entries in the data that triggered the alert,
-     * which may be more than 100, for example after a Cartesian product operation.
-     */
-    @JsonProperty("fire_results_count")
-    private int fireResultsCount;
-
-    /**
-     * Tag list
-     * Example: {"env":"test"}
-     */
-    private Map<String, String> labels;
-
-    /**
-     * Labeled lists
-     * Example: { "title": "Alarm title","desc": "Alarm desc" }
-     */
-    private Map<String, String> annotations;
-
-    /**
-     * Alarm severity.
-     *
-     * 10: Critical
-     * 8: High
-     * 6: Medium
-     * 4: Low
-     * 2: Report only
-     */
-    private int severity;
-
-    /**
-     *
-     */
-    @JsonProperty("signin_url")
-    private String signinUrl;
-
-
-    public String getAnnotation(String key) {
-        if (null == this.annotations || this.annotations.isEmpty()) {
-            return "N/A";
-        }
-        return this.annotations.get(key);
-    }
-
-    /**
-     * Severity
-     */
-    public enum Severity {
-
-        CRITICAL(10, "Critical"),
-
-        HIGH(8, "High"),
-
-        MEDIUM(6, "Medium"),
-
-        LOW(4, "Low"),
-
-        REPORT_ONLY(2, "Report only");
-
-        private static final Map<Integer, Severity> STATUS_MAP;
-
-        static {
-            STATUS_MAP = Arrays.stream(Severity.values()).collect(Collectors.toMap(Severity::getStatus, t -> t,  (oldVal, newVal) -> newVal));
-        }
-
-        private final int status;
-        private final String alias;
-
-        Severity(int status, String alias) {
-            this.status = status;
-            this.alias = alias;
-        }
-
-        public static Optional<Severity> convert(int severity) {
-            return Optional.ofNullable(STATUS_MAP.get(severity));
-        }
-
-        public int getStatus() {
-            return status;
-        }
-
-        public String getAlias() {
-            return alias;
-        }
-    }
-}
@@ -1,237 +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.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Arrays;
-
-/**
- * Huawei Cloud (CES) alert content entity.
- *
- * @see <a href="https://support.huaweicloud.com/usermanual-ces/ces_01_0218.html"/>
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class HuaweiCloudExternAlert {
-
-    public static final String FIELD_MESSAGE = "message";
-    public static final String FIELD_MESSAGE_ID = "message_id";
-    public static final String FIELD_TIMESTAMP = "timestamp";
-    public static final String FIELD_TOPIC_URN = "topic_urn";
-    public static final String FIELD_TYPE = "type";
-    public static final String FIELD_SUBJECT = "subject";
-    public static final String FIELD_SUBSCRIBE_URL = "subscribe_url";
-
-    /**
-     * Signature information.
-     */
-    private String signature;
-
-    /**
-     * Subject
-     */
-    private String subject;
-
-    /**
-     * The unique identifier of a topic, indicating the topic to which the message belongs.
-     */
-    @JsonProperty("topic_urn")
-    private String topicUrn;
-
-    /**
-     * Message unique identifier.
-     */
-    @JsonProperty("message_id")
-    private String messageId;
-
-    /**
-     * Message
-     */
-    private String message;
-
-    /**
-     * message types, the message types are respectively:
-     * SubscriptionConfirmation、Notification、UnsubscribeConfirmation
-     */
-    private String type;
-
-    /**
-     * Subscription confirms the URL that needs to be accessed
-     */
-    @JsonProperty("subscribe_url")
-    private String subscribeUrl;
-
-    /**
-     * The certificate URL used for message signing, which does not require authentication and can be accessed directly.
-     */
-    @JsonProperty("signing_cert_url")
-    private String signingCertUrl;
-
-    /**
-     * The timestamp of when the message was first sent.
-     */
-    private String timestamp;
-
-    /**
-     * Alert message
-     */
-    @Data
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class AlertMessage {
-
-        private String version;
-
-        private AlertData data;
-    }
-
-    /**
-     * Alert data
-     */
-    @Data
-    @Builder
-    @AllArgsConstructor
-    @NoArgsConstructor
-    public static class AlertData {
-
-        /**
-         * Whether an alarm occurs.
-         * Note: Empty and false are both recovery notifications.
-         * Note: There are no recovery notifications for event types
-         */
-        @JsonProperty("IsAlarm")
-        private Boolean alarm;
-
-        /**
-         * Alarm time
-         */
-        @JsonProperty("AlarmTime")
-        private String alarmTime;
-
-        /**
-         * Resource ID
-         */
-        @JsonProperty("ResourceId")
-        private String resourceId;
-
-        /**
-         * The name of the metric
-         */
-        @JsonProperty("MetricName")
-        private String metricName;
-
-        /**
-         * Specifies the alarm severity, which can be Critical, Major, Minor, or Informational.
-         */
-        @JsonProperty("AlarmLevel")
-        private String alarmLevel;
-
-        /**
-         * Namespace
-         */
-        @JsonProperty("Namespace")
-        private String namespace;
-
-        /**
-         * Region
-         */
-        @JsonProperty("Region")
-        private String region;
-
-        /**
-         * Dimension name
-         */
-        @JsonProperty("DimensionName")
-        private String dimensionName;
-
-        /**
-         * Resource name
-         */
-        @JsonProperty("ResourceName")
-        private String resourceName;
-
-        /**
-         * Alarm record ID
-         */
-        @JsonProperty("AlarmRecordID")
-        private String alarmRecordId;
-
-        /**
-         * Current data
-         */
-        @JsonProperty("CurrentData")
-        private String currentData;
-
-        /**
-         * The comparison conditions for the alarm thresholds can be >, =, <, >=, <=.
-         */
-        @JsonProperty("ComparisonOperator")
-        private String comparisonOperator;
-
-        /**
-         * Alarm value
-         */
-        @JsonProperty("Value")
-        private String value;
-
-        /**
-         * Number of consecutive occurrences of triggered alarms
-         */
-        @JsonProperty("Count")
-        private int count;
-
-    }
-
-    /**
-     * Huawei cloud alert type
-     */
-    public enum AlertType {
-
-        SUBSCRIPTION("SubscriptionConfirmation"),
-
-        UNSUBSCRIBE("UnsubscribeConfirmation"),
-
-        NOTIFICATION("Notification");
-
-        private final String type;
-
-        AlertType(String type) {
-            this.type = type;
-        }
-
-        public static boolean valid(String type) {
-            if (null == type || type.isEmpty()) {
-                return false;
-            }
-            return Arrays.stream(AlertType.values()).anyMatch(alertType -> alertType.getType().equals(type));
-        }
-
-        public String getType() {
-            return type;
-        }
-    }
-
-}
@@ -1,121 +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.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-
-/**
- * volcengine event alert entity class
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class VolcEngineExternEventAlert {
-    @JsonProperty("Type")
-    private String type;
-
-    @JsonProperty("AccountId")
-    private String accountId;
-
-    @JsonProperty("Source")
-    private String source;
-
-    @JsonProperty("ProjectName")
-    private String projectName;
-
-    @JsonProperty("Id")
-    private String id;
-
-    @JsonProperty("EventType")
-    private String eventType;
-
-    @JsonProperty("DescriptionCN")
-    private String descriptionCn;
-
-    @JsonProperty("HappenedAt")
-    private Long happenedAt;
-
-    @JsonProperty("Region")
-    private String region;
-
-    @JsonProperty("Details")
-    private EventDetails details;
-
-    @JsonProperty("Rules")
-    private List<EventRule> rules;
-
-    /**
-     * event details
-     */
-    @Data
-    public static class EventDetails {
-        @JsonProperty("specversion")
-        private String specVersion;
-
-        @JsonProperty("id")
-        private String id;
-
-        @JsonProperty("source")
-        private String source;
-
-        @JsonProperty("type")
-        private String type;
-
-        @JsonProperty("volcpublishtime")
-        private String volcPublishTime;
-
-        @JsonProperty("volcregion")
-        private String volcRegion;
-
-        @JsonProperty("volcaccountid")
-        private String volcAccountId;
-
-        @JsonProperty("volceventbusname")
-        private String volcEventBusName;
-
-        @JsonProperty("volcresourcename")
-        private String volcResourceName;
-
-        @JsonProperty("subject")
-        private String subject;
-
-        @JsonProperty("time")
-        private String time;
-    }
-
-    /**
-     * event rule
-     */
-    @Data
-    public static class EventRule {
-        @JsonProperty("RuleId")
-        private String ruleId;
-
-        @JsonProperty("RuleName")
-        private String ruleName;
-
-        @JsonProperty("Level")
-        private String level;
-    }
-}
@@ -1,203 +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.dto;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * Volcengine alarm entity class
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-public class VolcEngineExternMetricAlert {
-
-    @JsonProperty("Type")
-    private String type;
-
-    @JsonProperty("AccountId")
-    private String accountId;
-
-    @JsonProperty("RuleName")
-    private String ruleName;
-
-    @JsonProperty("RuleId")
-    private String ruleId;
-
-    @JsonProperty("Namespace")
-    private String namespace;
-
-    @JsonProperty("SubNamespace")
-    private String subNamespace;
-
-    @JsonProperty("Level")
-    private String level;
-
-    @JsonProperty("HappenedAt")
-    private String happenedAt;
-
-    @JsonProperty("RuleCondition")
-    private String ruleCondition;
-
-    @JsonProperty("Resources")
-    private List<Resource> resources;
-
-    @JsonProperty("RecoveredResources")
-    private List<Resource> recoveredResources;
-
-    @JsonProperty("NoDataResources")
-    private List<NoDataResource> noDataResources;
-
-    @JsonProperty("NoDataRecoveredResources")
-    private List<NoDataRecoveredResource> noDataRecoveredResources;
-
-    /**
-     * alert resource entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @Builder
-    public static class Resource {
-        @JsonProperty("Id")
-        private String id;
-
-        @JsonProperty("Name")
-        private String name;
-
-        @JsonProperty("Region")
-        private String region;
-
-        @JsonProperty("FirstAlertTime")
-        private Long firstAlertTime;
-
-        @JsonProperty("LastAlertTime")
-        private Long lastAlertTime;
-
-        @JsonProperty("Metrics")
-        private List<Metric> metrics;
-
-        @JsonProperty("AlertGroupId")
-        private String alertGroupId;
-
-        @JsonProperty("Dimensions")
-        private List<Dimension> dimensions;
-    }
-
-    /**
-     * alert no data resource entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @EqualsAndHashCode(callSuper = true)
-    public static class NoDataResource extends Resource {
-        @JsonProperty("NoDataMetrics")
-        private List<Metric> noDataMetrics;
-    }
-
-    /**
-     * alert no data recovered resource entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @EqualsAndHashCode(callSuper = true)
-    public static class NoDataRecoveredResource extends Resource {
-        @JsonProperty("DroppedMetrics")
-        private List<DroppedMetric> droppedMetrics;
-    }
-
-    /**
-     * alert metric entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Metric {
-        @JsonProperty("Name")
-        private String name;
-
-        @JsonProperty("Unit")
-        private String unit;
-
-        @JsonProperty("Threshold")
-        private Double threshold;
-
-        @JsonProperty("CurrentValue")
-        private Object currentValue;
-
-        @JsonProperty("Description")
-        private String description;
-
-        @JsonProperty("Warning")
-        private Boolean warning;
-    }
-
-    /**
-     * alert dropped metric entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @EqualsAndHashCode(callSuper = true)
-    public static class DroppedMetric extends Metric {
-        @JsonProperty("Reason")
-        private String reason;
-    }
-
-    /**
-     * resource dimension entity class
-     */
-    @Data
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class Dimension {
-        @JsonProperty("Name")
-        private String name;
-
-        @JsonProperty("NameCN")
-        private String nameCn;
-
-        @JsonProperty("Value")
-        private String value;
-
-        @JsonProperty("Description")
-        private String description;
-    }
-
-
-    public static final String ALERT_TYPE_METRIC = "Metric";
-    public static final String ALERT_TYPE_EVENT = "Event";
-    public static final String ALERT_TYPE_METRIC_RECOVERED = "MetricRecovered";
-    public static final String ALERT_TYPE_METRICS_NODATA = "MetricsNoData";
-    public static final String ALERT_TYPE_NO_DATA_RECOVERED = "NoDataRecovered";
-
-}
-
-
-
-
@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
 * of the available methods.
 *
 * @param <T> The return type of the visit operation. Use {@link Void} for
- *            operations with no return type.
+ * operations with no return type.
 */
@SuppressWarnings("CheckReturnValue")
 public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements AlertExpressionVisitor<T> {
@@ -37,10 +37,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitExpression(AlertExpressionParser.ExpressionContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitExpression(AlertExpressionParser.ExpressionContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -48,10 +45,15 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) { return visitChildren(ctx); }
+
+    /**
+	 * {@inheritDoc}
+	 *
+	 * <p>The default implementation returns the result of calling
+	 * {@link #visitChildren} on {@code ctx}.</p>
+	 */
+    @Override public T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -59,10 +61,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -70,10 +69,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -81,10 +77,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -92,10 +85,15 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) { return visitChildren(ctx); }
+
+    /**
+	 * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -103,10 +101,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitIdentifier(AlertExpressionParser.IdentifierContext ctx) { return visitChildren(ctx); }

    /**
     * {@inheritDoc}
@@ -114,349 +109,5 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     * <p>The default implementation returns the result of calling
     * {@link #visitChildren} on {@code ctx}.</p>
     */
-    @Override
-    public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitParameter(AlertExpressionParser.ParameterContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitNumber(AlertExpressionParser.NumberContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitString(AlertExpressionParser.StringContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitDuration(AlertExpressionParser.DurationContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitRelList(AlertExpressionParser.RelListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitRelation(AlertExpressionParser.RelationContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitCompOp(AlertExpressionParser.CompOpContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitCondition(AlertExpressionParser.ConditionContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitPromql(AlertExpressionParser.PromqlContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitLabelList(AlertExpressionParser.LabelListContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) {
-        return visitChildren(ctx);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * <p>The default implementation returns the result of calling
-     * {@link #visitChildren} on {@code ctx}.</p>
-     */
-    @Override
-    public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitNumber(AlertExpressionParser.NumberContext ctx) { return visitChildren(ctx); }
 }
@@ -17,34 +17,26 @@

 package org.apache.hertzbeat.alert.expr;

-import org.antlr.v4.runtime.CommonTokenStream;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.hertzbeat.common.support.exception.ExpressionVisitorException;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;

 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;

 /**
 * Alert expression visitor implement
 */
 public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<Map<String, Object>>> {

-    private static final String SCALAR = "__scalar__";
-    private static final String NAME = "__name__";
+    private static final String THRESHOLD = "__threshold__";
    private static final String VALUE = "__value__";
-    private static final String TIMESTAMP = "__timestamp__";

    private final QueryExecutor executor;
-    private final CommonTokenStream tokens;

-    public AlertExpressionEvalVisitor(QueryExecutor executor, CommonTokenStream tokens) {
+    public AlertExpressionEvalVisitor(QueryExecutor executor) {
        this.executor = executor;
-        this.tokens = tokens;
    }

    @Override
@@ -61,126 +53,69 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
    public List<Map<String, Object>> visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
        List<Map<String, Object>> leftResult = visit(ctx.left);
        List<Map<String, Object>> rightResult = visit(ctx.right);
-        int type = ctx.op.getType();
-        boolean boolModifier = ctx.BOOL() != null;
-        boolean leftIsScalar = isScalar(leftResult);
-        boolean rightIsScalar = isScalar(rightResult);
-        List<Map<String, Object>> results = new ArrayList<>();
+        if (rightResult.size() == 1 && rightResult.get(0).containsKey(THRESHOLD)) {
+            double threshold = (double) rightResult.get(0).get(THRESHOLD);
+            String operator = ctx.op.getText();

-        // scalar and scalar
-        if (leftIsScalar && rightIsScalar) {
-            if (!boolModifier) {
-                // Between two scalars,
-                // the bool modifier must be provided and these operators result in another scalar that is either 0 (false) or 1 (true), depending on the comparison result.
-                return results;
-            }
-            Object leftVal = leftResult.get(0).get(SCALAR);
-            Object rightVal = rightResult.get(0).get(SCALAR);
-            Boolean match = compareOp(leftVal, type, rightVal);
-            // returns a result only if the comparison condition is met.
-            Map<String, Object> result = new HashMap<>();
-            result.put(VALUE, match ? 1 : 0);
-            results.add(result);
-            return results;
-        }
-
-        // scalar and vector
-        if (leftIsScalar) {
-            Object leftVal = leftResult.get(0).get(SCALAR);
-            for (Map<String, Object> rightItem : rightResult) {
-                Object rightVal = rightItem.getOrDefault(VALUE, null);
-                if (isValidValue(rightVal)) {
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map<String, Object> item : leftResult) {
+                Object queryValues = item.get(VALUE);
+                if (queryValues == null) {
+                    // ignore the query result data is empty
                    continue;
                }
-                Boolean match = compareOp(leftVal, type, rightVal);
-                Map<String, Object> result = new HashMap<>(rightItem);
-                if (boolModifier) {
-                    result.put(VALUE, match ? 1 : 0);
-                    results.add(result);
-                } else {
-                    result.put(VALUE, match ? rightVal : null);
-                    results.add(result);
-                }
+                // queryValues may be a list of values, or a single value
+                Object matchValue = evaluateCondition(queryValues, operator, threshold);
+                item.put(VALUE, matchValue);
+                // if matchValue is null, mean not match the threshold
+                // if not null, mean match the threshold
+                result.add(new HashMap<>(item));
            }
-            return results;
+            return result;
        }
-
-        // vector and scalar
-        if (rightIsScalar) {
-            Object rightVal = rightResult.get(0).get(SCALAR);
-            for (Map<String, Object> leftItem : leftResult) {
-                Object leftVal = leftItem.getOrDefault(VALUE, null);
-                if (isValidValue(leftVal)) {
-                    continue;
-                }
-                Boolean match = compareOp(leftVal, type, rightVal);
-                Map<String, Object> result = new HashMap<>(leftItem);
-                if (boolModifier) {
-                    result.put(VALUE, match ? 1 : 0);
-                    results.add(result);
-                } else {
-                    result.put(VALUE, match ? leftVal : null);
-                    results.add(result);
-                }
-            }
-            return results;
-        }
-
-        // vector and vector
-        Map<String, Map<String, Object>> rightMap = rightResult.stream()
-                .filter(item -> item.get(VALUE) != null)
-                .collect(Collectors.toMap(this::labelKey, item -> item, (existing, replacement) -> existing));
-
-        for (Map<String, Object> leftItem : leftResult) {
-            Object leftVal = leftItem.getOrDefault(VALUE, null);
-            if (isValidValue(leftVal)) {
-                continue;
-            }
-            Map<String, Object> rightItem = rightMap.get(labelKey(leftItem));
-            if (rightItem == null) {
-                continue;
-            }
-            Object rightVal = rightItem.get(VALUE);
-            if (isValidValue(rightVal)) {
-                continue;
-            }
-            Boolean match = compareOp(leftVal, type, rightVal);
-            Map<String, Object> result = new HashMap<>(leftItem);
-            if (boolModifier) {
-                result.put(VALUE, match ? 1 : 0);
-                results.add(result);
-            } else {
-                result.put(VALUE, match ? leftVal : null);
-                results.add(result);
-            }
-        }
-        return results;
+        return new LinkedList<>();
    }

    @Override
    public List<Map<String, Object>> visitAndExpr(AlertExpressionParser.AndExprContext ctx) {
        List<Map<String, Object>> leftOperand = visit(ctx.left);
        List<Map<String, Object>> rightOperand = visit(ctx.right);
-        List<Map<String, Object>> results = new ArrayList<>();

-        // build a hash set of the right-side tag collection
-        Set<String> rightLabelsSet = rightOperand.stream()
-                .filter(item -> item.get(VALUE) != null)
-                .map(this::labelKey)
-                .collect(Collectors.toSet());
-
-        // iterate over the left side, O(1) match
-        for (Map<String, Object> leftItem : leftOperand) {
-            Object leftVal = leftItem.get(VALUE);
-            if (leftVal == null) {
-                continue;
+        Map<String, Object> leftMap = null;
+        boolean leftMatch = false;
+        Map<String, Object> rightMap = null;
+        boolean rightMatch = false;
+        for (Map<String, Object> item : leftOperand) {
+            if (leftMap == null) {
+                leftMap = item;
            }
-            String labelKey = labelKey(leftItem);
-            if (rightLabelsSet.contains(labelKey)) {
-                results.add(new HashMap<>(leftItem));
+            if (item.get(VALUE) != null) {
+                leftMap = item;
+                leftMatch = true;
+                break;
            }
        }
-        return results;
+        for (Map<String, Object> item : rightOperand) {
+            if (rightMap == null) {
+                rightMap = item;
+            }
+            if (item.get(VALUE) != null) {
+                rightMap = item;
+                rightMatch = true;
+                break;
+            }
+        }
+        if (leftMatch && rightMatch) {
+            rightMap.putAll(leftMap);
+            return new LinkedList<>(List.of(rightMap));
+        } else if (leftMap != null) {
+            leftMap.put(VALUE, null);
+            return new LinkedList<>(List.of(leftMap));
+        } else if (rightMap != null) {
+            rightMap.put(VALUE, null);
+            return new LinkedList<>(List.of(rightMap));
+        }
+        return new LinkedList<>();
    }

    @Override
@@ -188,51 +123,98 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
        List<Map<String, Object>> leftOperand = visit(ctx.left);
        List<Map<String, Object>> rightOperand = visit(ctx.right);

-        // build a hashMap of the left-hand label collection
-        Map<String, Map<String, Object>> leftLabelMap = leftOperand.stream()
-                .filter(item -> item.get(VALUE) != null)
-                .collect(Collectors.toMap(this::labelKey, HashMap::new, (k1, k2) -> k1));
-
-        // first add all the non-empty items on the left side
-        List<Map<String, Object>> results = new ArrayList<>(leftLabelMap.values());
-
-        // add the term that has a value on the right side and not on the left side
-        for (Map<String, Object> rightItem : rightOperand) {
-            Object rightVal = rightItem.get(VALUE);
-            if (rightVal == null) {
-                continue;
+        Map<String, Object> leftMap = null;
+        boolean leftMatch = false;
+        Map<String, Object> rightMap = null;
+        boolean rightMatch = false;
+        for (Map<String, Object> item : leftOperand) {
+            if (leftMap == null) {
+                leftMap = item;
            }
-            String key = labelKey(rightItem);
-            if (!leftLabelMap.containsKey(key)) {
-                results.add(new HashMap<>(rightItem));
+            if (item.get(VALUE) != null) {
+                leftMap = item;
+                leftMatch = true;
+                break;
            }
        }
-        return results;
+        for (Map<String, Object> item : rightOperand) {
+            if (rightMap == null) {
+                rightMap = item;
+            }
+            if (item.get(VALUE) != null) {
+                rightMap = item;
+                rightMatch = true;
+                break;
+            }
+        }
+        if (leftMatch && rightMatch) {
+            rightMap.putAll(leftMap);
+            return new LinkedList<>(List.of(rightMap));
+        } else if (leftMatch) {
+            return new LinkedList<>(List.of(leftMap));
+        } else if (rightMatch) {
+            return new LinkedList<>(List.of(rightMap));
+        } else {
+            if (leftMap != null && rightMap != null) {
+                rightMap.putAll(leftMap);
+                return new LinkedList<>(List.of(rightMap));
+            } else if (leftMap != null) {
+                return new LinkedList<>(List.of(leftMap));
+            } else if (rightMap != null) {
+                return new LinkedList<>(List.of(rightMap));
+            }
+        }
+        return new LinkedList<>();
    }

    @Override
    public List<Map<String, Object>> visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) {
        List<Map<String, Object>> leftOperand = visit(ctx.left);
        List<Map<String, Object>> rightOperand = visit(ctx.right);
-        List<Map<String, Object>> results = new ArrayList<>();
-
-        // build a hash set of the right-side tag collection
-        Set<String> rightLabelSet = rightOperand.stream()
-                .filter(item -> item.get(VALUE) != null)
-                .map(this::labelKey)
-                .collect(Collectors.toSet());
-
-        // iterate over the left side, O(1) match
-        for (Map<String, Object> leftItem : leftOperand) {
-            Object leftVal = leftItem.get(VALUE);
-            if (leftVal == null) {
-                continue;
+        Map<String, Object> leftMap = null;
+        boolean leftMatch = false;
+        Map<String, Object> rightMap = null;
+        boolean rightMatch = false;
+        for (Map<String, Object> item : leftOperand) {
+            if (leftMap == null) {
+                leftMap = item;
            }
-            if (!rightLabelSet.contains(labelKey(leftItem))) {
-                results.add(new HashMap<>(leftItem));
+            if (item.get(VALUE) != null) {
+                leftMap = item;
+                leftMatch = true;
+                break;
            }
        }
-        return results;
+        for (Map<String, Object> item : rightOperand) {
+            if (rightMap == null) {
+                rightMap = item;
+            }
+            if (item.get(VALUE) != null) {
+                rightMap = item;
+                rightMatch = true;
+                break;
+            }
+        }
+        if (leftMatch && !rightMatch) {
+            return new LinkedList<>(List.of(leftMap));
+        } else {
+            if (leftMap != null) {
+                leftMap.put(VALUE, null);
+                return new LinkedList<>(List.of(leftMap));
+            } else {
+                if (rightMap != null) {
+                    rightMap.put(VALUE, null);
+                    return new LinkedList<>(List.of(rightMap));
+                }
+            }
+        }
+        return new LinkedList<>();
+    }
+
+    @Override
+    public List<Map<String, Object>> visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) {
+        String query = ctx.identifier().getText();
+        return executor.execute(query);
    }

    @Override
@@ -240,83 +222,84 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
        double value = Double.parseDouble(ctx.number().getText());
        List<Map<String, Object>> numAsList = new ArrayList<>();
        Map<String, Object> valueMap = new HashMap<>();
-        valueMap.put(SCALAR, value);
+        valueMap.put(THRESHOLD, value);
        numAsList.add(valueMap);
        return numAsList;
    }

-    @Override
-    public List<Map<String, Object>> visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) {
-        String rawPromql = tokens.getText(ctx.promql());
-        return executor.execute(rawPromql);
-    }
-
-    @Override
-    public List<Map<String, Object>> visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) {
-        String rawSql = tokens.getText(ctx.selectSql());
-        return executor.execute(rawSql);
-    }
-
-    @Override
-    public List<Map<String, Object>> visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) {
-        return callSqlOrPromql(tokens.getText(ctx.string()));
-    }
-
-    @Override
-    public List<Map<String, Object>> visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) {
-        return callSqlOrPromql(tokens.getText(ctx.string()));
-    }
-
-    private List<Map<String, Object>> callSqlOrPromql(String text) {
-        String script = text.substring(1, text.length() - 1);
-        return executor.execute(script);
-    }
-
-    /**
-     * Generate tag key (excluding `__name__` and `__value__` and `__timestamp__`)
-     */
-    private String labelKey(Map<String, Object> labelsMap) {
-        if (null == labelsMap || labelsMap.isEmpty()) {
-            return "-";
-        }
-        String key = labelsMap.entrySet().stream()
-                .filter(e -> !e.getKey().equals(VALUE) && !e.getKey().equals(NAME) && !e.getKey().equals(TIMESTAMP))
-                .sorted(Map.Entry.comparingByKey())
-                .map(e -> e.getKey() + "=" + (e.getValue() == null ? "" : e.getValue()))
-                .collect(Collectors.joining(","));
-        return key.isEmpty() ? "-" : key;
-    }
-
-    private boolean isScalar(List<Map<String, Object>> context) {
-        return CollectionUtils.isNotEmpty(context)
-                && context.size() == 1
-                && context.get(0).containsKey(SCALAR)
-                && null != context.get(0).get(SCALAR);
-    }
-
-    private double parseStrToDouble(String text) {
-        try {
-            return Double.parseDouble(text);
-        } catch (NumberFormatException e) {
-            throw new ExpressionVisitorException("number format exception", e);
+    private Object evaluateCondition(Object value, String operator, Double threshold) {
+        // value may be a list of values, or a single value
+        switch (operator) {
+            case ">":
+                // if value is list, return the max value
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue > threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) > threshold ? value : null;
+                }
+            case ">=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue >= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) >= threshold ? value : null;
+                }
+            case "<":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue < threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) < threshold ? value : null;
+                }
+            case "<=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue <= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) <= threshold ? value : null;
+                }
+            case "==":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return v;
+                        }
+                    }
+                    return null;
+                } else {
+                    return value.equals(threshold) ? value : null;
+                }
+            case "!=":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return null;
+                        }
+                    }
+                    return value;
+                } else {
+                    return value.equals(threshold) ? null : value;
+                }
+            default:
+                // unsupported operator todo add more operator
+                return null;
        }
    }
-
-    private boolean isValidValue(Object val) {
-        return val == null || val instanceof List<?>;
-    }
-
-    private Boolean compareOp(Object leftVal, int opType, Object rightVal) {
-        double left = parseStrToDouble(leftVal.toString());
-        double right = parseStrToDouble(rightVal.toString());
-        return switch (opType) {
-            case AlertExpressionParser.GT -> left > right;
-            case AlertExpressionParser.GE -> left >= right;
-            case AlertExpressionParser.LT -> left < right;
-            case AlertExpressionParser.LE -> left <= right;
-            case AlertExpressionParser.EQ -> left == right;
-            case AlertExpressionParser.NE -> left != right;
-            default -> false;
-        };
-    }
-}
+}
@@ -26,13 +26,12 @@ import org.antlr.v4.runtime.tree.ParseTreeVisitor;
 * by {@link AlertExpressionParser}.
 *
 * @param <T> The return type of the visit operation. Use {@link Void} for
- *            operations with no return type.
+ * operations with no return type.
 */
 public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {

    /**
     * Visit a parse tree produced by {@link AlertExpressionParser#expression}.
-     *
     * @param ctx the parse tree
     * @return the visitor result
     */
@@ -40,17 +39,23 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {

    /**
     * Visit a parse tree produced by the {@code AndExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
    T visitAndExpr(AlertExpressionParser.AndExprContext ctx);

+    /**
+     * Visit a parse tree produced by the {@code QueryExpr}
+     * labeled alternative in AlertExpressionParser#expr
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx);
+
    /**
     * Visit a parse tree produced by the {@code ComparisonExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
@@ -58,35 +63,15 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {

    /**
     * Visit a parse tree produced by the {@code UnlessExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
    T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx);

-    /**
-     * Visit a parse tree produced by the {@code SqlExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code SqlCallExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx);
-
    /**
     * Visit a parse tree produced by the {@code LiteralExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
@@ -94,261 +79,31 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {

    /**
     * Visit a parse tree produced by the {@code ParenExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
    T visitParenExpr(AlertExpressionParser.ParenExprContext ctx);

-    /**
-     * Visit a parse tree produced by the {@code PromqlCallExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx);
-
-    /**
-     * Visit a parse tree produced by the {@code PromqlExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx);
-
    /**
     * Visit a parse tree produced by the {@code OrExpr}
-     * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
+     * labeled alternative in AlertExpressionParser#expr
     * @param ctx the parse tree
     * @return the visitor result
     */
    T visitOrExpr(AlertExpressionParser.OrExprContext ctx);

    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#functionCall}.
-     *
+     * Visit a parse tree produced by {@link AlertExpressionParser#identifier}.
     * @param ctx the parse tree
     * @return the visitor result
     */
-    T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#parameterList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitParameterList(AlertExpressionParser.ParameterListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#parameter}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitParameter(AlertExpressionParser.ParameterContext ctx);
+    T visitIdentifier(AlertExpressionParser.IdentifierContext ctx);

    /**
     * Visit a parse tree produced by {@link AlertExpressionParser#number}.
-     *
     * @param ctx the parse tree
     * @return the visitor result
     */
    T visitNumber(AlertExpressionParser.NumberContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#string}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitString(AlertExpressionParser.StringContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#duration}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitDuration(AlertExpressionParser.DurationContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#functionName}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#selectSql}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#selectFieldList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#selectField}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitSelectField(AlertExpressionParser.SelectFieldContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#groupByList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitGroupByList(AlertExpressionParser.GroupByListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#orderByList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitOrderByList(AlertExpressionParser.OrderByListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#orderByField}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#limitClause}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#relList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitRelList(AlertExpressionParser.RelListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#relation}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitRelation(AlertExpressionParser.RelationContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#conditionList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitConditionList(AlertExpressionParser.ConditionListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#compOp}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitCompOp(AlertExpressionParser.CompOpContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#condition}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitCondition(AlertExpressionParser.ConditionContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#conditionUnit}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#promql}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitPromql(AlertExpressionParser.PromqlContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#metricSelector}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherItem}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherOp}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#labelList}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitLabelList(AlertExpressionParser.LabelListContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#instantVectorOp}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx);
-
-    /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#aggregationOperator}.
-     *
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx);
 }
@@ -54,7 +54,15 @@ final class DingTalkRobotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandl
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<DingTalkWebHookDto> httpEntity = new HttpEntity<>(dingTalkWebHookDto, headers);
-            String webHookUrl = alerterProperties.getDingTalkWebhookUrl() + receiver.getAccessToken();
+            String baseUrl = alerterProperties.getDingTalkWebhookUrl();
+            String accessToken = receiver.getAccessToken();
+            if (StringUtils.isBlank(accessToken) || !accessToken.matches("^[a-zA-Z0-9_-]{20,50}$")) {
+                throw new AlertNoticeException("Invalid access token provided for DingTalk webhook.");
+            }
+            String webHookUrl = baseUrl + accessToken;
+            if (!webHookUrl.startsWith(baseUrl)) {
+                throw new AlertNoticeException("Constructed webhook URL is not within the trusted domain.");
+            }
            ResponseEntity<CommonRobotNotifyResp> responseEntity = restTemplate.postForEntity(webHookUrl,
                    httpEntity, CommonRobotNotifyResp.class);
            if (responseEntity.getStatusCode() == HttpStatus.OK) {
@@ -17,6 +17,8 @@

 package org.apache.hertzbeat.alert.notice.impl;

+import java.util.Arrays;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -27,14 +29,11 @@ import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

-import java.util.Arrays;
-import java.util.stream.Collectors;
-
 /**
 * Send alert information through FeiShu
 */
@@ -48,18 +47,19 @@ final class FlyBookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
     */
    private static final String[] TITLE_COLOR = {"red", "yellow", "orange"};

+
    @Override
    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
        try {
            String notificationContent = JsonUtil.toJson(renderContent(noticeTemplate, alert));
-            // todo priority custom the color
+            // todo priority custom the color 
            String cardMessage = createLarkMessage(receiver.getUserId(), notificationContent, (byte) 1);
            String webHookUrl = alerterProperties.getFlyBookWebhookUrl() + receiver.getAccessToken();
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<String> flyEntity = new HttpEntity<>(cardMessage, headers);
            ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl,
-                    flyEntity, CommonRobotNotifyResp.class);
+                flyEntity, CommonRobotNotifyResp.class);
            if (entity.getStatusCode() == HttpStatus.OK) {
                assert entity.getBody() != null;
                if (entity.getBody().getCode() == null || entity.getBody().getCode() == 0) {
@@ -87,120 +87,115 @@ final class FlyBookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
     */
    private String createLarkMessage(String userId, String notificationContent, byte priority) {
        String larkCardMessage = """
-                 {
-                 "msg_type": "interactive",
-                 "card":  {
-                      "schema": "2.0",
-                      "config": {
-                          "update_multi": true,
-                          "locales": [
-                              "en_us",
-                              "zh_cn"
-                          ],
-                          "style": {
-                              "text_size": {
-                                  "normal_v2": {
-                                      "default": "normal",
-                                      "pc": "normal",
-                                      "mobile": "heading"
-                                  }
-                              }
-                          }
-                      },
-                      "body": {
-                          "direction": "vertical",
-                          "padding": "12px 12px 12px 12px",
-                          "elements": [
-                              {
-                                  "tag": "markdown",
-                                  "content": "%s",
-                                  "i18n_content": {
-                                      "en_us": ""
-                                  },
-                                  "text_align": "left",
-                                  "text_size": "normal_v2",
-                                  "margin": "0px 0px 0px 0px"
-                              },
-                              {
-                                  "tag": "hr",
-                                  "margin": "0px 0px 0px 0px"
-                              },
-                              {
-                                  "tag": "column_set",
-                                  "horizontal_align": "left",
-                                  "columns": [
-                                      {
-                                          "tag": "column",
-                                          "width": "weighted",
-                                          "elements": [
-                                              {
-                                                  "tag": "button",
-                                                  "text": {
-                                                      "tag": "plain_text",
-                                                      "content": "登入控制台",
-                                                      "i18n_content": {
-                                                          "en_us": "Login In"
-                                                      }
-                                                  },
-                                                  "type": "default",
-                                                  "width": "default",
-                                                  "size": "medium",
-                                                  "behaviors": [
-                                                      {
-                                                          "type": "open_url",
-                                                          "default_url": "%s",
-                                                          "pc_url": "",
-                                                          "ios_url": "",
-                                                          "android_url": ""
-                                                      }
-                                                  ]
-                                              }
-                                          ],
-                                          "direction": "horizontal",
-                                          "vertical_spacing": "8px",
-                                          "horizontal_align": "left",
-                                          "vertical_align": "top",
-                                          "weight": 1
-                                      }
-                                  ],
-                                  "margin": "0px 0px 0px 0px"
-                              }
-                          ]
-                      },
-                      "header": {
-                          "title": {
-                              "tag": "plain_text",
-                              "content": "HertzBeat 告警",
-                              "i18n_content": {
-                                  "en_us": "HertzBeat Alarm"
-                              }
-                          },
-                          "subtitle": {
-                              "tag": "plain_text",
-                              "content": ""
-                          },
-                          "template": "%s",
-                          "padding": "12px 12px 12px 12px"
-                      }
-                  }
+            {
+                "msg_type": "interactive",
+                "card": {
+                    "config": {
+                        "update_multi": true
+                    },
+                    "i18n_elements": {
+                        "zh_cn": [
+                            {
+                                "tag": "column_set",
+                                "flex_mode": "none",
+                                "horizontal_spacing": "default",
+                                "background_style": "default",
+                                "columns": [
+                                    {
+                                        "tag": "column",
+                                        "elements": [
+                                            {
+                                                "tag": "div",
+                                                "text": {
+                                                    "tag": "plain_text",
+                                                    "content": "",
+                                                    "text_size": "normal",
+                                                    "text_align": "left",
+                                                    "text_color": "default"
+                                                }
+                                            }
+                                        ],
+                                        "width": "weighted",
+                                        "weight": 1
+                                    }
+                                ]
+                            },
+                            {
+                                "tag": "column_set",
+                                "flex_mode": "none",
+                                "horizontal_spacing": "default",
+                                "background_style": "default",
+                                "columns": [
+                                    {
+                                        "tag": "column",
+                                        "elements": [
+                                            {
+                                                "tag": "div",
+                                                "text": {
+                                                    "tag": "plain_text",
+                                                    "content": %s,
+                                                    "text_size": "normal",
+                                                    "text_align": "left",
+                                                    "text_color": "default"
+                                                }
+                                            }
+                                        ],
+                                        "width": "weighted",
+                                        "weight": 1
+                                    }
+                                ]
+                            },
+                            %s
+                            {
+                                "tag": "action",
+                                "actions": [
+                                    {
+                                        "tag": "button",
+                                        "text": {
+                                            "tag": "plain_text",
+                                            "content": "登入控制台"
+                                        },
+                                        "type": "default",
+                                        "complex_interaction": true,
+                                        "width": "default",
+                                        "size": "medium",
+                                        "multi_url": {
+                                            "url": "%s"
+                                        }
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "i18n_header": {
+                        "zh_cn": {
+                            "title": {
+                                "tag": "plain_text",
+                                "content": "HertzBeat 告警"
+                            },
+                            "template": "%s"
+                        }
+                    }
                }
-                """;
+            }
+            """;

        String atUserElement = "";
        if (StringUtils.isNotBlank(userId)) {
-            atUserElement = "\\n" + Arrays.stream(userId.split(","))
-                    .map(id -> "<at id=" + id + "></at>")
-                    .collect(Collectors.joining(" "));
+            String atUserId = Arrays.stream(userId.split(","))
+                .map(id -> "<at id=" + id + "></at>")
+                .collect(Collectors.joining(" "));
+            atUserElement = String.format("""
+                {
+                    "tag": "div",
+                    "text": {
+                        "content": "%s",
+                        "tag": "lark_md"
+                    }
+                },
+                """, atUserId);
        }
-
-        if (notificationContent.startsWith("\"") && notificationContent.endsWith("\"")) {
-            notificationContent = StringUtils.removeStart(notificationContent, "\"");
-            notificationContent = StringUtils.removeEnd(notificationContent, "\"");
-        }
-
-        return String.format(larkCardMessage,
-                notificationContent.replace("\"", "\\\"") + atUserElement,
-                alerterProperties.getConsoleUrl(), TITLE_COLOR[priority]);
+        return String.format(larkCardMessage, notificationContent, atUserElement, alerterProperties.getConsoleUrl(), TITLE_COLOR[priority]);
    }

    @Override
@@ -31,8 +31,6 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

-import java.util.List;
-
 /**
 * Send alarm information through Server
 */
@@ -56,16 +54,7 @@ public class ServerChanAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<ServerChanAlertNotifyHandlerImpl.ServerChanWebHookDto> httpEntity = new HttpEntity<>(serverChanWebHookDto, headers);
-            String sanitizedToken = receiver.getServerChanToken().replaceAll("[^a-zA-Z0-9_-]", "");
-            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");
-            boolean isValidUrl = allowedBaseUrls.stream().anyMatch(webHookUrl::startsWith);
-            if (!isValidUrl) {
-                throw new AlertNoticeException("Invalid webhook URL: " + webHookUrl);
-            }
-            
+            String webHookUrl = String.format(alerterProperties.getServerChanWebhookUrl(), receiver.getServerChanToken());
            ResponseEntity<CommonRobotNotifyResp> responseEntity = restTemplate.postForEntity(webHookUrl,
                    httpEntity, CommonRobotNotifyResp.class);
            if (responseEntity.getStatusCode() == HttpStatus.OK) {
@@ -17,7 +17,6 @@

 package org.apache.hertzbeat.alert.notice.impl;

-import java.net.URI;
 import java.util.Objects;
 import lombok.Builder;
 import lombok.Data;
@@ -53,12 +52,7 @@ final class SlackAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<SlackNotifyDTO> slackNotifyEntity = new HttpEntity<>(slackNotify, headers);
-            String slackWebHookUrl = receiver.getSlackWebHookUrl();
-            if (!isValidSlackWebHookUrl(slackWebHookUrl)) {
-                log.warn("Invalid Slack Webhook URL: {}", slackWebHookUrl);
-                throw new AlertNoticeException("Invalid Slack Webhook URL");
-            }
-            var entity = restTemplate.postForEntity(slackWebHookUrl, slackNotifyEntity, String.class);
+            var entity = restTemplate.postForEntity(receiver.getSlackWebHookUrl(), slackNotifyEntity, String.class);
            if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                var body = entity.getBody();
                if (Objects.equals(SUCCESS, body)) {
@@ -87,21 +81,4 @@ final class SlackAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
        private String text;
    }

-
-    /**
-     * Validate if the Slack Webhook URL belongs to an allowed domain.
-     *
-     * @param url the Slack Webhook URL to validate
-     * @return true if the URL is valid, false otherwise
-     */
-    private boolean isValidSlackWebHookUrl(String url) {
-        try {
-            URI uri = new URI(url);
-            String host = uri.getHost();
-            return "hooks.slack.com".equals(host);
-        } catch (Exception e) {
-            log.warn("Error validating Slack Webhook URL: {}", url, e);
-            return false;
-        }
-    }
 }
@@ -42,14 +42,9 @@ import org.springframework.stereotype.Component;
 final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {

    @Override
-    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert)
-            throws AlertNoticeException {
+    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) throws AlertNoticeException {
        try {
-            String token = receiver.getTgBotToken();
-            if (!isValidTelegramToken(token)) {
-                throw new AlertNoticeException("Invalid Telegram Bot Token");
-            }
-            String url = String.format(alerterProperties.getTelegramWebhookUrl(), token);
+            String url = String.format(alerterProperties.getTelegramWebhookUrl(), receiver.getTgBotToken());
            TelegramBotNotifyDTO notifyBody = TelegramBotNotifyDTO.builder()
                    .chatId(receiver.getTgUserId())
                    .text(renderContent(noticeTemplate, alert))
@@ -59,8 +54,7 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<TelegramBotNotifyDTO> telegramEntity = new HttpEntity<>(notifyBody, headers);
-            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, telegramEntity,
-                    TelegramBotNotifyResponse.class);
+            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, telegramEntity, TelegramBotNotifyResponse.class);
            if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                TelegramBotNotifyResponse body = entity.getBody();
                if (body.ok) {
@@ -105,10 +99,4 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
        private String description;
    }

-    private boolean isValidTelegramToken(String token) {
-        // Adjusted pattern to match real Telegram Bot tokens like
-        // 110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw
-        String tokenPattern = "^[0-9]+:[a-zA-Z0-9_-]+$";
-        return token != null && token.matches(tokenPattern);
-    }
 }
@@ -57,12 +57,7 @@ final class WeComRobotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<WeWorkWebHookDto> httpEntity = new HttpEntity<>(weWorkWebHookDTO, headers);
-            String wechatId = receiver.getWechatId();
-            if (!isValidWechatId(wechatId)) {
-                log.warn("Invalid WeChat ID: {}", wechatId);
-                throw new AlertNoticeException("Invalid WeChat ID provided.");
-            }
-            String webHookUrl = alerterProperties.getWeWorkWebhookUrl() + wechatId;
+            String webHookUrl = alerterProperties.getWeWorkWebhookUrl() + receiver.getWechatId();
            ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl, httpEntity, CommonRobotNotifyResp.class);
            if (entity.getStatusCode() == HttpStatus.OK) {
                assert entity.getBody() != null;
@@ -175,15 +170,4 @@ final class WeComRobotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI
        }

    }
-    
-    /**
-     * Validate the WeChat ID to ensure it meets the expected format.
-     *
-     * @param wechatId the WeChat ID to validate
-     * @return true if valid, false otherwise
-     */
-    private boolean isValidWechatId(String wechatId) {
-        // Example validation: ensure the ID is alphanumeric and non-empty
-        return StringUtils.isNotBlank(wechatId) && wechatId.matches("^[a-zA-Z0-9_-]+$");
-    }
 }
@@ -18,15 +18,12 @@
 package org.apache.hertzbeat.alert.service;

 import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.springframework.data.domain.Page;
 import org.springframework.web.multipart.MultipartFile;

-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
 * Alarm define manager service
 */
@@ -110,11 +107,5 @@ public interface AlertDefineService {
     * @return Real-time alarm definition list
     */
    List<AlertDefine> getRealTimeAlertDefines();
-
-    /**
-     * Get define preview
-     * @return Data queried based on expressions
-     * @throws AlertExpressionException expression error
-     */
-    List<Map<String, Object>> getDefinePreview(String datasource, String type, String expr);
+    
 }
@@ -28,9 +28,6 @@ import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.util.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.util.CollectionUtils;
@@ -44,15 +41,12 @@ public abstract class AlertDefineAbstractImExportServiceImpl implements AlertDef
    @Lazy
    private AlertDefineService alertDefineService;

-    private static final Logger logger = LoggerFactory.getLogger(AlertDefineAbstractImExportServiceImpl.class);
-
    @Override
    public void importConfig(InputStream is) {
        var formList = parseImport(is)
                .stream()
                .map(this::convert)
                .toList();
-        LogUtil.info(logger, "Importing alert defines from {0}", formList);
        if (!CollectionUtils.isEmpty(formList)) {
            formList.forEach(alertDefine -> {
                alertDefineService.validate(alertDefine, false);
@@ -17,6 +17,7 @@

 package org.apache.hertzbeat.alert.service.impl;

+import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,9 +29,7 @@ import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
-import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.common.cache.CacheFactory;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.constants.ExportFileConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
@@ -73,21 +72,18 @@ public class AlertDefineServiceImpl implements AlertDefineService {
    @Autowired
    private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;

-    private final DataSourceService dataSourceService;
-
    private final Map<String, AlertDefineImExportService> alertDefineImExportServiceMap = new HashMap<>();

    private static final String CONTENT_TYPE = MediaType.APPLICATION_OCTET_STREAM_VALUE + SignConstants.SINGLE_MARK + "charset=" + StandardCharsets.UTF_8;

-    public AlertDefineServiceImpl(List<AlertDefineImExportService> alertDefineImExportServiceList, DataSourceService dataSourceService) {
+    public AlertDefineServiceImpl(List<AlertDefineImExportService> alertDefineImExportServiceList) {
        alertDefineImExportServiceList.forEach(it -> alertDefineImExportServiceMap.put(it.type(), it));
-        this.dataSourceService = dataSourceService;
    }

    @Override
    public void validate(AlertDefine alertDefine, boolean isModify) throws IllegalArgumentException {
        if (StringUtils.hasText(alertDefine.getExpr())) {
-            if (CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
+            if (ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
                try {
                    JexlExpressionRunner.compile(alertDefine.getExpr());
                } catch (Exception e) {
@@ -217,23 +213,9 @@ public class AlertDefineServiceImpl implements AlertDefineService {
    public List<AlertDefine> getRealTimeAlertDefines() {
        List<AlertDefine> alertDefines = CacheFactory.getAlertDefineCache();
        if (alertDefines == null) {
-            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME);
+            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(ALERT_THRESHOLD_TYPE_REALTIME);
            CacheFactory.setAlertDefineCache(alertDefines);
        }
        return alertDefines;
    }
-
-    @Override
-    public List<Map<String, Object>> getDefinePreview(String datasource, String type, String expr) {
-        if (!StringUtils.hasText(expr) || !StringUtils.hasText(datasource) || !StringUtils.hasText(type)) {
-            return Collections.emptyList();
-        }
-        switch (type) {
-            case CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC:
-                return dataSourceService.calculate(datasource, expr);
-            default:
-                log.error("Get define preview unsupported type: {}", type);
-                return Collections.emptyList();
-        }
-    }
 }
@@ -1,185 +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.service.impl;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.alert.dto.AlibabaCloudSlsExternAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.ExternAlertService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.util.IpDomainUtil;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.springframework.stereotype.Service;
-
-import java.text.MessageFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * Alibaba Cloud 'Simple Log Service(SLS)'  external alarm service impl
- */
-@Slf4j
-@Service
-public class AlibabaCloudSlsExternAlertService implements ExternAlertService {
-
-    private final AlarmCommonReduce alarmCommonReduce;
-
-    public AlibabaCloudSlsExternAlertService(AlarmCommonReduce alarmCommonReduce) {
-        this.alarmCommonReduce = alarmCommonReduce;
-    }
-
-    @Override
-    public void addExternAlert(String content) {
-        AlibabaCloudSlsExternAlert externAlert = JsonUtil.fromJson(content, AlibabaCloudSlsExternAlert.class);
-        if (externAlert == null) {
-            log.warn("Failure to parse external alert content. content: {}", content);
-            return;
-        }
-        SingleAlert singleAlert = new AlibabaCloudSlsConverter().convert(externAlert);
-        alarmCommonReduce.reduceAndSendAlarm(singleAlert);
-    }
-
-    @Override
-    public String supportSource() {
-        return "alibabacloud-sls";
-    }
-
-    /**
-     *
-     */
-    public static class AlibabaCloudSlsConverter {
-
-        /**
-         * convert
-         *
-         * @param externAlert alert content entity
-         * @return Single alert
-         */
-        public SingleAlert convert(AlibabaCloudSlsExternAlert externAlert) {
-            return SingleAlert.builder()
-                    .triggerTimes(1)
-                    .status(externAlert.getStatus())
-                    .startAt(Instant.ofEpochSecond(externAlert.getFireTime()).toEpochMilli())
-                    .activeAt(Instant.ofEpochSecond(externAlert.getAlertTime()).toEpochMilli())
-                    .endAt(convertResolveTime(externAlert.getStatus(), externAlert.getResolveTime()))
-                    .labels(buildLabels(externAlert))
-                    .annotations(buildAnnotations(externAlert))
-                    .content(formatContent(externAlert))
-                    .build();
-        }
-
-        /**
-         * todo i18n
-         *
-         * @param externAlert alert content entity
-         * @return content
-         */
-        private String formatContent(AlibabaCloudSlsExternAlert externAlert) {
-            // convet severity
-            Optional<AlibabaCloudSlsExternAlert.Severity> severity = AlibabaCloudSlsExternAlert.Severity.convert(externAlert.getSeverity());
-            // If the alarm state is resolved, the value is the specific recovery time.
-            Long resolveTimeMilli = convertResolveTime(externAlert.getStatus(), externAlert.getResolveTime());
-
-            return MessageFormat.format(
-            "AlibabaCloud-sls alert , {0} - [{1}], level: [{2}], desc: {3}, fire_time:{4}, resolve_time:{5}",
-                    externAlert.getAnnotation("title"),
-                    externAlert.getStatus(),
-                    severity.isPresent() ? severity.get().getAlias() : "N/A",
-                    externAlert.getAnnotation("desc"),
-                    timeSecondToDate(Instant.ofEpochSecond(externAlert.getFireTime()).toEpochMilli()),
-                    null != resolveTimeMilli ? timeSecondToDate(resolveTimeMilli) : "N/A"
-            );
-        }
-
-        /**
-         * Converts a timestamp (milliseconds) to a formatted date-time string.
-         *
-         * @param timestampMillis timestamp in milliseconds
-         * @return formatted date-time string in the pattern: yyyy-MM-dd HH:mm:ss
-         */
-        private String timeSecondToDate(long timestampMillis) {
-            LocalDateTime dateTime = LocalDateTime.ofInstant(
-                    Instant.ofEpochMilli(timestampMillis),
-                    ZoneId.systemDefault()
-            );
-            return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        }
-
-        /**
-         * Build basic annotations and fill annotations for alibaba cloud sls.
-         *
-         * @param externAlert alert content entity
-         * @return annotations
-         */
-        private Map<String, String> buildAnnotations(AlibabaCloudSlsExternAlert externAlert) {
-            Map<String, String> annotations = new HashMap<>(8);
-            Optional<AlibabaCloudSlsExternAlert.Severity> severity = AlibabaCloudSlsExternAlert.Severity.convert(externAlert.getSeverity());
-            severity.ifPresent(value -> annotations.put("severity", value.getAlias()));
-            // Notification templates for sls need to be configured.
-            if (StringUtils.isNotBlank(externAlert.getSigninUrl()) && IpDomainUtil.isHasSchema(externAlert.getSigninUrl())) {
-                annotations.put("signinUrl", "<a target=\"_blank\" href=\"" + externAlert.getSigninUrl() + "\">View Details</a>");
-            }
-            // Filling the annotations with the alibaba cloud sls.
-            if (null != externAlert.getAnnotations() && !externAlert.getAnnotations().isEmpty()) {
-                annotations.putAll(externAlert.getAnnotations());
-            }
-
-            return annotations;
-        }
-
-        /**
-         * Build basic labels and fill labels for alibaba cloud sls.
-         *
-         * @param externAlert alert content entity
-         * @return labels
-         */
-        private Map<String, String> buildLabels(AlibabaCloudSlsExternAlert externAlert) {
-            Map<String, String> labels = new HashMap<>(8);
-            labels.put("__source__", "alibabacloud-sls");
-            labels.put("alertname", externAlert.getAlertName());
-            labels.put("region", externAlert.getRegion());
-            // The project name is globally unique.
-            labels.put("project", externAlert.getProject());
-            // Filling the labels with the alibaba cloud sls.
-            if (null != externAlert.getLabels() && !externAlert.getLabels().isEmpty()){
-                labels.putAll(externAlert.getLabels());
-            }
-            return labels;
-        }
-
-        /**
-         * If the alarm status is firing, the value is 0.
-         * If the alarm state is resolved, the value is the specific recovery time.
-         *
-         * @param status alert status
-         * @param resolveTimeSecond recovery time
-         * @return milliseconds
-         */
-        private Long convertResolveTime(String status, int resolveTimeSecond) {
-            return CommonConstants.ALERT_STATUS_RESOLVED.equals(status) ? Instant.ofEpochSecond(resolveTimeSecond).toEpochMilli() : null;
-        }
-    }
-
-}
@@ -27,14 +27,11 @@ import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.common.support.exception.SendMessageException;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.common.util.LogUtil;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -65,7 +62,6 @@ public class AlibabaSmsClientImpl implements SmsClient {
    private final String accessKeySecret;
    private final String signName;
    private final String templateCode;
-    private static final Logger logger = LoggerFactory.getLogger(AlibabaSmsClientImpl.class);

    public AlibabaSmsClientImpl(AlibabaSmsProperties config) {
        if (config != null) {
@@ -177,7 +173,7 @@ public class AlibabaSmsClientImpl implements SmsClient {
                log.info("Successfully sent SMS to phone: {}", phoneNumber);
            }
        } catch (Exception e) {
-            LogUtil.warn(logger, "Failed to send SMS: {0}", e.getMessage());
+            log.warn("Failed to send SMS: {}", e.getMessage());
            throw new SendMessageException(e.getMessage());
        }
    }
@@ -196,7 +192,6 @@ public class AlibabaSmsClientImpl implements SmsClient {
            // Step 4: Build authorization header
            return ALGORITHM + " Credential=" + accessKeyId + ",SignedHeaders=host;x-acs-action;x-acs-content-sha256;x-acs-date;" + "x-acs-signature-nonce;x-acs-version,Signature=" + signature;
        } catch (Exception e) {
-            LogUtil.warn(logger, "Failed to calculate authorization {0}", e.getMessage());
            throw new RuntimeException("Failed to calculate authorization", e);
        }
    }
@@ -24,14 +24,11 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.hertzbeat.alert.expr.AlertExpressionEvalVisitor;
 import org.apache.hertzbeat.alert.expr.AlertExpressionLexer;
 import org.apache.hertzbeat.alert.expr.AlertExpressionParser;
 import org.apache.hertzbeat.alert.service.DataSourceService;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
-import org.apache.hertzbeat.common.util.ResourceBundleUtil;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,7 +36,6 @@ import org.springframework.util.StringUtils;

 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;

 /**
@@ -49,8 +45,6 @@ import java.util.concurrent.TimeUnit;
@Slf4j
 public class DataSourceServiceImpl implements DataSourceService {

-    protected ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
-
    @Setter
    @Autowired(required = false)
    private List<QueryExecutor> executors;
@@ -75,7 +69,7 @@ public class DataSourceServiceImpl implements DataSourceService {
            throw new IllegalArgumentException("Empty expression");
        }
        if (executors == null || executors.isEmpty()) {
-            throw new IllegalArgumentException(bundle.getString("alerter.datasource.executor.not.found"));
+            throw new IllegalArgumentException("No query executor found");
        }
        QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);

@@ -86,9 +80,6 @@ public class DataSourceServiceImpl implements DataSourceService {
        expr = expr.replaceAll("\\s+", " ");
        try {
            return evaluate(expr, executor);
-        } catch (AlertExpressionException ae) {
-            log.error("Calculate query parse error {}: {}", datasource, ae.getMessage());
-            throw ae;
        } catch (Exception e) {
            log.error("Error executing query on datasource {}: {}", datasource, e.getMessage());
            throw new RuntimeException("Query execution failed", e);
@@ -96,14 +87,14 @@ public class DataSourceServiceImpl implements DataSourceService {
    }

    private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
-        CommonTokenStream tokens = tokenStreamCache.get(expr, this::createTokenStream);
-        AlertExpressionParser parser = new AlertExpressionParser(tokens);
-        ParseTree tree = expressionCache.get(expr, e -> parser.expr());
-        if (null != tokens && tokens.LA(1) != Token.EOF) {
-            throw new AlertExpressionException(bundle.getString("alerter.calculate.parse.error"));
-        }
-        AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor, tokens);
+        ParseTree tree = expressionCache.get(expr, e -> {
+            CommonTokenStream tokens = tokenStreamCache.get(e, this::createTokenStream);
+            AlertExpressionParser parser = new AlertExpressionParser(tokens);
+            return parser.expr();
+        });
+        AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor);
        return visitor.visit(tree);
+
    }

    private CommonTokenStream createTokenStream(String expr) {
@@ -1,343 +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.service.impl;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.ExternAlertService;
-import org.apache.hertzbeat.alert.util.DateUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.support.exception.IgnoreException;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.springframework.stereotype.Service;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.security.Signature;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.text.MessageFormat;
-import java.time.Instant;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.NOTIFICATION;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.SUBSCRIPTION;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.UNSUBSCRIBE;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_MESSAGE;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_MESSAGE_ID;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_SUBJECT;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_SUBSCRIBE_URL;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TIMESTAMP;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TOPIC_URN;
-import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TYPE;
-
-/**
- * Huawei cloud external alarm service impl
- */
-@Slf4j
-@Service
-public class HuaweiCloudExternAlertService implements ExternAlertService {
-
-    private static final String CERTIFICATE_TYPE = "X.509";
-
-    private static final String CHARSET_UTF8 = StandardCharsets.UTF_8.name();
-
-    private final AlarmCommonReduce alarmCommonReduce;
-
-    public HuaweiCloudExternAlertService(AlarmCommonReduce alarmCommonReduce) {
-        this.alarmCommonReduce = alarmCommonReduce;
-    }
-
-    @Override
-    public void addExternAlert(String content) {
-        HuaweiCloudExternAlert externAlert = JsonUtil.fromJson(content, HuaweiCloudExternAlert.class);
-        if (externAlert == null || StringUtils.isBlank(externAlert.getMessage())) {
-            log.warn("Failure to parse external alert content. content: {}", content);
-            return;
-        }
-        if (!isMessageValid(externAlert)) {
-            log.warn("Huawei cloud alert verify failed. content: {}", content);
-            return;
-        }
-        process(externAlert);
-    }
-
-    /**
-     * Process according to different types
-     *
-     * @param externAlert alert content entity
-     */
-    private void process(HuaweiCloudExternAlert externAlert) {
-        if (NOTIFICATION.getType().equals(externAlert.getType())) {
-            Optional.ofNullable(buildSendAlert(externAlert)).ifPresent(alarmCommonReduce::reduceAndSendAlarm);
-        } else if (SUBSCRIPTION.getType().equals(externAlert.getType())) {
-            autoSubscribeForUrl(externAlert.getSubscribeUrl());
-        } else if (UNSUBSCRIBE.getType().equals(externAlert.getType())) {
-            log.warn("Huawei cloud notifies the recipient of the notification to cancel the subscription.");
-        }
-    }
-
-    /**
-     * Build single alert.
-     *
-     * @param externAlert alert content entity
-     * @return single alert
-     */
-    private SingleAlert buildSendAlert(HuaweiCloudExternAlert externAlert) {
-        HuaweiCloudExternAlert.AlertMessage message = JsonUtil.fromJson(externAlert.getMessage(), HuaweiCloudExternAlert.AlertMessage.class);
-        if (null == message || null == message.getData()) {
-            log.warn("Failure to parse external alert message. message: {}", externAlert.getMessage());
-            return null;
-        }
-        // Note: Empty and false are both recovery notifications.
-        // Note: There are no recovery notifications for event types
-        boolean isAlarm = null != message.getData().getAlarm() && message.getData().getAlarm();
-        Long alarmTime = DateUtil.getZonedTimeStampFromFormat(message.getData().getAlarmTime(), "yyyy/MM/dd HH:mm:ss 'GMT'XXX");
-        return SingleAlert.builder()
-                .triggerTimes(1)
-                .status(isAlarm ? CommonConstants.ALERT_STATUS_FIRING : CommonConstants.ALERT_STATUS_RESOLVED)
-                .startAt(alarmTime)
-                .activeAt(Instant.now().toEpochMilli())
-                .endAt(isAlarm ? null : alarmTime)
-                .labels(buildLabels(message.getData()))
-                .annotations(buildAnnotations(message.getData()))
-                .content(formatContent(externAlert.getSubject(), message.getData()))
-                .build();
-    }
-
-    /**
-     * Build basic annotations and fill annotations for huawei cloud.
-     *
-     * @param alertData alert content entity
-     * @return annotations
-     */
-    private Map<String, String> buildAnnotations(HuaweiCloudExternAlert.AlertData alertData) {
-        Map<String, String> annotations = new HashMap<>(8);
-        if (null != alertData) {
-            putIfNotBlank(annotations, "region", alertData.getRegion());
-            putIfNotBlank(annotations, "dimensionName", alertData.getDimensionName());
-            putIfNotBlank(annotations, "resourceName", alertData.getResourceName());
-            putIfNotBlank(annotations, "alarmRecordId", alertData.getAlarmRecordId());
-        }
-        return annotations;
-    }
-
-    /**
-     * Build basic labels and fill labels for huawei cloud.
-     *
-     * @param alertData alert content entity
-     * @return labels
-     */
-    private Map<String, String> buildLabels(HuaweiCloudExternAlert.AlertData alertData) {
-        Map<String, String> labels = new HashMap<>(8);
-        labels.put("__source__", "huaweicloud-ces");
-        if (null != alertData) {
-            putIfNotBlank(labels, "namespace", alertData.getNamespace());
-            putIfNotBlank(labels, "metricName", alertData.getMetricName());
-            putIfNotBlank(labels, "resourceId", alertData.getResourceId());
-            putIfNotBlank(labels, "level", alertData.getAlarmLevel());
-        }
-        return labels;
-    }
-
-    /**
-     * todo i18n
-     *
-     * @param subject alert subject
-     * @param alertData alert content entity
-     * @return content
-     */
-    private String formatContent(String subject, HuaweiCloudExternAlert.AlertData alertData) {
-        if (null == alertData) {
-            return subject;
-        }
-        return MessageFormat.format(
-                "{0} threshold:{1}{2}, current：{3}",
-                subject,
-                alertData.getComparisonOperator(),
-                alertData.getValue(),
-                alertData.getCurrentData()
-        );
-    }
-
-    /**
-     * Automatic subscription url.
-     *
-     * @param subscribeUrl subscribeUrl
-     */
-    public void autoSubscribeForUrl(String subscribeUrl) {
-        if (StringUtils.isBlank(subscribeUrl)) {
-            return;
-        }
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            HttpGet httpGet = new HttpGet(subscribeUrl);
-            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
-                int statusCode = response.getStatusLine().getStatusCode();
-                String responseBody = EntityUtils.toString(response.getEntity());
-
-                if (statusCode != 200) {
-                    log.error("Subscribe url request failed with status code: " + statusCode + ", response: " + responseBody);
-                    return;
-                }
-                JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
-                if (jsonResponse == null) {
-                    throw new IgnoreException("Subscribe url failed with status code: " + statusCode + ", response: " + responseBody);
-                }
-                JsonNode surnNode = jsonResponse.get("subscription_urn");
-                if (surnNode == null || StringUtils.isBlank(surnNode.asText())) {
-                    throw new IgnoreException("Subscribe url failed with status code: " + statusCode + ", response: " + responseBody);
-                }
-                log.info("Successfully subscribed to Huawei Cloud(SMN) url.");
-            }
-        } catch (Exception e) {
-            log.error("Failed to subscribe url request: {}", e.getMessage());
-        }
-    }
-
-    /**
-     * Verifying the signature of huawei cloud alert message.
-     *
-     * @param externAlert alert content entity
-     * @return verification result
-     * @throws SecurityException thrown when validation fails
-     */
-    private boolean isMessageValid(HuaweiCloudExternAlert externAlert) {
-        try {
-            String signMessage = buildSignMessage(externAlert);
-            if (StringUtils.isBlank(signMessage)) {
-                throw new SecurityException("Verify sign message is null");
-            }
-            X509Certificate cert = getCertificate(externAlert.getSigningCertUrl());
-            return verifySignature(signMessage, cert, externAlert.getSignature());
-        } catch (Exception e) {
-            log.error("Failed to verify message signature: ", e);
-            return false;
-        }
-    }
-
-    /**
-     * Build sign message.
-     *
-     * @param externAlert alert content entity
-     * @return sign message
-     */
-    private String buildSignMessage(HuaweiCloudExternAlert externAlert) {
-        if (NOTIFICATION.getType().equals(externAlert.getType())) {
-            return buildNotificationMessage(externAlert);
-        } else if (SUBSCRIPTION.getType().equals(externAlert.getType()) || UNSUBSCRIBE.getType().equals(externAlert.getType())){
-            return buildSubscriptionMessage(externAlert);
-        }
-        return null;
-    }
-
-    /**
-     * Building sign message of 'Notification' type
-     *
-     * @param externAlert alert content entity
-     * @return sign message
-     */
-    private String buildNotificationMessage(HuaweiCloudExternAlert externAlert) {
-        StringBuilder message = new StringBuilder();
-        appendField(message, FIELD_MESSAGE, externAlert.getMessage());
-        appendField(message, FIELD_MESSAGE_ID, externAlert.getMessageId());
-        if (StringUtils.isNotBlank(externAlert.getSubject())) {
-            appendField(message, FIELD_SUBJECT, externAlert.getSubject());
-        }
-        appendField(message, FIELD_TIMESTAMP, externAlert.getTimestamp());
-        appendField(message, FIELD_TOPIC_URN, externAlert.getTopicUrn());
-        appendField(message, FIELD_TYPE, externAlert.getType());
-        return message.toString();
-    }
-
-    /**
-     * Building sign message of 'SubscriptionConfirmation' or 'UnsubscribeConfirmation' type
-     *
-     * @param externAlert alert content entity
-     * @return sign message
-     */
-    private String buildSubscriptionMessage(HuaweiCloudExternAlert externAlert) {
-        StringBuilder message = new StringBuilder();
-        appendField(message, FIELD_MESSAGE, externAlert.getMessage());
-        appendField(message, FIELD_MESSAGE_ID, externAlert.getMessageId());
-        appendField(message, FIELD_SUBSCRIBE_URL, externAlert.getSubscribeUrl());
-        appendField(message, FIELD_TIMESTAMP, externAlert.getTimestamp());
-        appendField(message, FIELD_TOPIC_URN, externAlert.getTopicUrn());
-        appendField(message, FIELD_TYPE, externAlert.getType());
-        return message.toString();
-    }
-
-    /**
-     * Obtain certificate
-     *
-     * @param signCertUrl sign cert url
-     * @return X509 certificate
-     * @throws Exception Thrown when certificate acquisition fails
-     */
-    private X509Certificate getCertificate(String signCertUrl) throws Exception {
-        URL url = new URL(signCertUrl);
-        try (InputStream in = url.openStream()) {
-            CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_TYPE);
-            return (X509Certificate) cf.generateCertificate(in);
-        }
-    }
-
-    /**
-     * Verify signature
-     *
-     * @param message sign message
-     * @param cert cert
-     * @param signature signature
-     * @return verification result
-     * @throws Exception thrown when an error occurs in the validation process
-     */
-    private boolean verifySignature(String message, X509Certificate cert, String signature) throws Exception {
-        Signature sig = Signature.getInstance(cert.getSigAlgName());
-        sig.initVerify(cert.getPublicKey());
-        sig.update(message.getBytes(CHARSET_UTF8));
-        return sig.verify(Base64.getDecoder().decode(signature));
-    }
-
-    private void putIfNotBlank(Map<String, String> map, String key, String value) {
-        if (StringUtils.isNotBlank(value)){
-            map.put(key, value);
-        }
-    }
-
-    private void appendField(StringBuilder builder, String fieldName, String value) {
-        builder.append(fieldName).append("\n").append(value).append("\n");
-    }
-
-    @Override
-    public String supportSource() {
-        return "huaweicloud-ces";
-    }
-
-}
@@ -1,244 +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.service.impl;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.hertzbeat.alert.dto.VolcEngineExternEventAlert;
-import org.apache.hertzbeat.alert.dto.VolcEngineExternMetricAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.ExternAlertService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.springframework.stereotype.Service;
-
-import java.time.OffsetDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Volcengine alarm entity class
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class VolcEngineExternAlertService implements ExternAlertService {
-
-    private final AlarmCommonReduce alarmCommonReduce;
-    private static final Map<String, Integer> severityOrder = Map.of(
-            CommonConstants.ALERT_SEVERITY_CRITICAL, 1,
-            CommonConstants.ALERT_SEVERITY_WARNING, 2,
-            CommonConstants.ALERT_SEVERITY_INFO, 3
-    );
-
-    @Override
-    @SneakyThrows
-    public void addExternAlert(String content) {
-        ObjectMapper mapper = new ObjectMapper();
-        JsonNode root = mapper.readTree(content);
-        String type = root.get("Type").asText();
-        if (VolcEngineExternMetricAlert.ALERT_TYPE_EVENT.equals(type)) {
-            VolcEngineExternEventAlert eventAlert = JsonUtil.fromJson(content, VolcEngineExternEventAlert.class);
-            if (eventAlert == null) {
-                log.warn("parse extern event alert content failed! content: {}", content);
-                return;
-            }
-            SingleAlert singleAlert = new VolcEngineAlertConverter().convertEventToSingleAlert(eventAlert);
-            alarmCommonReduce.reduceAndSendAlarm(singleAlert);
-
-        } else {
-            // deal with metric alert
-            VolcEngineExternMetricAlert report = JsonUtil.fromJson(content, VolcEngineExternMetricAlert.class);
-            if (report == null) {
-                log.warn("parse extern metrics alert content failed! content: {}", content);
-                return;
-            }
-            for (SingleAlert singleAlert : new VolcEngineAlertConverter().convertMetricAlertToSingeAlert(report)) {
-                alarmCommonReduce.reduceAndSendAlarm(singleAlert);
-            }
-        }
-    }
-
-    @Override
-    public String supportSource() {
-        return "volcengine";
-    }
-
-    /**
-     * Converter: VolcEngine alert to SingleAlert
-     */
-    public static class VolcEngineAlertConverter {
-
-        /**
-         * Convert VolcEngine metric alert to SingleAlert List
-         */
-        public List<SingleAlert> convertMetricAlertToSingeAlert(VolcEngineExternMetricAlert alert) {
-            String status = convertStatus(alert);
-            if (Objects.equals(alert.getType(), VolcEngineExternMetricAlert.ALERT_TYPE_METRIC)) {
-                return convertMetricAlert(alert, status, alert.getResources());
-            }
-            if (Objects.equals(alert.getType(), VolcEngineExternMetricAlert.ALERT_TYPE_METRICS_NODATA)) {
-                return convertMetricAlert(alert, status, alert.getNoDataResources());
-            }
-            if (Objects.equals(alert.getType(), VolcEngineExternMetricAlert.ALERT_TYPE_NO_DATA_RECOVERED)) {
-                return convertMetricAlert(alert, status, alert.getNoDataRecoveredResources());
-            }
-            if (Objects.equals(alert.getType(), VolcEngineExternMetricAlert.ALERT_TYPE_METRIC_RECOVERED)) {
-                return convertMetricAlert(alert, status, alert.getRecoveredResources());
-            }
-            return List.of();
-        }
-
-        public SingleAlert convertEventToSingleAlert(VolcEngineExternEventAlert alert) {
-            SingleAlert.SingleAlertBuilder builder = SingleAlert.builder()
-                    .status(CommonConstants.ALERT_STATUS_FIRING)
-                    .startAt(alert.getHappenedAt() * 1000)
-                    .activeAt(alert.getHappenedAt() * 1000)
-                    .labels(buildEventLabels(alert))
-                    .content(alert.getDescriptionCn())
-                    .annotations(new HashMap<>());
-            return builder.build();
-        }
-
-        /**
-         * build labels for volcengine event alert
-         */
-        private Map<String, String> buildEventLabels(VolcEngineExternEventAlert event) {
-            Map<String, String> labels = new HashMap<>();
-            labels.put("severity", convertEventSeverity(event));
-            labels.put("__source__", "volcengine");
-            labels.put("resource_name", event.getDetails().getVolcResourceName());
-            labels.put("account_id", event.getAccountId());
-            labels.put("region", event.getRegion());
-            labels.put("event_type", event.getEventType());
-            labels.put("source", event.getSource());
-            return labels;
-
-        }
-
-        /**
-         * convert volcengine event alert status to heartbeat alert status
-         * use the most severe level in the rules
-         *
-         * @param alert volcengine event alert
-         * @return status
-         */
-        private String convertEventSeverity(VolcEngineExternEventAlert alert) {
-            return alert.getRules().stream().map(VolcEngineExternEventAlert.EventRule::getLevel)
-                    .min((o1, o2) -> severityOrder.get(convertCommonSeverity(o1)).compareTo(severityOrder.get(convertCommonSeverity(o2))))
-                    .orElse(CommonConstants.ALERT_SEVERITY_INFO);
-        }
-
-        private String convertCommonSeverity(String level) {
-            return switch (level) {
-                case "critical" -> CommonConstants.ALERT_SEVERITY_CRITICAL;
-                case "warning" -> CommonConstants.ALERT_SEVERITY_WARNING;
-                default -> CommonConstants.ALERT_SEVERITY_INFO;
-            };
-        }
-
-        /**
-         * create SingleAlert for each resources in volcengine alert
-         *
-         * @param alert     volcengine alert
-         * @param status    status
-         * @param resources resources
-         * @return List of SingleAlert
-         */
-        private List<SingleAlert> convertMetricAlert(VolcEngineExternMetricAlert alert, String status,
-                                                     List<? extends VolcEngineExternMetricAlert.Resource> resources) {
-            if (CollectionUtils.isEmpty(resources)) {
-                return List.of();
-            }
-            List<SingleAlert> result = new ArrayList<>();
-            for (VolcEngineExternMetricAlert.Resource resource : resources) {
-                SingleAlert.SingleAlertBuilder builder = SingleAlert.builder()
-                        .status(status)
-                        .startAt(resource.getFirstAlertTime() * 1000)
-                        .endAt(resource.getLastAlertTime() * 1000)
-                        .labels(buildLabels(alert, resource))
-                        .activeAt(convertHappenAt(alert.getHappenedAt()))
-                        .content(resource.getName() + alert.getRuleCondition())
-                        .annotations(buildAnnotations(resource));
-                result.add(builder.build());
-            }
-            return result;
-        }
-
-        private Long convertHappenAt(String happenAt) {
-            String cleanedStr = happenAt.replace("UTC", "").replace("(", "").replace(")", "");
-            DateTimeFormatter altFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssXXX");
-            OffsetDateTime odt = OffsetDateTime.parse(cleanedStr, altFormatter);
-            return odt.toEpochSecond() * 1000;
-        }
-
-        private Map<String, String> buildLabels(VolcEngineExternMetricAlert alert, VolcEngineExternMetricAlert.Resource resource) {
-            Map<String, String> labels = new HashMap<>();
-            labels.put("__source__", "volcengine");
-            labels.put("resource_name", resource.getName());
-            labels.put("resource_id", resource.getId());
-            labels.put("rule_id", alert.getRuleId());
-            return labels;
-        }
-
-        private Map<String, String> buildAnnotations(VolcEngineExternMetricAlert.Resource resource) {
-            Map<String, String> annotations = new HashMap<>();
-            if (resource instanceof VolcEngineExternMetricAlert.NoDataResource noDataResource) {
-                for (VolcEngineExternMetricAlert.Metric noDataMetric : noDataResource.getNoDataMetrics()) {
-                    annotations.put(noDataMetric.getName(), "N/A");
-                }
-            }
-            for (VolcEngineExternMetricAlert.Metric metric : resource.getMetrics()) {
-                annotations.put(metric.getName(), metric.getCurrentValue() + metric.getUnit());
-            }
-            annotations.put("region", resource.getRegion());
-            List<VolcEngineExternMetricAlert.Dimension> dimensions = resource.getDimensions();
-            if (CollectionUtils.isNotEmpty(dimensions)) {
-                for (VolcEngineExternMetricAlert.Dimension dimension : dimensions) {
-                    annotations.put(dimension.getNameCn(), dimension.getValue());
-                }
-            }
-            return annotations;
-        }
-
-        /**
-         * convert volcengine alert status to heartbeat alert status
-         *
-         * @param alert volcengine alert
-         * @return status
-         */
-        private String convertStatus(VolcEngineExternMetricAlert alert) {
-            String type = alert.getType();
-            if (Objects.equals(type, VolcEngineExternMetricAlert.ALERT_TYPE_METRIC)
-                    || Objects.equals(type, VolcEngineExternMetricAlert.ALERT_TYPE_EVENT)
-                    || Objects.equals(type, VolcEngineExternMetricAlert.ALERT_TYPE_METRICS_NODATA)) {
-                return CommonConstants.ALERT_STATUS_FIRING;
-            }
-            return CommonConstants.ALERT_STATUS_RESOLVED;
-        }
-    }
-}
@@ -19,7 +19,6 @@ package org.apache.hertzbeat.alert.util;

 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.util.Optional;
@@ -81,19 +80,4 @@ public final class DateUtil {
        return Optional.empty();
    }

-    /**
-     * convert format data to timestamp
-     */
-    public static Long getZonedTimeStampFromFormat(String dateStr, String format) {
-        try {
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
-            // the parsed zoned date-time, not null
-            return ZonedDateTime.parse(dateStr, formatter).toInstant().toEpochMilli();
-        } catch (Exception e) {
-            log.error("Error parsing date '{}' with format '{}': {}",
-                    dateStr, format, e.getMessage());
-        }
-        return null;
-    }
-
 }
@@ -32,5 +32,3 @@ alerter.notify.console = Console Login
 alerter.priority.0 = Emergency Alert
 alerter.priority.1 = Critical Alert
 alerter.priority.2 = Warning Alert
-alerter.calculate.parse.error = Expression is not fully parsed, may have syntax errors or incomplete inputs
-alerter.datasource.executor.not.found = No query executor found
@@ -32,5 +32,3 @@ alerter.notify.console = 登入控制台
 alerter.priority.0 = 紧急告警
 alerter.priority.1 = 严重告警
 alerter.priority.2 = 警告告警
-alerter.calculate.parse.error = 表达式未完全解析，可能存在语法错误或输入不完整
-alerter.datasource.executor.not.found = 未找到查询执行器
@@ -32,5 +32,3 @@ alerter.notify.console = 控制台登錄
 alerter.priority.0 = 緊急警報
 alerter.priority.1 = 嚴重警報
 alerter.priority.2 = 警告警報
-alerter.calculate.parse.error = 表達式未完全解析，可能存在語法錯誤或輸入不完整
-alerter.datasource.executor.not.found = 未找到查詢執行器
@@ -22,268 +22,36 @@ expression
    ;

 expr
-    : LPAREN expr RPAREN                                          # ParenExpr
-    | left=expr op=(GE|LE|GT|LT|EQ|NE) BOOL? right=expr          # ComparisonExpr
-    | left=expr AND right=expr                                    # AndExpr
-    | left=expr UNLESS right=expr                                 # UnlessExpr
-    | left=expr OR right=expr                                     # OrExpr
-    | promql                                                      # PromqlExpr
-    | selectSql                                                   # SqlExpr
-    | number                                                      # LiteralExpr
-    | SQL_FUNCTION LPAREN string RPAREN                           # SqlCallExpr
-    | PROMQL_FUNCTION LPAREN string RPAREN                        # PromqlCallExpr
-    ;
-
-functionCall
-    : functionName LPAREN parameterList RPAREN
-    ;
-
-parameterList
-    : parameter (COMMA parameter)*
-    ;
-
-parameter
-    : expr
-    | STAR
-    | string
-    | duration
-    ;
-
-number
-    : NUMBER
-    | FLOAT
-    | SCIENTIFIC_NUMBER
-    ;
-
-string
-    : STRING
-    ;
-
-duration
-    : DURATION
-    ;
-
-functionName
-    : COUNT
-    | AVG
-    | SUM
-    | MIN
-    | MAX
-    | RATE_FUNCTION
-    | INCREASE_FUNCTION
-    | HISTOGRAM_QUANTILE_FUNCTION
-    | BY_FUNCTION
-    | WITHOUT_FUNCTION
-    | GROUP_LEFT_FUNCTION
-    | GROUP_RIGHT_FUNCTION
-    | IGNORING_FUNCTION
-    | ON_FUNCTION
-    | IDENTIFIER
-    ;
-
-// SQL grammar for complex queries
-selectSql
-    : SELECT selectFieldList FROM relList (WHERE conditionList)?
-      (GROUP BY groupByList)? (HAVING conditionList)?
-      (ORDER BY orderByList)? (LIMIT limitClause)?
-    ;
-
-selectFieldList
-    : selectField (COMMA selectField)*
-    ;
-
-selectField
-    : functionCall (AS? IDENTIFIER)?
-    | IDENTIFIER (AS? IDENTIFIER)?
-    | STAR (AS? IDENTIFIER)?
-    | IDENTIFIER DOT IDENTIFIER (AS? IDENTIFIER)?
-    ;
-
-groupByList
-    : IDENTIFIER (COMMA IDENTIFIER)*
-    ;
-
-orderByList
-    : orderByField (COMMA orderByField)*
-    ;
-
-orderByField
-    : IDENTIFIER (ASC | DESC)?
-    | functionCall (ASC | DESC)?
-    ;
-
-limitClause
-    : NUMBER
-    ;
-
-relList
-    : relation (COMMA relation)*
-    ;
-
-relation
-    : IDENTIFIER (AS? IDENTIFIER)?
-    | LPAREN selectSql RPAREN AS IDENTIFIER
-    ;
-
-conditionList
-    : conditionList AND conditionList
-    | conditionList OR conditionList
-    | condition
-    | LPAREN conditionList RPAREN
-    ;
-
-compOp
-    : EQ | LT | GT | LE | GE | NE | LIKE | NOT LIKE | IN | NOT IN | IS | IS NOT
-    ;
-
-condition
-    : conditionUnit compOp conditionUnit
-    | LPAREN condition RPAREN
-    | IDENTIFIER BETWEEN number AND number
-    ;
-
-conditionUnit
-    : number
-    | string
-    | IDENTIFIER
-    | IDENTIFIER DOT IDENTIFIER
-    | NULL
-    | LPAREN selectSql RPAREN
-    | functionCall
-    ;
-
-// PromQL query expressions
-promql
-    : metricSelector instantVectorOp?
-    | aggregationOperator LPAREN promql (BY labelList)? RPAREN
-    | functionCall
-    | promql LBRACKET duration RBRACKET
-    | promql LBRACKET duration COLON duration RBRACKET
-    | promql OFFSET duration
-    | IDENTIFIER
-    ;
-
-metricSelector
-    : LBRACE labelMatcherList? RBRACE
-    ;
-
-labelMatcherList
-    : labelMatcherItem (COMMA labelMatcherItem)*
-    ;
-
-labelMatcherItem
-    : IDENTIFIER labelMatcherOp string
-    ;
-
-labelMatcherOp
-    : EQ | NE
-    ;
-
-labelList
-    : LPAREN IDENTIFIER (COMMA IDENTIFIER)* RPAREN
-    ;
-
-instantVectorOp
-    : LBRACKET duration RBRACKET
-    ;
-
-aggregationOperator
-    : SUM | AVG | COUNT | MIN | MAX | STDDEV | STDVAR | TOPK | BOTTOMK | QUANTILE
+    : '(' expr ')'                       # ParenExpr
+    | left=expr op=('>='|'<='|'>'|'<'|'=='|'!=') right=expr  # ComparisonExpr
+    | left=expr 'and' right=expr         # AndExpr
+    | left=expr 'unless' right=expr      # UnlessExpr
+    | left=expr 'or' right=expr          # OrExpr
+    | identifier                         # QueryExpr
+    | number                             # LiteralExpr
    ;

 // Lexer rules
-
-// Boolean operators
-AND      : [Aa][Nn][Dd] ;
-OR       : [Oo][Rr] ;
-UNLESS   : [Uu][Nn][Ll][Ee][Ss][Ss] ;
-NOT      : [Nn][Oo][Tt] ;
-
-// SQL keywords
-SELECT  : [Ss][Ee][Ll][Ee][Cc][Tt] ;
-FROM    : [Ff][Rr][Oo][Mm] ;
-WHERE   : [Ww][Hh][Ee][Rr][Ee] ;
-GROUP   : [Gg][Rr][Oo][Uu][Pp] ;
-BY      : [Bb][Yy] ;
-HAVING  : [Hh][Aa][Vv][Ii][Nn][Gg] ;
-ORDER   : [Oo][Rr][Dd][Ee][Rr] ;
-LIMIT   : [Ll][Ii][Mm][Ii][Tt] ;
-OFFSET  : [Oo][Ff][Ff][Ss][Ee][Tt] ;
-AS      : [Aa][Ss] ;
-ASC     : [Aa][Ss][Cc] ;
-DESC    : [Dd][Ee][Ss][Cc] ;
-IN      : [Ii][Nn] ;
-IS      : [Ii][Ss] ;
-NULL    : [Nn][Uu][Ll][Ll] ;
-LIKE    : [Ll][Ii][Kk][Ee] ;
-BETWEEN : [Bb][Ee][Tt][Ww][Ee][Ee][Nn] ;
-STAR    : '*' ;
-
-// Aggregate functions
-COUNT   : [Cc][Oo][Uu][Nn][Tt] ;
-SUM     : [Ss][Uu][Mm] ;
-AVG     : [Aa][Vv][Gg] ;
-MIN     : [Mm][Ii][Nn] ;
-MAX     : [Mm][Aa][Xx] ;
-STDDEV  : [Ss][Tt][Dd][Dd][Ee][Vv] ;
-STDVAR  : [Ss][Tt][Dd][Vv][Aa][Rr] ;
-VARIANCE: [Vv][Aa][Rr][Ii][Aa][Nn][Cc][Ee] ;
-
-// PromQL specific functions
-RATE_FUNCTION    : [Rr][Aa][Tt][Ee] ;
-INCREASE_FUNCTION: [Ii][Nn][Cc][Rr][Ee][Aa][Ss][Ee] ;
-HISTOGRAM_QUANTILE_FUNCTION: [Hh][Ii][Ss][Tt][Oo][Gg][Rr][Aa][Mm] '_' [Qq][Uu][Aa][Nn][Tt][Ii][Ll][Ee] ;
-TOPK    : [Tt][Oo][Pp][Kk] ;
-BOTTOMK : [Bb][Oo][Tt][Tt][Oo][Mm][Kk] ;
-QUANTILE: [Qq][Uu][Aa][Nn][Tt][Ii][Ll][Ee] ;
-BY_FUNCTION: [Bb][Yy] ;
-WITHOUT_FUNCTION: [Ww][Ii][Tt][Hh][Oo][Uu][Tt] ;
-GROUP_LEFT_FUNCTION: [Gg][Rr][Oo][Uu][Pp] '_' [Ll][Ee][Ff][Tt] ;
-GROUP_RIGHT_FUNCTION: [Gg][Rr][Oo][Uu][Pp] '_' [Rr][Ii][Gg][Hh][Tt] ;
-IGNORING_FUNCTION: [Ii][Gg][Nn][Oo][Rr][Ii][Nn][Gg] ;
-ON_FUNCTION: [Oo][Nn] ;
-
-// Other functions
-SQL_FUNCTION: [Ss][Qq][Ll] ;
-PROMQL_FUNCTION: [Pp][Rr][Oo][Mm][Qq][Ll] ;
-
-// Comparison operators
+AND     : 'and' ;
+OR      : 'or' ;
+UNLESS  : 'unless' ;
 GT      : '>' ;
 GE      : '>=' ;
 LT      : '<' ;
 LE      : '<=' ;
-EQ      : '==' | '=' ;
+EQ      : '==' ;
 NE      : '!=' ;
-BOOL    : 'bool';
-
-// Delimiters
 LPAREN  : '(' ;
 RPAREN  : ')' ;
-LBRACE  : '{' ;
-RBRACE  : '}' ;
-LBRACKET: '[' ;
-RBRACKET: ']' ;
-COMMA   : ',' ;
-DOT     : '.' ;
-COLON   : ':' ;
-SEMICOLON: ';' ;

-// number formats
-SCIENTIFIC_NUMBER: [0-9]+ ('.' [0-9]+)? [eE] [+-]? [0-9]+ ;
-FLOAT           : [0-9]+ '.' [0-9]+ ;
-NUMBER          : [0-9]+ ;
+identifier
+    : IDENTIFIER
+    ;

-// Duration literals for PromQL (e.g., 5m, 1h, 30s)
-DURATION        : [0-9]+ [a-zA-Z]+ ;
+number
+    : NUMBER
+    ;

-// String literals
-STRING          : '"' (~["\r\n\\] | '\\' .)* '"'
-                | '\'' (~['\r\n\\] | '\\' .)* '\'' ;
-
-// Identifiers and metric names
-IDENTIFIER      : [a-zA-Z_] [a-zA-Z0-9_=～{}[\]".~-]* ;
-
-// Whitespace and comments
-WS              : [ \t\r\n]+ -> channel(HIDDEN) ;
-LINE_COMMENT    : '//' ~[\r\n]* -> skip ;
-BLOCK_COMMENT   : '/*' .*? '*/' -> skip ;
+IDENTIFIER : [a-zA-Z_] [a-zA-Z0-9_=～{}[\]".]*;
+NUMBER     : [0-9]+ ('.' [0-9]+)? ;
+WS         : [ \t\r\n]+ -> skip ;
@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
-/**
- * alert cache manager test
- */
-@ExtendWith(MockitoExtension.class)
-public class AlarmCacheManagerTest {
-
-    @Mock
-    private SingleAlertDao singleAlertDao;
-
-    private AlarmCacheManager alarmCacheManager;
-
-    @BeforeEach
-    public void setUp() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(1L));
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-        when(singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING)).thenReturn(Collections.singletonList(alert));
-        alarmCacheManager = new AlarmCacheManager(singleAlertDao);
-    }
-
-    @Test
-    void testInit() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(1L));
-
-        String fingerprint = AlertUtil.calculateFingerprint(labels);
-        SingleAlert firingSingleAlert = alarmCacheManager.getFiring(1L, fingerprint);
-        assertNotNull(firingSingleAlert);
-        assertEquals("Alert cache manager test", firingSingleAlert.getContent());
-        alarmCacheManager.removeFiring(1L, fingerprint);
-        firingSingleAlert = alarmCacheManager.getFiring(1L, fingerprint);
-        assertNull(firingSingleAlert);
-    }
-
-    @Test
-    void testPending() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.ALERT_SEVERITY_INFO, CommonConstants.ALERT_STATUS_PENDING);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(2L));
-
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        alarmCacheManager.putPending(2L, fingerprint, alert);
-
-        SingleAlert pendingSingleAlert = alarmCacheManager.getPending(2L, fingerprint);
-        assertNotNull(pendingSingleAlert);
-        alarmCacheManager.removePending(2L, fingerprint);
-        pendingSingleAlert = alarmCacheManager.getPending(2L, fingerprint);
-        assertNull(pendingSingleAlert);
-    }
-
-    @Test
-    void testFiring() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.ALERT_SEVERITY_INFO, CommonConstants.ALERT_STATUS_PENDING);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(3L));
-
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        alarmCacheManager.putFiring(3L, fingerprint, alert);
-
-        SingleAlert firingSingleAlert = alarmCacheManager.getFiring(3L, fingerprint);
-        assertNotNull(firingSingleAlert);
-        alarmCacheManager.removeFiring(3L, fingerprint);
-        firingSingleAlert = alarmCacheManager.getFiring(3L, fingerprint);
-        assertNull(firingSingleAlert);
-    }
-
-    @Test
-    void testHistorical() {
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(Collections.singletonMap(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL));
-        when(singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING)).thenReturn(Collections.singletonList(alert));
-        alarmCacheManager = new AlarmCacheManager(singleAlertDao);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        SingleAlert historicalSingleAlert = alarmCacheManager.getFiring(4L, fingerprint);
-        assertNotNull(historicalSingleAlert);
-        SingleAlert singleAlert = alarmCacheManager.removeFiring(4L, fingerprint);
-        assertNotNull(singleAlert);
-        historicalSingleAlert = alarmCacheManager.getFiring(4L, fingerprint);
-        assertNull(historicalSingleAlert);
-    }
-}
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.AlertCollectorDao;
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.entity.manager.Collector;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Collector alert handler test
- */
-@ExtendWith(MockitoExtension.class)
-public class CollectorAlertHandlerTest {
-
-    @Mock
-    private AlertCollectorDao alertCollectorDao;
-
-    @Mock
-    private SingleAlertDao singleAlertDao;
-
-    @Mock
-    private AlarmCommonReduce alarmCommonReduce;
-
-    private AlarmCacheManager alarmCacheManager;
-
-    private CollectorAlertHandler collectorAlertHandler;
-
-    @BeforeEach
-    void setUp() {
-        alarmCacheManager = Mockito.spy(new AlarmCacheManager(singleAlertDao));
-        collectorAlertHandler = new CollectorAlertHandler(alarmCommonReduce, alertCollectorDao, alarmCacheManager);
-    }
-
-    @Test
-    public void testOnline() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-        SingleAlert singleAlert = SingleAlert.builder().build();
-
-        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
-        when(alarmCacheManager.removeFiring(any(String.class))).thenReturn(singleAlert);
-
-        collectorAlertHandler.online(identity);
-
-        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, singleAlert.getStatus());
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    public void testOffline() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-
-        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
-        when(alarmCacheManager.getFiring(any(String.class))).thenReturn(null);
-
-        collectorAlertHandler.offline(identity);
-
-        verify(alarmCacheManager, times(1)).putFiring(any(String.class), any(SingleAlert.class));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testOfflineAndOnlineLifecycle() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-
-        Map<String, String> fingerPrints = new HashMap<>(8);
-        fingerPrints.put("collectorName", collector.getName());
-        fingerPrints.put("collectorVersion", collector.getVersion());
-        fingerPrints.put("collectorHost", collector.getIp());
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-
-        when(alertCollectorDao.findCollectorByName(identity)).thenReturn(collector);
-
-        // step1. first time offline
-        collectorAlertHandler.offline(identity);
-        assertNotNull(alarmCacheManager.getFiring(fingerprint));
-
-        // step2. online
-        collectorAlertHandler.online(identity);
-        assertNull(alarmCacheManager.getFiring(fingerprint));
-
-        // step3. second time offline
-        collectorAlertHandler.offline(identity);
-        assertNotNull(alarmCacheManager.getFiring(fingerprint));
-
-        // Verify that the push status is correct.
-        ArgumentCaptor<SingleAlert> captor = ArgumentCaptor.forClass(SingleAlert.class);
-        verify(alarmCommonReduce, atLeast(3)).reduceAndSendAlarm(captor.capture());
-        List<SingleAlert> alerts = captor.getAllValues();
-        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(0).getStatus());
-        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, alerts.get(1).getStatus());
-        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(2).getStatus());
-    }
-}
@@ -42,7 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -93,12 +92,12 @@ class PeriodicAlertCalculatorTest {
        result.put("__value__", 95.0); // Non-null, matched with threshold
        result.put("__timestamp__", System.currentTimeMillis());
        when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
-        when(alarmCacheManager.getPending(eq(rule.getId()), anyString())).thenReturn(null);
+        when(alarmCacheManager.getPending(anyString())).thenReturn(null);
        periodicAlertCalculator.calculate(rule);
        // Verify that putFiring is called
        ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class);
        ArgumentCaptor<SingleAlert> alertCaptor = ArgumentCaptor.forClass(SingleAlert.class);
-        verify(alarmCacheManager).putFiring(eq(rule.getId()), idCaptor.capture(), alertCaptor.capture());
+        verify(alarmCacheManager).putFiring(idCaptor.capture(), alertCaptor.capture());
        // Assertion alarm status and content
        SingleAlert alert = alertCaptor.getValue();
        assertAll(() -> assertEquals(CommonConstants.ALERT_STATUS_FIRING, alert.getStatus()),
@@ -113,7 +112,7 @@ class PeriodicAlertCalculatorTest {
        result.put("__timestamp__", System.currentTimeMillis());
        when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
        periodicAlertCalculator.calculate(rule);
-        verify(alarmCacheManager, times(0)).putFiring(any(), any(), any());
+        verify(alarmCacheManager, times(0)).putFiring(any(), any());
    }

    @Test
@@ -127,7 +126,7 @@ class PeriodicAlertCalculatorTest {
                .triggerTimes(2).startAt(System.currentTimeMillis() - 60000)
                .activeAt(System.currentTimeMillis() - 30000)
                .build();
-        when(alarmCacheManager.removeFiring(eq(rule.getId()), anyString())).thenReturn(pendingAlert);
+        when(alarmCacheManager.removeFiring(anyString())).thenReturn(pendingAlert);
        when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
        periodicAlertCalculator.calculate(rule);
        ArgumentCaptor<SingleAlert> resolvedCaptor = ArgumentCaptor.forClass(SingleAlert.class);
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import com.google.common.collect.Lists;
-import org.apache.hertzbeat.alert.AlerterWorkerPool;
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.AlertDefineService;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.constants.MetricDataConstants;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.queue.CommonDataQueue;
-import org.apache.hertzbeat.common.queue.impl.InMemoryCommonDataQueue;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- *
- */
-public class RealTimeAlertCalculatorMatchTest {
-
-    private final AlerterWorkerPool workerPool = new AlerterWorkerPool();
-
-    @Mock
-    private CommonDataQueue dataQueue = new InMemoryCommonDataQueue();
-
-    @Mock
-    private AlertDefineService alertDefineService;
-
-    @Mock
-    private SingleAlertDao singleAlertDao;
-
-    @Mock
-    private AlarmCommonReduce alarmCommonReduce;
-
-    @Mock
-    private AlarmCacheManager alarmCacheManager;
-
-    private RealTimeAlertCalculator realTimeAlertCalculator;
-
-    @BeforeEach
-    public void setUp() {
-        MockitoAnnotations.openMocks(this);
-        when(singleAlertDao.querySingleAlertsByStatus(any())).thenReturn(new ArrayList<>());
-        realTimeAlertCalculator = new RealTimeAlertCalculator(
-                workerPool,
-                dataQueue,
-                alertDefineService,
-                singleAlertDao,
-                alarmCommonReduce,
-                alarmCacheManager,
-                false
-        );
-    }
-
-    @Test
-    void testFilterThresholdsByAppAndMetrics_withInstanceExpr_HasSpace() {
-
-        String app = "redis";
-        String instanceId = "501045327364864";
-        int priority = 0;
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__, \"501045327364864\")");
-
-        AlertDefine unmatchDefine = new AlertDefine();
-        unmatchDefine.setExpr("equals(__app__,\"redis\") && equals(__instance__, \"999999999\")");
-
-        List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
-
-        List<AlertDefine> filtered = realTimeAlertCalculator.filterThresholdsByAppAndMetrics(allDefines, app, "", Map.of(), instanceId, priority);
-
-        // It should filter out 999999999.
-        assertEquals(1, filtered.size());
-        assertEquals("equals(__app__,\"redis\") && equals(__instance__, \"501045327364864\")",
-                filtered.get(0).getExpr());
-    }
-
-    @Test
-    void testPrometheusReplaceMultipleJobsApp() throws InterruptedException {
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        builder.setId(518789738974464L)
-                .setApp("_prometheus_Cool_Stingray_34Nj_copy")
-                .setMetrics("canal_instance")
-                .setPriority(0)
-                .setCode(CollectRep.Code.SUCCESS);
-
-        CollectRep.Field destination = CollectRep.Field.newBuilder().setName("destination").setType(CommonConstants.TYPE_STRING).setLabel(true).build();
-        CollectRep.Field mode = CollectRep.Field.newBuilder().setName("mode").setType(CommonConstants.TYPE_STRING).setLabel(true).build();
-        CollectRep.Field metricValue = CollectRep.Field.newBuilder().setName("metric_value").setType(CommonConstants.TYPE_NUMBER).setLabel(true).build();
-
-        Map<String, String> meta = new HashMap<>();
-        meta.put(MetricDataConstants.INSTANCE_NAME, "Cool_Stingray_34Nj_copy");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
-
-        builder.addMetadataAll(meta);
-        builder.addAllFields(Lists.newArrayList(destination, mode, metricValue));
-        builder.addValueRow(CollectRep.ValueRow.newBuilder().addColumn("example").addColumn("spring").addColumn("1.0").build());
-
-        CollectRep.MetricsData metricsData = builder.build();
-
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
-        matchDefine.setName("test");
-        matchDefine.setExpr(
-            "equals(__app__,\"prometheus\") && "
-            + "equals(__metrics__,\"canal_instance\") && "
-            + "(equals(__instance__, \"515224274242816\") or equals(__instance__, \"518789738974464\")) && "
-            + "metric_value > 0"
-        );
-        matchDefine.setTemplate("Canal instance val: ${value}%");
-        matchDefine.setTimes(1);
-
-        List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
-
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
-        when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
-
-        realTimeAlertCalculator.startCalculate();
-
-        Thread.sleep(3000);
-
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
-    }
-
-    @Test
-    void testPrometheusReplaceApp() throws InterruptedException {
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        builder.setId(1)
-                .setApp("_prometheus_Cool_Stingray_34Nj")
-                .setMetrics("canal_instance")
-                .setPriority(0)
-                .setCode(CollectRep.Code.SUCCESS);
-
-        CollectRep.Field destination = CollectRep.Field.newBuilder().setName("destination").setType(CommonConstants.TYPE_STRING).setLabel(true).build();
-        CollectRep.Field mode = CollectRep.Field.newBuilder().setName("mode").setType(CommonConstants.TYPE_STRING).setLabel(true).build();
-        CollectRep.Field metricValue = CollectRep.Field.newBuilder().setName("metric_value").setType(CommonConstants.TYPE_NUMBER).setLabel(true).build();
-
-        Map<String, String> meta = new HashMap<>();
-        meta.put(MetricDataConstants.INSTANCE_NAME, "Cool_Stingray_34Nj");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
-
-        builder.addMetadataAll(meta);
-        builder.addAllFields(Lists.newArrayList(destination, mode, metricValue));
-        builder.addValueRow(CollectRep.ValueRow.newBuilder().addColumn("example").addColumn("spring").addColumn("1.0").build());
-
-        CollectRep.MetricsData metricsData = builder.build();
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
-        matchDefine.setName("test");
-        matchDefine.setExpr("equals(__app__,\"prometheus\") && equals(__metrics__,\"canal_instance\") && metric_value > 0");
-        matchDefine.setTemplate("Canal instance val: ${value}%");
-        matchDefine.setTimes(1);
-
-        List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
-
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
-        when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
-
-        realTimeAlertCalculator.startCalculate();
-
-        Thread.sleep(3000);
-
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
-    }
-
-    @Test
-    void testCalculateWithNormalApp() throws InterruptedException {
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        builder.setId(1)
-                .setApp("springboot3")
-                .setMetrics("available")
-                .setPriority(0)
-                .setCode(CollectRep.Code.SUCCESS)
-                .setTenantId(0).setId(518679137103104L)
-                .setTime(1749110170834L)
-                .setPriority(0);
-
-        CollectRep.Field responseTime = CollectRep.Field.newBuilder()
-                .setName("responseTime")
-                .setType(CommonConstants.TYPE_STRING)
-                .setUnit("ms")
-                .setLabel(false)
-                .build();
-
-        Map<String, String> meta = new HashMap<>();
-        meta.put(MetricDataConstants.INSTANCE_NAME, "Vibrant_Gazelle_83vJ");
-        meta.put(MetricDataConstants.INSTANCE_HOST, "127.0.0.1");
-
-        builder.addMetadataAll(meta);
-        builder.addAllFields(Lists.newArrayList(responseTime));
-        builder.addValueRow(CollectRep.ValueRow.newBuilder().addColumn("18").build());
-
-        CollectRep.MetricsData metricsData = builder.build();
-
-        AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
-        matchDefine.setName("test");
-        matchDefine.setExpr("equals(__app__,\"springboot3\") && equals(__metrics__,\"available\") && equals(__instance__, \"518679137103104\") && responseTime > 0");
-        matchDefine.setTemplate("Canal instance val: ${value}%");
-        matchDefine.setTimes(1);
-
-        List<AlertDefine> allDefines = Collections.singletonList(matchDefine);
-
-        when(alertDefineService.getRealTimeAlertDefines()).thenReturn(allDefines);
-        when(dataQueue.pollMetricsDataToAlerter()).thenReturn(metricsData).thenThrow(new InterruptedException());
-
-        realTimeAlertCalculator.startCalculate();
-
-        Thread.sleep(3000);
-
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
-    }
-
-}
@@ -17,22 +17,15 @@

 package org.apache.hertzbeat.alert.controller;

-import static org.mockito.ArgumentMatchers.anyString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -107,37 +100,6 @@ class AlertDefineControllerTest {
                .andReturn();
    }

-    @Test
-    void testGetDefinePreview() throws Exception {
-        List<Map<String, Object>> previewData = new ArrayList<>();
-        Map<String, Object> row = new HashMap<>();
-        row.put("__value__", 123);
-        row.put("job", "spring-boot");
-        previewData.add(row);
-
-        Mockito.when(alertDefineService.getDefinePreview(anyString(), anyString(), anyString()))
-                .thenReturn(previewData);
-
-        mockMvc.perform(MockMvcRequestBuilders.get("/api/alert/define/preview/{datasource}", "promql")
-                        .param("type", "periodic")
-                        .param("expr", "up == 1"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value(0))
-                .andExpect(jsonPath("$.data[0].__value__").value(123))
-                .andExpect(jsonPath("$.data[0].job").value("spring-boot"));
-
-        Mockito.when(alertDefineService.getDefinePreview(anyString(), anyString(), anyString()))
-                .thenThrow(new AlertExpressionException("Expression error"));
-
-        mockMvc.perform(MockMvcRequestBuilders.get("/api/alert/define/preview/{datasource}", "promql")
-                        .param("type", "periodic")
-                        .param("expr", "http_server_requests_seconds_count{!@~!!#$%^&}"))
-                .andExpect(status().isBadRequest())
-                .andExpect(jsonPath("$.code").exists())
-                .andExpect(jsonPath("$.msg").value("Expression error"));
-
-    }
-
    @Test
    void modifyAlertDefine() throws Exception {
        mockMvc.perform(MockMvcRequestBuilders.put("/api/alert/define")
@@ -24,14 +24,12 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;

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

 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.when;

 /**
@@ -40,130 +38,76 @@ import static org.mockito.Mockito.when;
 class AlertExpressionEvalVisitorTest {

    private QueryExecutor mockExecutor;
+    private AlertExpressionEvalVisitor visitor;

    @BeforeEach
    void setUp() {
        mockExecutor = Mockito.mock(QueryExecutor.class);
+        visitor = new AlertExpressionEvalVisitor(mockExecutor);
    }

    @Test
    void testGreaterThan() {
        when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80.0))));
-        when(mockExecutor.execute("select cpu from cpu_table where id = 1")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 80.0))));
-        // promql
        List<Map<String, Object>> result = evaluate("cpu > 70");
        assertEquals(1, result.size());
        assertEquals(80.0, result.get(0).get("__value__"));
-        //sql
-        result = evaluate("(select cpu from cpu_table where id = 1) > 70");
-        assertEquals(1, result.size());
-        assertEquals(80.0, result.get(0).get("__value__"));
    }

    @Test
    void testGreaterThanWithInteger() {
        when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80))));
-        when(mockExecutor.execute("select cpu_usage from system_metrics where host = 'server1'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 80))));
-        // promql
        List<Map<String, Object>> result = evaluate("cpu > 70");
        assertEquals(1, result.size());
        assertEquals(80, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select cpu_usage from system_metrics where host = 'server1') > 70");
-        assertEquals(1, result.size());
-        assertEquals(80, result.get(0).get("__value__"));
    }

    @Test
    void testLessThan() {
        when(mockExecutor.execute("memory")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 65.0))));
-        when(mockExecutor.execute("select memory_usage from memory_table where instance = 'web1'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 65.0))));
-        // promql
        List<Map<String, Object>> result = evaluate("memory < 70");
        assertEquals(1, result.size());
        assertEquals(65.0, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select memory_usage from memory_table where instance = 'web1') < 70");
-        assertEquals(1, result.size());
-        assertEquals(65.0, result.get(0).get("__value__"));
    }

    @Test
    void testEqualWithTolerance() {
        when(mockExecutor.execute("disk")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 99.999))));
-        when(mockExecutor.execute("select disk_usage from storage_metrics where partition = '/'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 99.999))));
-        // promql
        List<Map<String, Object>> result = evaluate("disk == 100");
        assertEquals(1, result.size());
        assertNull(result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select disk_usage from storage_metrics where partition = '/') == 100");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
    }

    @Test
    void testNotEqual() {
        when(mockExecutor.execute("network")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        when(mockExecutor.execute("select bandwidth from network_stats where interface = 'eth0'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        // promql
        List<Map<String, Object>> result = evaluate("network != 60");
        assertEquals(1, result.size());
        assertEquals(50.0, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select bandwidth from network_stats where interface = 'eth0') != 60");
-        assertEquals(1, result.size());
-        assertEquals(50.0, result.get(0).get("__value__"));
    }

    @Test
    void testExactlyEqual() {
        when(mockExecutor.execute("threshold")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 100.0))));
-        when(mockExecutor.execute("select alert_threshold from alert_config where rule_id = 'cpu_high'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 100.0))));
-        // promql
        List<Map<String, Object>> result = evaluate("threshold == 100");
        assertEquals(1, result.size());
        assertEquals(100.0, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select alert_threshold from alert_config where rule_id = 'cpu_high') == 100");
-        assertEquals(1, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
    }

    @Test
    void testMaxValueBoundary() {
        when(mockExecutor.execute("max_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MAX_VALUE))));
-        when(mockExecutor.execute("select max_value from boundary_test where test_case = 'extreme'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", Double.MAX_VALUE))));
-        // promql
        List<Map<String, Object>> result = evaluate("max_val > 100");
        assertEquals(1, result.size());
        assertEquals(Double.MAX_VALUE, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select max_value from boundary_test where test_case = 'extreme') > 100");
-        assertEquals(1, result.size());
-        assertEquals(Double.MAX_VALUE, result.get(0).get("__value__"));
    }

    @Test
    void testMinValueBoundary() {
        when(mockExecutor.execute("min_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MIN_VALUE))));
-        when(mockExecutor.execute("select min_value from boundary_test where test_case = 'minimal'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", Double.MIN_VALUE))));
-        // promql
        List<Map<String, Object>> result = evaluate("min_val > 0");
        assertEquals(1, result.size());
        assertEquals(Double.MIN_VALUE, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("(select min_value from boundary_test where test_case = 'minimal') > 0");
-        assertEquals(1, result.size());
-        assertEquals(Double.MIN_VALUE, result.get(0).get("__value__"));
    }

    @Test
@@ -177,40 +121,25 @@ class AlertExpressionEvalVisitorTest {
    @Test
    void testListValueWithMax() {
        when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        when(mockExecutor.execute("select values from multi_metrics where group_id = 'test_group'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        // promql
        List<Map<String, Object>> result = evaluate("multi_val > 25");
-        assertEquals(0, result.size());
-        // sql
-        result = evaluate("(select values from multi_metrics where group_id = 'test_group') > 25");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
    }

    @Test
    void testListValueWithMin() {
        when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        when(mockExecutor.execute("select response_times from performance_data where service = 'api'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
-        // promql
        List<Map<String, Object>> result = evaluate("multi_val < 15");
-        assertEquals(0, result.size());
-        // sql
-        result = evaluate("(select response_times from performance_data where service = 'api') < 15");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
    }

    @Test
    void testEmptyListValue() {
        when(mockExecutor.execute("empty_list")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of()))));
-        when(mockExecutor.execute("select error_codes from error_log where date = '2024-01-01'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", List.of()))));
-        // promql
        List<Map<String, Object>> result = evaluate("empty_list > 50");
-        assertEquals(0, result.size());
-        // sql
-        result = evaluate("(select error_codes from error_log where date = '2024-01-01') > 50");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -218,219 +147,19 @@ class AlertExpressionEvalVisitorTest {
        when(mockExecutor.execute("a")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 10.0))));
        when(mockExecutor.execute("b")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 20.0))));
        when(mockExecutor.execute("c")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 30.0))));
-        when(mockExecutor.execute("select cpu from server_a where region = 'us-east'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 10.0))));
-        when(mockExecutor.execute("select memory from server_b where region = 'us-west'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 20.0))));
-        when(mockExecutor.execute("select disk from server_c where region = 'eu-central'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 30.0))));
-        // promql
        List<Map<String, Object>> result = evaluate("(a > 5) and (b > 15 or c < 25)");
        assertEquals(1, result.size());
        assertEquals(10.0, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("((select cpu from server_a where region = 'us-east') > 5)"
-                + " and ((select memory from server_b where region = 'us-west') > 15"
-                + " or (select disk from server_c where region = 'eu-central') < 25)");
-        assertEquals(1, result.size());
-        assertEquals(10.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testUnlessOpPromql() {
-        String promql = "http_server_requests_seconds_count > 10 unless http_server_requests_seconds_max > 0";
-
-        Map<String, Object> countValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> maxValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10.007799125);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_max");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/health");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(countValue1));
-        when(mockExecutor.execute("http_server_requests_seconds_max")).thenReturn(List.of(maxValue1));
-        List<Map<String, Object>> result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        maxValue1.put("uri", "/actuator/prometheus");
-        result = evaluate(promql);
-        assertEquals(0, result.size());
-
-        Map<String, Object> sumValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 20.018);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_sum");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/**");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        maxValue1.put("uri", "/actuator/health");
-        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(sumValue1));
-        promql = "(http_server_requests_seconds_count > 10 unless http_server_requests_seconds_max > 0) unless http_server_requests_seconds_sum > 10";
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1307, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testOrOpPromql() {
-        String promql = "http_server_requests_seconds_count > 10 or jvm_threads_states_threads > 0";
-
-        Map<String, Object> countValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> countValue2 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 16);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/**");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> countValue3 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 7);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/health");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> threadsValue1 = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10.007799125);
-                put("__name__", "jvm_threads_states_threads");
-                put("__timestamp__", "1.750320922467E9");
-                put("job", "spring-boot-app");
-                put("state=", "runnable");
-            }
-        };
-
-        Map<String, Object> threadsValue2 = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1);
-                put("__name__", "jvm_threads_states_threads");
-                put("__timestamp__", "1.750320922467E9");
-                put("job", "spring-boot-app");
-                put("state=", "timed-waiting");
-            }
-        };
-
-        Map<String, Object> threadsValue3 = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 19.02);
-                put("__name__", "jvm_threads_states_threads");
-                put("__timestamp__", "1.750320922467E9");
-                put("job", "spring-boot-app");
-                put("state=", "waiting");
-            }
-        };
-
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(countValue1, countValue2, countValue3));
-        when(mockExecutor.execute("jvm_threads_states_threads")).thenReturn(List.of(threadsValue1, threadsValue2, threadsValue3));
-        List<Map<String, Object>> result = evaluate(promql);
-        assertEquals(5, result.size());
-        assertTrue(result.stream().allMatch(t -> null != t.get("__value__")));
-
-
-        when(mockExecutor.execute("jvm_threads_states_threads")).thenReturn(new ArrayList<>());
-        result = evaluate(promql);
-        assertEquals(2, result.size());
-        assertTrue(result.stream().allMatch(t -> null != t.get("__value__")));
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(new ArrayList<>());
-        when(mockExecutor.execute("jvm_threads_states_threads")).thenReturn(List.of(threadsValue1, threadsValue2, threadsValue3));
-        result = evaluate(promql);
-        assertEquals(3, result.size());
-        assertTrue(result.stream().allMatch(t -> null != t.get("__value__")));
-        assertEquals(10.007799125, result.get(0).get("__value__"));
    }

    @Test
    void testMultipleUnlessConditions() {
-        when(mockExecutor.execute("metric1")).thenReturn(List.of(new HashMap<>(Map.of("job", "api", "__value__", 40.0))));
-        when(mockExecutor.execute("metric2")).thenReturn(List.of(new HashMap<>(Map.of("job", "web", "__value__", 50.0))));
-        when(mockExecutor.execute("metric3")).thenReturn(List.of(new HashMap<>(Map.of("job", "api", "__value__", 60.0))));
-        when(mockExecutor.execute("select cpu_usage from metrics where service = 'web'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 40.0))));
-        when(mockExecutor.execute("select memory_usage from metrics where service = 'db'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 50.0))));
-        when(mockExecutor.execute("select disk_usage from metrics where service = 'cache'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 60.0))));
-        // promql
-        List<Map<String, Object>> result = evaluate("(metric1 > 30 unless metric2 > 45) unless metric3 > 50");
-        assertEquals(0, result.size());
-        // sql
-        result = evaluate("((select cpu_usage from metrics where service = 'web') > 30"
-                + " unless (select memory_usage from metrics where service = 'db') > 55)"
-                + " unless (select disk_usage from metrics where service = 'cache') > 50");
-        assertEquals(0, result.size());
+        when(mockExecutor.execute("metric1")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 40.0))));
+        when(mockExecutor.execute("metric2")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
+        when(mockExecutor.execute("metric3")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 60.0))));
+        List<Map<String, Object>> result = evaluate("metric1 > 30 unless metric2 > 45 unless metric3 < 70");
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -438,436 +167,15 @@ class AlertExpressionEvalVisitorTest {
        when(mockExecutor.execute("cpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 75.0))));
        when(mockExecutor.execute("gpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 85.0))));
        when(mockExecutor.execute("fan_speed")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 2000.0))));
-        when(mockExecutor.execute("select cpu_temperature from hardware_metrics where component = 'cpu'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 75.0))));
-        when(mockExecutor.execute("select gpu_temperature from hardware_metrics where component = 'gpu'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 85.0))));
-        when(mockExecutor.execute("select fan_rpm from hardware_metrics where component = 'fan'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 2000.0))));

-        // promql
        List<Map<String, Object>> result = evaluate("(cpu_temp > 70 and gpu_temp < 90) or fan_speed > 1500");
        assertEquals(1, result.size());
        assertEquals(75.0, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("((select cpu_temperature from hardware_metrics where component = 'cpu') > 70"
-                + " and (select gpu_temperature from hardware_metrics where component = 'gpu') < 90)"
-                + " or (select fan_rpm from hardware_metrics where component = 'fan') > 1500");
-        assertEquals(1, result.size());
-        assertEquals(75.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlAggregateCount() {
-        when(mockExecutor.execute("select count(*) from cpu_metrics where host = 'server1'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 150))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from cpu_metrics where host = 'server1') > 100");
-        assertEquals(1, result.size());
-        assertEquals(150, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlAggregateAvg() {
-        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where region = 'us-east'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 75.5))));
-        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where region = 'us-east') > 70");
-        assertEquals(1, result.size());
-        assertEquals(75.5, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlAggregateSum() {
-        when(mockExecutor.execute("select sum(memory_used) from memory_stats where service = 'web'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 2048.0))));
-        List<Map<String, Object>> result = evaluate("(select sum(memory_used) from memory_stats where service = 'web') < 3000");
-        assertEquals(1, result.size());
-        assertEquals(2048.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlAggregateMaxMin() {
-        when(mockExecutor.execute("select max(response_time) from api_metrics where endpoint = '/api/users'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 250.0))));
-        when(mockExecutor.execute("select min(response_time) from api_metrics where endpoint = '/api/users'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 50.0))));
-
-        List<Map<String, Object>> result = evaluate("(select max(response_time) from api_metrics where endpoint = '/api/users') > 200");
-        assertEquals(1, result.size());
-        assertEquals(250.0, result.get(0).get("__value__"));
-
-        result = evaluate("(select min(response_time) from api_metrics where endpoint = '/api/users') < 100");
-        assertEquals(1, result.size());
-        assertEquals(50.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlGroupBy() {
-        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where timestamp > '2024-01-01' group by host")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 80.5))));
-        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where timestamp > '2024-01-01' group by host) > 75");
-        assertEquals(1, result.size());
-        assertEquals(80.5, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlGroupByHaving() {
-        when(mockExecutor.execute("select count(*) from error_logs where level = 'ERROR' group by service having count(*) > 10")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 25))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from error_logs where level = 'ERROR' group by service having count(*) > 10) > 20");
-        assertEquals(1, result.size());
-        assertEquals(25, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlOrderByLimit() {
-        when(mockExecutor.execute("select cpu_usage from system_metrics where host like 'web%' order by cpu_usage desc limit 1")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 95.2))));
-        List<Map<String, Object>> result = evaluate("(select cpu_usage from system_metrics where host like 'web%' order by cpu_usage desc limit 1) > 90");
-        assertEquals(1, result.size());
-        assertEquals(95.2, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlMultipleColumns() {
-        when(mockExecutor.execute("select avg(cpu_usage), max(memory_usage) from system_metrics where region = 'us-west'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 65.8))));
-        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage), max(memory_usage) from system_metrics where region = 'us-west') < 70");
-        assertEquals(1, result.size());
-        assertEquals(65.8, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlSubquery() {
-        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where host in (select host from active_servers where status = 'running')")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 72.3))));
-        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where host in (select host from active_servers where status = 'running')) > 70");
-        assertEquals(1, result.size());
-        assertEquals(72.3, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlComplexSubquery() {
-        when(mockExecutor.execute("select count(*) from alerts where severity = 'HIGH' and service_id in (select id from services where category = 'critical')")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 8))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from alerts where severity = 'HIGH' and service_id in (select id from services where category = 'critical')) >= 5");
-        assertEquals(1, result.size());
-        assertEquals(8, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlWithJoins() {
-        when(mockExecutor.execute("select avg(m.cpu_usage) from metrics m, servers s where m.server_id = s.id and s.environment = 'production'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 78.9))));
-        List<Map<String, Object>> result = evaluate("(select avg(m.cpu_usage) from metrics m, servers s where m.server_id = s.id and s.environment = 'production') < 80");
-        assertEquals(1, result.size());
-        assertEquals(78.9, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlBetweenCondition() {
-        when(mockExecutor.execute("select count(*) from performance_logs where response_time between 100 and 500")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 1200))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from performance_logs where response_time between 100 and 500) > 1000");
-        assertEquals(1, result.size());
-        assertEquals(1200, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlComplexGroupByOrderBy() {
-        when(mockExecutor.execute("select service, avg(response_time) from api_metrics where timestamp > '2024-01-01'"
-                + " group by service order by avg(response_time) desc limit 5")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 180.5))));
-        List<Map<String, Object>> result = evaluate("(select service, avg(response_time) from api_metrics where timestamp > '2024-01-01'"
-                + " group by service order by avg(response_time) desc limit 5) > 150");
-        assertEquals(1, result.size());
-        assertEquals(180.5, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlVarianceStddev() {
-        when(mockExecutor.execute("select stddev(cpu_usage) from system_metrics where host = 'db-server' and timestamp > '2024-01-01'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 12.5))));
-        List<Map<String, Object>> result = evaluate("(select stddev(cpu_usage) from system_metrics where host = 'db-server' and timestamp > '2024-01-01') < 15");
-        assertEquals(1, result.size());
-        assertEquals(12.5, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlNestedAggregation() {
-        when(mockExecutor.execute("select max(daily_avg) from (select date, avg(cpu_usage) as daily_avg from system_metrics group by date) as daily_stats")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 88.7))));
-        List<Map<String, Object>> result = evaluate("(select max(daily_avg) from (select date, avg(cpu_usage) as daily_avg from system_metrics group by date) as daily_stats) > 85");
-        assertEquals(1, result.size());
-        assertEquals(88.7, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlComplexWhereConditions() {
-        when(mockExecutor.execute("select count(*) from alerts where (severity = 'HIGH' or severity = 'CRITICAL') and status = 'ACTIVE' and created_at > '2024-01-01'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 42))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from alerts where (severity = 'HIGH' or severity = 'CRITICAL') and status = 'ACTIVE' and created_at > '2024-01-01') != 50");
-        assertEquals(1, result.size());
-        assertEquals(42, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlWithNullChecks() {
-        when(mockExecutor.execute("select count(*) from system_metrics where cpu_usage is not null and memory_usage is not null")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 9876))));
-        List<Map<String, Object>> result = evaluate("(select count(*) from system_metrics where cpu_usage is not null and memory_usage is not null) > 9000");
-        assertEquals(1, result.size());
-        assertEquals(9876, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlMultipleAggregatesWithAlias() {
-        when(mockExecutor.execute("select max(cpu_usage) as max_cpu, min(cpu_usage) as min_cpu, avg(cpu_usage) as avg_cpu from system_metrics where region = 'asia'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 92.1))));
-        List<Map<String, Object>> result = evaluate("(select max(cpu_usage) as max_cpu, min(cpu_usage) as min_cpu, avg(cpu_usage) as avg_cpu from system_metrics where region = 'asia') > 90");
-        assertEquals(1, result.size());
-        assertEquals(92.1, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testSqlAndPromqlCallExpr() {
-        when(mockExecutor.execute("sum(rate(http_requests_total{job='your-service'}[1m]))")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80))));
-        when(mockExecutor.execute("select cpu_usage from system_metrics where host = 'server1'")).thenReturn(
-                List.of(new HashMap<>(Map.of("__value__", 80))));
-        // promql
-        List<Map<String, Object>> result = evaluate("promql(\"sum(rate(http_requests_total{job='your-service'}[1m]))\") > 70");
-        assertEquals(1, result.size());
-        assertEquals(80, result.get(0).get("__value__"));
-        // sql
-        result = evaluate("sql(\"select cpu_usage from system_metrics where host = 'server1'\") > 70");
-        assertEquals(1, result.size());
-        assertEquals(80, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void testAndOpPromql() {
-        String promql = "http_server_requests_seconds_count > 10 and http_server_requests_seconds_max > 5";
-
-        Map<String, Object> countValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> countValue2 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 16);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/**");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> countValue3 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 7);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/health");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> maxValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10.007799125);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_max");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> maxValue2 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/**");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        Map<String, Object> maxValue3 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 0);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/health");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(countValue1, countValue2, countValue3));
-        when(mockExecutor.execute("http_server_requests_seconds_max")).thenReturn(List.of(maxValue1, maxValue2, maxValue3));
-        List<Map<String, Object>> result = evaluate(promql);
-        assertEquals(2, result.size());
-        assertEquals(1307, result.get(0).get("__value__"));
-        assertEquals(16, result.get(1).get("__value__"));
-    }
-
-    @Test
-    void testComparisonExpr() {
-        String promql = "3 > bool 2";
-
-        // scalar and scalar
-        List<Map<String, Object>> result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-
-        // scalar and vector
-        promql = "0 < http_server_requests_seconds_count";
-        Map<String, Object> vector = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vector));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        // scalar and vector bool
-        promql = "0 < bool http_server_requests_seconds_count";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-
-        // false
-        vector.put("__value__", -1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
-
-        // vector and scalar
-        promql = "http_server_requests_seconds_sum > 0";
-        vector = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 13);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vector));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(13, result.get(0).get("__value__"));
-
-        // vector and scalar bool
-        promql = "http_server_requests_seconds_sum > bool 0";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-        // false
-        vector.put("__value__", -1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
-
-        // vector and vector
-        promql = "http_server_requests_seconds_count > http_server_requests_seconds_sum";
-        Map<String, Object> vectorCount = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 13);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        Map<String, Object> vectorSum = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vectorCount));
-        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vectorSum));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(13, result.get(0).get("__value__"));
-
-        // vector and vector bool
-        promql = "http_server_requests_seconds_count > bool http_server_requests_seconds_sum";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-        // false
-        vectorCount.put("__value__", 1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
    }

    private List<Map<String, Object>> evaluate(String expression) {
        AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expression));
-        CommonTokenStream tokens = new CommonTokenStream(lexer);
-        AlertExpressionParser parser = new AlertExpressionParser(tokens);
-        return new AlertExpressionEvalVisitor(mockExecutor, tokens).visit(parser.expression());
+        AlertExpressionParser parser = new AlertExpressionParser(new CommonTokenStream(lexer));
+        return visitor.visit(parser.expression());
    }
 }
@@ -20,7 +20,6 @@ package org.apache.hertzbeat.alert.notice.impl;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;

 import org.apache.hertzbeat.alert.AlerterProperties;
@@ -49,7 +48,7 @@ import java.util.ResourceBundle;
 */
@ExtendWith(MockitoExtension.class)
 class ServerChanAlertNotifyHandlerImplTest {
-    
+
    @Mock
    private RestTemplate restTemplate;
    
@@ -58,21 +57,20 @@ class ServerChanAlertNotifyHandlerImplTest {
    
    @Mock
    private ResourceBundle bundle;
-    
+
    @InjectMocks
    private ServerChanAlertNotifyHandlerImpl serverChanAlertNotifyHandler;
-    
+
    private NoticeReceiver receiver;
    private GroupAlert groupAlert;
    private NoticeTemplate template;
-    
+
    @BeforeEach
    public void setUp() {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
-        receiver.setServerChanToken("SCT193569TSNm6xIabdjqeZPtOGOWcvU1e");
        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
@@ -89,31 +87,43 @@ class ServerChanAlertNotifyHandlerImplTest {
        template.setName("test-template");
        template.setContent("test content");
        
-        lenient().when(alerterProperties.getServerChanWebhookUrl())
-                .thenReturn("https://api.serverchan.com/send/%s");
-        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+        when(alerterProperties.getServerChanWebhookUrl()).thenReturn("http://test.url/");
+        when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
    }
    
+
    @Test
    public void testNotifyAlertSuccess() {
        CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
        successResp.setErrCode(0);
        successResp.setMsg("success");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(successResp, HttpStatus.OK);
-        
+        ResponseEntity<CommonRobotNotifyResp> responseEntity =
+                new ResponseEntity<>(successResp, HttpStatus.OK);
+
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class)
+        )).thenReturn(responseEntity);
        
        serverChanAlertNotifyHandler.send(receiver, template, groupAlert);
    }
-    
+
    @Test
-    public void testNotifyAlertWithInvalidUrl() {
-        when(alerterProperties.getServerChanWebhookUrl()).thenReturn("http://invalid-url.com/%s");
+    public void testNotifyAlertFailure() {
+        CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
+        failResp.setCode(1);
+        failResp.setErrMsg("Test Error");
+        ResponseEntity<CommonRobotNotifyResp> responseEntity =
+                new ResponseEntity<>(failResp, HttpStatus.BAD_REQUEST);
+
+        when(restTemplate.postForEntity(
+                any(String.class),
+                any(),
+                eq(CommonRobotNotifyResp.class)
+        )).thenReturn(responseEntity);
        
-        assertThrows(AlertNoticeException.class,
+        assertThrows(AlertNoticeException.class, 
                () -> serverChanAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -51,7 +51,7 @@ class SlackAlertNotifyHandlerImplTest {

    @Mock
    private RestTemplate restTemplate;
-
+    
    @Mock
    private ResourceBundle bundle;

@@ -68,18 +68,18 @@ class SlackAlertNotifyHandlerImplTest {
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
-        receiver.setSlackWebHookUrl("https://hooks.slack.com/services/ABCDEF/GHIJKL/mnopqrstuvwxyz");
-
+        receiver.setSlackWebHookUrl("http://localhost:8080");
+        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
        singleAlert.setLabels(new HashMap<>());
        singleAlert.getLabels().put("severity", "critical");
        singleAlert.getLabels().put("alertname", "Test Alert");
-
+        
        List<SingleAlert> alerts = new ArrayList<>();
        alerts.add(singleAlert);
        groupAlert.setAlerts(alerts);
-
+        
        template = new NoticeTemplate();
        template.setId(1L);
        template.setName("test-template");
@@ -90,18 +90,22 @@ class SlackAlertNotifyHandlerImplTest {

    @Test
    public void testNotifyAlertSuccess() {
-        ResponseEntity<String> responseEntity = new ResponseEntity<>("ok", HttpStatus.OK);
-
+        ResponseEntity<String> responseEntity = 
+            new ResponseEntity<>("ok", HttpStatus.OK);
+        
        when(restTemplate.postForEntity(any(String.class), any(), eq(String.class))).thenReturn(responseEntity);
-
+        
        slackAlertNotifyHandler.send(receiver, template, groupAlert);
    }

    @Test
-    public void testNotifyAlertWithInvalidUrl() {
-        receiver.setSlackWebHookUrl("http://localhost:8080");
+    public void testNotifyAlertFailure() {
+        ResponseEntity<String> responseEntity =
+                new ResponseEntity<>("invalid_payload", HttpStatus.BAD_REQUEST);

-        assertThrows(AlertNoticeException.class,
+        when(restTemplate.postForEntity(any(String.class), any(), eq(String.class))).thenReturn(responseEntity);
+        
+        assertThrows(AlertNoticeException.class, 
                () -> slackAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -20,7 +20,6 @@ package org.apache.hertzbeat.alert.notice.impl;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;

 import org.apache.hertzbeat.alert.AlerterProperties;
@@ -52,10 +51,10 @@ class TelegramBotAlertNotifyHandlerImplTest {

    @Mock
    private RestTemplate restTemplate;
-
+    
    @Mock
    private AlerterProperties alerterProperties;
-
+    
    @Mock
    private ResourceBundle bundle;

@@ -71,57 +70,58 @@ class TelegramBotAlertNotifyHandlerImplTest {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
-        receiver.setTgBotToken("123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11");
+        receiver.setAccessToken("test-token");
        receiver.setTgUserId("123456789"); // Telegram specific - chat ID
-
+        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
        singleAlert.setLabels(new HashMap<>());
        singleAlert.getLabels().put("severity", "critical");
        singleAlert.getLabels().put("alertname", "Test Alert");
-
+        
        List<SingleAlert> alerts = new ArrayList<>();
        alerts.add(singleAlert);
        groupAlert.setAlerts(alerts);
-
+        
        template = new NoticeTemplate();
        template.setId(1L);
        template.setName("test-template");
        template.setContent("test content");
-
-        lenient().when(alerterProperties.getTelegramWebhookUrl())
-                .thenReturn("https://api.telegram.org/bot%s/sendMessage");
-        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+        
+        when(alerterProperties.getTelegramWebhookUrl()).thenReturn("https://api.telegram.org/bot%s/sendMessage");
+        when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
    }

    @Test
    public void testNotifyAlertSuccess() {
-        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp = new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
+        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp = 
+            new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
        successResp.setOk(true);
        successResp.setDescription("Test Success");
-
-        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = new ResponseEntity<>(
-                successResp, HttpStatus.OK);
-
-        when(restTemplate.postForEntity(any(String.class), any(),
+        
+        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = 
+            new ResponseEntity<>(successResp, HttpStatus.OK);
+        
+        when(restTemplate.postForEntity(any(String.class), any(), 
                eq(TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse.class))).thenReturn(responseEntity);
-
+        
        telegramBotAlertNotifyHandler.send(receiver, template, groupAlert);
    }

    @Test
    public void testNotifyAlertFailure() {
-        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse failureResp = new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
-        failureResp.setOk(false);
-        failureResp.setDescription("Test failed");
+        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp =
+                new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
+        successResp.setOk(false);
+        successResp.setDescription("Test failed");

-        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = new ResponseEntity<>(
-                failureResp, HttpStatus.OK);
+        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity =
+                new ResponseEntity<>(successResp, HttpStatus.BAD_REQUEST);

        when(restTemplate.postForEntity(any(String.class), any(),
                eq(TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse.class))).thenReturn(responseEntity);
-
-        assertThrows(AlertNoticeException.class,
+        
+        assertThrows(AlertNoticeException.class, 
                () -> telegramBotAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -48,7 +48,7 @@ import java.util.ResourceBundle;
 */
@ExtendWith(MockitoExtension.class)
 class WeComRobotAlertNotifyHandlerImplTest {
-    
+
    @Mock
    private RestTemplate restTemplate;
    
@@ -57,21 +57,20 @@ class WeComRobotAlertNotifyHandlerImplTest {
    
    @Mock
    private ResourceBundle bundle;
-    
+
    @InjectMocks
    private WeComRobotAlertNotifyHandlerImpl weComRobotAlertNotifyHandler;
-    
+
    private NoticeReceiver receiver;
    private GroupAlert groupAlert;
    private NoticeTemplate template;
-    
+
    @BeforeEach
    public void setUp() {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
-        receiver.setWechatId("test-wechat-id");
        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
@@ -96,29 +95,33 @@ class WeComRobotAlertNotifyHandlerImplTest {
    public void testNotifyAlertSuccess() {
        CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
        successResp.setErrCode(0);
-        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(successResp, HttpStatus.OK);
-        
+        ResponseEntity<CommonRobotNotifyResp> responseEntity =
+                new ResponseEntity<>(successResp, HttpStatus.OK);
+
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class)
+        )).thenReturn(responseEntity);
        
        weComRobotAlertNotifyHandler.send(receiver, template, groupAlert);
    }
-    
+
    @Test
    public void testNotifyAlertFailure() {
        CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
        failResp.setCode(1);
        failResp.setErrMsg("Test Error");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(failResp, HttpStatus.OK);
-        
+        ResponseEntity<CommonRobotNotifyResp> responseEntity =
+                new ResponseEntity<>(failResp, HttpStatus.OK);
+
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class)
+        )).thenReturn(responseEntity);
        
-        assertThrows(AlertNoticeException.class,
+        assertThrows(AlertNoticeException.class, 
                () -> weComRobotAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -17,7 +17,19 @@

 package org.apache.hertzbeat.alert.service;

-import com.google.common.collect.Lists;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anySet;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
 import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
@@ -33,27 +45,6 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.test.util.ReflectionTestUtils;

-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC;
-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anySet;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
 * Test case for {@link AlertDefineService}
 */
@@ -71,9 +62,6 @@ class AlertDefineServiceTest {
    @Mock
    private List<AlertDefineImExportService> alertDefineImExportServiceList;

-    @Mock
-    private DataSourceService dataSourceService;
-
    @InjectMocks
    private AlertDefineServiceImpl alertDefineService;

@@ -143,36 +131,4 @@ class AlertDefineServiceTest {
        assertNotNull(alertDefineService.getAlertDefines(null, null, "id", "desc", 1, 10));
        verify(alertDefineDao, times(1)).findAll(any(Specification.class), any(PageRequest.class));
    }
-
-    @Test
-    void getDefinePreview() {
-        String expr = "http_server_requests_seconds_count > 10";
-
-        Map<String, Object> countValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-        when(dataSourceService.calculate(eq("promql"), eq(expr))).thenReturn(Lists.newArrayList(countValue1));
-        List<Map<String, Object>> result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_PERIODIC, expr);
-        assertNotNull(result);
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_PERIODIC, null);
-        assertEquals(0, result.size());
-
-        result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_REALTIME, null);
-        assertEquals(0, result.size());
-    }
-
 }
@@ -1,150 +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.service;
-
-
-import org.apache.hertzbeat.alert.dto.AlibabaCloudSlsExternAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.impl.AlibabaCloudSlsExternAlertService;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * unit test for {@link AlibabaCloudSlsExternAlertServiceTest }
- */
-@ExtendWith(MockitoExtension.class)
-public class AlibabaCloudSlsExternAlertServiceTest {
-
-    @Mock
-    private AlarmCommonReduce alarmCommonReduce;
-
-    @InjectMocks
-    private AlibabaCloudSlsExternAlertService externAlertService;
-
-    @Test
-    void testAddExternAlertWithInvalidContent() {
-        String invalidContent = "invalid json";
-        externAlertService.addExternAlert(invalidContent);
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlert() {
-        String source = externAlertService.supportSource();
-        assertEquals("alibabacloud-sls", source);
-
-        AlibabaCloudSlsExternAlert externAlert = new AlibabaCloudSlsExternAlert();
-        externAlert.setAlertName("Test SLS alert");
-        externAlert.setFireTime((int) Instant.now().getEpochSecond());
-        externAlert.setAlertTime((int) Instant.now().getEpochSecond());
-        externAlert.setRegion("cn-hangzhou");
-        externAlert.setProject("project");
-        externAlert.setStatus("firing");
-        externAlert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
-
-        Map<String, String> labels = new HashMap<>();
-        labels.put("labels-k", "labels-v");
-        externAlert.setLabels(labels);
-
-        Map<String, String> annotations = new HashMap<>();
-        annotations.put("annotations-k", "annotations-v");
-        externAlert.setAnnotations(annotations);
-
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlertWithSigninUrl() {
-        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
-        alert.setAlertName("Test Alert");
-        alert.setFireTime((int) Instant.now().getEpochSecond());
-        alert.setAlertTime((int) Instant.now().getEpochSecond());
-        alert.setRegion("cn-hangzhou");
-        alert.setProject("test-project");
-        alert.setStatus("firing");
-        alert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
-        alert.setSigninUrl("https://example.com");
-        externAlertService.addExternAlert(JsonUtil.toJson(alert));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlertWithDifferentSeverityLevels() {
-        for (AlibabaCloudSlsExternAlert.Severity severity : AlibabaCloudSlsExternAlert.Severity.values()) {
-            AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
-            alert.setAlertName("Test Alert");
-            alert.setFireTime((int) Instant.now().getEpochSecond());
-            alert.setAlertTime((int) Instant.now().getEpochSecond());
-            alert.setRegion("cn-hangzhou");
-            alert.setProject("test-project");
-            alert.setStatus("firing");
-            alert.setSeverity(severity.getStatus());
-            externAlertService.addExternAlert(JsonUtil.toJson(alert));
-        }
-        verify(alarmCommonReduce, times(AlibabaCloudSlsExternAlert.Severity.values().length))
-                .reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlertWithEmptyLabelsAndAnnotations() {
-        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
-        alert.setAlertName("Test Alert");
-        alert.setFireTime((int) Instant.now().getEpochSecond());
-        alert.setAlertTime((int) Instant.now().getEpochSecond());
-        alert.setRegion("cn-hangzhou");
-        alert.setProject("test-project");
-        alert.setStatus("firing");
-        alert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
-        alert.setLabels(new HashMap<>());
-        alert.setAnnotations(new HashMap<>());
-        externAlertService.addExternAlert(JsonUtil.toJson(alert));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlertWithInvalidSeverity() {
-        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
-        alert.setAlertName("Test Alert");
-        alert.setFireTime((int) Instant.now().getEpochSecond());
-        alert.setAlertTime((int) Instant.now().getEpochSecond());
-        alert.setRegion("cn-hangzhou");
-        alert.setProject("test-project");
-        alert.setStatus("firing");
-        alert.setSeverity(-99);
-        externAlertService.addExternAlert(JsonUtil.toJson(alert));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-}
@@ -17,35 +17,29 @@

 package org.apache.hertzbeat.alert.service;

+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import java.util.HashMap;
+
 import com.github.benmanes.caffeine.cache.Cache;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.hertzbeat.alert.service.impl.DataSourceServiceImpl;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
+import org.mockito.Mockito;

 /**
 * test case for {@link DataSourceService}
 */
 class DataSourceServiceTest {
-
+    
    private DataSourceServiceImpl dataSourceService;
-
+    
    @BeforeEach
    void setUp() {
        dataSourceService = new DataSourceServiceImpl();
@@ -57,12 +51,12 @@ class DataSourceServiceTest {
                new HashMap<>(Map.of("__value__", 100.0, "timestamp", 1343554, "instance", "node1")),
                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
        );
-
+        
        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
        Mockito.when(mockExecutor.execute(Mockito.anyString())).thenReturn(prometheusData);
        dataSourceService.setExecutors(List.of(mockExecutor));
-
+        
        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total > 150");
        assertEquals(2, result.size());
        assertNull(result.get(0).get("__value__"));
@@ -302,36 +296,45 @@ class DataSourceServiceTest {
    @Test
    void calculate15() {
        List<Map<String, Object>> prometheusData1 = List.of(
-                new HashMap<>(Map.of("__value__", 1))
+                new HashMap<>(Map.of("__value__", 100.0, "timestamp", 1343554, "instance", "node1")),
+                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
        );
+        List<Map<String, Object>> prometheusData2 = List.of(
+                new HashMap<>(Map.of("__value__", 100.0, "timestamp", 1343554, "instance", "node1")),
+                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
+        );
+
        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute("count(node_cpu_seconds_total{mode=\"user\"} > 250)")).thenReturn(prometheusData1);
-        Mockito.when(mockExecutor.execute("count(node_cpu_seconds_total{mode=\"idle\"} < 220 )")).thenReturn(new ArrayList<>());
+        Mockito.when(mockExecutor.execute("node_cpu_seconds_total{mode=\"user\"}")).thenReturn(prometheusData1);
+        Mockito.when(mockExecutor.execute("node_cpu_seconds_total{mode=\"idle\"}")).thenReturn(prometheusData2);
        dataSourceService.setExecutors(List.of(mockExecutor));

-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "count(node_cpu_seconds_total{mode=\"user\"} > 250) > 0 and count(node_cpu_seconds_total{mode=\"idle\"} < 220 ) > 0");
-        assertEquals(0, result.size());
+        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 250 and node_cpu_seconds_total{mode=\"idle\"} < 220");
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
    void calculate16() {
        List<Map<String, Object>> prometheusData1 = List.of(
-                new HashMap<>(Map.of("__value__", 1))
+                new HashMap<>(Map.of("__value__", 100.0, "timestamp", 1343554, "instance", "node1")),
+                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
        );
        List<Map<String, Object>> prometheusData2 = List.of(
-                new HashMap<>(Map.of("__value__", 1))
+                new HashMap<>(Map.of("__value__", 100.0, "timestamp", 1343554, "instance", "node1")),
+                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "instance", "node2"))
        );

        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        Mockito.when(mockExecutor.execute("count(node_cpu_seconds_total{mode=\"user\"} > 250)")).thenReturn(prometheusData1);
-        Mockito.when(mockExecutor.execute("count(node_cpu_seconds_total{mode=\"idle\"} < 220 )")).thenReturn(prometheusData2);
+        Mockito.when(mockExecutor.execute("node_cpu_seconds_total{mode=\"user\"}")).thenReturn(prometheusData1);
+        Mockito.when(mockExecutor.execute("node_cpu_seconds_total{mode=\"idle\"}")).thenReturn(prometheusData2);
        dataSourceService.setExecutors(List.of(mockExecutor));

-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "count(node_cpu_seconds_total{mode=\"user\"} > 250) > 0 and count(node_cpu_seconds_total{mode=\"idle\"} < 220 ) > 0");
+        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 50 and node_cpu_seconds_total{mode=\"idle\"} < 20");
        assertEquals(1, result.size());
-        assertNotNull(result.get(0).get("__value__"));
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -396,7 +399,8 @@ class DataSourceServiceTest {
        dataSourceService.setExecutors(List.of(mockExecutor));

        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 250 or node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -417,7 +421,8 @@ class DataSourceServiceTest {
        dataSourceService.setExecutors(List.of(mockExecutor));

        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 50 or node_cpu_seconds_total{mode=\"idle\"} < 320");
-        assertEquals(4, result.size());
+        assertEquals(1, result.size());
+        assertNotNull(result.get(0).get("__value__"));
    }

    @Test
@@ -438,8 +443,8 @@ class DataSourceServiceTest {
        dataSourceService.setExecutors(List.of(mockExecutor));

        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 50 unless node_cpu_seconds_total{mode=\"idle\"} < 320");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -460,8 +465,8 @@ class DataSourceServiceTest {
        dataSourceService.setExecutors(List.of(mockExecutor));

        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 50 unless node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
+        assertEquals(1, result.size());
+        assertNotNull(result.get(0).get("__value__"));
    }

    @Test
@@ -482,7 +487,8 @@ class DataSourceServiceTest {
        dataSourceService.setExecutors(List.of(mockExecutor));

        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 250 unless node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
    }

    @Test
@@ -559,6 +565,7 @@ class DataSourceServiceTest {
        tokenStreamCache.invalidateAll();
        long beforeHits = tokenStreamCache.stats().hitCount();
        dataSourceService.calculate("promql", expr);
+        expressionCache.invalidateAll();
        dataSourceService.calculate("promql", expr);
        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
        assertEquals(1, actualHits, "expression cache should hit but miss");
@@ -609,34 +616,4 @@ class DataSourceServiceTest {
        long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
        assertEquals(0, actualHits, "expression cache should miss but hit");
    }
-
-    @Test
-    void testAlertExpressionException() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>() {
-                    {
-                        put("exception", "none");
-                        put("instance", "host.docker.internal:8989");
-                        put("__value__", 1307);
-                        put("method", "GET");
-                        put("__name__", "http_server_requests_seconds_count");
-                        put("__timestamp__", "1.750320922467E9");
-                        put("error", "none");
-                        put("job", "spring-boot-app");
-                        put("uri", "/actuator/prometheus");
-                        put("outcome", "SUCCESS");
-                        put("status", "200");
-                    }
-                });
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        when(mockExecutor.support(eq("promql"))).thenReturn(true);
-        when(mockExecutor.execute(eq("http_server_requests_seconds_count"))).thenReturn(prometheusData);
-
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "http_server_requests_seconds_count > 10");
-        assertNotNull(result);
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        assertThrows(AlertExpressionException.class, () -> dataSourceService.calculate("promql", "http_server_requests_seconds_count{!@~!!#$%^&}"));
-    }
 }
@@ -1,152 +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.service;
-
-import org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.service.impl.HuaweiCloudExternAlertService;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * unit test for {@link AlibabaCloudSlsExternAlertServiceTest }
- */
-@ExtendWith(MockitoExtension.class)
-public class HuaweiCloudExternAlertServiceTest {
-
-    @Mock
-    private AlarmCommonReduce alarmCommonReduce;
-
-    @InjectMocks
-    private HuaweiCloudExternAlertService externAlertService;
-
-    @BeforeEach
-    void setUp() {
-        assertEquals("huaweicloud-ces", externAlertService.supportSource());
-    }
-
-    @Test
-    void testAddExternAlertWithInvalidContent() {
-        String invalidContent = "invalid json";
-        externAlertService.addExternAlert(invalidContent);
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testMessageValidFailed() {
-        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
-        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
-        externAlert.setType("failedType");
-        externAlert.setMessage("failedMessage");
-        externAlert.setTimestamp("2025-06-07T15:12:09Z");
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testCertFailed() {
-        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
-        externAlert.setSignature("TImrLoeb0tV1JZJSPyA0rpC9mNqH3MmhwQ4tgpuHHa+JztfGVZFvkU//OthKKhzpDAoYiXOYG9DbzXCLb"
-                + "vaGePIRITakoynYyYr9zZIpdx9jXhQNlgF8np1+t0JxNeoIq0DYWgH52tsodwqOm+OnmkcHwCRo/1rFv85KrKAaX2gy3sNwX"
-                + "w1hKnAwAw0mJlxHHSf/N3+7j6GoxCNV7fN9K4CpJiLMGNvUa7zVmG0U9mPvt/7Lac155kPPQ9lYyeL7vVI0e4sfRbuQruz3E"
-                + "0ZP40TKx0afoeR0/Bx/IoZzRP1La7pKlbEISvkcM7TqW/IOGQTkhVsQ32RFRxZWO2snw==");
-        externAlert.setSubject("[华为云][紧急告警恢复]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已恢复正常。");
-        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
-        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
-        externAlert.setType("Notification");
-        externAlert.setMessage("{}");
-        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/failedUrl");
-        externAlert.setTimestamp("2025-06-07T15:12:09Z");
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testAddExternAlert() {
-        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
-        externAlert.setSignature("Igs0bBhzw0JGmlgBH+9ejw2xWfPTXjAatAEsKDkkWcC5bZ/jveckdRZdgp/S0JER9eiJfMF427YDABufIN0sv/vBRXaRQKfRBLTJYbSTl+AQpEbIW5yUfJSRLEG3HNEhUDjASolbrW7zdPCoGkkqjifE23FCvw"
-                + "+4tewMzqmHnfJHcFBq3W89CJzdPBjwO1UcY9C39moUZgqZk+qDVLpxb4bHSrEYAwPOSrOPR7TZpETJ30UOgFYajJydQk692edfs0NeVutHoQiOJ5/YC83ULHft0aXhichjtfZE4KF69nROAKez0ubk3l"
-                + "Ey/mBIM9Ylbxn5b84OIrzzZQrIWe8Syw==");
-        externAlert.setSubject("[华为云][紧急告警]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已触发告警。");
-        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
-        externAlert.setMessageId("1565df032a19494590d61e05f7b0dc0e");
-        externAlert.setType("Notification");
-        externAlert.setMessage("{\"version\":\"v1\",\"data\":{\"AccountName\":\"hid_hk6tij5o1v-95zn\",\"Namespace\":\"分布式缓存服务\",\"DimensionName\":\"DCS Redis实例\",\"ResourceName\""
-                + ":\"dcs-h4tv\",\"MetricName\":\"每秒并发操作数\",\"IsAlarm\":true,\"AlarmLevel\":\"紧急\",\"Region\":\"华东-上海一\",\"RegionId\":\"cn-east-3\",\"ResourceId\":\"3dc7b9ea"
-                + "-70b4-4c38-942d-e2636e6d844c\",\"PrivateIp\":\"192.168.0.54\",\"CurrentData\":\"6.00 count\",\"AlarmTime\":\"2025/06/02 22:56:15 GMT+08:00\","
-                + "\"AlarmRecordID\":\"ah1748876175242njvndyzMZ\","
-                + "\"AlarmRuleName\":\"alarm-c5jj\",\"IsOriginalValue\":true,\"Filter\":\"原始值\",\"ComparisonOperator\":\"\\u003e\",\"Value\":\"5 count\",\"Unit\":\"count\",\"Count\":2}}");
-        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
-        externAlert.setTimestamp("2025-06-02T14:56:17Z");
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testSubscriptionUrl() {
-        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
-        externAlert.setSubscribeUrl("https://console.huaweicloud.com/smn/subscription/confirm?token=477a784601d744e4ab9ab83986502d31c4b938"
-                + "0ec0b64392b134e517c3aa17eb7b3a12dc9f3b4ab495e61c4dee654b435d7223ea934345bf8ae8901cef912b1d&topic_urn=urn:smn:cn-north-4"
-                + ":477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX&region=cn-north-4");
-        externAlert.setSignature("ottf37C/2RdDgqimRQMIBU6i7XjUfPPMU760jJn71wwP3825YPoIT22uw2A9399rkm9Jrt1qUEFrDLuA5yHFLd5n/XoM4FghIgyFn7VIfgpuVM31a+co78s"
-                + "YBiZ1egOCE/AwFm2oygRhfIceUj9Kw9vmc06el9TXY6RtE5tAEF6qEmICtTh45KwtCO/WRs3DY72dQi5hm0w7/tktS4WFZ1iP4LHt5eCwFvnH0u29Y96cJNI0fLUQxI5MkhgjK"
-                + "77JkFK7UT6ZYJZhzgSp/B7OQGStOQx+3Duvx4T4CzccZQM3sca81Z0B0GFGWeVXuEHyCPLsayY/Iz+5Tco51elT8w==");
-        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
-        externAlert.setMessageId("242fac183d3a4936b5ead6c725a32ed0");
-        externAlert.setType("SubscriptionConfirmation");
-        externAlert.setMessage("You are invited to subscribe to topic: urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:"
-                + "CES_notification_group_bngJ2aMpX. To confirm this subscription, please visit the subscribe_url included in this message. The subscribe_url is valid only within 48 hours.");
-        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
-        externAlert.setTimestamp("2025-06-07T15:07:14Z");
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testUnsubscribe() {
-        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
-        externAlert.setSignature("TImrLoeb0tV1JZJSPyA0rpC9mNqH3MmhwQ4tgpuHHa+JztfGVZFvkU//OthKKhzpDAoYiXOYG9DbzXCLbvaGePIRITakoynYyYr9zZIpdx9jXhQNlgF8np"
-                + "1+t0JxNeoIq0DYWgH52tsodwqOm+OnmkcHwCRo/1rFv85KrKAaX2gy3sNwXw1hKnAwAw0mJlxHHSf/N3+7j6GoxCNV7fN9K4CpJiLMGNvUa7zVmG0U9mPvt/7Lac155kPPQ9l"
-                + "YyeL7vVI0e4sfRbuQruz3E0+ZP40TKx0afoeR0/Bx/IoZzRP1La7pKlbEISvkcM7TqW/IOGQTkhVsQ32RFRxZWO2snw==");
-        externAlert.setSubject("[华为云][紧急告警恢复]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已恢复正常。");
-        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
-        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
-        externAlert.setType("UnsubscribeConfirmation");
-        externAlert.setMessage("{}");
-        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
-        externAlert.setTimestamp("2025-06-07T15:12:09Z");
-        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
-        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-
-
-
-}
@@ -1,92 +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.service;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hertzbeat.alert.config.SmsConfig;
-import org.apache.hertzbeat.alert.config.SmslocalSmsProperties;
-import org.apache.hertzbeat.base.dao.GeneralConfigDao;
-import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum;
-import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
-
-/**
- * unit test for {@link SmsClientFactory }
- */
-@ExtendWith(MockitoExtension.class)
-public class SmsClientFactoryTest {
-
-
-    @Mock
-    private GeneralConfigDao generalConfigDao;
-
-    @Mock
-    private ObjectMapper objectMapper;
-
-    @Mock
-    private SmsConfig yamlSmsConfig;
-
-    @InjectMocks
-    private SmsClientFactory smsClientFactory;
-
-
-    @Test
-    void testloadDbConfig() throws JsonProcessingException {
-        GeneralConfig generalConfig = new GeneralConfig();
-
-        SmsConfig smsConfig = new SmsConfig();
-        smsConfig.setType("smslocal");
-        smsConfig.setEnable(true);
-        smsConfig.setSmslocal(new SmslocalSmsProperties("11"));
-
-        generalConfig.setContent(JsonUtil.toJson(smsConfig));
-        when(objectMapper.readValue(generalConfig.getContent(), SmsConfig.class)).thenReturn(smsConfig);
-        when(generalConfigDao.findByType(GeneralConfigTypeEnum.sms.name())).thenReturn(generalConfig);
-
-        assertNotNull(smsClientFactory.getSmsClient());
-
-    }
-
-    @Test
-    void testloadYamlConfig() {
-        when(generalConfigDao.findByType(GeneralConfigTypeEnum.sms.name())).thenReturn(null);
-        when(yamlSmsConfig.getType()).thenReturn("smslocal");
-        when(yamlSmsConfig.isEnable()).thenReturn(true);
-        when(yamlSmsConfig.getSmslocal()).thenReturn(new SmslocalSmsProperties("11"));
-        assertNotNull(smsClientFactory.getSmsClient());
-    }
-
-    @Test
-    void testNull() {
-        when(generalConfigDao.findByType(GeneralConfigTypeEnum.sms.name())).thenReturn(null);
-        when(yamlSmsConfig.getType()).thenReturn("");
-        assertNull(smsClientFactory.getSmsClient());
-    }
-
-}
@@ -1,73 +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.service.impl;
-
-import com.google.common.collect.Lists;
-import org.apache.hertzbeat.alert.config.SmslocalSmsProperties;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.support.exception.SendMessageException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-
-/**
- * Test case for {@link SmsLocalSmsClientImpl}
- */
-@ExtendWith(MockitoExtension.class)
-public class SmsLocalSmsClientImplTest {
-
-    @Mock
-    private SmslocalSmsProperties smslocalSmsProperties;
-
-    private SmsLocalSmsClientImpl smsLocalSmsClient;
-
-
-    @BeforeEach
-    void setUp() {
-        smsLocalSmsClient = new SmsLocalSmsClientImpl(smslocalSmsProperties);
-        when(smslocalSmsProperties.getApiKey()).thenReturn("2");
-    }
-
-    @Test
-    void testSendMessage() {
-        assertEquals("smslocal", smsLocalSmsClient.getType());
-        assertTrue(smsLocalSmsClient.checkConfig());
-        //
-        NoticeReceiver noticeReceiver = new NoticeReceiver();
-        noticeReceiver.setPhone("13888888888");
-
-        SingleAlert singleAlert = new SingleAlert();
-        singleAlert.setContent("test");
-
-        GroupAlert groupAlert = new GroupAlert();
-        groupAlert.setAlerts(Lists.newArrayList(singleAlert));
-
-        assertThrows(SendMessageException.class,
-                () -> smsLocalSmsClient.sendMessage(noticeReceiver, null, groupAlert));
-    }
-
-}
@@ -1,85 +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.service.impl;
-
-import org.apache.hertzbeat.alert.config.UniSmsProperties;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.support.exception.SendMessageException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-
-
-/**
- * Test case for {@link UniSmsClientImpl}
- */
-@ExtendWith(MockitoExtension.class)
-public class UniSmsClientImplTest {
-
-    @Mock
-    private UniSmsProperties uniSmsProperties;
-
-    private UniSmsClientImpl uniSmsClient;
-
-    @BeforeEach
-    void setUp() {
-        uniSmsClient = new UniSmsClientImpl(uniSmsProperties);
-        when(uniSmsProperties.getSignature()).thenReturn("2");
-        when(uniSmsProperties.getTemplateId()).thenReturn("any(String.class)");
-        when(uniSmsProperties.getAuthMode()).thenReturn("hmac");
-        when(uniSmsProperties.getAccessKeyId()).thenReturn("hmac");
-        when(uniSmsProperties.getAccessKeySecret()).thenReturn("hmac");
-    }
-
-    @Test
-    void testSendMessage() {
-        assertEquals("unisms", uniSmsClient.getType());
-        assertTrue(uniSmsClient.checkConfig());
-        //
-        NoticeReceiver noticeReceiver = new NoticeReceiver();
-        noticeReceiver.setPhone("13888888888");
-
-        Map<String, String> commonLabels = new HashMap<>();
-        commonLabels.put("instance", "");
-        commonLabels.put("priority", "unknown");
-
-        Map<String, String> commonAnnotations = new HashMap<>();
-        commonAnnotations.put("test", "test");
-
-        GroupAlert groupAlert = new GroupAlert();
-        groupAlert.setCommonLabels(commonLabels);
-        groupAlert.setCommonAnnotations(commonAnnotations);
-
-        assertThrows(SendMessageException.class,
-                () -> uniSmsClient.sendMessage(noticeReceiver, null, groupAlert));
-
-    }
-
-
-}
@@ -1,48 +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.util;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * Test case for {@link CryptoUtils}
- */
-public class CryptoUtilsTest {
-
-
-    @Test
-    void testSha256Hex() {
-        String sign = CryptoUtils.sha256Hex("Hello world.");
-        assertEquals("aa3ec16e6acc809d8b2818662276256abfd2f1b441cb51574933f3d4bd115d11", sign);
-    }
-
-    @Test
-    void testHmacSha256Base64Debug() {
-        String signature = CryptoUtils.hmacSha256Base64("your-real-key", "your-real-data");
-        assertEquals("8JrfX0v5Tt3s8PfI85o6jcf5XM3C+vLlMwvFp45LupU=", signature);
-    }
-
-    @Test
-    void testHmacSha256Hex() {
-        String signature = CryptoUtils.hmacSha256Hex("your-real-key", "your-real-data");;
-        assertEquals("41878ccd7ecd795a2dd7ec39be7f33fed4be3ec75f5307689e39dd6f41fdbaac", signature);
-    }
-
-}
@@ -19,7 +19,6 @@ package org.apache.hertzbeat.alert.util;

 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
@@ -59,13 +58,4 @@ class DateUtilTest {
        actualTimestamp = DateUtil.getTimeStampFromFormat(date, format);
        assertFalse(actualTimestamp.isPresent());
    }
-
-    @Test
-    void getZonedTimeStampFromFormat() {
-        String dataStr = "2025/06/02 22:56:15 GMT+08:00";
-        Long time = DateUtil.getZonedTimeStampFromFormat(dataStr, "yyyy/MM/dd HH:mm:ss 'GMT'XXX");
-        assertNotNull(time);
-        assertEquals(1748876175000L, time);
-    }
-
 }
@@ -1,19 +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.
-wrapperVersion=3.3.2
-distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
@@ -33,7 +33,7 @@
        <maven.compiler.source>17</maven.compiler.source>
        <maven.compiler.target>17</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mqtt.version>1.2.5</mqtt.version>
+        <mqtt.version>1.3.3</mqtt.version>
    </properties>

    <dependencies>
@@ -69,8 +69,8 @@
        </dependency>
        <!-- mysql -->
        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
            <scope>provided</scope>
        </dependency>
        <!-- clickhouse -->
@@ -140,19 +140,10 @@
        </dependency>
        <!-- mqtt -->
        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <groupId>com.hivemq</groupId>
+            <artifactId>hivemq-mqtt-client</artifactId>
            <version>${mqtt.version}</version>
        </dependency>
-        <!--Bouncy Castle-->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.68</version>
-        </dependency>
-
-
-
        <!--plc-->
        <dependency>
            <groupId>org.apache.plc4x</groupId>
@@ -173,11 +164,5 @@
            <groupId>org.apache.sshd</groupId>
            <artifactId>sshd-sftp</artifactId>
        </dependency>
-        <!-- Zookeeper -->
-        <dependency>
-            <groupId>org.apache.zookeeper</groupId>
-            <artifactId>zookeeper</artifactId>
-            <version>${zookeeper.version}</version>
-        </dependency>
    </dependencies>
 </project>
@@ -17,7 +17,6 @@

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

-import java.nio.charset.StandardCharsets;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
@@ -75,7 +74,6 @@ public class JdbcCommonCollect extends AbstractCollect {
            // code execution related - may result in remote code execution
            "init=", "javaobjectserializer=", "runscript", "serverstatusdiffinterceptor",
            "queryinterceptors=", "statementinterceptors=", "exceptioninterceptors=",
-            "xp_cmdshell", "create function", "dbms_java", "sp_sysexecute", "load_file",

            // multiple statement execution - may lead to SQL injection
            "allowmultiqueries",
@@ -84,96 +82,6 @@ public class JdbcCommonCollect extends AbstractCollect {
            "autodeserialize", "detectcustomcollations",
    };

-    // universal bypass detection mode - applicable to all databases for dangerous command bypass detection
-    private static final String[] UNIVERSAL_BYPASS_PATTERNS = {
-            ".*create\\s*([/\\\\]|\\\\n|/n|\\n)\\s*trigger.*",
-            ".*create\\s*([/\\\\]|\\\\n|/n|\\n)\\s*function.*",
-            ".*drop\\s*([/\\\\]|\\\\n|/n|\\n)\\s*table.*",
-            ".*drop\\s*([/\\\\]|\\\\n|/n|\\n)\\s*database.*",
-            ".*run\\s*([/\\\\]|\\\\n|/n|\\n)\\s*script.*",
-            ".*alter\\s*([/\\\\]|\\\\n|/n|\\n)\\s*system.*",
-            ".*grant\\s*([/\\\\]|\\\\n|/n|\\n)\\s*all.*",
-            ".*revoke\\s*([/\\\\]|\\\\n|/n|\\n)\\s*all.*",
-            ".*xp\\s*([/\\\\]|\\\\n|/n|\\n)\\s*cmdshell.*",
-            ".*load\\s*([/\\\\]|\\\\n|/n|\\n)\\s*file.*"
-    };
-
-    // database platform specific bypass detection mode
-    private static final HashMap<String, String[]> PLATFORM_BYPASS_PATTERNS = new HashMap<>();
-
-    static {
-        // H2 database special character bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("h2", new String[]{
-                ".*(\\\\\\\\|/|\\\\|\\\\n|/n|\\n)\\s*init\\s*=.*",
-                ".*in\\s*([/\\\\]|\\\\n|/n|\\n)\\s*it\\s*=.*",
-                ".*(\\\\\\\\|/|\\\\|\\\\n|/n|\\n)\\s*runscript\\s+from.*",
-                ".*ru\\s*([/\\\\]|\\\\n|/n|\\n)\\s*script\\s+from.*"
-        });
-
-        // MySQL/MariaDB bypass mode
-        String[] mysqlPatterns = {
-                ".*allow\\s*([/\\\\]|\\\\n|/n|\\n)\\s*load\\s*([/\\\\]|\\\\n|/n|\\n)\\s*local\\s*([/\\\\]|\\\\n|/n|\\n)\\s*infile.*",
-                ".*allow\\s*([/\\\\]|\\\\n|/n|\\n)\\s*multi\\s*([/\\\\]|\\\\n|/n|\\n)\\s*queries.*",
-                ".*query\\s*([/\\\\]|\\\\n|/n|\\n)\\s*interceptors.*",
-                ".*statement\\s*([/\\\\]|\\\\n|/n|\\n)\\s*interceptors.*",
-                ".*exception\\s*([/\\\\]|\\\\n|/n|\\n)\\s*interceptors.*",
-                ".*auto\\s*([/\\\\]|\\\\n|/n|\\n)\\s*deserialize.*"
-        };
-        PLATFORM_BYPASS_PATTERNS.put("mysql", mysqlPatterns);
-        PLATFORM_BYPASS_PATTERNS.put("mariadb", mysqlPatterns);
-
-        // PostgreSQL bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("postgresql", new String[]{
-                ".*socket\\s*([/\\\\]|\\\\n|/n|\\n)\\s*factory.*",
-                ".*logger\\s*([/\\\\]|\\\\n|/n|\\n)\\s*file.*",
-                ".*ssl\\s*([/\\\\]|\\\\n|/n|\\n)\\s*mode.*",
-                ".*logger\\s*([/\\\\]|\\\\n|/n|\\n)\\s*level.*"
-        });
-
-        // SQL Server bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("sqlserver", new String[]{
-                ".*integrated\\s*([/\\\\]|\\\\n|/n|\\n)\\s*security.*",
-                ".*authentication\\s*([/\\\\]|\\\\n|/n|\\n)\\s*scheme.*",
-                ".*select\\s*([/\\\\]|\\\\n|/n|\\n)\\s*method.*",
-                ".*send\\s*([/\\\\]|\\\\n|/n|\\n)\\s*string\\s*([/\\\\]|\\\\n|/n|\\n)\\s*parameters\\s*([/\\\\]|\\\\n|/n|\\n)\\s*as\\s*([/\\\\]|\\\\n|/n|\\n)\\s*unicode.*",
-                ".*x\\s*([/\\\\]|\\\\n|/n|\\n)\\s*open\\s*([/\\\\]|\\\\n|/n|\\n)\\s*state.*",
-                ".*application\\s*([/\\\\]|\\\\n|/n|\\n)\\s*intent.*"
-        });
-
-        // ClickHouse bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("clickhouse", new String[]{
-                ".*custom\\s*([/\\\\]|\\\\n|/n|\\n)\\s*http\\s*([/\\\\]|\\\\n|/n|\\n)\\s*params.*",
-                ".*http\\s*([/\\\\]|\\\\n|/n|\\n)\\s*connection\\s*([/\\\\]|\\\\n|/n|\\n)\\s*provider.*",
-                ".*check\\s*([/\\\\]|\\\\n|/n|\\n)\\s*all\\s*([/\\\\]|\\\\n|/n|\\n)\\s*nodes.*",
-                ".*fail\\s*([/\\\\]|\\\\n|/n|\\n)\\s*over.*",
-                ".*use\\s*([/\\\\]|\\\\n|/n|\\n)\\s*objects\\s*([/\\\\]|\\\\n|/n|\\n)\\s*in\\s*([/\\\\]|\\\\n|/n|\\n)\\s*arrays.*"
-        });
-
-        // Oracle bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("oracle", new String[]{
-                ".*oracle\\s*([/\\\\]|\\\\n|/n|\\n)\\s*jdbc.*",
-                ".*oracle\\s*([/\\\\]|\\\\n|/n|\\n)\\s*net.*",
-                ".*oracle\\.jdbc\\.timezoneinfotable\\s*=.*",
-                ".*oracle\\.net\\.wallet_location\\s*=.*",
-                ".*oracle\\.net\\.ssl_server_dn_match\\s*=\\s*false.*",
-                ".*oracle\\.jdbc\\.enablesqlinjectionattack\\s*=\\s*true.*",
-                ".*oracle\\.jdbc\\.implicitstatementcachesize\\s*=\\s*0.*",
-                ".*oracle\\.jdbc\\.timezoneinfotable\\s*=.*",
-                ".*oracle\\.net\\.wallet_location\\s*=.*",
-                ".*oracle\\.net\\.ssl_server_dn_match\\s*=\\s*false.*",
-                ".*oracle\\.jdbc\\.enablesqlinjectionattack\\s*=\\s*true.*",
-                ".*oracle\\.jdbc\\.implicitstatementcachesize\\s*=\\s*0.*"
-        });
-
-        // DM bypass mode
-        PLATFORM_BYPASS_PATTERNS.put("dm", new String[]{
-                ".*login\\s*([/\\\\]|\\\\n|/n|\\n)\\s*mode.*",
-                ".*compatible\\s*([/\\\\]|\\\\n|/n|\\n)\\s*mode.*",
-                ".*en\\s*([/\\\\]|\\\\n|/n|\\n)\\s*crypt.*",
-                ".*ci\\s*([/\\\\]|\\\\n|/n|\\n)\\s*pher.*"
-        });
-    }
-
    private final GlobalConnectionCache connectionCommonCache = GlobalConnectionCache.getInstance();


@@ -183,9 +91,8 @@ public class JdbcCommonCollect extends AbstractCollect {
            throw new IllegalArgumentException("Database collect must has jdbc params");
        }
        if (StringUtils.hasText(metrics.getJdbc().getUrl())) {
-            String url = metrics.getJdbc().getUrl().toLowerCase();
            for (String keyword : VULNERABLE_KEYWORDS) {
-                if (url.contains(keyword.toLowerCase())) {
+                if (metrics.getJdbc().getUrl().contains(keyword)) {
                    throw new IllegalArgumentException("Jdbc url prohibit contains vulnerable param " + keyword);
                }
            }
@@ -433,27 +340,6 @@ public class JdbcCommonCollect extends AbstractCollect {
        }
    }

-    /**
-     * Recursively decode the URL to prevent multiple encoding bypasses.
-     *
-     * @param url jdbc url
-     * @return decoded decoded jdbc url
-     */
-    private String recursiveDecode(String url) {
-        String prev;
-        String decoded = url;
-        int max = 5; // Decode it at most 5 times to prevent infinite loops.
-        do {
-            prev = decoded;
-            try {
-                decoded = java.net.URLDecoder.decode(prev, StandardCharsets.UTF_8);
-            } catch (Exception e) {
-                break;
-            }
-        } while (!prev.equals(decoded) && --max > 0);
-        return decoded;
-    }
-
    /**
     * construct jdbc url due the jdbc protocol
     *
@@ -469,54 +355,20 @@ public class JdbcCommonCollect extends AbstractCollect {
                throw new IllegalArgumentException("JDBC URL length exceeds maximum limit of 2048 characters");
            }
            // remove special characters
-            String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F\\xA0]", "");
-            String url = recursiveDecode(cleanedUrl);
-            String urlLowerCase = url.toLowerCase();
-            // url format check
-            if (!urlLowerCase.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
-                throw new IllegalArgumentException("Invalid JDBC URL format");
-            }
+            String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F]", "");
+            String url = cleanedUrl.toLowerCase();
            // backlist check
            for (String keyword : BLACK_LIST) {
-                if (urlLowerCase.contains(keyword.toLowerCase())) {
+                if (url.contains(keyword)) {
                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
                }
            }
-            // universal detection
-            String normalizedUrl = urlLowerCase.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ");
-            // universal detection of JDBC injection and deserialization attacks
-            if (normalizedUrl.matches(".*jndi\\s*[:=].*")
-                    || normalizedUrl.matches(".*ldap\\s*[:=].*")
-                    || normalizedUrl.matches(".*rmi\\s*[:=].*")
-                    || normalizedUrl.matches(".*java\\s*[:=].*")
-                    || normalizedUrl.matches(".*serialization\\s*[:=].*")
-                    || normalizedUrl.matches(".*deserializ.*\\s*[:=].*")
-                    || normalizedUrl.matches(".*objectinputstream\\s*[:=].*")
-                    || normalizedUrl.matches(".*readobject\\s*[:=].*")) {
-                throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious JNDI or deserialization parameter");
+            // url format check
+            if (!url.matches("^jdbc:[a-zA-Z0-9]+://[^\\s]+$")) {
+                throw new IllegalArgumentException("Invalid JDBC URL format");
            }
-            // universal detection of bypass
-            for (String pattern : UNIVERSAL_BYPASS_PATTERNS) {
-                if (normalizedUrl.matches(pattern)) {
-                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious bypass pattern");
-                }
-            }
-            // database platform specific bypass detection
-            if (jdbcProtocol.getPlatform() != null) {
-                String platform = jdbcProtocol.getPlatform().toLowerCase();
-                // check for specific bypass modes on the platform
-                String[] platformPatterns = PLATFORM_BYPASS_PATTERNS.get(platform);
-                if (platformPatterns != null) {
-                    for (String pattern : platformPatterns) {
-                        if (normalizedUrl.matches(pattern)) {
-                            throw new IllegalArgumentException("Invalid " + platform.toUpperCase() + " JDBC URL: contains potentially malicious bypass pattern");
-                        }
-                    }
-                }
-            }
-            return url;
+            return cleanedUrl;
        }
-        assert jdbcProtocol.getPlatform() != null;
        return switch (jdbcProtocol.getPlatform()) {
            case "mysql", "mariadb" -> "jdbc:mysql://" + host + ":" + port
                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase())
@@ -68,7 +68,6 @@ import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
 import org.apache.http.Header;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
@@ -145,46 +144,37 @@ public class HttpCollectImpl extends AbstractCollect {
                builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                return;
            }
-
-            long responseTime = System.currentTimeMillis() - startTime;
+            /*
+             this could create large objects, potentially impacting JVM memory space significantly.
+             Option 1: Parse using InputStream, but this requires significant code changes;
+             Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
+             */
+            String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (!StringUtils.hasText(resp)) {
+                log.info("http response entity is empty, status: {}.", statusCode);
+            }
+            Long responseTime = System.currentTimeMillis() - startTime;
            String parseType = metrics.getHttp().getParseType();
-            HttpEntity entity = response.getEntity();
-
            try {
-                if (DispatchConstants.PARSE_PROMETHEUS.equals(parseType)) {
-                    if (entity != null) {
-                        parseResponseByPrometheusExporter(entity.getContent(), metrics.getAliasFields(), builder);
-                    }
-                } else if (DispatchConstants.PARSE_HEADER.equals(parseType)) {
-                    parseResponseByHeader(builder, metrics.getAliasFields(), response);
-                    // Consume entity to release connection
-                    EntityUtils.consumeQuietly(entity);
-                } else {
-                    /*
-                     this could create large objects, potentially impacting JVM memory space significantly.
-                     Option 1: Parse using InputStream, but this requires significant code changes;
-                     Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
-                     */
-                    String resp = entity == null ? "" : EntityUtils.toString(entity, StandardCharsets.UTF_8);
-                    if (!StringUtils.hasText(resp)) {
-                        log.info("http response entity is empty, status: {}.", statusCode);
-                    }
-                    switch (parseType) {
-                        case DispatchConstants.PARSE_JSON_PATH ->
-                                parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                        case DispatchConstants.PARSE_PROM_QL ->
-                                parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
-                        case DispatchConstants.PARSE_XML_PATH ->
-                                parseResponseByXmlPath(resp, metrics, builder, responseTime);
-                        case DispatchConstants.PARSE_WEBSITE ->
-                                parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime, statusCode);
-                        case DispatchConstants.PARSE_SITE_MAP ->
-                                parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
-                        case DispatchConstants.PARSE_CONFIG ->
-                                parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                        default ->
-                                parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                    }
+                switch (parseType) {
+                    case DispatchConstants.PARSE_JSON_PATH ->
+                            parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                    case DispatchConstants.PARSE_PROM_QL ->
+                            parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
+                    case DispatchConstants.PARSE_PROMETHEUS ->
+                            parseResponseByPrometheusExporter(response.getEntity().getContent(), metrics.getAliasFields(), builder);
+                    case DispatchConstants.PARSE_XML_PATH ->
+                            parseResponseByXmlPath(resp, metrics, builder, responseTime);
+                    case DispatchConstants.PARSE_WEBSITE ->
+                            parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime);
+                    case DispatchConstants.PARSE_SITE_MAP ->
+                            parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
+                    case DispatchConstants.PARSE_HEADER ->
+                            parseResponseByHeader(builder, metrics.getAliasFields(), response);
+                    case DispatchConstants.PARSE_CONFIG ->
+                            parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                    default ->
+                            parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                }
            } catch (Exception e) {
                log.info("parse error: {}.", e.getMessage(), e);
@@ -247,15 +237,11 @@ public class HttpCollectImpl extends AbstractCollect {
    }

    private void parseResponseByWebsite(String resp, Metrics metrics, HttpProtocol http,
-                                        CollectRep.MetricsData.Builder builder, Long responseTime, int statusCode) {
+                                        CollectRep.MetricsData.Builder builder, Long responseTime) {
        CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
        for (String alias : metrics.getAliasFields()) {
-            if (CollectorConstants.STATUS_CODE.equalsIgnoreCase(alias)) {
-                valueRowBuilder.addColumn(Integer.toString(statusCode));
-            } else {
-                addColumnForSummary(responseTime, valueRowBuilder, keywordNum, alias);
-            }
+            addColumnForSummary(responseTime, valueRowBuilder, keywordNum, alias);
        }
        builder.addValueRow(valueRowBuilder.build());
    }
@@ -604,18 +590,6 @@ public class HttpCollectImpl extends AbstractCollect {
                    }
                }
                builder.addValueRow(valueRowBuilder.build());
-            } else if (objectValue instanceof Number numberValue) {
-                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-                for (String alias : aliasFields) {
-                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(responseTime.toString());
-                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                    } else {
-                        valueRowBuilder.addColumn(numberValue.toString());
-                    }
-                }
-                builder.addValueRow(valueRowBuilder.build());
            }
        }
    }
@@ -878,4 +852,4 @@ public class HttpCollectImpl extends AbstractCollect {
        }
        return successCodeSet.contains(statusCode);
    }
-}
+}
@@ -42,6 +42,7 @@ import javax.management.remote.JMXServiceURL;
 import javax.management.remote.rmi.RMIConnectorServer;
 import javax.naming.Context;
 import javax.rmi.ssl.SslRMIClientSocketFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.common.cache.AbstractConnection;
 import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier;
@@ -53,21 +54,19 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.JmxProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.hertzbeat.common.util.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

 /**
 * jmx protocol acquisition implementation
 */
+@Slf4j
 public class JmxCollectImpl extends AbstractCollect {

    private static final String JMX_URL_PREFIX = "service:jmx:rmi:///jndi/rmi://";

    private static final String JMX_URL_SUFFIX = "/jmxrmi";
-
+    
    private static final String IGNORED_STUB = "/stub/";

    private static final String SUB_ATTRIBUTE = "->";
@@ -76,8 +75,7 @@ public class JmxCollectImpl extends AbstractCollect {

    private final ClassLoader jmxClassLoader;

-    private static final Logger logger = LoggerFactory.getLogger(JmxCollectImpl.class);
-
+    
    public JmxCollectImpl() {
        jmxClassLoader = new JmxClassLoader(ClassLoader.getSystemClassLoader());
    }
@@ -85,66 +83,13 @@ public class JmxCollectImpl extends AbstractCollect {
    @Override
    public void preCheck(Metrics metrics) throws IllegalArgumentException {
        Assert.isTrue(metrics != null && metrics.getJmx() != null, "JMX collect must have JMX params");
-        JmxProtocol jmxProtocol = metrics.getJmx();

-        // Validate JMX URL if provided
-        String url = jmxProtocol.getUrl();
+        String url = metrics.getJmx().getUrl();
        if (StringUtils.hasText(url)) {
            Assert.doesNotContain(url, IGNORED_STUB, "JMX url prohibit contains stub, please check");
-
-            // Prevent JNDI injection by validating URL format
-            validateJmxUrl(url);
-        } else {
-            // Validate host and port inputs
-            String host = jmxProtocol.getHost();
-            int port = Integer.parseInt(jmxProtocol.getPort());
-
-            // Validate host format (only allow valid hostnames or IP addresses)
-            Assert.isTrue(isValidHostname(host), "Invalid hostname format");
-            Assert.isTrue(port > 0 && port <= 65535, "Port must be between 1 and 65535");
        }
    }

-    /**
-     * Validate JMX URL 
-     * 
-     * @param url JMX URL to validate
-     * @throws IllegalArgumentException if URL is potentially malicious
-     */
-    private void validateJmxUrl(String url) throws IllegalArgumentException {
-        // Only allow service:jmx:rmi protocol
-        Assert.isTrue(url.startsWith("service:jmx:rmi:"), "Only service:jmx:rmi protocol is supported");
-
-        String[] disallowedPatterns = { "ldap:", "rmi:", "iiop:", "nis:", "dns:", "corbaname:", "http:", "https:" };
-        for (String pattern : disallowedPatterns) {
-            if (url.contains(pattern) && !pattern.equals("rmi:///jndi/rmi:")) {
-                throw new IllegalArgumentException("Potentially unsafe JNDI protocol detected in URL: " + pattern);
-            }
-        }
-
-        // Check for suspicious patterns
-        if (url.contains("${") || url.contains("$[") || url.contains(":#") || url.contains(":/")) {
-            throw new IllegalArgumentException("Potentially malicious pattern detected in JMX URL");
-        }
-    }
-
-    /**
-     * Validate hostname format 
-     * 
-     * @param hostname Hostname to validate
-     * @return true if hostname is valid
-     */
-    private boolean isValidHostname(String hostname) {
-        if (hostname == null || hostname.isEmpty()) {
-            return false;
-        }
-
-        // Simplified hostname/IP validation regex
-        // This regex accepts valid hostnames, IPv4 and IPv6 addresses
-        String hostnameRegex = "^([a-zA-Z0-9][-a-zA-Z0-9]*\\.)+[a-zA-Z0-9][-a-zA-Z0-9]*$|^(\\d{1,3}\\.){3}\\d{1,3}$|^([0-9a-fA-F]{0,4}:){2,7}[0-9a-fA-F]{0,4}$";
-        return hostname.matches(hostnameRegex);
-    }
-
    @Override
    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
        ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
@@ -198,12 +143,12 @@ public class JmxCollectImpl extends AbstractCollect {
            }
        } catch (IOException exception) {
            String errorMsg = CommonUtil.getMessageFromThrowable(exception);
-            LogUtil.error(logger, "JMX IOException: {0}", errorMsg);
+            log.error("JMX IOException :{}", errorMsg);
            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
            builder.setMsg(errorMsg);
        } catch (Exception e) {
            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            LogUtil.error(logger, "JMX Error: {0}", errorMsg);
+            log.error("JMX Error :{}", errorMsg);
            builder.setCode(CollectRep.Code.FAIL);
            builder.setMsg(errorMsg);
        } finally {
@@ -224,21 +169,19 @@ public class JmxCollectImpl extends AbstractCollect {
        for (Attribute attribute : attributeList.asList()) {
            Object value = attribute.getValue();
            if (value == null) {
-                LogUtil.info(logger, "attribute {0} value is null.", attribute.getName());
+                log.info("attribute {} value is null.", attribute.getName());
                continue;
            }
-            if (value instanceof Number || value instanceof String || value instanceof ObjectName
+            if (value instanceof Number || value instanceof  String || value instanceof ObjectName
                    || value instanceof Boolean || value instanceof Date || value instanceof TimeUnit) {
                attributeValueMap.put(attribute.getName(), value.toString());
-            } else if (value instanceof CompositeData) {
-                CompositeData compositeData = (CompositeData) value;
+            } else if (value instanceof CompositeData compositeData) {
                CompositeType compositeType = compositeData.getCompositeType();
                for (String typeKey : compositeType.keySet()) {
                    Object fieldValue = compositeData.get(typeKey);
                    attributeValueMap.put(attribute.getName() + SUB_ATTRIBUTE + typeKey, fieldValue.toString());
                }
-            } else if (value instanceof String[]) {
-                String[] values = (String[]) value;
+            } else if (value instanceof String[] values) {
                StringBuilder builder = new StringBuilder();
                for (int index = 0; index < values.length; index++) {
                    builder.append(values[index]);
@@ -248,7 +191,7 @@ public class JmxCollectImpl extends AbstractCollect {
                }
                attributeValueMap.put(attribute.getName(), builder.toString());
            } else {
-                LogUtil.warn(logger, "attribute value type {0} not support.", value.getClass().getName());
+                log.warn("attribute value type {} not support.", value.getClass().getName());
            }
        }
        return attributeValueMap;
@@ -276,33 +219,12 @@ public class JmxCollectImpl extends AbstractCollect {
        String url;
        if (jmxProtocol.getUrl() != null) {
            url = jmxProtocol.getUrl();
-            // Double check URL format for security
-            if (!url.startsWith("service:jmx:rmi:")) {
-                throw new IOException("Unsupported JMX URL protocol. Only service:jmx:rmi: is allowed.");
-            }
        } else {
-            // More strict formatting with proper escaping
-            String host = jmxProtocol.getHost();
-            int port = Integer.parseInt(jmxProtocol.getPort());
-
-            // Additional validation at connection time
-            if (!isValidHostname(host)) {
-                throw new IOException("Invalid hostname format for JMX connection: " + host);
-            }
-            if (port <= 0 || port > 65535) {
-                throw new IOException("Invalid port for JMX connection: " + port);
-            }
-
-            url = JMX_URL_PREFIX + host + ":" + port + JMX_URL_SUFFIX;
+            url = JMX_URL_PREFIX + jmxProtocol.getHost() + ":" + jmxProtocol.getPort() + JMX_URL_SUFFIX;
        }
-
-        // Set security properties to prevent remote class loading
-        System.setProperty("com.sun.jndi.rmi.object.trustURLCodebase", "false");
-        System.setProperty("com.sun.jndi.cosnaming.object.trustURLCodebase", "false");
-
        Map<String, Object> environment = new HashMap<>(4);
        if (StringUtils.hasText(jmxProtocol.getUsername()) && StringUtils.hasText(jmxProtocol.getPassword())) {
-            String[] credential = new String[] { jmxProtocol.getUsername(), jmxProtocol.getPassword() };
+            String[] credential = new String[] {jmxProtocol.getUsername(), jmxProtocol.getPassword()};
            environment.put(javax.management.remote.JMXConnector.CREDENTIALS, credential);
        }
        if (Boolean.TRUE.toString().equals(jmxProtocol.getSsl())) {
@@ -311,20 +233,10 @@ public class JmxCollectImpl extends AbstractCollect {
            environment.put(RMIConnectorServer.RMI_CLIENT_SOCKET_FACTORY_ATTRIBUTE, clientSocketFactory);
            environment.put("com.sun.jndi.rmi.factory.socket", clientSocketFactory);
        }
-
-        // Limit JMX connection timeout
-        environment.put("jmx.remote.x.client.connection.timeout", 10000);
-        environment.put("jmx.remote.x.server.connection.timeout", 10000);
-
-        try {
-            JMXServiceURL jmxServiceUrl = new JMXServiceURL(url);
-            conn = JMXConnectorFactory.connect(jmxServiceUrl, environment);
-            connectionCommonCache.addCache(identifier, new JmxConnect(conn));
-            return conn;
-        } catch (Exception e) {
-            LogUtil.error(logger, "Failed to connect to JMX connection: {0}", e.getMessage());
-            throw new IOException("Failed to connect to JMX server: " + e.getMessage(), e);
-        }
+        JMXServiceURL jmxServiceUrl = new JMXServiceURL(url);
+        conn = JMXConnectorFactory.connect(jmxServiceUrl, environment);
+        connectionCommonCache.addCache(identifier, new JmxConnect(conn));
+        return conn;
    }

 }
@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.mqtt;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formats the private key and certificate, supporting concatenation of multiple certificates in PEM format.
- */
-public class CertificateFormatter {
-
-    public static String formatCertificateChain(String input) {
-        if (input == null || input.trim().isEmpty()) {
-            return input;
-        }
-
-        String normalized = normalizeInput(input);
-
-        List<String> certificates = extractCertificates(normalized);
-
-        if (certificates.isEmpty()) {
-            return formatAsSingleCertificate(normalized);
-        }
-
-        StringBuilder formattedChain = new StringBuilder();
-        for (String cert : certificates) {
-            if (cert.trim().isEmpty()) continue;
-
-            String formatted = formatPemBlock(cert);
-            formattedChain.append(formatted).append("\n");
-        }
-
-        return formattedChain.toString().trim();
-    }
-
-    private static String normalizeInput(String input) {
-        return input
-                .replace("\r\n", "\n")
-                .replace("\r", "\n")
-                .replaceAll("\\s*\\\\n\\s*", "\n")
-                .replaceAll("(?m)^\\s+|\\s+$", "")
-                .trim();
-    }
-
-    private static List<String> extractCertificates(String input) {
-        List<String> certificates = new ArrayList<>();
-        String regex = "(-----BEGIN\\s+[\\w\\s]+?-----)[\\s\\S]*?(-----END\\s+[\\w\\s]+?-----)";
-
-
-        Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-        Matcher matcher = pattern.matcher(input);
-
-        int lastEnd = 0;
-        while (matcher.find()) {
-
-            if (matcher.start() > lastEnd) {
-                String gap = input.substring(lastEnd, matcher.start());
-                if (!gap.trim().isEmpty()) {
-                    certificates.add(gap);
-                }
-            }
-
-            certificates.add(matcher.group());
-            lastEnd = matcher.end();
-        }
-
-
-        if (lastEnd < input.length()) {
-            certificates.add(input.substring(lastEnd));
-        }
-
-        return certificates;
-    }
-
-    private static String formatPemBlock(String block) {
-        try {
-            Pattern pattern = Pattern.compile(
-                    "(-----BEGIN\\s+[\\w\\s]+?-----)(.*?)(-----END\\s+[\\w\\s]+?-----)",
-                    Pattern.DOTALL | Pattern.CASE_INSENSITIVE
-            );
-
-            Matcher matcher = pattern.matcher(block);
-            if (matcher.find()) {
-                String header = matcher.group(1).trim();
-                String body = matcher.group(2);
-                String footer = matcher.group(3).trim();
-
-
-                if (body == null) body = "";
-
-                String cleanBody = body
-                        .replaceAll("\\s", "")
-                        .replaceAll("\"", "")
-                        .trim();
-
-
-                if (cleanBody.isEmpty() && body != null && !body.trim().isEmpty()) {
-
-                    cleanBody = body.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-                }
-
-                String formattedBody = formatBase64Body(cleanBody);
-
-                return header + "\n" + formattedBody + "\n" + footer;
-            } else {
-
-                return formatAsCertificate(block);
-            }
-        } catch (Exception e) {
-
-            return block;
-        }
-    }
-
-    private static String formatAsCertificate(String content) {
-
-        String cleanContent = content.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-
-        if (cleanContent.isEmpty()) {
-            return content;
-        }
-
-
-        String formattedBody = formatBase64Body(cleanContent);
-
-
-        if (cleanContent.toLowerCase().contains("private")) {
-            if (cleanContent.startsWith("MII") || cleanContent.length() > 1000) {
-                return "-----BEGIN PRIVATE KEY-----\n" + formattedBody + "\n-----END PRIVATE KEY-----";
-            } else {
-                return "-----BEGIN RSA PRIVATE KEY-----\n" + formattedBody + "\n-----END RSA PRIVATE KEY-----";
-            }
-        } else {
-            return "-----BEGIN CERTIFICATE-----\n" + formattedBody + "\n-----END CERTIFICATE-----";
-        }
-    }
-
-    private static String formatAsSingleCertificate(String input) {
-        String cleanContent = input.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-        return formatAsCertificate(cleanContent);
-    }
-
-    private static String formatBase64Body(String body) {
-
-        StringBuilder formatted = new StringBuilder();
-        int index = 0;
-        while (index < body.length()) {
-            int end = Math.min(index + 64, body.length());
-            formatted.append(body.substring(index, end));
-            if (end < body.length()) {
-                formatted.append("\n");
-            }
-            index = end;
-        }
-        return formatted.toString().trim();
-    }
-
-    public static String formatPrivateKey(String input) {
-        if (input == null || input.trim().isEmpty()) {
-            return input;
-        }
-
-
-        String normalized = normalizeInput(input);
-
-
-        if (isPemEncapsulated(normalized)) {
-            return formatPemBlock(normalized);
-        }
-
-        return formatAsCertificate(normalized);
-    }
-
-    private static boolean isPemEncapsulated(String block) {
-        return block.contains("-----BEGIN") && block.contains("-----END");
-    }
-}
@@ -17,7 +17,26 @@

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

-
+import com.hivemq.client.mqtt.MqttVersion;
+import com.hivemq.client.mqtt.datatypes.MqttQos;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3Client;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder;
+import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder;
+import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
@@ -27,27 +46,13 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.entity.message.CollectRep.MetricsData.Builder;
-import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
-import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.IMqttToken;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StopWatch;

-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 /**
- * collect mqtt metrics using Eclipse Paho
+ * collect mqtt metrics
 */
 public class MqttCollectImpl extends AbstractCollect {

@@ -56,224 +61,138 @@ public class MqttCollectImpl extends AbstractCollect {

    private static final Logger logger = LoggerFactory.getLogger(MqttCollectImpl.class);

-    @Override
-    public String supportProtocol() {
-        return DispatchConstants.PROTOCOL_MQTT;
-    }
-
    @Override
    public void preCheck(Metrics metrics) throws IllegalArgumentException {
        MqttProtocol mqttProtocol = metrics.getMqtt();
        Assert.hasText(mqttProtocol.getHost(), "MQTT protocol host is required");
        Assert.hasText(mqttProtocol.getPort(), "MQTT protocol port is required");
-
-        if ("mqtts".equalsIgnoreCase(mqttProtocol.getProtocol())) {
-            if (Boolean.parseBoolean(mqttProtocol.getEnableMutualAuth())) {
-                Assert.hasText(mqttProtocol.getCaCert(), "CA certificate is required for mutual auth");
-                Assert.hasText(mqttProtocol.getClientCert(), "Client certificate is required for mutual auth");
-                Assert.hasText(mqttProtocol.getClientKey(), "Client private key is required for mutual auth");
-            }
-        }
+        Assert.hasText(mqttProtocol.getProtocolVersion(), "MQTT protocol version is required");
    }

    @Override
    public void collect(Builder builder, Metrics metrics) {
+        MqttProtocol mqtt = metrics.getMqtt();
+        String protocolVersion = mqtt.getProtocolVersion();
+        MqttVersion mqttVersion = MqttVersion.valueOf(protocolVersion);
+        if (mqttVersion == MqttVersion.MQTT_3_1_1) {
+            collectWithVersion3(metrics, builder);
+        } else if (mqttVersion == MqttVersion.MQTT_5_0) {
+            collectWithVersion5(metrics, builder);
+        }
+    }
+
+    @Override
+    public String supportProtocol() {
+        return DispatchConstants.PROTOCOL_MQTT;
+    }
+
+    /**
+     * collecting data of MQTT 5
+     */
+    private void collectWithVersion5(Metrics metrics, Builder builder) {
        MqttProtocol mqttProtocol = metrics.getMqtt();
        Map<Object, String> data = new HashMap<>();
-
-        try {
-            MqttAsyncClient client = buildMqttClient(mqttProtocol);
-            long responseTime = connectClient(client, mqttProtocol);
-            testSubscribeAndPublish(client, mqttProtocol, data);
-            convertToMetricsData(builder, metrics, responseTime, data);
-            client.disconnect();
-        } catch (Exception e) {
-            logger.error("MQTT collection error: {}", e.getMessage(), e);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("Collection failed: " + e.getMessage());
-        }
-    }
-
-    private MqttAsyncClient buildMqttClient(MqttProtocol protocol) throws Exception {
-        String clientId = protocol.getClientId();
-
-        String serverUri = String.format("%s://%s:%s",
-                StringUtils.equals(protocol.getProtocol(), "MQTT") ? "tcp" : "ssl",
-                protocol.getHost(),
-                protocol.getPort());
-
-        MqttClientPersistence persistence = new MemoryPersistence();
-
-        return new MqttAsyncClient(serverUri, clientId, persistence);
-    }
-
-    private long connectClient(MqttAsyncClient client, MqttProtocol protocol) throws Exception {
-        MqttConnectOptions connOpts = new MqttConnectOptions();
-
-        if (protocol.hasAuth()) {
-            connOpts.setUserName(protocol.getUsername());
-            connOpts.setPassword(protocol.getPassword().toCharArray());
-        }
-
-        connOpts.setKeepAliveInterval(Integer.parseInt(protocol.getKeepalive()));
-        connOpts.setConnectionTimeout(Integer.parseInt(protocol.getTimeout()) / 1000);
-        connOpts.setCleanSession(true);
-        connOpts.setAutomaticReconnect(false);
-        if ("mqtts".equalsIgnoreCase(protocol.getProtocol())) {
-            boolean insecureSkipVerify = Boolean.parseBoolean(protocol.getInsecureSkipVerify());
-            if (insecureSkipVerify) {
-                connOpts.setHttpsHostnameVerificationEnabled(false);
-            }
-            if (Boolean.parseBoolean(protocol.getEnableMutualAuth())) {
-                connOpts.setSocketFactory(MqttSslFactory.getMslSocketFactory(protocol, insecureSkipVerify));
-            } else {
-                connOpts.setSocketFactory(MqttSslFactory.getSslSocketFactory(protocol, insecureSkipVerify));
-            }
-        }
-
-
-        StopWatch connectWatch = new StopWatch();
-        connectWatch.start();
-
-        client.connect(connOpts).waitForCompletion(Long.parseLong(protocol.getTimeout()));
-        connectWatch.stop();
-        return connectWatch.getTotalTimeMillis();
-    }
-
-
-    /**
-     * Test MQTT subscribe and publish capabilities
-     */
-    private void testSubscribeAndPublish(MqttAsyncClient client, MqttProtocol protocol, Map<Object, String> data) {
-
-        // 1 test subscribe
-        if (StringUtils.isNotBlank(protocol.getTopic())) {
-            String subscribe = testSubscribe(client, protocol.getTopic());
-            if (StringUtils.isBlank(subscribe)) {
-                data.put("canSubscribe", "Subscription successful");
-            } else {
-                data.put("canSubscribe", String.format("Subscription failed: %s", subscribe));
-            }
-
-        } else {
-            data.put("canSubscribe", "No topic, subscription test skipped");
-        }
-
-
-        // 2 test publish
-        if (StringUtils.isNotBlank(protocol.getTestMessage())) {
-            String publish = testPublish(client, protocol.getTopic(), protocol.getTestMessage());
-            if (StringUtils.isBlank(publish)) {
-                data.put("canPublish", "Message published successfully");
-
-                // 3 test receive message
-                String receivedData = getReceivedData(client, protocol.getTopic());
-                data.put("canReceive", receivedData);
-            } else {
-                data.put("canPublish", String.format("Message publishing failed: %s", publish));
-                data.put("canReceive", "Message reception skipped due to failed publish");
-            }
-        } else {
-            data.put("canPublish", "No test message, publish test skipped");
-            data.put("canReceive", "No test message, receive test skipped");
-        }
-
-
-        // 4 test unsubscribe
-        if (StringUtils.isNotBlank(protocol.getTopic())) {
-            String subscribe = testUnSubscribe(client, protocol.getTopic());
-            if (StringUtils.isBlank(subscribe)) {
-                data.put("canUnSubscribe", "Unsubscription successful");
-            } else {
-                data.put("canUnSubscribe", String.format("Unsubscription failed: %s", subscribe));
-            }
-        } else {
-            data.put("canUnSubscribe", "No topic, unsubscription test skipped");
-        }
-    }
-
-    private String getReceivedData(MqttAsyncClient client, String topic) {
-        final CountDownLatch latch = new CountDownLatch(1);
-        final StringBuilder messageHolder = new StringBuilder();
-
-
-        client.setCallback(new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                latch.countDown();
-            }
-
-            @Override
-            public void messageArrived(String arrivedTopic, MqttMessage message) {
-
-                if (topic.equals(arrivedTopic)) {
-                    messageHolder.append(new String(message.getPayload()));
-                    latch.countDown();
-                }
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
+        Mqtt5AsyncClient client = buildMqtt5Client(mqttProtocol);
+        long responseTime = connectClient(client, mqtt5AsyncClient -> {
+            CompletableFuture<Mqtt5ConnAck> connectFuture = mqtt5AsyncClient.connect();
+            try {
+                connectFuture.get(Long.parseLong(mqttProtocol.getTimeout()), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg(getErrorMessage(e.getMessage()));
            }
        });
-
-        try {
-            boolean received = latch.await(5, TimeUnit.SECONDS);
-            if (messageHolder.length() > 0) {
-                return messageHolder.toString();
-            } else if (!received) {
-                return "Message reception timed out after 5 seconds";
-            } else {
-                return "No valid message received";
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return e.getMessage();
-        } finally {
-            client.setCallback(null);
-        }
-    }
-
-    private String testSubscribe(MqttAsyncClient client, String topic) {
-        try {
-            IMqttToken subToken = client.subscribe(topic, 1);
-            subToken.waitForCompletion(5000);
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT subscribe test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
-    }
-
-    private String testPublish(MqttAsyncClient client, String topic, String message) {
-        try {
-            MqttMessage mqttMessage = new MqttMessage(message.getBytes());
-            mqttMessage.setQos(1);
-
-            IMqttToken pubToken = client.publish(topic, mqttMessage);
-            pubToken.waitForCompletion(5000);
-
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT publish test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
-    }
-
-    private String testUnSubscribe(MqttAsyncClient client, String topic) {
-        try {
-            IMqttToken unsubToken = client.unsubscribe(topic);
-            unsubToken.waitForCompletion(5000);
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT unsubscribe test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
+        testDescribeAndPublish5(client, mqttProtocol, data);
+        convertToMetricsData(builder, metrics, responseTime, data);
+        client.disconnect();
    }

    /**
-     * Convert collected data to MetricsData
+     * collecting data of MQTT 3.1.1
     */
+    private void collectWithVersion3(Metrics metrics, Builder builder) {
+        MqttProtocol mqttProtocol = metrics.getMqtt();
+        Map<Object, String> data = new HashMap<>();
+        Mqtt3AsyncClient client = buildMqtt3Client(mqttProtocol);
+        long responseTime = connectClient(client, mqtt3AsyncClient -> {
+            CompletableFuture<Mqtt3ConnAck> connectFuture = mqtt3AsyncClient.connect();
+            try {
+                connectFuture.get(Long.parseLong(mqttProtocol.getTimeout()), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg(getErrorMessage(e.getMessage()));
+            }
+        });
+        testDescribeAndPublish3(client, mqttProtocol, data);
+        convertToMetricsData(builder, metrics, responseTime, data);
+        client.disconnect();
+    }
+
+    private void testDescribeAndPublish3(Mqtt3AsyncClient client, MqttProtocol mqttProtocol, Map<Object, String> data) {
+        data.put("canDescribe", test(() -> {
+            client.subscribeWith().topicFilter(mqttProtocol.getTopic()).qos(MqttQos.AT_LEAST_ONCE).send();
+            client.unsubscribeWith().topicFilter(mqttProtocol.getTopic()).send();
+        }, "subscribe").toString());
+
+        data.put("canPublish", !mqttProtocol.testPublish() ? Boolean.FALSE.toString() : test(() -> {
+            client.publishWith().topic(mqttProtocol.getTopic())
+                .payload(mqttProtocol.getTestMessage().getBytes(StandardCharsets.UTF_8))
+                .qos(MqttQos.AT_LEAST_ONCE).send();
+            data.put("canPublish", Boolean.TRUE.toString());
+        }, "publish").toString());
+    }
+
+    private void testDescribeAndPublish5(Mqtt5AsyncClient client, MqttProtocol mqttProtocol, Map<Object, String> data) {
+        data.put("canDescribe", test(() -> {
+            client.subscribeWith().topicFilter(mqttProtocol.getTopic()).qos(MqttQos.AT_LEAST_ONCE).send();
+            client.unsubscribeWith().topicFilter(mqttProtocol.getTopic()).send();
+        }, "subscribe").toString());
+
+        data.put("canPublish", !mqttProtocol.testPublish() ? Boolean.FALSE.toString() : test(() -> {
+            client.publishWith().topic(mqttProtocol.getTopic())
+                .payload(mqttProtocol.getTestMessage().getBytes(StandardCharsets.UTF_8))
+                .qos(MqttQos.AT_LEAST_ONCE).send();
+            data.put("canPublish", Boolean.TRUE.toString());
+        }, "publish").toString());
+    }
+
+    private Mqtt5AsyncClient buildMqtt5Client(MqttProtocol mqttProtocol) {
+        Mqtt5ClientBuilder mqtt5ClientBuilder = Mqtt5Client.builder()
+            .serverHost(mqttProtocol.getHost())
+            .identifier(mqttProtocol.getClientId())
+            .serverPort(Integer.parseInt(mqttProtocol.getPort()));
+
+        if (mqttProtocol.hasAuth()) {
+            mqtt5ClientBuilder.simpleAuth().username(mqttProtocol.getUsername())
+                .password(mqttProtocol.getPassword().getBytes(StandardCharsets.UTF_8))
+                .applySimpleAuth();
+        }
+        return mqtt5ClientBuilder.buildAsync();
+    }
+
+    private Mqtt3AsyncClient buildMqtt3Client(MqttProtocol mqttProtocol) {
+
+        Mqtt3ClientBuilder mqtt3ClientBuilder = Mqtt3Client.builder()
+            .serverHost(mqttProtocol.getHost())
+            .identifier(mqttProtocol.getClientId())
+            .serverPort(Integer.parseInt(mqttProtocol.getPort()));
+
+        if (mqttProtocol.hasAuth()) {
+            mqtt3ClientBuilder.simpleAuth().username(mqttProtocol.getUsername())
+                .password(mqttProtocol.getPassword().getBytes(StandardCharsets.UTF_8))
+                .applySimpleAuth();
+        }
+        return mqtt3ClientBuilder.buildAsync();
+    }
+
+    public <T> long connectClient(T client, Consumer<T> connect) {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        connect.accept(client);
+        stopWatch.stop();
+        return stopWatch.getTotalTimeMillis();
+    }
+
    private void convertToMetricsData(Builder builder, Metrics metrics, long responseTime, Map<Object, String> data) {
        CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
        for (String column : metrics.getAliasFields()) {
@@ -288,4 +207,25 @@ public class MqttCollectImpl extends AbstractCollect {
        builder.addValueRow(valueRowBuilder.build());
    }

+    private Boolean test(Runnable runnable, String operationName) {
+        try {
+            runnable.run();
+            return true;
+        } catch (Exception e) {
+            logger.error("{} fail", operationName, e);
+        }
+        return false;
+    }
+
+    private String getErrorMessage(String errorMessage) {
+        if (StringUtils.isBlank(errorMessage)) {
+            return "connect failed";
+        }
+        String[] split = errorMessage.split(":");
+        if (split.length > 1) {
+            return Arrays.stream(split).skip(1).collect(Collectors.joining(":"));
+        }
+        return errorMessage;
+    }
+
 }
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.mqtt;
-
-import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-/**
- * Support MQTT SSL Factory
- */
-public class MqttSslFactory {
-
-    /**
-     * Get MSL Socket Factory
-     */
-    public static SSLSocketFactory getMslSocketFactory(MqttProtocol mqttProtocol, boolean insecureSkipVerify) {
-        try {
-            Security.addProvider(new BouncyCastleProvider());
-
-            KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-            ks.load(null, null);
-
-            Certificate[] chain = null;
-            if (mqttProtocol.getClientCert() != null && !mqttProtocol.getClientCert().isEmpty()) {
-                String formatClientCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getClientCert());
-                try (InputStream certIn = new ByteArrayInputStream(formatClientCert.getBytes())) {
-                    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                    Collection<? extends Certificate> certs = cf.generateCertificates(certIn);
-                    chain = certs.toArray(new Certificate[0]);
-                }
-            }
-
-            PrivateKey privateKey;
-            if (mqttProtocol.getClientKey() != null && !mqttProtocol.getClientKey().isEmpty()) {
-                String formatClientKey = CertificateFormatter.formatPrivateKey(mqttProtocol.getClientKey());
-                try (PEMParser pemParser = new PEMParser(new StringReader(formatClientKey))) {
-                    JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-                    Object object = pemParser.readObject();
-
-                    if (object instanceof PEMKeyPair) {
-                        privateKey = converter.getPrivateKey(((PEMKeyPair) object).getPrivateKeyInfo());
-                    } else if (object instanceof PrivateKeyInfo) {
-                        privateKey = converter.getPrivateKey((PrivateKeyInfo) object);
-                    } else {
-                        throw new IllegalArgumentException("Unsupported private key type");
-                    }
-
-                    ks.setKeyEntry("private-key", privateKey, "".toCharArray(), chain);
-                }
-            }
-
-            TrustManager[] trustManagers;
-            if (insecureSkipVerify) {
-                trustManagers = createInsecureTrustManager();
-            } else {
-                String formatCaCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getCaCert());
-                KeyStore trustStore = createMergedTrustStore(formatCaCert);
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                tmf.init(trustStore);
-                trustManagers = tmf.getTrustManagers();
-            }
-
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-            kmf.init(ks, "".toCharArray());
-
-
-            SSLContext context = SSLContext.getInstance(mqttProtocol.getTlsVersion());
-            context.init(kmf.getKeyManagers(), trustManagers, null);
-
-            return context.getSocketFactory();
-        } catch (Exception e) {
-            throw new RuntimeException("Fails to SSL initialize: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Get SSL Socket Factory
-     */
-    public static SSLSocketFactory getSslSocketFactory(MqttProtocol mqttProtocol, boolean insecureSkipVerify) {
-        try {
-            Security.addProvider(new BouncyCastleProvider());
-
-
-            TrustManager[] trustManagers;
-            if (insecureSkipVerify) {
-                trustManagers = createInsecureTrustManager();
-            } else {
-
-                String formatCaCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getCaCert());
-                KeyStore trustStore = createMergedTrustStore(formatCaCert);
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                tmf.init(trustStore);
-                trustManagers = tmf.getTrustManagers();
-            }
-
-            SSLContext sslContext = SSLContext.getInstance(mqttProtocol.getTlsVersion());
-            sslContext.init(null, trustManagers, null);
-
-            return sslContext.getSocketFactory();
-        } catch (Exception e) {
-            throw new RuntimeException("Fails to SSL initialize: " + e.getMessage(), e);
-        }
-    }
-
-    private static TrustManager[] createInsecureTrustManager() {
-        return new TrustManager[]{
-                new X509TrustManager() {
-                    public void checkClientTrusted(X509Certificate[] chain, String authType) {
-                    }
-
-                    public void checkServerTrusted(X509Certificate[] chain, String authType) {
-                    }
-
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-                }
-        };
-    }
-
-    private static KeyStore createMergedTrustStore(String caCertPem) throws Exception {
-        KeyStore mergedKs = KeyStore.getInstance(KeyStore.getDefaultType());
-        mergedKs.load(null, null);
-
-
-        TrustManagerFactory systemTmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        systemTmf.init((KeyStore) null);
-        X509TrustManager systemTm = (X509TrustManager) systemTmf.getTrustManagers()[0];
-
-        int systemIndex = 1;
-        for (X509Certificate cert : systemTm.getAcceptedIssuers()) {
-            mergedKs.setCertificateEntry("system-ca-" + systemIndex++, cert);
-        }
-
-
-        if (caCertPem != null && !caCertPem.isEmpty()) {
-            try (InputStream caIn = new ByteArrayInputStream(caCertPem.getBytes())) {
-                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                Collection<? extends Certificate> customCerts = cf.generateCertificates(caIn);
-
-                int customIndex = 1;
-                for (Certificate cert : customCerts) {
-                    mergedKs.setCertificateEntry("custom-ca-" + customIndex++, cert);
-                }
-            }
-        }
-
-        return mergedKs;
-    }
-}
@@ -72,13 +72,12 @@ import org.springframework.util.StringUtils;
 * prometheus auto collect
 */
@Slf4j
-public class PrometheusAutoCollectImpl implements PrometheusCollect {
+public class PrometheusAutoCollectImpl {
    
    private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
            HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
            HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
    
-    @Override
    public List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder,
                                                Metrics metrics) {
        try {
@@ -140,7 +139,6 @@ public class PrometheusAutoCollectImpl implements PrometheusCollect {
        return Collections.singletonList(builder.build());
    }
    
-    @Override
    public String supportProtocol() {
        return DispatchConstants.PROTOCOL_PROMETHEUS;
    }
@@ -181,7 +179,7 @@ public class PrometheusAutoCollectImpl implements PrometheusCollect {
                            builder.addField(CollectRep.Field.newBuilder().setName(label.getName())
                                    .setType(CommonConstants.TYPE_STRING).setLabel(true).build());
                        });
-                        builder.addField(CollectRep.Field.newBuilder().setName("metric_value")
+                        builder.addField(CollectRep.Field.newBuilder().setName("value")
                                .setType(CommonConstants.TYPE_NUMBER).setLabel(false).build());
                    }
                    Map<String, String> labelMap = metric.getLabels()
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.prometheus;
-
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-
-import java.util.List;
-
-/**
- * Prometheus metrics collector interface
- */
-public interface PrometheusCollect {
-
-    /**
-     * Collect prometheus metrics data
-     * @param builder metrics data builder
-     * @param metrics metrics config
-     * @return list of metrics data
-     */
-    List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder, Metrics metrics);
-
-    /**
-     * Get the protocol name this collector supported
-     * @return protocol name
-     */
-    String supportProtocol();
-}
@@ -1,308 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.prometheus;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.constants.NetworkConstants;
-import org.apache.hertzbeat.common.constants.SignConstants;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.PrometheusProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.util.Base64Util;
-import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.hertzbeat.common.util.IpDomainUtil;
-import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpStatus;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.auth.DigestScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.EntityUtils;
-import org.springframework.http.MediaType;
-import org.springframework.util.StringUtils;
-
-import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-import javax.net.ssl.SSLException;
-
-import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
-
-
-@Slf4j
-public class PrometheusProxyCollectImpl implements PrometheusCollect {
-
-    private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
-            HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
-            HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
-
-    public static final String RAW_TEXT_CONTENT_FIELD_NAME = "raw_text_content";
-
-    @Override
-    public List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        PrometheusProtocol prometheusProtocol = metrics.getPrometheus();
-        HttpUriRequest request;
-        try {
-            validateParams(metrics);
-        } catch (Exception e) {
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(e.getMessage());
-            return Collections.singletonList(builder.build());
-        }
-
-        HttpContext httpContext = createHttpContext(prometheusProtocol);
-        request = createHttpRequest(prometheusProtocol);
-
-        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)) {
-            int statusCode = response.getStatusLine().getStatusCode();
-            log.debug("Prometheus proxy collect, response status: {}", statusCode);
-
-            if (!defaultSuccessStatusCodes.contains(statusCode)) {
-                builder.setCode(CollectRep.Code.FAIL);
-                builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
-                return Collections.singletonList(builder.build());
-            }
-
-            String rawTextContent = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-
-            builder.clearFields();
-            builder.clearValues();
-
-            CollectRep.Field rawDataField = CollectRep.Field.newBuilder()
-                    .setName(RAW_TEXT_CONTENT_FIELD_NAME)
-                    .setType(CommonConstants.TYPE_STRING)
-                    .build();
-            builder.addField(rawDataField);
-
-            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-            valueRowBuilder.addColumn(rawTextContent);
-            builder.addValueRow(valueRowBuilder.build());
-
-            builder.setCode(CollectRep.Code.SUCCESS);
-        } catch (ClientProtocolException e1) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e1);
-            log.error("Prometheus proxy collect error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e1);
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg(errorMsg);
-        } catch (UnknownHostException e2) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e2);
-            log.info("Prometheus proxy collect unknown host: {}. Host: {}", errorMsg, prometheusProtocol.getHost(), e2);
-            builder.setCode(CollectRep.Code.UN_REACHABLE);
-            builder.setMsg("unknown host:" + errorMsg);
-        } catch (InterruptedIOException | ConnectException | SSLException e3) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e3);
-            log.info("Prometheus proxy collect connect error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e3);
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg(errorMsg);
-        } catch (IOException e4) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e4);
-            log.info("Prometheus proxy collect IO error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e4);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        } catch (Exception e) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            log.error("Prometheus proxy collect unknown error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        } finally {
-            if (request != null) {
-                request.abort();
-            }
-        }
-        return Collections.singletonList(builder.build());
-    }
-
-    @Override
-    public String supportProtocol() {
-        return DispatchConstants.PROTOCOL_PROMETHEUS;
-    }
-
-    private void validateParams(Metrics metrics) throws Exception {
-        if (metrics == null || metrics.getPrometheus() == null) {
-            throw new Exception("Prometheus collect must has prometheus params");
-        }
-        PrometheusProtocol protocol = metrics.getPrometheus();
-        if (!StringUtils.hasText(protocol.getHost())
-            || !StringUtils.hasText(protocol.getPort())) {
-            throw new Exception("Prometheus collect must has host and port params");
-        }
-        if (protocol.getPath() == null
-                || !StringUtils.hasText(protocol.getPath())
-                || !protocol.getPath().startsWith(RIGHT_DASH)) {
-            protocol.setPath(protocol.getPath() == null ? RIGHT_DASH : RIGHT_DASH + protocol.getPath().trim());
-        }
-    }
-    
-    /**
-     * create httpContext
-     * This method is adapted from PrometheusAutoCollectImpl
-     * @param protocol prometheus protocol
-     * @return context
-     */
-    public HttpContext createHttpContext(PrometheusProtocol protocol) {
-        PrometheusProtocol.Authorization auth = protocol.getAuthorization();
-        if (auth != null && DispatchConstants.DIGEST_AUTH.equals(auth.getType())) {
-            HttpClientContext clientContext = new HttpClientContext();
-            if (StringUtils.hasText(auth.getDigestAuthUsername())
-                        && StringUtils.hasText(auth.getDigestAuthPassword())) {
-                CredentialsProvider provider = new BasicCredentialsProvider();
-                UsernamePasswordCredentials credentials =
-                        new UsernamePasswordCredentials(auth.getDigestAuthUsername(), auth.getDigestAuthPassword());
-                provider.setCredentials(AuthScope.ANY, credentials);
-                AuthCache authCache = new BasicAuthCache();
-                HttpHost targetHost = new HttpHost(protocol.getHost(), Integer.parseInt(protocol.getPort()));
-                authCache.put(targetHost, new DigestScheme());
-                clientContext.setCredentialsProvider(provider);
-                clientContext.setAuthCache(authCache);
-                return clientContext;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * create http request
-     * This method is adapted from PrometheusAutoCollectImpl
-     * @param protocol http params
-     * @return http uri request
-     */
-    public HttpUriRequest createHttpRequest(PrometheusProtocol protocol) {
-        RequestBuilder requestBuilder = RequestBuilder.get();
-        // params
-        Map<String, String> params = protocol.getParams();
-        if (params != null && !params.isEmpty()) {
-            for (Map.Entry<String, String> param : params.entrySet()) {
-                if (StringUtils.hasText(param.getValue())) {
-                    requestBuilder.addParameter(param.getKey(), param.getValue());
-                }
-            }
-        }
-        requestBuilder.addHeader(HttpHeaders.CONNECTION, NetworkConstants.KEEP_ALIVE);
-        requestBuilder.addHeader(HttpHeaders.USER_AGENT, NetworkConstants.USER_AGENT);
-        // headers  The custom request header is overwritten here
-        Map<String, String> headers = protocol.getHeaders();
-        if (headers != null && !headers.isEmpty()) {
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                if (StringUtils.hasText(header.getValue())) {
-                    requestBuilder.addHeader(CollectUtil.replaceUriSpecialChar(header.getKey()),
-                            CollectUtil.replaceUriSpecialChar(header.getValue()));
-                }
-            }
-        }
-        if (headers == null || headers.keySet().stream().noneMatch(HttpHeaders.ACCEPT::equalsIgnoreCase)) {
-            requestBuilder.addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_PLAIN_VALUE + ";version=0.0.4,*/*;q=0.1");
-        }
-        
-        if (protocol.getAuthorization() != null) {
-            PrometheusProtocol.Authorization authorization = protocol.getAuthorization();
-            if (DispatchConstants.BEARER_TOKEN.equalsIgnoreCase(authorization.getType())) {
-                if (StringUtils.hasText(authorization.getBearerTokenToken())) {
-                    String value = DispatchConstants.BEARER + " " + authorization.getBearerTokenToken();
-                    requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, value);
-                }
-            } else if (DispatchConstants.BASIC_AUTH.equals(authorization.getType())) {
-                if (StringUtils.hasText(authorization.getBasicAuthUsername())
-                            && StringUtils.hasText(authorization.getBasicAuthPassword())) {
-                    String authStr = authorization.getBasicAuthUsername() + ":" + authorization.getBasicAuthPassword();
-                    String encodedAuth = Base64Util.encode(authStr);
-                    requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, DispatchConstants.BASIC + " " + encodedAuth);
-                }
-            }
-        }
-
-        if (StringUtils.hasLength(protocol.getPayload())) {
-            requestBuilder.setEntity(new StringEntity(protocol.getPayload(), StandardCharsets.UTF_8));
-            if (headers == null || headers.keySet().stream().noneMatch(HttpHeaders.CONTENT_TYPE::equalsIgnoreCase)) {
-                requestBuilder.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE);
-            }
-        }
-        
-        String uriPath = CollectUtil.replaceUriSpecialChar(protocol.getPath());
-        if (IpDomainUtil.isHasSchema(protocol.getHost())) {
-            requestBuilder.setUri(protocol.getHost() + SignConstants.DOUBLE_MARK + protocol.getPort() + uriPath);
-        } else {
-            String ipAddressType = IpDomainUtil.checkIpAddressType(protocol.getHost());
-            String baseUri = NetworkConstants.IPV6.equals(ipAddressType)
-                                     ? String.format("[%s]:%s%s", protocol.getHost(), protocol.getPort(), uriPath)
-                                     : String.format("%s:%s%s", protocol.getHost(), protocol.getPort(), uriPath);
-            boolean ssl = Boolean.parseBoolean(protocol.getSsl());
-            if (ssl) {
-                requestBuilder.setUri(NetworkConstants.HTTPS_HEADER + baseUri);
-            } else {
-                requestBuilder.setUri(NetworkConstants.HTTP_HEADER + baseUri);
-            }
-        }
-        
-        // custom timeout
-        int timeout = CollectUtil.getTimeout(protocol.getTimeout());
-        if (timeout > 0) {
-            RequestConfig requestConfig = RequestConfig.custom()
-                                                  .setConnectTimeout(timeout)
-                                                  .setSocketTimeout(timeout)
-                                                  .setConnectionRequestTimeout(timeout)
-                                                  .setRedirectsEnabled(true)
-                                                  .build();
-            requestBuilder.setConfig(requestConfig);
-        } else {
-            RequestConfig requestConfig = RequestConfig.custom()
-                                                  .setRedirectsEnabled(true)
-                                                  .build();
-            requestBuilder.setConfig(requestConfig);
-        }
-        return requestBuilder.build();
-    }
-
-    /**
-     * get collect instance
-     * @return instance
-     */
-    public static PrometheusProxyCollectImpl getInstance() {
-        return PrometheusProxyCollectImpl.SingleInstance.INSTANCE;
-    }
-
-    /**
-     * static instance
-     */
-    private static class SingleInstance {
-        private static final PrometheusProxyCollectImpl INSTANCE = new PrometheusProxyCollectImpl();
-    }
-}
@@ -20,42 +20,24 @@ package org.apache.hertzbeat.collector.collect.sd;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Lists;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.constants.NetworkConstants;
-import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.entity.sd.ConnectionConfig;
 import org.apache.hertzbeat.common.entity.sd.ServiceDiscoveryResponseEntity;
-import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.http.HttpHeaders;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
-import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.util.UriUtils;


 /**
@@ -70,10 +52,9 @@ public class HttpSdCollectImpl extends AbstractCollect {
    @Override
    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
        List<ConnectionConfig> configList = Lists.newArrayList();
+        HttpUriRequest request = RequestBuilder.get().setUri(metrics.getHttp_sd().getUrl()).build();

-        HttpUriRequest request = createHttpRequest(metrics.getHttp_sd());
-        HttpContext httpContext = createHttpContext(metrics.getHttp_sd());
-        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)) {
+        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request)) {
            int statusCode = response.getStatusLine().getStatusCode();
            if (statusCode != 200) {
                log.warn("Failed to fetch sd...");
@@ -132,111 +113,4 @@ public class HttpSdCollectImpl extends AbstractCollect {
    public String supportProtocol() {
        return DispatchConstants.PROTOCOL_HTTP_SD;
    }
-
-    /**
-     * create httpContext
-     *
-     * @param httpSdProtocol http sd protocol
-     * @return context
-     */
-    public HttpContext createHttpContext(HttpProtocol httpSdProtocol) {
-        HttpProtocol.Authorization auth = httpSdProtocol.getAuthorization();
-        if (auth != null && DispatchConstants.DIGEST_AUTH.equals(auth.getType())) {
-            HttpClientContext clientContext = new HttpClientContext();
-            if (org.springframework.util.StringUtils.hasText(auth.getDigestAuthUsername())
-                    && org.springframework.util.StringUtils.hasText(auth.getDigestAuthPassword())) {
-                CredentialsProvider provider = new BasicCredentialsProvider();
-                UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(auth.getDigestAuthUsername(),
-                        auth.getDigestAuthPassword());
-                URL url;
-                try {
-                    url = new URL(httpSdProtocol.getUrl());
-                } catch (MalformedURLException e) {
-                    throw new IllegalArgumentException("Invalid URI format.", e);
-                }
-                int port = url.getPort() != -1 ? url.getPort() : ("https".equals(url.getProtocol()) ? 443 : 80);
-                AuthScope authScope = new AuthScope(url.getHost(), port);
-                provider.setCredentials(authScope, credentials);
-
-                clientContext.setCredentialsProvider(provider);
-                return clientContext;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * create http request
-     *
-     * @param httpSdProtocol http request set
-     * @return http uri request
-     */
-    public HttpUriRequest createHttpRequest(HttpProtocol httpSdProtocol) {
-        RequestBuilder requestBuilder = RequestBuilder.get();
-
-        // The default request header can be overridden if customized
-        // keep-alive
-        requestBuilder.addHeader(HttpHeaders.CONNECTION, NetworkConstants.KEEP_ALIVE);
-        requestBuilder.addHeader(HttpHeaders.USER_AGENT, NetworkConstants.USER_AGENT);
-        // headers  The custom request header is overwritten here
-        Map<String, String> headers = httpSdProtocol.getHeaders();
-        if (headers != null && !headers.isEmpty()) {
-            for (Map.Entry<String, String> header : headers.entrySet()) {
-                if (org.springframework.util.StringUtils.hasText(header.getValue())) {
-                    requestBuilder.addHeader(header.getKey(), header.getValue());
-                }
-            }
-        }
-        // add accept
-        requestBuilder.addHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE);
-
-        // add authorization
-        if (httpSdProtocol.getAuthorization() != null) {
-            HttpProtocol.Authorization authorization = httpSdProtocol.getAuthorization();
-            if (DispatchConstants.BEARER_TOKEN.equalsIgnoreCase(authorization.getType())) {
-                String value = DispatchConstants.BEARER + SignConstants.BLANK + authorization.getBearerTokenToken();
-                requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, value);
-            } else if (DispatchConstants.BASIC_AUTH.equals(authorization.getType())) {
-                if (org.springframework.util.StringUtils.hasText(authorization.getBasicAuthUsername())
-                        && org.springframework.util.StringUtils.hasText(authorization.getBasicAuthPassword())) {
-                    String authStr = authorization.getBasicAuthUsername() + SignConstants.DOUBLE_MARK + authorization.getBasicAuthPassword();
-                    String encodedAuth = Base64Util.encode(authStr);
-                    requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, DispatchConstants.BASIC + SignConstants.BLANK + encodedAuth);
-                }
-            }
-        }
-
-        // uri encode, default true
-        boolean enableUrlEncoding = Boolean.parseBoolean(httpSdProtocol.getEnableUrlEncoding());
-        if (enableUrlEncoding) {
-            // if the url contains parameters directly
-            if (httpSdProtocol.getUrl().contains("?")) {
-                String path = httpSdProtocol.getUrl().substring(0, httpSdProtocol.getUrl().indexOf("?"));
-                String query = httpSdProtocol.getUrl().substring(httpSdProtocol.getUrl().indexOf("?") + 1);
-                httpSdProtocol.setUrl(UriUtils.encodePath(path, "UTF-8") + "?" + UriUtils.encodeQuery(query, "UTF-8"));
-            } else {
-                httpSdProtocol.setUrl(UriUtils.encodePath(httpSdProtocol.getUrl(), "UTF-8"));
-            }
-        }
-
-        // set uri
-        try {
-            requestBuilder.setUri(httpSdProtocol.getUrl());
-        } catch (IllegalArgumentException e) {
-            log.warn("Invalid URI with illegal characters: {}. User has disabled URL encoding, not applying any encoding.", httpSdProtocol.getUrl());
-            throw e;
-        }
-
-        // custom timeout
-        int timeout = CollectUtil.getTimeout(httpSdProtocol.getTimeout(), 0);
-        if (timeout > 0) {
-            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(timeout)
-                    .setSocketTimeout(timeout)
-                    .setRedirectsEnabled(true)
-                    .build();
-            requestBuilder.setConfig(requestConfig);
-        }
-        return requestBuilder.build();
-    }
 }
@@ -1,114 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.sd;
-
-import java.util.List;
-
-import org.apache.hertzbeat.collector.collect.AbstractCollect;
-import org.apache.hertzbeat.collector.collect.registry.constant.DiscoveryClientInstance;
-import org.apache.hertzbeat.collector.collect.registry.discovery.DiscoveryClient;
-import org.apache.hertzbeat.collector.collect.registry.discovery.DiscoveryClientManagement;
-import org.apache.hertzbeat.collector.collect.registry.discovery.entity.ServiceInstance;
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.RegistryProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.util.CommonUtil;
-import org.springframework.util.CollectionUtils;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * Nacos Service Discovery Collector
- * This collector integrates with Nacos to discover registered services
- */
-@Slf4j
-public class NacosSdCollectImpl extends AbstractCollect {
-    
-    /**
-     * Client management to interact with discovery services
-     */
-    private final DiscoveryClientManagement discoveryClientManagement = new DiscoveryClientManagement();
-    
-    @Override
-    public void preCheck(Metrics metrics) throws IllegalArgumentException {
-        // Validate the required configuration is present
-        if (metrics == null || metrics.getNacos_sd() == null) {
-            throw new IllegalArgumentException("Nacos service discovery monitoring, the config is null");
-        }
-        if (metrics.getNacos_sd().isInvalid()) {
-            throw new IllegalArgumentException("Nacos service discovery monitoring, the config is invalid");
-        }
-    }
-    
-    @Override
-    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        // Create Registry protocol from NacosSd protocol
-        RegistryProtocol registryProtocol = RegistryProtocol.builder()
-                .host(metrics.getNacos_sd().getHost())
-                .port(metrics.getNacos_sd().getPort())
-                .discoveryClientTypeName(DiscoveryClientInstance.NACOS.name())
-                .build();
-
-        DiscoveryClient discoveryClient = null;
-        try {
-            // Use the existing NacosDiscoveryClient through DiscoveryClientManagement
-            discoveryClient = discoveryClientManagement.getClient(registryProtocol);
-            if (discoveryClient == null) {
-                builder.setCode(CollectRep.Code.FAIL);
-                builder.setMsg("Failed to get Nacos discovery client");
-                return;
-            }
-            
-            // Get all services registered in Nacos
-            List<ServiceInstance> services = discoveryClient.getServices();
-            if (CollectionUtils.isEmpty(services)) {
-                return;
-            }
-            
-            // Populate the response data with service information
-            services.forEach(service -> {
-                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-                valueRowBuilder.addColumn(service.getAddress());
-                valueRowBuilder.addColumn(String.valueOf(service.getPort()));
-                valueRowBuilder.addColumn(service.getServiceName());
-                valueRowBuilder.addColumn(service.getHealthStatus());
-                builder.addValueRow(valueRowBuilder.build());
-            });
-        } catch (Exception e) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            log.warn("Failed to fetch services from Nacos: {}", errorMsg);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        } finally {
-            // Close the discovery client to release resources
-            if (discoveryClient != null) {
-                try {
-                    discoveryClient.close();
-                } catch (Exception e) {
-                    log.warn("Failed to close Nacos discovery client: {}", CommonUtil.getMessageFromThrowable(e));
-                }
-            }
-        }
-    }
-    
-    @Override
-    public String supportProtocol() {
-        return DispatchConstants.PROTOCOL_NACOS_SD;
-    }
-}
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.sd;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.AbstractCollect;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.entity.job.protocol.ZookeeperSdProtocol;
-import org.apache.hertzbeat.common.entity.sd.ConnectionConfig;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.hertzbeat.common.util.CommonUtil;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * zookeeper sd collector
- */
-@Slf4j
-public class ZookeeperSdCollectImpl extends AbstractCollect {
-
-    private static int TIMEOUT = 30000;
-
-    @Override
-    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        ZookeeperSdProtocol zookeeperSdProtocol = metrics.getZookeeper_sd();
-        String url = zookeeperSdProtocol.getUrl();
-        String pathPrefix = zookeeperSdProtocol.getPathPrefix();
-        try (ZooKeeper zk = new ZooKeeper(url, TIMEOUT, event -> {})){
-
-            List<String> children = zk.getChildren(pathPrefix, false);
-            List<ConnectionConfig> connectionConfigs = children.stream().map(node -> {
-                String[] split = node.split(":");
-                if (split.length != 2) log.warn("Node format is incorrect: {}, expected format is 'host:port'", node);
-                return new ConnectionConfig(split[0], split[1]);
-            }).toList();
-            connectionConfigs.forEach(config -> {
-                CollectRep.ValueRow valueRow = CollectRep.ValueRow.newBuilder()
-                        .addColumn(config.getHost())
-                        .addColumn(config.getPort())
-                        .build();
-                builder.addValueRow(valueRow);
-            });
-        } catch (IOException e){
-            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            log.error("Failed to connect to Zookeeper: {}", errorMsg);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        } catch (InterruptedException e) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            log.error("Zookeeper connection interrupted: {}", errorMsg);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        } catch (KeeperException e) {
-            String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            log.error("Zookeeper operation failed: {}", errorMsg);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg(errorMsg);
-        }
-    }
-
-    @Override
-    public void preCheck(Metrics metrics) throws IllegalArgumentException {
-        if (metrics.getZookeeper_sd() == null) {
-            throw new IllegalArgumentException("Zookeeper SD configuration cannot be null");
-        }
-        if (metrics.getZookeeper_sd().getUrl() == null || metrics.getZookeeper_sd().getUrl().isEmpty()) {
-            throw new IllegalArgumentException("Zookeeper URL cannot be null or empty");
-        }
-        if (metrics.getZookeeper_sd().getPathPrefix() == null || metrics.getZookeeper_sd().getPathPrefix().isEmpty()) {
-            throw new IllegalArgumentException("Zookeeper path prefix cannot be null or empty");
-        }
-    }
-
-    @Override
-    public String supportProtocol() {
-        return "zookeeper_sd";
-    }
-}
@@ -17,6 +17,11 @@

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

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

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

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

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

-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 /**
 * Test case for {@link HttpCollectImpl}
 */
@@ -75,30 +73,6 @@ class HttpCollectImplTest {
        assert "http".equals(protocol);
    }

-    @Test
-    void parseResponseByWebsite() {
-        HttpProtocol http = HttpProtocol.builder().build();
-        http.setMethod("GET");
-        http.setHost("http://127.0.0.1");
-        http.setUrl("/");
-        http.setPort("8428");
-        http.setParseType("website");
-        http.setEnableUrlEncoding("true");
-        Metrics metrics = Metrics.builder()
-                .http(http)
-                .aliasFields(Lists.newArrayList("responseTime", "keyword", "statusCode"))
-                .build();
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        httpCollectImpl.collect(builder, metrics);
-
-        assertNotNull(builder.getValuesList());
-        for (CollectRep.ValueRow row : builder.getValuesList()) {
-            assertNotNull(row.getColumns(0));
-            assertEquals(row.getColumns(1), "0");
-            assertEquals(row.getColumns(2), "200");
-        }
-    }
-
    @Test
    void parseResponseByXmlPath() throws Exception {
        // Create a sample XML response
@@ -186,107 +160,4 @@ class HttpCollectImplTest {
        assertEquals("0.0", secondRow.getColumns(2), "Second server CPU should be 0.0");
        assertEquals("0", secondRow.getColumns(3), "Second server memory should be 0");
    }
-
-    @Test
-    void parseResponseByJsonPath() throws Exception {
-        String jsonResponse = "{"
-                + "  \"name\": \"jvm.memory.used\","
-                + "  \"description\": \"The amount of used memory\","
-                + "  \"baseUnit\": \"bytes\","
-                + "  \"measurements\": ["
-                + "    {"
-                + "      \"statistic\": \"VALUE\","
-                + "      \"value\": 90282296"
-                + "    }"
-                + "  ],"
-                + "  \"availableTags\": ["
-                + "    {"
-                + "      \"tag\": \"area\","
-                + "      \"values\": ["
-                + "        \"heap\","
-                + "        \"nonheap\""
-                + "      ]"
-                + "    },"
-                + "    {"
-                + "      \"tag\": \"id\","
-                + "      \"values\": ["
-                + "        \"G1 Survivor Space\","
-                + "        \"G1 Eden Space\""
-                + "      ]"
-                + "    }"
-                + "  ]"
-                + "}";
-
-        HttpProtocol http = HttpProtocol.builder()
-                .parseType(DispatchConstants.PARSE_JSON_PATH)
-                .parseScript("$.availableTags[?(@.tag == \"id\")].values[*]")
-                .build();
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByJsonPath",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class,
-                Long.class);
-        parseMethod.setAccessible(true);
-
-        // Call the method
-        parseMethod.invoke(httpCollectImpl, jsonResponse, Lists.newArrayList("id"), http, builder, 100L);
-
-        // Verify the results
-        assertEquals(2, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("G1 Survivor Space", firstRow.getColumns(0));
-        CollectRep.ValueRow secondRow = capturedRows.get(1);
-        assertEquals("G1 Eden Space", secondRow.getColumns(0));
-
-        // number
-        String numberJson = "{"
-                + "  \"name\": \"system.cpu.usage\","
-                + "  \"description\": \"The \\\"recent cpu usage\\\" of the system the application is running in\","
-                + "  \"measurements\": ["
-                + "    {"
-                + "      \"statistic\": \"VALUE\","
-                + "      \"value\": 0.268751364291017"
-                + "    }"
-                + "  ],"
-                + "  \"availableTags\": []"
-                + "}";
-        http = HttpProtocol.builder()
-                .parseType(DispatchConstants.PARSE_JSON_PATH)
-                .parseScript("$.measurements[?(@.statistic == \"VALUE\")].value")
-                .build();
-        capturedRows.clear();
-        builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-        };
-        parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByJsonPath",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class,
-                Long.class);
-        parseMethod.setAccessible(true);
-
-        // Call the method
-        parseMethod.invoke(httpCollectImpl, numberJson, Lists.newArrayList("usage"), http, builder, 100L);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        firstRow = capturedRows.get(0);
-        assertEquals("0.268751364291017", firstRow.getColumns(0));
-    }
 }
@@ -17,91 +17,108 @@

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

-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
+import com.hivemq.client.mqtt.MqttVersion;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
 * Test case for {@link MqttCollectImpl}
 */
-class MqttCollectTest {
+public class MqttCollectTest {
    private MqttCollectImpl mqttCollect;
    private Metrics metrics;
-    private MqttProtocol.MqttProtocolBuilder mqttBuilder;
+    private CollectRep.MetricsData.Builder builder;

    @BeforeEach
-    void setup() {
+    public void setup() {
        mqttCollect = new MqttCollectImpl();
-        metrics = new Metrics();
-
-        // Initialize base MQTT parameters for test cases
-        mqttBuilder = MqttProtocol.builder()
-                .host("example.com")
-                .port("1883")
-                .protocol("mqtt")
-                .timeout("5000")
-                .keepalive("60");
-    }
-
-    // Region: preCheck validation tests
-
-    @Test
-    // Verify preCheck throws exception when host is missing
-    void preCheckShouldThrowWhenHostMissing() {
-        metrics.setMqtt(mqttBuilder.host("").build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+        MqttProtocol mqtt = MqttProtocol.builder().build();
+        metrics = Metrics.builder()
+                .mqtt(mqtt)
+                .build();
+        builder = CollectRep.MetricsData.newBuilder();
    }

    @Test
-    // Verify preCheck throws exception when port is missing
-    void preCheckShouldThrowWhenPortMissing() {
-        metrics.setMqtt(mqttBuilder.port("").build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+    void preCheck() {
+        // host is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            mqttCollect.preCheck(metrics);
+        });
+
+        // port is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            metrics.setMqtt(mqtt);
+            mqttCollect.preCheck(metrics);
+        });
+
+        // protocol version is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            metrics.setMqtt(mqtt);
+            mqttCollect.preCheck(metrics);
+        });
+
+        // everything is ok
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            metrics.setMqtt(mqtt);
+            mqtt.setProtocolVersion("3.1.1");
+            mqttCollect.preCheck(metrics);
+        });
    }

    @Test
-    // Verify preCheck throws exception when MQTTS mutual auth is enabled but CA cert is missing
-    void preCheckShouldThrowWhenMqttsMutualAuthMissingCerts() {
-        metrics.setMqtt(mqttBuilder
-                .protocol("mqtts")
-                .enableMutualAuth("true")
-                .caCert("")
-                .clientCert("client.crt")
-                .clientKey("client.key")
-                .build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+    void supportProtocol() {
+        Assertions.assertEquals(DispatchConstants.PROTOCOL_MQTT, mqttCollect.supportProtocol());
    }

    @Test
-    // Verify preCheck succeeds with valid standard MQTT parameters
-    void preCheckShouldSucceedWithValidMqttParams() {
-        metrics.setMqtt(mqttBuilder.build());
-        assertDoesNotThrow(() -> mqttCollect.preCheck(metrics));
-    }
+    void collect() {
+        // with version 3.1.1
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            mqtt.setClientId("clientid");
+            mqtt.setTimeout("1");
+            mqtt.setProtocolVersion(MqttVersion.MQTT_3_1_1.name());

-    @Test
-    // Verify preCheck succeeds with valid MQTTS parameters including mutual authentication
-    void preCheckShouldSucceedWithValidMqttsMutualAuth() {
-        metrics.setMqtt(mqttBuilder
-                .protocol("mqtts")
-                .enableMutualAuth("true")
-                .caCert("ca.pem")
-                .clientCert("client.crt")
-                .clientKey("client.key")
-                .build());
-        assertDoesNotThrow(() -> mqttCollect.preCheck(metrics));
-    }
-    // End region
+            metrics.setMqtt(mqtt);
+            metrics.setAliasFields(new ArrayList<>());

-    @Test
-    // Verify supportProtocol method returns correct MQTT constant
-    void supportProtocolShouldReturnMqttConstant() {
-        assertEquals(DispatchConstants.PROTOCOL_MQTT, mqttCollect.supportProtocol());
+            mqttCollect.collect(builder, metrics);
+        });
+
+        
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            mqtt.setClientId("clientid");
+            mqtt.setTimeout("1");
+            mqtt.setProtocolVersion(MqttVersion.MQTT_5_0.name());
+
+            metrics.setMqtt(mqtt);
+            metrics.setAliasFields(new ArrayList<>());
+
+            mqttCollect.collect(builder, metrics);
+        });
    }
 }
@@ -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.collector.collect.sd;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.when;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import lombok.SneakyThrows;
-import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.entity.sd.ServiceDiscoveryResponseEntity;
-import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.http.HttpEntity;
-import org.apache.http.ProtocolVersion;
-import org.apache.http.StatusLine;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.message.BasicStatusLine;
-import org.apache.http.protocol.HttpContext;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-/**
- * Test case for {@link HttpSdCollectImpl}
- */
-@ExtendWith(MockitoExtension.class)
-class HttpSdCollectImplTest {
-
-    @InjectMocks
-    private HttpSdCollectImpl httpSdCollectImpl;
-
-    @Mock
-    private CloseableHttpClient httpClient;
-
-    @Mock
-    private CloseableHttpResponse httpResponse;
-
-    private Metrics metrics;
-    private HttpProtocol httpProtocol;
-    private CollectRep.MetricsData.Builder builder;
-
-    @BeforeEach
-    void setUp() {
-        httpProtocol = HttpProtocol.builder()
-                .url("http://localhost:8080/services")
-                .build();
-
-        metrics = Metrics.builder()
-                .http_sd(httpProtocol)
-                .build();
-
-        builder = CollectRep.MetricsData.newBuilder();
-    }
-
-    @Test
-    void testCollectSuccess() throws IOException {
-        List<ServiceDiscoveryResponseEntity> responseEntities = new ArrayList<>();
-
-        ServiceDiscoveryResponseEntity entity1 = new ServiceDiscoveryResponseEntity();
-        entity1.setTarget(Arrays.asList("192.168.1.10:8080", "192.168.1.11:8081"));
-
-        ServiceDiscoveryResponseEntity entity2 = new ServiceDiscoveryResponseEntity();
-        entity2.setTarget(Arrays.asList("192.168.1.12:8082"));
-
-        responseEntities.add(entity1);
-        responseEntities.add(entity2);
-
-        String jsonResponse = JsonUtil.toJson(responseEntities);
-
-        try (MockedStatic<CommonHttpClient> mockedHttpClient = Mockito.mockStatic(CommonHttpClient.class)) {
-            mockedHttpClient.when(CommonHttpClient::getHttpClient).thenReturn(httpClient);
-
-            when(httpClient.execute(any(HttpUriRequest.class), nullable(HttpContext.class))).thenReturn(httpResponse);
-
-            StatusLine statusLine = new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK");
-            when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
-            HttpEntity entity = new StringEntity(jsonResponse, ContentType.APPLICATION_JSON);
-            when(httpResponse.getEntity()).thenReturn(entity);
-
-            httpSdCollectImpl.collect(builder, metrics);
-
-            assertEquals(3, builder.getValuesCount());
-
-            CollectRep.ValueRow firstRow = builder.getValues(0);
-            assertEquals("192.168.1.10", firstRow.getColumns(0));
-            assertEquals("8080", firstRow.getColumns(1));
-
-            CollectRep.ValueRow secondRow = builder.getValues(1);
-            assertEquals("192.168.1.11", secondRow.getColumns(0));
-            assertEquals("8081", secondRow.getColumns(1));
-
-            CollectRep.ValueRow thirdRow = builder.getValues(2);
-            assertEquals("192.168.1.12", thirdRow.getColumns(0));
-            assertEquals("8082", thirdRow.getColumns(1));
-        }
-    }
-
-    @Test
-    void testCollectWithNon200Status() throws IOException {
-        try (MockedStatic<CommonHttpClient> mockedHttpClient = Mockito.mockStatic(CommonHttpClient.class)) {
-            mockedHttpClient.when(CommonHttpClient::getHttpClient).thenReturn(httpClient);
-
-            when(httpClient.execute(any(HttpUriRequest.class), nullable(HttpContext.class))).thenReturn(httpResponse);
-
-            StatusLine statusLine = new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 404, "Not Found");
-            when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
-            httpSdCollectImpl.collect(builder, metrics);
-
-            assertEquals(CollectRep.Code.FAIL, builder.getCode());
-            assertEquals("StatusCode 404", builder.getMsg());
-        }
-    }
-
-    @SneakyThrows
-    @Test
-    void testCollectWithException() {
-        String exceptionMessage = "Connection refused";
-        IOException testException = new IOException(exceptionMessage);
-
-        try (MockedStatic<CommonHttpClient> mockedHttpClient = Mockito.mockStatic(CommonHttpClient.class);
-             MockedStatic<CommonUtil> mockedCommonUtil = Mockito.mockStatic(CommonUtil.class)) {
-
-            mockedHttpClient.when(CommonHttpClient::getHttpClient).thenReturn(httpClient);
-
-            when(httpClient.execute(any(HttpUriRequest.class), nullable(HttpContext.class))).thenThrow(testException);
-            mockedCommonUtil.when(() -> CommonUtil.getMessageFromThrowable(any(Throwable.class)))
-                    .thenReturn(exceptionMessage);
-
-            httpSdCollectImpl.collect(builder, metrics);
-
-            assertEquals(CollectRep.Code.FAIL, builder.getCode());
-            assertEquals(exceptionMessage, builder.getMsg());
-        }
-    }
-
-    @Test
-    void testCollectWithEmptyServiceList() throws IOException {
-        List<ServiceDiscoveryResponseEntity> emptyList = Collections.emptyList();
-        String jsonResponse = JsonUtil.toJson(emptyList);
-
-        try (MockedStatic<CommonHttpClient> mockedHttpClient = Mockito.mockStatic(CommonHttpClient.class)) {
-            mockedHttpClient.when(CommonHttpClient::getHttpClient).thenReturn(httpClient);
-
-            when(httpClient.execute(any(HttpUriRequest.class), nullable(HttpContext.class))).thenReturn(httpResponse);
-
-            StatusLine statusLine = new BasicStatusLine(new ProtocolVersion("HTTP", 1, 1), 200, "OK");
-            when(httpResponse.getStatusLine()).thenReturn(statusLine);
-
-            HttpEntity entity = new StringEntity(jsonResponse, ContentType.APPLICATION_JSON);
-            when(httpResponse.getEntity()).thenReturn(entity);
-
-            httpSdCollectImpl.collect(builder, metrics);
-
-            assertEquals(0, builder.getValuesCount());
-        }
-    }
-
-    @Test
-    void testSupportProtocol() {
-        assertEquals(DispatchConstants.PROTOCOL_HTTP_SD, httpSdCollectImpl.supportProtocol());
-    }
-}
@@ -1,233 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.sd;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import lombok.SneakyThrows;
-import org.apache.hertzbeat.collector.collect.registry.discovery.DiscoveryClient;
-import org.apache.hertzbeat.collector.collect.registry.discovery.DiscoveryClientManagement;
-import org.apache.hertzbeat.collector.collect.registry.discovery.entity.ServiceInstance;
-import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.NacosSdProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.RegistryProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.util.CommonUtil;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockedStatic;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.test.util.ReflectionTestUtils;
-
-/**
- * Test case for {@link NacosSdCollectImpl}
- */
-@ExtendWith(MockitoExtension.class)
-class NacosSdCollectImplTest {
-
-    @InjectMocks
-    private NacosSdCollectImpl nacosSdCollectImpl;
-
-    @Mock
-    private DiscoveryClientManagement discoveryClientManagement;
-
-    @Mock
-    private DiscoveryClient discoveryClient;
-
-    private Metrics metrics;
-    private NacosSdProtocol nacosSdProtocol;
-    private CollectRep.MetricsData.Builder builder;
-
-    @BeforeEach
-    void setUp() {
-        nacosSdProtocol = NacosSdProtocol.builder()
-                .host("localhost")
-                .port("8848")
-                .username("nacos")
-                .password("nacos")
-                .build();
-
-        metrics = Metrics.builder()
-                .nacos_sd(nacosSdProtocol)
-                .build();
-
-        builder = CollectRep.MetricsData.newBuilder();
-
-        ReflectionTestUtils.setField(nacosSdCollectImpl, "discoveryClientManagement", discoveryClientManagement);
-    }
-    
-    @Test
-    void testPreCheckWithNullMetrics() {
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, 
-                () -> nacosSdCollectImpl.preCheck(null));
-
-        assertEquals("Nacos service discovery monitoring, the config is null", exception.getMessage());
-    }
-    
-    @Test
-    void testPreCheckWithNullNacosSdConfig() {
-        Metrics metricsWithoutNacosSd = Metrics.builder().build();
-
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, 
-                () -> nacosSdCollectImpl.preCheck(metricsWithoutNacosSd));
-
-        assertEquals("Nacos service discovery monitoring, the config is null", exception.getMessage());
-    }
-    
-    @Test
-    void testPreCheckWithInvalidNacosSdConfig() {
-        NacosSdProtocol invalidNacosSdProtocol = NacosSdProtocol.builder()
-                .host("")
-                .port("8848")
-                .build();
-
-        Metrics metricsWithInvalidNacosSd = Metrics.builder()
-                .nacos_sd(invalidNacosSdProtocol)
-                .build();
-
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> nacosSdCollectImpl.preCheck(metricsWithInvalidNacosSd));
-
-        assertEquals("Nacos service discovery monitoring, the config is invalid", exception.getMessage());
-
-        NacosSdProtocol portInvalidNacosSdProtocol = NacosSdProtocol.builder()
-                .host("localhost")
-                .port("")
-                .build();
-
-        Metrics portMetricsWithInvalidNacosSd = Metrics.builder()
-                .nacos_sd(portInvalidNacosSdProtocol)
-                .build();
-
-        exception = assertThrows(IllegalArgumentException.class,
-                () -> nacosSdCollectImpl.preCheck(portMetricsWithInvalidNacosSd));
-
-        assertEquals("Nacos service discovery monitoring, the config is invalid", exception.getMessage());
-    }
-    
-    @Test
-    void testPreCheckWithValidConfig() {
-        assertDoesNotThrow(() -> nacosSdCollectImpl.preCheck(metrics));
-    }
-    
-    @Test
-    void testCollectSuccess() throws Exception {
-        List<ServiceInstance> services = new ArrayList<>();
-        services.add(ServiceInstance.builder()
-                .serviceId("service-1")
-                .serviceName("user-service")
-                .address("192.168.1.10")
-                .port(8080)
-                .healthStatus("UP")
-                .build());
-        services.add(ServiceInstance.builder()
-                .serviceId("service-2")
-                .serviceName("order-service")
-                .address("192.168.1.11")
-                .port(8081)
-                .healthStatus("UP")
-                .build());
-
-        when(discoveryClientManagement.getClient(any(RegistryProtocol.class))).thenReturn(discoveryClient);
-
-        when(discoveryClient.getServices()).thenReturn(services);
-
-        nacosSdCollectImpl.collect(builder, metrics);
-        
-
-        verify(discoveryClient, times(1)).close();
-
-        assertEquals(2, builder.getValuesCount());
-
-        CollectRep.ValueRow firstRow = builder.getValues(0);
-        assertEquals("192.168.1.10", firstRow.getColumns(0));
-        assertEquals("8080", firstRow.getColumns(1));
-        assertEquals("user-service", firstRow.getColumns(2));
-        assertEquals("UP", firstRow.getColumns(3));
-
-        CollectRep.ValueRow secondRow = builder.getValues(1);
-        assertEquals("192.168.1.11", secondRow.getColumns(0));
-        assertEquals("8081", secondRow.getColumns(1));
-        assertEquals("order-service", secondRow.getColumns(2));
-        assertEquals("UP", secondRow.getColumns(3));
-    }
-    
-    @Test
-    void testCollectClientNull() {
-        when(discoveryClientManagement.getClient(any(RegistryProtocol.class))).thenReturn(null);
-
-        nacosSdCollectImpl.collect(builder, metrics);
-
-        assertEquals(CollectRep.Code.FAIL, builder.getCode());
-        assertEquals("Failed to get Nacos discovery client", builder.getMsg());
-    }
-    
-    @SneakyThrows
-    @Test
-    void testCollectWithException() {
-        String exceptionMessage = "Connection refused";
-        Exception testException = new RuntimeException(exceptionMessage);
-
-        when(discoveryClientManagement.getClient(any(RegistryProtocol.class))).thenReturn(discoveryClient);
-        when(discoveryClient.getServices()).thenThrow(testException);
-
-        try (MockedStatic<CommonUtil> mockedCommonUtil = Mockito.mockStatic(CommonUtil.class)) {
-            mockedCommonUtil.when(() -> CommonUtil.getMessageFromThrowable(any(Throwable.class)))
-                    .thenReturn(exceptionMessage);
-
-            nacosSdCollectImpl.collect(builder, metrics);
-
-            assertEquals(CollectRep.Code.FAIL, builder.getCode());
-            assertEquals(exceptionMessage, builder.getMsg());
-
-            verify(discoveryClient, times(1)).close();
-        }
-    }
-    
-    @Test
-    void testCollectWithEmptyServiceList() throws Exception {
-        when(discoveryClientManagement.getClient(any(RegistryProtocol.class))).thenReturn(discoveryClient);
-        when(discoveryClient.getServices()).thenReturn(Collections.emptyList());
-
-        nacosSdCollectImpl.collect(builder, metrics);
-
-        assertEquals(0, builder.getValuesCount());
-
-        verify(discoveryClient, times(1)).close();
-    }
-    
-    @Test
-    void testSupportProtocol() {
-        assertEquals(DispatchConstants.PROTOCOL_NACOS_SD, nacosSdCollectImpl.supportProtocol());
-    }
-}
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.sd;
-
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.ZookeeperSdProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.zookeeper.ZooKeeper;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.MockedConstruction;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-
-@ExtendWith(MockitoExtension.class)
-class ZookeeperSdCollectImplTest {
-
-    private ZookeeperSdCollectImpl zookeeperSdCollect;
-
-    private Metrics metrics;
-    private ZookeeperSdProtocol protocol;
-    private CollectRep.MetricsData.Builder builder;
-
-    @BeforeEach
-    void setUp() {
-        zookeeperSdCollect = new ZookeeperSdCollectImpl();
-
-        protocol = ZookeeperSdProtocol.builder()
-                .url("localhost:2181")
-                .pathPrefix("/services")
-                .build();
-
-        metrics = Metrics.builder()
-                .zookeeper_sd(protocol)
-                .build();
-
-        builder = CollectRep.MetricsData.newBuilder();
-    }
-
-    @Test
-    void testPreCheckWithNullConfig() {
-        Metrics invalid = Metrics.builder().build();
-        IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
-                () -> zookeeperSdCollect.preCheck(invalid));
-        assertEquals("Zookeeper SD configuration cannot be null", e.getMessage());
-    }
-
-    @Test
-    void testPreCheckWithEmptyUrl() {
-        ZookeeperSdProtocol badProtocol = ZookeeperSdProtocol.builder().url("").pathPrefix("/path").build();
-        Metrics m = Metrics.builder().zookeeper_sd(badProtocol).build();
-        IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
-                () -> zookeeperSdCollect.preCheck(m));
-        assertEquals("Zookeeper URL cannot be null or empty", e.getMessage());
-    }
-
-    @Test
-    void testPreCheckWithEmptyPath() {
-        ZookeeperSdProtocol badProtocol = ZookeeperSdProtocol.builder().url("host").pathPrefix("").build();
-        Metrics m = Metrics.builder().zookeeper_sd(badProtocol).build();
-        IllegalArgumentException e = assertThrows(IllegalArgumentException.class,
-                () -> zookeeperSdCollect.preCheck(m));
-        assertEquals("Zookeeper path prefix cannot be null or empty", e.getMessage());
-    }
-
-    @Test
-    void testPreCheckValid() {
-        assertDoesNotThrow(() -> zookeeperSdCollect.preCheck(metrics));
-    }
-
-    @Test
-    void testSupportProtocol() {
-        assertEquals("zookeeper_sd", zookeeperSdCollect.supportProtocol());
-    }
-
-    @Test
-    void testCollectSuccess() throws Exception {
-        try (MockedConstruction<ZooKeeper> mocked = Mockito.mockConstruction(ZooKeeper.class,
-                (mock, context) -> Mockito.when(mock.getChildren("/services", false)).thenReturn(List.of("host1:8080", "host2:9090")))) {
-
-            zookeeperSdCollect.collect(builder, metrics);
-
-            assertEquals(2, builder.getValuesCount());
-            assertEquals("host1", builder.getValues(0).getColumns(0));
-            assertEquals("8080", builder.getValues(0).getColumns(1));
-            assertEquals("host2", builder.getValues(1).getColumns(0));
-            assertEquals("9090", builder.getValues(1).getColumns(1));
-        }
-    }
-}
@@ -28,7 +28,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import org.apache.hertzbeat.collector.dispatch.CollectorInfoProperties;
 import org.apache.hertzbeat.collector.dispatch.DispatchProperties;
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.CommonThreadPool;
 import org.apache.hertzbeat.remoting.RemotingClient;
@@ -32,7 +32,7 @@ import java.util.concurrent.CountDownLatch;
 import org.apache.hertzbeat.collector.dispatch.DispatchProperties;
 import org.apache.hertzbeat.collector.dispatch.WorkerPool;
 import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
@@ -70,11 +70,14 @@
            <version>${hertzbeat.version}</version>
        </dependency>

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

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

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

    private final String collectorIdentity;

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

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


@@ -385,4 +354,4 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
        private Metrics metrics;
        private Timeout timeout;
    }
-}
+}
@@ -23,8 +23,8 @@ import org.apache.commons.jexl3.JexlExpression;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.prometheus.PrometheusAutoCollectImpl;
 import org.apache.hertzbeat.collector.collect.strategy.CollectStrategyFactory;
-import org.apache.hertzbeat.common.timer.Timeout;
-import org.apache.hertzbeat.collector.timer.WheelTimerTask;
+import org.apache.hertzbeat.collector.dispatch.timer.Timeout;
+import org.apache.hertzbeat.collector.dispatch.timer.WheelTimerTask;
 import org.apache.hertzbeat.collector.dispatch.unit.UnitConvert;
 import org.apache.hertzbeat.collector.util.CollectUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -115,10 +115,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
     * Whether it is a service discovery job, true is yes, false is no
     */
    protected boolean isSd;
-    /**
-     * Whether to use the Prometheus proxy
-     */
-    protected boolean prometheusProxyMode;

    protected List<UnitConvert> unitConvertList;

@@ -141,7 +137,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
        this.collectDataDispatch = collectDataDispatch;
        this.isCyclic = job.isCyclic();
        this.isSd = job.isSd();
-        this.prometheusProxyMode = job.isPrometheusProxyMode();
        this.unitConvertList = unitConvertList;
        // Temporary one-time tasks are executed with high priority
        if (isCyclic) {
@@ -158,31 +153,11 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
        CollectRep.MetricsData.Builder response = CollectRep.MetricsData.newBuilder();
        response.setApp(app).setId(id).setTenantId(tenantId)
                .setLabels(labels).setAnnotations(annotations).addMetadataAll(metadata);
-        // for prometheus auto or proxy mode
+        // for prometheus auto
        if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(metrics.getProtocol())) {
-            List<CollectRep.MetricsData> metricsData;
-
-            // TODO: Refactor Prometheus metrics collection logic.
-            // The current implementation for proxy mode and auto mode needs review and potential simplification.
-            // Consider a more unified approach or clarify the conditions for each mode.
-            /*
-            // TODO USE PROXY MODE
-            if (prometheusProxyMode) {
-                List<CollectRep.MetricsData> proxyData = PrometheusProxyCollectImpl.getInstance().collect(response, metrics);
-                List<CollectRep.MetricsData> autoData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
-                metricsData = new LinkedList<>();
-                if (proxyData != null) {
-                    metricsData.addAll(proxyData);
-                }
-                if (autoData != null) {
-                    metricsData.addAll(autoData);
-                }
-            } else {
-                metricsData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
-            }
-            */
-            metricsData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
-            validateResponse(metricsData == null ? null : metricsData.stream().findFirst().orElse(null));
+            List<CollectRep.MetricsData> metricsData = PrometheusAutoCollectImpl
+                    .getInstance().collect(response, metrics);
+            validateResponse(metricsData.stream().findFirst().orElse(null));
            collectDataDispatch.dispatchCollectData(timeout, metrics, metricsData);
            return;
        }
@@ -422,9 +397,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
     */
    private Object[] transformCal(String cal, Map<String, String> fieldAliasMap) {
        int splitIndex = cal.indexOf("=");
-        if (splitIndex < 0) {
-            return null;
-        }
        String field = cal.substring(0, splitIndex).trim();
        String expressionStr = cal.substring(splitIndex + 1).trim().replace("\\#", "#");
        JexlExpression expression;
@@ -1,89 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.hertzbeat.collector.metrics;
-
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Timer;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.springframework.stereotype.Service;
-
-import java.time.Duration;
-import java.util.Map;
-
-/**
- * Service for managing and recording Micrometer metrics.
- * This service uses Micrometer which integrates natively with Spring Boot Actuator.
- */
-@Service
-@Slf4j
-public class HertzBeatMetricsCollector {
-
-    private final MeterRegistry meterRegistry;
-
-    public HertzBeatMetricsCollector(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-        log.info("MetricsService initialized with MeterRegistry: {}", meterRegistry.getClass().getSimpleName());
-    }
-
-    /**
-     * Records the metrics for a completed collection sub-task.
-     *
-     * @param job            The parent job containing monitor info.
-     * @param durationMillis The duration of the collection task in milliseconds.
-     * @param status         The final status of the collection ("success", "fail", "timeout").
-     */
-    public void recordCollectMetrics(Job job, long durationMillis, String status) {
-        if (job == null) {
-            return;
-        }
-
-        Map<String, String> metadata = job.getMetadata();
-        String monitorName = metadata != null ? metadata.get("instancename") : "unknown";
-        String monitorTarget = metadata != null ? metadata.get("instancehost") : "unknown";
-
-        // Record collection count
-        Counter.builder("hertzbeat.collect.total")
-                .description("The total number of collection tasks executed")
-                .tag("status", status)
-                .tag("monitor_type", job.getApp())
-                .tag("monitor_id", String.valueOf(job.getMonitorId()))
-                .tag("monitor_name", monitorName)
-                .tag("monitor_target", monitorTarget)
-                .register(meterRegistry)
-                .increment();
-
-        // Record collection duration
-        Timer.builder("hertzbeat.collect.duration")
-                .description("The duration of collection task executions")
-                .tag("status", status)
-                .tag("monitor_type", job.getApp())
-                .tag("monitor_id", String.valueOf(job.getMonitorId()))
-                .tag("monitor_name", monitorName)
-                .tag("monitor_target", monitorTarget)
-                .register(meterRegistry)
-                .record(Duration.ofMillis(durationMillis));
-
-        if (log.isDebugEnabled()) {
-            log.debug("Recorded metrics for monitor [{}] ({}): status={}, duration={}ms",
-                    monitorName, job.getMonitorId(), status, durationMillis);
-        }
-    }
-}
@@ -29,7 +29,6 @@ org.apache.hertzbeat.collector.collect.mqtt.MqttCollectImpl
 org.apache.hertzbeat.collector.collect.ipmi2.IpmiCollectImpl
 org.apache.hertzbeat.collector.collect.kafka.KafkaCollectImpl
 org.apache.hertzbeat.collector.collect.sd.HttpSdCollectImpl
-org.apache.hertzbeat.collector.collect.sd.NacosSdCollectImpl
 org.apache.hertzbeat.collector.collect.sd.DnsSdCollectImpl
 org.apache.hertzbeat.collector.collect.sd.EurekaSdCollectImpl
 org.apache.hertzbeat.collector.collect.sd.ConsulSdCollectImpl
@@ -30,23 +30,7 @@ spring:
  # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed...
  autoconfigure:
    exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-management:
-  endpoints:
-    web:
-      exposure:
-        include:
-          - 'prometheus'
-  endpoint:
-    prometheus:
-      access: read_only
-  metrics:
-    tags:
-      application: ${spring.application.name}
-      environment: ${spring.profiles.active}
-  prometheus:
-    metrics:
-      export:
-        enabled: true
+
 ---
 spring:
  config:
@@ -55,7 +39,7 @@ spring:

 collector:
  info:
-    version: ${COLLECTOR_VERSION:1.7.2}
+    version: ${COLLECTOR_VERSION:1.7.1}
    ip: ${COLLECTOR_IP:}
  dispatch:
    entrance:
@@ -47,6 +47,6 @@ public interface CollectorConstants extends NetworkConstants {

    String RESPONSE_TIME = "responseTime";

-    String STATUS_CODE = "statusCode";
+    String STATUS_CODE = "StatusCode";

 }
@@ -17,7 +17,7 @@

 package org.apache.hertzbeat.collector.dispatch;

-import org.apache.hertzbeat.common.timer.Timeout;
+import org.apache.hertzbeat.collector.dispatch.timer.Timeout;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.message.CollectRep;

@@ -127,10 +127,6 @@ public interface DispatchConstants {
     * protocol http sd
     */
    String PROTOCOL_HTTP_SD = "http_sd";
-    /**
-     * protocol nacos sd
-     */
-    String PROTOCOL_NACOS_SD = "nacos_sd";
    /**
     * protocol dns sd
     */
@@ -17,7 +17,7 @@

 package org.apache.hertzbeat.collector.dispatch;

-import org.apache.hertzbeat.common.timer.Timeout;
+import org.apache.hertzbeat.collector.dispatch.timer.Timeout;

 /**
 * Metrics collection task scheduler interface
@@ -31,7 +31,7 @@ import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoCloseProcess
 import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoOfflineProcessor;
 import org.apache.hertzbeat.collector.dispatch.entrance.processor.GoOnlineProcessor;
 import org.apache.hertzbeat.collector.dispatch.entrance.processor.HeartbeatProcessor;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.CommonThreadPool;
@@ -22,7 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.dispatch.DispatchProperties;
 import org.apache.hertzbeat.collector.dispatch.WorkerPool;
 import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
@@ -20,7 +20,7 @@ package org.apache.hertzbeat.collector.dispatch.entrance.processor;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
@@ -20,7 +20,7 @@ package org.apache.hertzbeat.collector.dispatch.entrance.processor;
 import com.google.protobuf.ByteString;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
@@ -20,13 +20,10 @@ package org.apache.hertzbeat.collector.dispatch.entrance.processor;
 import com.google.protobuf.ByteString;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.timer.TimerDispatch;
+import org.apache.hertzbeat.collector.dispatch.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.apache.hertzbeat.common.util.AesUtil;
-import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;

 /**
@@ -43,16 +40,6 @@ public class GoOnlineProcessor implements NettyRemotingProcessor {
        if (this.timerDispatch == null) {
            this.timerDispatch = SpringContextHolder.getBean(TimerDispatch.class);
        }
-        if (message.getMsg().isEmpty()) {
-            log.warn("The message that server response to collector is empty, please upgrade server");
-        } else {
-            ServerInfo serverInfo = JsonUtil.fromJson(message.getMsg().toStringUtf8(), ServerInfo.class);
-            if (serverInfo == null || serverInfo.getAesSecret() == null) {
-                log.warn("The message that server response to collector has not secret empty, please check");
-            } else {
-                AesUtil.setDefaultSecretKey(serverInfo.getAesSecret());
-            }
-        }
        timerDispatch.goOnline();
        log.info("receive online message and handle success");
        return ClusterMsg.Message.newBuilder()
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.common.timer;
+package org.apache.hertzbeat.collector.dispatch.timer;

 import org.apache.hertzbeat.common.util.NetworkUtil;
 import org.slf4j.Logger;
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.common.timer;
+package org.apache.hertzbeat.collector.dispatch.timer;

 /**
 * Derived from Apache Dubbo org.apache.dubbo.common.timer.Timeout 
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.common.timer;
+package org.apache.hertzbeat.collector.dispatch.timer;

 import java.util.Set;
 import java.util.concurrent.RejectedExecutionException;
--- a/Show More
+++ b/Show More