Merge branch 'master' into fix-page-not-found

refactor(web-app): update route configurations and menu settings
2026-09-17 18:19:02 +00:00 · 2025-01-23 18:42:05 +08:00 · 2025-01-23 16:56:11 +08:00 · 2025-01-23 16:53:35 +08:00 · 2025-01-23 15:29:18 +08:00 · 2025-01-10 08:47:21 +08:00
167 changed files with 37559 additions and 42416 deletions
@@ -2225,79 +2225,6 @@
      "contributions": [
        "code"
      ]
-    },
-    {
-      "login": "helei1030",
-      "name": "helei1030",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11839080?v=4",
-      "profile": "https://github.com/helei1030",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "pjfanning",
-      "name": "PJ Fanning",
-      "avatar_url": "https://avatars.githubusercontent.com/u/11783444?v=4",
-      "profile": "https://medium.com/@pjfanning",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "MonsterChenzhuo",
-      "name": "monster",
-      "avatar_url": "https://avatars.githubusercontent.com/u/60029759?v=4",
-      "profile": "https://github.com/MonsterChenzhuo",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "MasamiYui",
-      "name": "Sherlock Yin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/22274133?v=4",
-      "profile": "https://github.com/MasamiYui",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "wanhao23",
-      "name": "wanhao",
-      "avatar_url": "https://avatars.githubusercontent.com/u/29560961?v=4",
-      "profile": "https://github.com/wanhao23",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "jonasHanhan",
-      "name": "jonasHanhan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/130035609?v=4",
-      "profile": "https://github.com/jonasHanhan",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "NikhilMurugesan",
-      "name": "NikhilMurugesan",
-      "avatar_url": "https://avatars.githubusercontent.com/u/49281792?v=4",
-      "profile": "https://github.com/NikhilMurugesan",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "myangle1120",
-      "name": "myangle1120",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19237013?v=4",
-      "profile": "https://github.com/myangle1120",
-      "contributions": [
-        "code"
-      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -73,7 +73,7 @@ jobs:
      
      # upload application logs
      - name: Upload logs & API test reports
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        if: always()
        with:
          name: hz-logs-${{ github.run_id }}
@@ -39,7 +39,7 @@ jobs:
        run: npx docusaurus-prince-pdf -u https://hertzbeat.apache.org/docs --output docs-en.pdf
  
      - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: docs-cn-pdf
          path: docs-cn.pdf
@@ -47,7 +47,7 @@ jobs:
          retention-days: 1
          
      - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
        with:
          name: docs-en-pdf
          path: docs-en.pdf
@@ -496,18 +496,6 @@ Thanks to these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Suvrat1629"><img src="https://avatars.githubusercontent.com/u/140749446?v=4?s=100" width="100px;" alt="Suvrat1629"/><br /><sub><b>Suvrat1629</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Suvrat1629" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://ghyghoo8.github.io/"><img src="https://avatars.githubusercontent.com/u/363129?v=4?s=100" width="100px;" alt="ghy"/><br /><sub><b>ghy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ghyghoo8" title="Code">💻</a></td>
    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/helei1030"><img src="https://avatars.githubusercontent.com/u/11839080?v=4?s=100" width="100px;" alt="helei1030"/><br /><sub><b>helei1030</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=helei1030" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MonsterChenzhuo"><img src="https://avatars.githubusercontent.com/u/60029759?v=4?s=100" width="100px;" alt="monster"/><br /><sub><b>monster</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MonsterChenzhuo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wanhao23"><img src="https://avatars.githubusercontent.com/u/29560961?v=4?s=100" width="100px;" alt="wanhao"/><br /><sub><b>wanhao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jonasHanhan"><img src="https://avatars.githubusercontent.com/u/130035609?v=4?s=100" width="100px;" alt="jonasHanhan"/><br /><sub><b>jonasHanhan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jonasHanhan" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NikhilMurugesan"><img src="https://avatars.githubusercontent.com/u/49281792?v=4?s=100" width="100px;" alt="NikhilMurugesan"/><br /><sub><b>NikhilMurugesan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=NikhilMurugesan" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myangle1120"><img src="https://avatars.githubusercontent.com/u/19237013?v=4?s=100" width="100px;" alt="myangle1120"/><br /><sub><b>myangle1120</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=myangle1120" title="Code">💻</a></td>
-    </tr>
  </tbody>
 </table>

@@ -495,18 +495,6 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Suvrat1629"><img src="https://avatars.githubusercontent.com/u/140749446?v=4?s=100" width="100px;" alt="Suvrat1629"/><br /><sub><b>Suvrat1629</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Suvrat1629" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="http://ghyghoo8.github.io/"><img src="https://avatars.githubusercontent.com/u/363129?v=4?s=100" width="100px;" alt="ghy"/><br /><sub><b>ghy</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=ghyghoo8" title="Code">💻</a></td>
    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/helei1030"><img src="https://avatars.githubusercontent.com/u/11839080?v=4?s=100" width="100px;" alt="helei1030"/><br /><sub><b>helei1030</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=helei1030" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://medium.com/@pjfanning"><img src="https://avatars.githubusercontent.com/u/11783444?v=4?s=100" width="100px;" alt="PJ Fanning"/><br /><sub><b>PJ Fanning</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=pjfanning" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MonsterChenzhuo"><img src="https://avatars.githubusercontent.com/u/60029759?v=4?s=100" width="100px;" alt="monster"/><br /><sub><b>monster</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MonsterChenzhuo" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MasamiYui"><img src="https://avatars.githubusercontent.com/u/22274133?v=4?s=100" width="100px;" alt="Sherlock Yin"/><br /><sub><b>Sherlock Yin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=MasamiYui" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/wanhao23"><img src="https://avatars.githubusercontent.com/u/29560961?v=4?s=100" width="100px;" alt="wanhao"/><br /><sub><b>wanhao</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=wanhao23" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jonasHanhan"><img src="https://avatars.githubusercontent.com/u/130035609?v=4?s=100" width="100px;" alt="jonasHanhan"/><br /><sub><b>jonasHanhan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=jonasHanhan" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/NikhilMurugesan"><img src="https://avatars.githubusercontent.com/u/49281792?v=4?s=100" width="100px;" alt="NikhilMurugesan"/><br /><sub><b>NikhilMurugesan</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=NikhilMurugesan" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/myangle1120"><img src="https://avatars.githubusercontent.com/u/19237013?v=4?s=100" width="100px;" alt="myangle1120"/><br /><sub><b>myangle1120</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=myangle1120" title="Code">💻</a></td>
-    </tr>
  </tbody>
 </table>

@@ -29,11 +29,6 @@
        "type": 0,
        "paramValue": 1000
      },
-      {
-        "field": "ssl",
-        "type": 1,
-        "paramValue": false
-      },
      {
        "field": "username",
        "type": 1
@@ -40,11 +40,6 @@
            <groupId>org.apache.hertzbeat</groupId>
            <artifactId>hertzbeat-plugin</artifactId>
        </dependency>
-        <!-- warehouse -->
-        <dependency>
-            <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-warehouse</artifactId>
-        </dependency>
        <!-- spring -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -98,6 +93,25 @@
            <version>${easy-poi.version}</version>
            <scope>compile</scope>
        </dependency>
+        <!-- sms -->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-sms</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>logging-interceptor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
        <dependency>
            <groupId>com.huaweicloud.sdk</groupId>
            <artifactId>huaweicloud-sdk-smn</artifactId>
@@ -17,172 +17,90 @@

 package org.apache.hertzbeat.alert.calculate;

-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Objects;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
-import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.JexlExpressionRunner;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.Collections;
 import java.util.concurrent.ConcurrentHashMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.stereotype.Component;

 /**
 * Periodic Alert Calculator
 */

@Slf4j
-@Component
+@RequiredArgsConstructor
 public class PeriodicAlertCalculator {
-    
-    private static final String VALUE = "__value__";
-    private static final String TIMESTAMP = "__timestamp__";

    private final DataSourceService dataSourceService;
-    private final AlarmCommonReduce alarmCommonReduce;
-    /**
-     * The alarm in the process is triggered
-     * key - labels fingerprint
-     */
-    private final Map<String, SingleAlert> pendingAlertMap;
-    /**
-     * The not recover alert
-     * key - labels fingerprint
-     */
-    private final Map<String, SingleAlert> firingAlertMap;
+    private final JexlExpressionRunner expressionRunner;
+    private final Map<String, SingleAlert> notRecoveredAlertMap = new ConcurrentHashMap<>(16);
    
-    public PeriodicAlertCalculator(DataSourceService dataSourceService, AlarmCommonReduce alarmCommonReduce) {
-        this.dataSourceService = dataSourceService;
-        this.alarmCommonReduce = alarmCommonReduce;
-        this.pendingAlertMap = new ConcurrentHashMap<>(8);
-        this.firingAlertMap = new ConcurrentHashMap<>(8);
-    }
    
-    public void calculate(AlertDefine rule) {
+    public List<SingleAlert> calculate(AlertDefine rule) {
        if (!rule.isEnable() || StringUtils.isEmpty(rule.getExpr())) {
-            log.error("Periodic rule {} is disabled or expression is empty", rule.getName());
-            return;
+            return Collections.emptyList();
        }
-        long currentTimeMilli = System.currentTimeMillis();
+        // todo: implement the following logic
        try {
-            // for prometheus is instant promql query, for db is sql query
-            // result: [{'value': 100, 'timestamp': 1343554, 'instance': 'node1'},{'value': 200, 'timestamp': 1343555, 'instance': 'node2'}]
-            // the return result should be matched with threshold
-            try {
-                List<Map<String, Object>> results = dataSourceService.calculate(
-                        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
-                if (CollectionUtils.isEmpty(results)) {
-                    return;
-                }
-                for (Map<String, Object> result : results) {
-                    Map<String, String> fingerPrints = new HashMap<>(8);
-                    // here use the alert name as finger, not care the alert name may be changed
-                    fingerPrints.put(CommonConstants.LABEL_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())) {
-                            fingerPrints.put(entry.getKey(), entry.getValue().toString());
-                        }
-                    }
-                    if (result.get(VALUE) == null) {
-                        // recovery the alert
-                        handleRecoveredAlert(fingerPrints);
-                        continue;
-                    }
-                    Map<String, Object> fieldValueMap = new HashMap<>(8);
-                    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, rule);
-                }
-            } catch (Exception ignored) {
-                // ignore the query exception eg: no result, timeout, etc
-                return;
+            // Execute query
+            List<Map<String, Object>> queryResults = dataSourceService.query(
+                rule.getDatasource(), 
+                rule.getExpr()
+            );
+            
+            if (CollectionUtils.isEmpty(queryResults)) {
+                return Collections.emptyList();
            }
+            
+            // Execute expression calculation on query results
+            List<SingleAlert> newAlerts = queryResults.stream()
+                .filter(result -> execAlertExpression(result, rule.getExpr()))
+                .map(result -> buildAlert(rule, result))
+                .collect(Collectors.toList());
+                
+            // Handle recovery notification
+            if (newAlerts.isEmpty()) {
+                return handleAlertRecover(rule);
+            }
+            
+            return newAlerts;
        } catch (Exception e) {
            log.error("Calculate periodic rule {} failed: {}", rule.getName(), e.getMessage());
+            return Collections.emptyList();
        }
    }

-    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
-                                         Map<String, Object> fieldValueMap, AlertDefine define) {
-        String fingerprint = calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = pendingAlertMap.get(fingerprint);
-        Map<String, String> labels = new HashMap<>(8);
-        fieldValueMap.putAll(define.getLabels());
-        labels.putAll(fingerPrints);
-        int requiredTimes = define.getTimes() == null ? 1 : define.getTimes();
-        if (existingAlert == null) {
-            // First time triggering alert, create new alert and set to pending status
-            SingleAlert newAlert = SingleAlert.builder()
-                    .labels(labels)
-                    // todo render var content in annotations
-                    .annotations(define.getAnnotations())
-                    .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
-                    .status(CommonConstants.ALERT_STATUS_PENDING)
-                    .triggerTimes(1)
-                    .startAt(currentTimeMilli)
-                    .activeAt(currentTimeMilli)
-                    .build();
-
-            // If required trigger times is 1, set to firing status directly
-            if (requiredTimes <= 1) {
-                newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                firingAlertMap.put(fingerprint, newAlert);
-                alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
-            } else {
-                // Otherwise put into pending queue first
-                pendingAlertMap.put(fingerprint, newAlert);
-            }
-        } else {
-            // Update existing alert
-            existingAlert.setTriggerTimes(existingAlert.getTriggerTimes() + 1);
-            existingAlert.setActiveAt(currentTimeMilli);
-
-            // Check if required trigger times reached
-            if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
-                // Reached trigger times threshold, change to firing status
-                pendingAlertMap.remove(fingerprint);
-                existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                firingAlertMap.put(fingerprint, existingAlert);
-                alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
-            }
-        }
+    private boolean execAlertExpression(Map<String, Object> result, String expr) {
+        return false;
    }

-    private void handleRecoveredAlert(Map<String, String> fingerprints) {
-        String fingerprint = calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = firingAlertMap.remove(fingerprint);
+    private SingleAlert buildAlert(AlertDefine rule, Map<String, Object> metrics) {
+        return SingleAlert.builder()
+                .labels(rule.getLabels())
+                .annotations(rule.getAnnotations())
+                .triggerTimes(1)
+                .startAt(System.currentTimeMillis())
+                .activeAt(System.currentTimeMillis())
+                .build();
+    }
+    
+    private List<SingleAlert> handleAlertRecover(AlertDefine rule) {
+        SingleAlert firingAlert = notRecoveredAlertMap.remove(rule.getId().toString());
        if (firingAlert != null) {
-            // todo consider multi times to tig for resolved alert
-            firingAlert.setTriggerTimes(1);
-            firingAlert.setEndAt(System.currentTimeMillis());
-            firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
-            alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
+            return Collections.singletonList(buildResolvedAlert(rule, firingAlert));
        }
-        pendingAlertMap.remove(fingerprint);
+        return Collections.emptyList();
    }

-    private String calculateFingerprint(Map<String, String> fingerPrints) {
-        List<String> keyList = fingerPrints.keySet().stream().filter(Objects::nonNull).sorted().toList();
-        List<String> valueList = fingerPrints.values().stream().filter(Objects::nonNull).sorted().toList();
-        return Arrays.hashCode(keyList.toArray(new String[0])) + "-"
-                + Arrays.hashCode(valueList.toArray(new String[0]));
+    private SingleAlert buildResolvedAlert(AlertDefine rule, SingleAlert firingAlert) {
+        return null;
    }
 } 
@@ -17,79 +17,13 @@

 package org.apache.hertzbeat.alert.calculate;

-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.dao.AlertDefineDao;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.stereotype.Component;
-import org.apache.hertzbeat.common.entity.alerter.AlertDefine;

 /**
- * Periodic Alert Rule Scheduler
+ * period alert rule scheduler
 */
@Slf4j
-@Component
-public class PeriodicAlertRuleScheduler implements CommandLineRunner {
-
-    private final PeriodicAlertCalculator calculator;
-    private final AlertDefineDao alertDefineDao;
-    private final ScheduledExecutorService scheduledExecutor;
-    private final Map<Long, ScheduledFuture<?>> scheduledFutures;
-
-    public PeriodicAlertRuleScheduler(PeriodicAlertCalculator calculator, AlertDefineDao alertDefineDao) {
-        this.calculator = calculator;
-        this.alertDefineDao = alertDefineDao;
-        ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setUncaughtExceptionHandler((thread, throwable) -> {
-                    log.error("Scheduled periodic alert threshold has uncaughtException.");
-                    log.error(throwable.getMessage(), throwable);
-                })
-                .setDaemon(true)
-                .setNameFormat("periodic-alert-threshold-worker-%d")
-                .build();
-        this.scheduledExecutor = Executors.newScheduledThreadPool(10, threadFactory);
-        this.scheduledFutures = new ConcurrentHashMap<>();
-    }
-
-    public void cancelSchedule(Long ruleId) {
-        if (ruleId == null) {
-            return;
-        }
-        ScheduledFuture<?> future = scheduledFutures.get(ruleId);
-        if (future != null) {
-            future.cancel(true);
-            scheduledFutures.remove(ruleId);
-        }
-    }
-
-    public void updateSchedule(AlertDefine rule) {
-        if (rule == null || rule.getId() == null) {
-            log.error("Alert rule is null or rule id is null.");
-            return;
-        }
-        cancelSchedule(rule.getId());
-        if (rule.getType().equals(ALERT_THRESHOLD_TYPE_PERIODIC)) {
-            ScheduledFuture<?> future = scheduledExecutor.scheduleAtFixedRate(() -> {
-                calculator.calculate(rule);
-            }, 0, rule.getPeriod(), java.util.concurrent.TimeUnit.SECONDS);
-            scheduledFutures.put(rule.getId(), future);
-        }
-    }
-
-    @Override
-    public void run(String... args) throws Exception {
-        log.info("Starting periodic alert rule scheduler...");
-        List<AlertDefine> periodicRules = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(ALERT_THRESHOLD_TYPE_PERIODIC);
-        for (AlertDefine rule : periodicRules) {
-            updateSchedule(rule);
-        }
-    }
+public class PeriodicAlertRuleScheduler {
+    
+    // todo implement the following logic
 }
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hertzbeat.alert.config;
-
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.io.IOException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * SSE manager for alert
- */
-@Component
-public class AlertSseManager {
-    private final Map<Long, SseEmitter> emitters = new ConcurrentHashMap<>();
-
-    public SseEmitter createEmitter(Long clientId) {
-        SseEmitter emitter = new SseEmitter(Long.MAX_VALUE);
-        emitter.onCompletion(() -> removeEmitter(clientId));
-        emitter.onTimeout(() -> removeEmitter(clientId));
-        emitters.put(clientId, emitter);
-        return emitter;
-    }
-
-    @Async
-    public void broadcast(String data) {
-        emitters.forEach((clientId, emitter) -> {
-            try {
-                emitter.send(SseEmitter.event()
-                        .id(String.valueOf(System.currentTimeMillis()))
-                        .name("ALERT_EVENT")
-                        .data(data));
-            } catch (IOException e) {
-                emitter.complete();
-                removeEmitter(clientId);
-            }
-        });
-    }
-
-    private void removeEmitter(Long clientId) {
-        emitters.remove(clientId);
-    }
-}
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.config;
-
-/**
- * Alibaba Cloud SMS properties
- */
-public class AlibabaSmsProperties {
-    // todo add properties
-}
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * SMS configuration
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "alerter.sms")
-public class SmsConfig {
-
-    /**
-     * whether to enable SMS, default is false
-     */
-    private boolean enable = false;
-
-    /**
-     * sms service provider
-     */
-    private String type;
-
-    /**
-     * Tencent cloud SMS configuration
-     */
-    private TencentSmsProperties tencent;
-
-    /**
-     * Aliyun SMS configuration
-     */
-    private AlibabaSmsProperties alibaba;
-
-}
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.config;
-
-import lombok.Data;
-
-/**
- * Tencent Cloud SMS properties
- */
-@Data
-public class TencentSmsProperties {
-    /**
-     * Tencent cloud account secret id
-     */
-    private String secretId;
-
-    /**
-     * Tencent cloud account secret key
-     */
-    private String secretKey;
-
-    /**
-     * SMS app id
-     */
-    private String appId;
-
-    /**
-     * SMS signature
-     */
-    private String signName;
-
-    /**
-     * SMS template ID
-     */
-    private String templateId;
-}
@@ -38,9 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

 /**
- * Alarm Inhibit management API
+ * Alarm Silence management API
 */
-@Tag(name = "Alert Inhibit API")
+@Tag(name = "Alert Silence API")
@RestController
@RequestMapping(path = "/api/alert/inhibit", produces = {APPLICATION_JSON_VALUE})
 public class AlertInhibitController {
@@ -49,7 +49,7 @@ public class AlertInhibitController {
    private AlertInhibitService alertInhibitService;

    @PostMapping
-    @Operation(summary = "New Alarm Inhibit", description = "Added an alarm Inhibit")
+    @Operation(summary = "New Alarm Silence", description = "Added an alarm Silence")
    public ResponseEntity<Message<Void>> addNewAlertInhibit(@Valid @RequestBody AlertInhibit alertInhibit) {
        alertInhibitService.validate(alertInhibit, false);
        alertInhibitService.addAlertInhibit(alertInhibit);
@@ -57,7 +57,7 @@ public class AlertInhibitController {
    }

    @PutMapping
-    @Operation(summary = "Modifying an Alarm Inhibit", description = "Modify an existing alarm Inhibit")
+    @Operation(summary = "Modifying an Alarm Silence", description = "Modify an existing alarm Silence")
    public ResponseEntity<Message<Void>> modifyAlertInhibit(@Valid @RequestBody AlertInhibit alertInhibit) {
        alertInhibitService.validate(alertInhibit, true);
        alertInhibitService.modifyAlertInhibit(alertInhibit);
@@ -65,10 +65,10 @@ public class AlertInhibitController {
    }

    @GetMapping(path = "/{id}")
-    @Operation(summary = "Querying Alarm Inhibit",
-            description = "You can obtain alarm Inhibit information based on the alarm Inhibit ID")
+    @Operation(summary = "Querying Alarm Silence",
+            description = "You can obtain alarm Silence information based on the alarm Silence ID")
    public ResponseEntity<Message<AlertInhibit>> getAlertInhibit(
-            @Parameter(description = "Alarm Inhibit ID", example = "6565463543") @PathVariable("id") long id) {
+            @Parameter(description = "Alarm Silence ID", example = "6565463543") @PathVariable("id") long id) {
        AlertInhibit alertInhibit = alertInhibitService.getAlertInhibit(id);

        return Objects.isNull(alertInhibit)
@@ -36,9 +36,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

 /**
- * Inhibit the batch API for alarms
+ * Silence the batch API for alarms
 */
-@Tag(name = "Alert Inhibit Batch API")
+@Tag(name = "Alert Silence Batch API")
@RestController
@RequestMapping(path = "/api/alert/inhibits", produces = {APPLICATION_JSON_VALUE})
 public class AlertInhibitsController {
@@ -50,7 +50,7 @@ public class AlertInhibitsController {
    @Operation(summary = "Query the alarm inhibit list",
            description = "You can obtain the list of alarm inhibit by querying filter items")
    public ResponseEntity<Message<Page<AlertInhibit>>> getAlertInhibits(
-            @Parameter(description = "Alarm Inhibit ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
+            @Parameter(description = "Alarm Silence ID", example = "6565463543") @RequestParam(required = false) List<Long> ids,
            @Parameter(description = "Search Name", example = "x") @RequestParam(required = false) String search,
            @Parameter(description = "Sort field, default id", example = "id") @RequestParam(defaultValue = "id") String sort,
            @Parameter(description = "Sort mode: asc: ascending, desc: descending", example = "desc") @RequestParam(defaultValue = "desc") String order,
@@ -64,7 +64,7 @@ public class AlertInhibitsController {
    @Operation(summary = "Delete alarm inhibit in batches",
            description = "Delete alarm inhibit in batches based on the alarm inhibit ID list")
    public ResponseEntity<Message<Void>> deleteAlertDefines(
-            @Parameter(description = "Alarm Inhibit IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids
+            @Parameter(description = "Alarm Silence IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids
    ) {
        if (ids != null && !ids.isEmpty()) {
            alertInhibitService.deleteAlertInhibits(new HashSet<>(ids));
@@ -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.controller;
-
-import static org.springframework.http.MediaType.TEXT_EVENT_STREAM_VALUE;
-import org.apache.hertzbeat.alert.config.AlertSseManager;
-import org.apache.hertzbeat.common.util.SnowFlakeIdGenerator;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-/**
- * SSE controller for alert
- */
-@RestController
-@RequestMapping(path = "/api/alert/sse", produces = {TEXT_EVENT_STREAM_VALUE})
-public class AlertSseController {
-
-    private final AlertSseManager emitterManager;
-
-    public AlertSseController(AlertSseManager emitterManager) {
-        this.emitterManager = emitterManager;
-    }
-
-    @GetMapping(path = "/subscribe")
-    public SseEmitter subscribe() {
-        Long clientId = SnowFlakeIdGenerator.generateId();
-        return emitterManager.createEmitter(clientId);
-    }
-}
@@ -31,7 +31,6 @@ import org.apache.hertzbeat.common.entity.alerter.NoticeRule;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.alert.service.NoticeConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -83,18 +82,9 @@ public class NoticeConfigController {
    @GetMapping(path = "/receivers")
    @Operation(summary = "Get a list of message notification recipients based on query filter items",
            description = "Get a list of message notification recipients based on query filter items")
-    public ResponseEntity<Message<Page<NoticeReceiver>>> getReceivers(
-            @Parameter(description = "en: Recipient name,support fuzzy query", example = "tom") @RequestParam(required = false) final String name,
-            @Parameter(description = "en: List current page", example = "0") @RequestParam(defaultValue = "0") final int pageIndex,
-            @Parameter(description = "en: Number of list pages", example = "8") @RequestParam(defaultValue = "8") final int pageSize) {
-        return ResponseEntity.ok(Message.success(noticeConfigService.getNoticeReceivers(name, pageIndex, pageSize)));
-    }
-
-    @GetMapping(path = "/receivers/all")
-    @Operation(summary = "Get a list of all message notification recipients",
-            description = "Get a list of all message notification recipients")
-    public ResponseEntity<Message<List<NoticeReceiver>>> getAllReceivers() {
-        return ResponseEntity.ok(Message.success(noticeConfigService.getAllNoticeReceivers()));
+    public ResponseEntity<Message<List<NoticeReceiver>>> getReceivers(
+            @Parameter(description = "en: Recipient name,support fuzzy query", example = "tom") @RequestParam(required = false) final String name) {
+        return ResponseEntity.ok(Message.success(noticeConfigService.getNoticeReceivers(name)));
    }

    @GetMapping(path = "/receiver/{id}")
@@ -139,11 +129,9 @@ public class NoticeConfigController {
    @GetMapping(path = "/rules")
    @Operation(summary = "Get a list of message notification policies based on query filter items",
            description = "Get a list of message notification policies based on query filter items")
-    public ResponseEntity<Message<Page<NoticeRule>>> getRules(
-            @Parameter(description = "en: Recipient name", example = "rule1") @RequestParam(required = false) final String name,
-            @Parameter(description = "en: List current page", example = "0") @RequestParam(defaultValue = "0") final int pageIndex,
-            @Parameter(description = "en: Number of list pages", example = "8") @RequestParam(defaultValue = "8") final int pageSize) {
-        return ResponseEntity.ok(Message.success(noticeConfigService.getNoticeRules(name, pageIndex, pageSize)));
+    public ResponseEntity<Message<List<NoticeRule>>> getRules(
+            @Parameter(description = "en: Recipient name", example = "rule1") @RequestParam(required = false) final String name) {
+        return ResponseEntity.ok(Message.success(noticeConfigService.getNoticeRules(name)));
    }

    @GetMapping(path = "/rule/{id}")
@@ -188,22 +176,12 @@ public class NoticeConfigController {
    @GetMapping(path = "/templates")
    @Operation(summary = "Get a list of message notification templates based on query filter items",
            description = "Get a list of message notification templates based on query filter items")
-    public ResponseEntity<Message<Page<NoticeTemplate>>> getTemplates(
-            @Parameter(description = "Template name,support fuzzy query", example = "rule1") @RequestParam(required = false) final String name,
-            @Parameter(description = "Whether it is a preset template", example = "true") @RequestParam(defaultValue = "true") final boolean preset,
-            @Parameter(description = "List current page", example = "0") @RequestParam(defaultValue = "0") final int pageIndex,
-            @Parameter(description = "Number of list pages", example = "8") @RequestParam(defaultValue = "8") final int pageSize) {
-        Page<NoticeTemplate> templatePage = noticeConfigService.getNoticeTemplates(name, preset, pageIndex, pageSize);
+    public ResponseEntity<Message<List<NoticeTemplate>>> getTemplates(
+            @Parameter(description = "Template name,support fuzzy query", example = "rule1") @RequestParam(required = false) final String name) {
+        List<NoticeTemplate> templatePage = noticeConfigService.getNoticeTemplates(name);
        return ResponseEntity.ok(Message.success(templatePage));
    }

-    @GetMapping(path = "/templates/all")
-    @Operation(summary = "Get a list of all message notification templates",
-            description = "Get a list of all message notification templates")
-    public ResponseEntity<Message<List<NoticeTemplate>>> getAllTemplates() {
-        return ResponseEntity.ok(Message.success(noticeConfigService.getAllNoticeTemplates()));
-    }
-
    @GetMapping(path = "/template/{id}")
    @Operation(summary = "Get the notification template information based on the template ID",
            description = "Get the notification template information based on the template ID")
@@ -23,13 +23,11 @@ import java.util.Map;
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
-import org.apache.hertzbeat.alert.config.AlertSseManager;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
 import org.apache.hertzbeat.common.entity.alerter.NoticeRule;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.alert.service.NoticeConfigService;
-import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.plugin.PostAlertPlugin;
 import org.apache.hertzbeat.plugin.Plugin;
 import org.apache.hertzbeat.plugin.runner.PluginRunner;
@@ -47,18 +45,16 @@ public class AlertNoticeDispatch {
    private final AlertStoreHandler alertStoreHandler;
    private final Map<Byte, AlertNotifyHandler> alertNotifyHandlerMap;
    private final PluginRunner pluginRunner;
-    private final AlertSseManager emitterManager;

    public AlertNoticeDispatch(AlerterWorkerPool workerPool,
                               NoticeConfigService noticeConfigService,
                               AlertStoreHandler alertStoreHandler,
-                               List<AlertNotifyHandler> alertNotifyHandlerList, PluginRunner pluginRunner, AlertSseManager emitterManager) {
+                               List<AlertNotifyHandler> alertNotifyHandlerList, PluginRunner pluginRunner) {
        this.workerPool = workerPool;
        this.noticeConfigService = noticeConfigService;
        this.alertStoreHandler = alertStoreHandler;
        this.pluginRunner = pluginRunner;
        alertNotifyHandlerMap = Maps.newHashMapWithExpectedSize(alertNotifyHandlerList.size());
-        this.emitterManager = emitterManager;
        alertNotifyHandlerList.forEach(r -> alertNotifyHandlerMap.put(r.type(), r));
    }

@@ -80,7 +76,7 @@ public class AlertNoticeDispatch {
            if (noticeTemplate == null) {
                noticeTemplate = noticeConfigService.getDefaultNoticeTemplateByType(alertNotifyHandler.type());
            }
-            if (noticeTemplate == null && alertNotifyHandler.type() != 0) {
+            if (noticeTemplate == null) {
                log.error("alert does not have mapping default notice template. type: {}.", alertNotifyHandler.type());
                throw new NullPointerException(alertNotifyHandler.type() + " does not have mapping default notice template");
            }
@@ -108,27 +104,27 @@ public class AlertNoticeDispatch {
    public void dispatchAlarm(GroupAlert groupAlert) {
        if (groupAlert != null) {
            // Determining alarm type storage
-            GroupAlert storedGroupAlert = alertStoreHandler.store(groupAlert);
+            alertStoreHandler.store(groupAlert);
            // Notice distribution
-            sendNotify(storedGroupAlert);
+            sendNotify(groupAlert);
            // Execute the plugin if enable (Compatible with old version plugins, will be removed in later versions)
-            pluginRunner.pluginExecute(Plugin.class, plugin -> plugin.alert(storedGroupAlert));
+            pluginRunner.pluginExecute(Plugin.class, plugin -> plugin.alert(groupAlert));
            // Execute the plugin if enable with params
-            pluginRunner.pluginExecute(PostAlertPlugin.class, (afterAlertPlugin, pluginContext) -> afterAlertPlugin.execute(storedGroupAlert, pluginContext));
-            // Send alert to the sse client
-            emitterManager.broadcast(JsonUtil.toJson(storedGroupAlert));
+            pluginRunner.pluginExecute(PostAlertPlugin.class, (afterAlertPlugin, pluginContext) -> afterAlertPlugin.execute(groupAlert, pluginContext));
        }
    }

    private void sendNotify(GroupAlert alert) {
-        matchNoticeRulesByAlert(alert).ifPresent(noticeRules -> noticeRules.forEach(rule -> workerPool.executeNotify(() -> rule.getReceiverId()
-                .forEach(receiverId -> {
-                    try {
-                        sendNoticeMsg(getOneReceiverById(receiverId),
-                                getOneTemplateById(rule.getTemplateId()), alert);
-                    } catch (AlertNoticeException e) {
-                        log.warn("DispatchTask sendNoticeMsg error, message: {}", e.getMessage());
-                    }
-                }))));
+        matchNoticeRulesByAlert(alert).ifPresent(noticeRules -> noticeRules.forEach(rule -> {
+            workerPool.executeNotify(() -> rule.getReceiverId()
+                    .forEach(receiverId -> {
+                        try {
+                            sendNoticeMsg(getOneReceiverById(receiverId),
+                                    getOneTemplateById(rule.getTemplateId()), alert);
+                        } catch (AlertNoticeException e) {
+                            log.warn("DispatchTask sendNoticeMsg error, message: {}", e.getMessage());
+                        }
+                    }));
+        }));
    }
 }
@@ -28,9 +28,7 @@ public interface AlertStoreHandler {
     * Persistent alarm records
     * It is necessary to associate and assign values
     * to the alert tag information tags while persisting.
-     *
     * @param alert alarm information
-     * @return groupAlert
     */
-    GroupAlert store(GroupAlert alert);
+    void store(GroupAlert alert);
 }
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.notice.impl;
+
+import java.util.ResourceBundle;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.notice.AlertNoticeException;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
+import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
+import org.apache.hertzbeat.common.util.ResourceBundleUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * Send alarm information through Alibaba Cloud SMS
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+@ConditionalOnProperty("common.sms.aliyun.app-id")
+final class AliYunAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
+
+    private final ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
+
+    @Override
+    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
+        // SMS notification
+        try {
+            // todo send aliyun sms
+        } catch (Exception e) {
+            throw new AlertNoticeException("[Sms Notify Error] " + e.getMessage());
+        }
+    }
+
+    @Override
+    public byte type() {
+        return 0;
+    }
+}
@@ -17,7 +17,6 @@

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

-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -47,53 +46,44 @@ final class DbAlertStoreHandlerImpl implements AlertStoreHandler {
    private final SingleAlertDao singleAlertDao;

    @Override
-    public GroupAlert store(GroupAlert groupAlert) {
+    public void store(GroupAlert groupAlert) {
        if (groupAlert == null || groupAlert.getAlerts() == null || groupAlert.getAlerts().isEmpty()) {
            log.error("The Group Alerts is empty, ignore store");
-            return groupAlert;
+            return;
        }
        // 1. Find existing alert group
        GroupAlert existGroupAlert = groupAlertDao.findByGroupKey(groupAlert.getGroupKey());
        
        // 2. Process individual alerts
        Set<String> alertFingerprints = new HashSet<>(8);
-
-        List<SingleAlert> originalAlerts = groupAlert.getAlerts();
-        List<SingleAlert> newAlerts = new ArrayList<>();
-
-
-        for (SingleAlert singleAlert : originalAlerts) {
+        groupAlert.getAlerts().forEach(singleAlert -> {
            SingleAlert existAlert = singleAlertDao.findByFingerprint(singleAlert.getFingerprint());
-
            if (existAlert != null) {
-                // Update the existing alert with the ID and creation time from the database
+                // Update existing alert
                singleAlert.setId(existAlert.getId());
                singleAlert.setGmtCreate(existAlert.getGmtCreate());
-
+                
                // Status transition logic
                if (CommonConstants.ALERT_STATUS_FIRING.equals(singleAlert.getStatus())) {
-                    // If the alert is firing and the existing alert is not resolved, update the start time and trigger times
                    if (!CommonConstants.ALERT_STATUS_RESOLVED.equals(existAlert.getStatus())) {
                        singleAlert.setStartAt(existAlert.getStartAt());
-                        int triggerTimes = Optional.ofNullable(existAlert.getTriggerTimes()).orElse(1)
-                                + Optional.ofNullable(singleAlert.getTriggerTimes()).orElse(1);
+                        int triggerTimes = Optional.ofNullable(existAlert.getTriggerTimes()).orElse(1) + Optional.ofNullable(singleAlert.getTriggerTimes()).orElse(1);
                        singleAlert.setTriggerTimes(triggerTimes);
-                    }
+                    } 
                } else if (CommonConstants.ALERT_STATUS_RESOLVED.equals(singleAlert.getStatus())) {
-                    // If the alert is resolved, set the end time (if not already set) and copy other fields from the existing alert
+                    // Transition to resolved state
                    if (singleAlert.getEndAt() == null) {
-                        singleAlert.setEndAt(System.currentTimeMillis());
+                        singleAlert.setEndAt(System.currentTimeMillis());   
                    }
                    singleAlert.setStartAt(existAlert.getStartAt());
                    singleAlert.setActiveAt(existAlert.getActiveAt());
                    singleAlert.setTriggerTimes(existAlert.getTriggerTimes());
                }
            }
-            SingleAlert savedSingleAlert = singleAlertDao.save(singleAlert);
-            newAlerts.add(savedSingleAlert);
-            alertFingerprints.add(savedSingleAlert.getFingerprint());
-        }
-        groupAlert.setAlerts(newAlerts);
+            alertFingerprints.add(singleAlert.getFingerprint());
+            singleAlertDao.save(singleAlert);
+        });
+        
        // 3. Process resolved alerts
        if (existGroupAlert != null) {
            List<String> existFingerprints = existGroupAlert.getAlertFingerprints();
@@ -130,8 +120,6 @@ final class DbAlertStoreHandlerImpl implements AlertStoreHandler {
        
        // 4. Save alert group
        groupAlert.setAlertFingerprints(alertFingerprints.stream().toList());
-        GroupAlert savedGroupAlert = groupAlertDao.save(groupAlert);
-        savedGroupAlert.setAlerts(groupAlert.getAlerts());
-        return savedGroupAlert;
+        groupAlertDao.save(groupAlert);
    }
 }
@@ -21,12 +21,12 @@ import java.util.ResourceBundle;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.notice.AlertNoticeException;
-import org.apache.hertzbeat.alert.service.SmsClient;
-import org.apache.hertzbeat.alert.service.SmsClientFactory;
+import org.apache.hertzbeat.alert.service.TencentSmsClient;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.common.util.ResourceBundleUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;

 /**
@@ -35,22 +35,35 @@ import org.springframework.stereotype.Component;
@Component
@RequiredArgsConstructor
@Slf4j
+@ConditionalOnProperty("common.sms.tencent.app-id")
+@Deprecated
 final class SmsAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
    
-    private final SmsClientFactory smsFactory;
+    private final TencentSmsClient tencentSmsClient;
+    
    private final ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
    
    @Override
    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
+        // SMS notification todo use the rest api not sdk
        try {
-            SmsClient smsClient = smsFactory.getSmsClient();
-            if (smsClient == null) {
-                throw new AlertNoticeException("No SMS Service available, please check the configuration");
+            String instance = null;
+            String priority = null;
+            String content = null;
+            if (alert.getCommonLabels() != null) {
+                instance = alert.getCommonLabels().get("instance");
+                priority = alert.getCommonLabels().get("priority");
+                content = alert.getCommonAnnotations().get("summary");
+                content = content == null ? alert.getCommonAnnotations().get("description") : content;
+                if (content == null) {
+                    content = alert.getCommonAnnotations().values().stream().findFirst().orElse(null);
+                }
            }
-            if (!smsClient.checkConfig()) {
-                throw new AlertNoticeException(smsClient.getType() + " SMS Service configuration is invalid, please check the configuration");
-            }
-            smsClient.sendMessage(receiver, noticeTemplate, alert);
+            String[] params = new String[3];
+            params[0] = instance == null ? alert.getGroupKey() : instance;
+            params[1] = priority == null ? "unknown" : priority;
+            params[2] = content;
+            tencentSmsClient.sendMessage(params, new String[]{receiver.getPhone()});
        } catch (Exception e) {
            throw new AlertNoticeException("[Sms Notify Error] " + e.getMessage());
        }
@@ -80,6 +80,7 @@ final class WeChatAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
        JsonObject textContent = new JsonObject();

        // Here you can construct the message content based on the NoticeTemplate and Alert information
+        // String alertMessage = String.format("警告：%s\n详情：%s", alert.getAlertDefineId(), alert.getContent());
        String alertMessage = "Alert message content";
        textContent.addProperty("content", alertMessage);
        messageContent.add("text", textContent);
@@ -21,8 +21,8 @@ package org.apache.hertzbeat.alert.reduce;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -267,7 +267,7 @@ public class AlarmGroupReduce {
                .groupLabels(alert.getLabels())
                .commonLabels(alert.getLabels())
                .commonAnnotations(alert.getAnnotations())
-                .alerts(new LinkedList<>(List.of(alert)))
+                .alerts(Collections.singletonList(alert))
                .status(alert.getStatus())
                .build();

@@ -26,10 +26,10 @@ import java.util.Map;
 public interface DataSourceService {
    
    /**
-     * execute query expr calculate
+     * execute query
     * @param datasource datasource
-     * @param expr query expr
+     * @param query query
     * @return result
     */
-    List<Map<String, Object>> calculate(String datasource, String expr);
+    List<Map<String, Object>> query(String datasource, String query);
 } 
@@ -23,7 +23,6 @@ import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
 import org.apache.hertzbeat.common.entity.alerter.NoticeRule;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
-import org.springframework.data.domain.Page;

 /**
 * Message notification configuration interface
@@ -33,32 +32,23 @@ public interface NoticeConfigService {
    /**
     * Dynamic conditional query
     * @param name Recipient name,support fuzzy query
-     * @param pageIndex Page number
-     * @param pageSize Number of records per page
     * @return Search result
     */
-    Page<NoticeReceiver> getNoticeReceivers(String name, int pageIndex, int pageSize);
+    List<NoticeReceiver> getNoticeReceivers(String name);

    /**
     * Dynamic conditional query
     * @param name Template name,support fuzzy query
-     * @param preset Whether it is a system preset template
-     *               true: System preset template
-     *               false: Custom template
-     * @param pageIndex Page number
-     * @param pageSize Number of records per page
     * @return Search result
     */
-    Page<NoticeTemplate> getNoticeTemplates(String name, boolean preset, int pageIndex, int pageSize);
+    List<NoticeTemplate> getNoticeTemplates(String name);

    /**
     * Dynamic conditional query
-     * @param name Recipient name ,support fuzzy query
-     * @param pageIndex Page number
-     * @param pageSize Number of records per page
+     * @param name Recipient name
     * @return Search result
     */
-    Page<NoticeRule> getNoticeRules(String name, int pageIndex, int pageSize);
+    List<NoticeRule> getNoticeRules(String name);

    /**
     * Add a notification recipient
@@ -164,15 +154,4 @@ public interface NoticeConfigService {
     */
    boolean sendTestMsg(NoticeReceiver noticeReceiver);

-    /**
-     * Query all notification recipients
-     * @return Recipient List
-     */
-    List<NoticeReceiver> getAllNoticeReceivers();
-
-    /**
-     * Query all notification policies
-     * @return Notification Policy List
-     */
-    List<NoticeTemplate> getAllNoticeTemplates();
 }
@@ -1,42 +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.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
-
-/**
- * SMS client interface
- */
-public interface SmsClient {
-    /**
-     * send SMS
-     */
-    void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert);
-
-    /**
-     * get SMS provider type
-     */
-    String getType();
-
-    /**
-     * check SMS configuration, return true if the configuration is correct
-     */
-    boolean checkConfig();
-} 
@@ -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.service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.config.SmsConfig;
-import org.apache.hertzbeat.alert.service.impl.TencentSmsClientImpl;
-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.support.event.SmsConfigChangeEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-
-import static org.apache.hertzbeat.common.constants.SmsConstants.ALIBABA;
-import static org.apache.hertzbeat.common.constants.SmsConstants.TENCENT;
-
-/**
- * SMS client factory
- */
-@Slf4j
-@Component
-public class SmsClientFactory {
-
-    private static final String TYPE = GeneralConfigTypeEnum.sms.name();
-
-    private final GeneralConfigDao generalConfigDao;
-    private final ObjectMapper objectMapper;
-    private final SmsConfig yamlSmsConfig;
-
-    private volatile SmsClient currentSmsClient;
-
-    public SmsClientFactory(GeneralConfigDao generalConfigDao,
-                            ObjectMapper objectMapper,
-                            SmsConfig yamlSmsConfig) {
-        this.generalConfigDao = generalConfigDao;
-        this.objectMapper = objectMapper;
-        this.yamlSmsConfig = yamlSmsConfig;
-    }
-
-    /**
-     * SMS configuration change event listener
-     */
-    @EventListener(SmsConfigChangeEvent.class)
-    public void onSmsConfigChange(SmsConfigChangeEvent event) {
-        log.info("[SmsClientFactory] SMS configuration change event received");
-        synchronized (this) {
-            currentSmsClient = null;
-        }
-    }
-
-    public SmsClient getSmsClient() {
-        if (currentSmsClient != null) {
-            return currentSmsClient;
-        }
-        synchronized (this) {
-            if (currentSmsClient != null) {
-                return currentSmsClient;
-            }
-            loadConfig();
-            return currentSmsClient;
-        }
-    }
-
-    private void loadConfig() {
-        try {
-            // 1. try to load database configuration
-            SmsConfig dbConfig = loadDatabaseConfig();
-            if (dbConfig != null && !dbConfig.getType().isBlank() && dbConfig.isEnable()) {
-                createSmsClient(dbConfig);
-                if (currentSmsClient != null) {
-                    log.info("[SmsClientFactory] Using database SMS configuration, provider: {}", dbConfig.getType());
-                    return;
-                }
-            }
-
-            // 2. try to load YAML configuration
-            if (yamlSmsConfig != null && !yamlSmsConfig.getType().isBlank() && yamlSmsConfig.isEnable()) {
-                createSmsClient(yamlSmsConfig);
-                if (currentSmsClient != null) {
-                    log.info("[SmsClientFactory] Using YAML SMS configuration, provider: {}", yamlSmsConfig.getType());
-                    return;
-                }
-            }
-
-            log.warn("[SmsClientFactory] No valid SMS configuration found");
-
-        } catch (Exception e) {
-            log.error("[SmsClientFactory] Failed to load SMS configuration", e);
-            currentSmsClient = null;
-        }
-    }
-
-    private SmsConfig loadDatabaseConfig() {
-        try {
-            GeneralConfig config = generalConfigDao.findByType(TYPE);
-            if (config != null && config.getContent() != null) {
-                return objectMapper.readValue(config.getContent(), SmsConfig.class);
-            }
-        } catch (Exception e) {
-            log.error("[SmsClientFactory] Failed to load database configuration", e);
-        }
-        return null;
-    }
-
-    private void createSmsClient(SmsConfig smsConfig) {
-        switch (smsConfig.getType()) {
-            case TENCENT:
-                currentSmsClient = new TencentSmsClientImpl(smsConfig.getTencent());
-                break;
-            case ALIBABA:
-                // TODO: implement Alibaba SMS client
-                break;
-            default:
-                log.warn("[SmsClientFactory] Unsupported SMS provider type: {}", smsConfig.getType());
-                break;
-        }
-    }
-} 
@@ -0,0 +1,101 @@
+/*
+ * 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.tencentcloudapi.common.Credential;
+import com.tencentcloudapi.sms.v20210111.SmsClient;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest;
+import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse;
+import com.tencentcloudapi.sms.v20210111.models.SendStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.config.CommonProperties;
+import org.apache.hertzbeat.common.support.exception.SendMessageException;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * sms service client for tencent cloud
+ */
+@Component
+@ConditionalOnProperty("common.sms.tencent.app-id")
+@Slf4j
+public class TencentSmsClient {
+
+    private static final String RESPONSE_OK = "Ok";
+    private static final String REGION = "ap-guangzhou";
+
+    private SmsClient smsClient;
+    private String appId;
+    private String signName;
+    private String templateId;
+
+    public TencentSmsClient(CommonProperties properties) {
+        if (properties == null || properties.getSms() == null || properties.getSms().getTencent() == null) {
+            log.error("init error, please config TencentSmsClient props in application.yml");
+            throw new IllegalArgumentException("please config TencentSmsClient props");
+        }
+        initSmsClient(properties.getSms().getTencent());
+    }
+
+    private void initSmsClient(CommonProperties.TencentSmsProperties tencent) {
+        this.appId = tencent.getAppId();
+        this.signName = tencent.getSignName();
+        this.templateId = tencent.getTemplateId();
+        Credential cred = new Credential(tencent.getSecretId(), tencent.getSecretKey());
+        smsClient = new SmsClient(cred, REGION);
+    }
+
+    /**
+     * send text message
+     * @param appId appId
+     * @param signName sign name
+     * @param templateId template id
+     * @param templateValues template values
+     * @param phones phones num
+     */
+    public void sendMessage(String appId, String signName, String templateId,
+                            String[] templateValues, String[] phones) {
+        SendSmsRequest req = new SendSmsRequest();
+        req.setSmsSdkAppId(appId);
+        req.setSignName(signName);
+        req.setTemplateId(templateId);
+        req.setTemplateParamSet(templateValues);
+        req.setPhoneNumberSet(phones);
+        try {
+            SendSmsResponse smsResponse = this.smsClient.SendSms(req);
+            SendStatus sendStatus = smsResponse.getSendStatusSet()[0];
+            if (!RESPONSE_OK.equals(sendStatus.getCode())) {
+                throw new SendMessageException(sendStatus.getCode() + ":" + sendStatus.getMessage());
+            }
+        } catch (Exception e) {
+            log.warn(e.getMessage());
+            throw new SendMessageException(e.getMessage());
+        }
+    }
+
+    /**
+     * send text message
+     * @param templateValues template values
+     * @param phones phones num
+     */
+    public void sendMessage(String[] templateValues, String[] phones) {
+        sendMessage(this.appId, this.signName, this.templateId, templateValues, phones);
+    }
+
+
+}
@@ -25,7 +25,6 @@ import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.Predicate;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
@@ -68,9 +67,6 @@ public class AlertDefineServiceImpl implements AlertDefineService {

    @Autowired
    private AlertDefineDao alertDefineDao;
-    
-    @Autowired
-    private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;

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

@@ -102,22 +98,19 @@ public class AlertDefineServiceImpl implements AlertDefineService {

    @Override
    public void addAlertDefine(AlertDefine alertDefine) throws RuntimeException {
-        alertDefine = alertDefineDao.save(alertDefine);
-        periodicAlertRuleScheduler.updateSchedule(alertDefine);
+        alertDefineDao.save(alertDefine);
        CacheFactory.clearAlertDefineCache();
    }

    @Override
    public void modifyAlertDefine(AlertDefine alertDefine) throws RuntimeException {
        alertDefineDao.save(alertDefine);
-        periodicAlertRuleScheduler.updateSchedule(alertDefine);
        CacheFactory.clearAlertDefineCache();
    }

    @Override
    public void deleteAlertDefine(long alertId) throws RuntimeException {
        alertDefineDao.deleteById(alertId);
-        periodicAlertRuleScheduler.cancelSchedule(alertId);
        CacheFactory.clearAlertDefineCache();
    }

@@ -130,9 +123,6 @@ public class AlertDefineServiceImpl implements AlertDefineService {
    @Override
    public void deleteAlertDefines(Set<Long> alertIds) throws RuntimeException {
        alertDefineDao.deleteAlertDefinesByIdIn(alertIds);
-        for (Long alertId : alertIds) {
-            periodicAlertRuleScheduler.cancelSchedule(alertId);
-        }
        CacheFactory.clearAlertDefineCache();
    }

@@ -17,21 +17,13 @@

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

-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Stack;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.service.DataSourceService;
-import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

 import java.util.List;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import org.springframework.util.StringUtils;

 /**
 * datasource service
@@ -41,307 +33,21 @@ import org.springframework.util.StringUtils;
 public class DataSourceServiceImpl implements DataSourceService {
    
    @Autowired(required = false)
-    private List<QueryExecutor> executors;
-    
-    private static final Pattern EXPR_TOKEN = Pattern.compile("\\(|\\)|[a-zA-Z_][a-zA-Z0-9_=～{}\\[\\]\".]*|\\d+(\\.\\d+)?|>=|<=|==|!=|>|<|and|or|unless");
-    private static final String THRESHOLD = "__threshold__";
-    private static final String VALUE = "__value__";
+    private Map<String, QueryExecutor> executors;
    
    @Override
-    public List<Map<String, Object>> calculate(String datasource, String expr) {
-        if (!StringUtils.hasText(expr)) {
-            throw new IllegalArgumentException("Empty expression");
-        }
-        if (executors == null || executors.isEmpty()) {
-            throw new IllegalArgumentException("No query executor found");
-        }
-        QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);
+    public List<Map<String, Object>> query(String datasource, String query) {
+        QueryExecutor executor = executors.get(datasource);
        if (executor == null) {
            throw new IllegalArgumentException("Unsupported datasource: " + datasource);
        }
-        // replace all white space
-        expr = expr.replaceAll("\\s+", " ");
-        try {
-            return evaluate(expr, executor);
-        } catch (Exception e) {
-            log.error("Error executing query on datasource {}: {}", datasource, e.getMessage());
-            throw new RuntimeException("Query execution failed", e);
-        }
+        return executor.execute(query);
    }

-    private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
-        Stack<List<Map<String, Object>>> values = new Stack<>();
-        Stack<String> operators = new Stack<>();
-        Matcher matcher = EXPR_TOKEN.matcher(expr);
-        List<String> tokens = new ArrayList<>();
-        while (matcher.find()) {
-            tokens.add(matcher.group());
-        }
-        for (String token : tokens) {
-            if (token.equals("(")) {
-                operators.push(token);
-            } else if (token.equals(")")) {
-                while (!operators.isEmpty() && !operators.peek().equals("(")) {
-                    applyOperator(values, operators.pop());
-                }
-                // remove the left parenthesis
-                operators.pop();
-            } else if (token.matches(">=|<=|==|!=|>|<")) {
-                operators.push(token);
-            } else if (token.equals("and") || token.equals("or") || token.equals("unless")) {
-                while (!operators.isEmpty() && precedence(operators.peek()) >= precedence(token)) {
-                    applyOperator(values, operators.pop());
-                }
-                operators.push(token);
-            } else if (token.matches("\\d+(\\.\\d+)?")) { 
-                double value = Double.parseDouble(token);
-                List<Map<String, Object>> numAsList = new ArrayList<>();
-                numAsList.add(Map.of(THRESHOLD, value));
-                values.push(numAsList);
-            } else if (token.matches("[a-zA-Z_][a-zA-Z0-9_=～{}\\[\\]\".]*")) {
-                List<Map<String, Object>> results = executor.execute(token);
-                values.push(results);
-            }
-        }
-        while (!operators.isEmpty()) {
-            applyOperator(values, operators.pop());
-        }
-        return values.isEmpty() ? new LinkedList<>() : values.pop();
-    }
-
-    private int precedence(String op) {
-        return switch (op) {
-            case "or" -> 1;
-            case "unless" -> 2;
-            case "and" -> 3;
-            case ">", "<", ">=", "<=", "==", "!=" -> 4;
-            default -> 0;
-        };
-    }
-
-    private void applyOperator(Stack<List<Map<String, Object>>> values, String op) {
-        if (values.size() < 2) {
-            return;
-        };
-        List<Map<String, Object>> rightOperand = values.pop();
-        List<Map<String, Object>> leftOperand = values.pop();
-        if (rightOperand.size() == 1 && rightOperand.get(0).containsKey(THRESHOLD)) {
-            double threshold = (double) rightOperand.get(0).get(THRESHOLD);
-            List<Map<String, Object>> result = new ArrayList<>();
-            for (Map<String, Object> item : leftOperand) {
-                Object queryValues = item.get(VALUE);
-                if (queryValues == null) {
-                    // ignore the query result data is empty
-                    continue;
-                }
-                // queryValues may be a list of values, or a single value
-                Object matchValue = evaluateCondition(queryValues, op, 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));
-            }
-            if (!result.isEmpty()) {
-                values.push(result);    
-            }
-            return;
-        }
-        Map<String, Object> leftMap = null;
-        boolean leftMatch = false;
-        Map<String, Object> rightMap = null;
-        boolean rightMatch = false;
-        switch (op) {
-            case "and" -> {
-                for (Map<String, Object> item : leftOperand) {
-                    if (leftMap == null) {
-                        leftMap = item;
-                    }
-                    if (item.get(VALUE) != null) {
-                        leftMap = item;
-                        leftMatch = true;
-                        break;
-                    }
-                }
-                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);
-                    values.push(new LinkedList<>(List.of(rightMap)));
-                } else if (leftMap != null) {
-                    leftMap.put(VALUE, null);
-                    values.push(new LinkedList<>(List.of(leftMap)));
-                } else if (rightMap != null) {
-                    rightMap.put(VALUE, null);
-                    values.push(new LinkedList<>(List.of(rightMap)));
-                } 
-            }
-            case "or" -> {
-                for (Map<String, Object> item : leftOperand) {
-                    if (leftMap == null) {
-                        leftMap = item;
-                    }
-                    if (item.get(VALUE) != null) {
-                        leftMap = item;
-                        leftMatch = true;
-                        break;
-                    }
-                }
-                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);
-                    values.push(new LinkedList<>(List.of(rightMap)));
-                } else if (leftMatch) {
-                    values.push(new LinkedList<>(List.of(leftMap)));
-                } else if (rightMatch) {
-                    values.push(new LinkedList<>(List.of(rightMap)));
-                } else {
-                    if (leftMap != null && rightMap != null) {
-                        rightMap.putAll(leftMap);
-                        values.push(new LinkedList<>(List.of(rightMap)));
-                    } else if (leftMap != null) {
-                        values.push(new LinkedList<>(List.of(leftMap)));
-                    } else if (rightMap != null){
-                        values.push(new LinkedList<>(List.of(rightMap)));
-                    }
-                }
-            }
-            case "unless" -> {
-                for (Map<String, Object> item : leftOperand) {
-                    if (leftMap == null) {
-                        leftMap = item;
-                    }
-                    if (item.get(VALUE) != null) {
-                        leftMap = item;
-                        leftMatch = true;
-                        break;
-                    }
-                }
-                for (Map<String, Object> item : rightOperand) {
-                    if (rightMap == null) {
-                        rightMap = item;
-                    }
-                    if (item.get(VALUE) != null) {
-                        rightMap = item;
-                        rightMatch = true;
-                        break;
-                    }
-                }
-                if (leftMatch && !rightMatch) {
-                    values.push(new LinkedList<>(List.of(leftMap)));
-                } else {
-                    if (leftMap != null) {
-                        leftMap.put(VALUE, null);
-                        values.push(new LinkedList<>(List.of(leftMap)));
-                    } else {
-                        if (rightMap != null) {
-                            rightMap.put(VALUE, null);
-                            values.push(new LinkedList<>(List.of(rightMap)));
-                        } 
-                    }
-                }
-            }
-            default -> throw new IllegalArgumentException("Unsupported operator: " + op);
-        }
-    }
-    
-    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;
-        }
-    }
-
-    public void setExecutors(List<QueryExecutor> mockExecutor) {
-        this.executors = mockExecutor;
+    /**
+     * 
+     */
+    public interface QueryExecutor {
+        List<Map<String, Object>> execute(String query);
    }
 } 
@@ -18,6 +18,18 @@
 package org.apache.hertzbeat.alert.service.impl;

 import jakarta.persistence.criteria.Predicate;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.common.cache.CacheFactory;
@@ -39,28 +51,10 @@ import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 /**
 * Message notification configuration implementation
 */
@@ -86,87 +80,44 @@ public class NoticeConfigServiceImpl implements NoticeConfigService, CommandLine
    private AlertNoticeDispatch dispatcherAlarm;

    @Override
-    public Page<NoticeReceiver> getNoticeReceivers(String name, int pageIndex, int pageSize) {
+    public List<NoticeReceiver> getNoticeReceivers(String name) {
        Specification<NoticeReceiver> specification = (root, query, criteriaBuilder) -> {
            Predicate predicate = criteriaBuilder.conjunction();
            if (StringUtils.isNotBlank(name)) {
-                Predicate predicateName = criteriaBuilder.like(
-                        criteriaBuilder.lower(root.get("name")), "%" + name.toLowerCase() + "%"
-                );
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
                predicate = criteriaBuilder.and(predicateName);
            }
            return predicate;
        };
-        return noticeReceiverDao.findAll(specification, PageRequest.of(pageIndex, pageSize, Sort.by(Sort.Direction.DESC, "id")));
+        return noticeReceiverDao.findAll(specification);
    }

    @Override
-    public List<NoticeReceiver> getAllNoticeReceivers() {
-        return noticeReceiverDao.findAll();
-    }
-
-    @Override
-    public Page<NoticeTemplate> getNoticeTemplates(String name, boolean preset, int pageIndex, int pageSize) {
-        if (preset) {
-            // Query preset templates
-            List<NoticeTemplate> defaultTemplates = new LinkedList<>(PRESET_TEMPLATE.values());
-
-            // Filter by name (case-insensitive)
-            List<NoticeTemplate> filteredDefaultTemplates = defaultTemplates.stream()
-                    .filter(template -> StringUtils.isBlank(name)
-                            || template.getName().toLowerCase().contains(name.toLowerCase()))
-                    .collect(Collectors.toList());
-
-            // Pagination logic
-            int totalItems = filteredDefaultTemplates.size();
-            int fromIndex = Math.min(pageIndex * pageSize, totalItems);
-            int toIndex = Math.min(fromIndex + pageSize, totalItems);
-
-            if (fromIndex >= totalItems) {
-                return new PageImpl<>(Collections.emptyList(), PageRequest.of(pageIndex, pageSize), totalItems);
+    public List<NoticeTemplate> getNoticeTemplates(String name) {
+        Specification<NoticeTemplate> specification = (root, query, criteriaBuilder) -> {
+            Predicate predicate = criteriaBuilder.conjunction();
+            if (StringUtils.isNotBlank(name)) {
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
+                predicate = criteriaBuilder.and(predicateName);
            }
-
-            List<NoticeTemplate> paginatedTemplates = filteredDefaultTemplates.subList(fromIndex, toIndex);
-            return new PageImpl<>(paginatedTemplates, PageRequest.of(pageIndex, pageSize), totalItems);
-        } else {
-            // Query custom templates
-            Specification<NoticeTemplate> specification = (root, query, criteriaBuilder) -> {
-                Predicate predicate = criteriaBuilder.conjunction();
-                if (StringUtils.isNotBlank(name)) {
-                    Predicate predicateName = criteriaBuilder.like(
-                            criteriaBuilder.lower(root.get("name")), "%" + name.toLowerCase() + "%"
-                    );
-                    predicate = criteriaBuilder.and(predicateName);
-                }
-                return predicate;
-            };
-            PageRequest pageRequest = PageRequest.of(pageIndex, pageSize, Sort.by(Sort.Direction.DESC, "id"));
-            return noticeTemplateDao.findAll(specification, pageRequest);
-        }
-    }
-
-
-
-    @Override
-    public List<NoticeTemplate> getAllNoticeTemplates() {
+            return predicate;
+        };
        List<NoticeTemplate> defaultTemplates = new LinkedList<>(PRESET_TEMPLATE.values());
-        defaultTemplates.addAll(noticeTemplateDao.findAll());
+        defaultTemplates.addAll(noticeTemplateDao.findAll(specification));
        return defaultTemplates;
    }

    @Override
-    public Page<NoticeRule> getNoticeRules(String name, int pageIndex, int pageSize) {
+    public List<NoticeRule> getNoticeRules(String name) {
        Specification<NoticeRule> specification = (root, query, criteriaBuilder) -> {
            Predicate predicate = criteriaBuilder.conjunction();
            if (StringUtils.isNotBlank(name)) {
-                Predicate predicateName = criteriaBuilder.like(
-                        criteriaBuilder.lower(root.get("name")), "%" + name.toLowerCase() + "%"
-                );
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
                predicate = criteriaBuilder.and(predicateName);
            }
            return predicate;
        };
-        return noticeRuleDao.findAll(specification, PageRequest.of(pageIndex, pageSize, Sort.by(Sort.Direction.DESC, "id")));
+        return noticeRuleDao.findAll(specification);
    }

    @Override
@@ -1,181 +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.hertzbeat.alert.config.TencentSmsProperties;
-import org.apache.hertzbeat.alert.service.SmsClient;
-import org.apache.hertzbeat.alert.util.TencentCloudApiSignV3;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-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.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.apache.hertzbeat.common.util.JsonUtil;
-import com.fasterxml.jackson.databind.JsonNode;
-
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.apache.hertzbeat.common.constants.SmsConstants.TENCENT;
-
-/**
- * sms service client for tencent cloud <br>
- * doc: <a href="https://cloud.tencent.com/document/api/382/55981">https://cloud.tencent.com/document/api/382/55981</a>
- */
-
-@Slf4j
-public class TencentSmsClientImpl implements SmsClient {
-
-    private static final String RESPONSE_OK = "Ok";
-    private static final String REGION = "ap-guangzhou";
-    private static final String API_VERSION = "2021-01-11";
-    private static final String ACTION = "SendSms";
-    private static final String HOST = "sms.tencentcloudapi.com";
-    
-    private String appId;
-    private String signName;
-    private String templateId;
-    private String secretId;
-    private String secretKey;
-
-    public TencentSmsClientImpl(TencentSmsProperties config) {
-        if (config != null) {
-            this.appId = config.getAppId();
-            this.signName = config.getSignName();
-            this.templateId = config.getTemplateId();
-            this.secretId = config.getSecretId();
-            this.secretKey = config.getSecretKey();
-        }
-    }
-
-    @Override
-    public void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
-        // todo limit the number of words
-        String instance = null;
-        String priority = null;
-        String content = null;
-        if (alert.getCommonLabels() != null) {
-            instance = alert.getCommonLabels().get("instance");
-            priority = alert.getCommonLabels().get("priority");
-            content = alert.getCommonAnnotations().get("summary");
-            content = content == null ? alert.getCommonAnnotations().get("description") : content;
-            if (content == null) {
-                content = alert.getCommonAnnotations().values().stream().findFirst().orElse(null);
-            }
-        }
-
-        String[] templateValues = new String[3];
-        templateValues[0] = instance == null ? alert.getGroupKey() : instance;
-        templateValues[1] = priority == null ? "unknown" : priority;
-        templateValues[2] = content;
-
-        String[] phones = new String[1];
-        phones[0] = receiver.getPhone();
-
-        sendSms(this.appId, this.signName, this.templateId, templateValues, phones);
-    }
-
-    public void sendSms(String appId, String signName, String templateId,
-                     String[] templateValues, String[] phones) {
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-            
-            // build request payload
-            Map<String, Object> params = new HashMap<>();
-            params.put("SmsSdkAppId", appId);
-            params.put("SignName", signName);
-            params.put("TemplateId", templateId);
-            params.put("TemplateParamSet", templateValues);
-            params.put("PhoneNumberSet", phones);
-            
-            String payload = JsonUtil.toJson(params);
-            
-            // calculate request signature
-            String authorization = TencentCloudApiSignV3.calculateAuthorization(
-                    secretId, secretKey, "sms", HOST, REGION,
-                    ACTION, API_VERSION, payload);
-            
-            // build http request
-            HttpPost httpPost = new HttpPost("https://" + HOST);
-            httpPost.setHeader("Content-Type", "application/json; charset=utf-8");
-            httpPost.setHeader("Host", HOST);
-            httpPost.setHeader("X-TC-Action", ACTION);
-            httpPost.setHeader("X-TC-Timestamp", timestamp);
-            httpPost.setHeader("X-TC-Version", API_VERSION);
-            httpPost.setHeader("X-TC-Region", REGION);
-            httpPost.setHeader("Authorization", authorization);
-            httpPost.setEntity(new StringEntity(payload, StandardCharsets.UTF_8));
-
-            log.debug("Sending SMS request to {}, payload: {}", httpPost.getURI(), payload);
-
-            // send http request and handle response
-            try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
-                int statusCode = response.getStatusLine().getStatusCode();
-                String responseBody = EntityUtils.toString(response.getEntity());
-
-                log.debug("SMS response status: {}, body: {}", statusCode, responseBody);
-                
-                if (statusCode != 200) {
-                    throw new SendMessageException("HTTP request failed with status code: " + statusCode);
-                }
-                
-                JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
-                JsonNode responseNode = jsonResponse.get("Response");
-                JsonNode error = responseNode.get("Error");
-                if (error != null) {
-                    String code = error.get("Code").asText();
-                    String message = error.get("Message").asText();
-                    throw new SendMessageException(code + ":" + message);
-                }
-                JsonNode sendStatusSet = responseNode.get("SendStatusSet");
-                if (sendStatusSet != null && sendStatusSet.isArray() && sendStatusSet.size() > 0) {
-                    JsonNode firstStatus = sendStatusSet.get(0);
-                    String code = firstStatus.get("Code").asText();
-                    String message = firstStatus.get("Message").asText();
-                    if (!RESPONSE_OK.equals(code)) {
-                        throw new SendMessageException(code + ":" + message);
-                    }
-                }
-                log.info("Successfully sent SMS to phones: {}", String.join(",", phones));
-            }
-        } catch (Exception e) {
-            log.warn("Failed to send SMS: {}", e.getMessage());
-            throw new SendMessageException(e.getMessage());
-        }
-    }
-
-    @Override
-    public String getType() {
-        return TENCENT;
-    }
-
-    @Override
-    public boolean checkConfig() {
-        if (appId.isBlank() || templateId.isBlank() || secretId.isBlank() || secretKey.isBlank()) {
-            return false;
-        }
-        return true;
-    }
-}
@@ -1,84 +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 java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.TimeZone;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
-
-/**
- * used to calculate the signature of the Tencent Cloud API.
- */
-public class TencentCloudApiSignV3 {
-    private static final Charset UTF8 = StandardCharsets.UTF_8;
-
-    public static String calculateAuthorization(String secretId, String secretKey, 
-            String service, String host, String region,
-            String action, String version, String payload) throws Exception {
-        String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        String date = sdf.format(new Date(Long.valueOf(timestamp + "000")));
-
-        // Step 1: Construct the canonical request string
-        String httpRequestMethod = "POST";
-        String canonicalUri = "/";
-        String canonicalQueryString = "";
-        String canonicalHeaders = "content-type:application/json; charset=utf-8\n" + "host:" + host + "\n";
-        String signedHeaders = "content-type;host";
-        String hashedRequestPayload = sha256Hex(payload);
-        String canonicalRequest = httpRequestMethod + "\n" + canonicalUri + "\n" + canonicalQueryString + "\n"
-                + canonicalHeaders + "\n" + signedHeaders + "\n" + hashedRequestPayload;
-
-        // Step 2: Construct the string to sign
-        String algorithm = "TC3-HMAC-SHA256";
-        String credentialScope = date + "/" + service + "/" + "tc3_request";
-        String hashedCanonicalRequest = sha256Hex(canonicalRequest);
-        String stringToSign = algorithm + "\n" + timestamp + "\n" + credentialScope + "\n" + hashedCanonicalRequest;
-
-        // Step 3: Calculate the signature
-        byte[] secretDate = hmac256(("TC3" + secretKey).getBytes(UTF8), date);
-        byte[] secretService = hmac256(secretDate, service);
-        byte[] secretSigning = hmac256(secretService, "tc3_request");
-        String signature = DatatypeConverter.printHexBinary(hmac256(secretSigning, stringToSign)).toLowerCase();
-
-        // Step 4: Construct the Authorization header
-        return algorithm + " " + "Credential=" + secretId + "/" + credentialScope + ", "
-                + "SignedHeaders=" + signedHeaders + ", " + "Signature=" + signature;
-    }
-
-    public static byte[] hmac256(byte[] key, String msg) throws Exception {
-        Mac mac = Mac.getInstance("HmacSHA256");
-        SecretKeySpec secretKeySpec = new SecretKeySpec(key, mac.getAlgorithm());
-        mac.init(secretKeySpec);
-        return mac.doFinal(msg.getBytes(UTF8));
-    }
-
-    public static String sha256Hex(String s) throws Exception {
-        MessageDigest md = MessageDigest.getInstance("SHA-256");
-        byte[] d = md.digest(s.getBytes(UTF8));
-        return DatatypeConverter.printHexBinary(d).toLowerCase();
-    }
-}
@@ -28,6 +28,7 @@ import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -42,6 +43,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 /**
 * Test case for {@link AlertDefineController}
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 class AlertDefineControllerTest {

@@ -64,7 +66,6 @@ class AlertDefineControllerTest {

        this.alertDefine = AlertDefine.builder()
                .id(1L)
-                .name("alertDefine")
                .expr("1 > 0")
                .times(1)
                .template("template")
@@ -137,4 +138,14 @@ class AlertDefineControllerTest {
                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                .andReturn();
    }
+
+    @Test
+    void applyAlertDefineMonitorsBind() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.post("/api/alert/define/" + this.alertDefine.getId() + "/monitors")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(JsonUtil.toJson(this.alertDefineMonitorBinds)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andReturn();
+    }
 }
@@ -19,6 +19,7 @@ package org.apache.hertzbeat.alert.controller;

 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;
@@ -30,6 +31,7 @@ import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -48,6 +50,7 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 * Test case for {@link AlertDefinesController}
 * Test whether the data mocked at the mock is correct, and test whether the format of the returned data is correct
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 class AlertDefinesControllerTest {

@@ -90,7 +93,8 @@ class AlertDefinesControllerTest {
        pageRequest = PageRequest.of((Integer) content.get("pageIndex"), (Integer) content.get("pageSize"), sortExp);
    }

-    @Test
+    //    @Test
+    // todo: fix this test
    void getAlertDefines() throws Exception {

        // Test the correctness of the mock
@@ -108,27 +112,31 @@ class AlertDefinesControllerTest {
        //            }
        //        }))).thenReturn(new PageImpl<AlertDefine>(new ArrayList<AlertDefine>()));
        AlertDefine define = AlertDefine.builder().id(9L).expr("x").times(1).build();
-        PageRequest pageRequest = PageRequest.of(pageIndex, pageSize, Sort.by(Sort.Order.asc(sort)));
-        Mockito.when(alertDefineService.getAlertDefines(
-                Mockito.eq(ids),
-                Mockito.isNull(),
-                Mockito.eq(sort),
-                Mockito.eq(order),
-                Mockito.eq(pageIndex),
-                Mockito.eq(pageSize)
-        )).thenReturn(new PageImpl<>(Collections.singletonList(define), pageRequest, 1));
+        Mockito.when(alertDefineService.getAlertDefines(null, null, "id", "desc", 1, 10)).thenReturn(new PageImpl<>(Collections.singletonList(define)));

-        mockMvc.perform(MockMvcRequestBuilders.get("/api/alert/defines")
+        mockMvc.perform(MockMvcRequestBuilders.get(
+                                "/api/alert/defines")
                        .param("ids", ids.toString().substring(1, ids.toString().length() - 1))
+                        .param("priority", priority.toString())
                        .param("sort", sort)
                        .param("order", order)
-                        .param("pageIndex", String.valueOf(pageIndex))
-                        .param("pageSize", String.valueOf(pageSize)))
+                        .param("pageIndex", pageIndex.toString())
+                        .param("pageSize", pageSize.toString()))
                .andExpect(status().isOk())
                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andExpect(jsonPath("$.data.content[0].id").value(9))
-                .andExpect(jsonPath("$.data.content[0].expr").value("x"))
-                .andExpect(jsonPath("$.data.content[0].times").value(1))
+                .andExpect(jsonPath("$.data.content").value(new ArrayList<>()))
+                .andExpect(jsonPath("$.data.pageable").value("INSTANCE"))
+                .andExpect(jsonPath("$.data.totalPages").value(1))
+                .andExpect(jsonPath("$.data.totalElements").value(0))
+                .andExpect(jsonPath("$.data.last").value(true))
+                .andExpect(jsonPath("$.data.number").value(0))
+                .andExpect(jsonPath("$.data.size").value(0))
+                .andExpect(jsonPath("$.data.first").value(true))
+                .andExpect(jsonPath("$.data.numberOfElements").value(0))
+                .andExpect(jsonPath("$.data.empty").value(true))
+                .andExpect(jsonPath("$.data.sort.empty").value(true))
+                .andExpect(jsonPath("$.data.sort.sorted").value(false))
+                .andExpect(jsonPath("$.data.sort.unsorted").value(true))
                .andReturn();
    }

@@ -27,12 +27,12 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
-
 import org.apache.hertzbeat.alert.service.AlertGroupConvergeService;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertGroupConverge;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -44,6 +44,7 @@ import org.springframework.test.web.servlet.MockMvc;
 /**
 * test case for {@link AlertGroupConvergeController}
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 public class AlertGroupConvergeControllerTest {

@@ -78,8 +79,8 @@ public class AlertGroupConvergeControllerTest {

        mockMvc.perform(post("/api/alert/group")
                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(JsonUtil.toJson(alertGroupConverge)))
-                .andExpect(status().isOk())
+                        .content(JsonUtil.toJson(alertGroupConverge))
+                ).andExpect(status().isOk())
                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                .andExpect(jsonPath("$.msg").value("Add success"));
    }
@@ -92,8 +93,8 @@ public class AlertGroupConvergeControllerTest {

        mockMvc.perform(put("/api/alert/group")
                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(JsonUtil.toJson(alertGroupConverge)))
-                .andExpect(status().isOk())
+                        .content(JsonUtil.toJson(alertGroupConverge))
+                ).andExpect(status().isOk())
                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                .andExpect(jsonPath("$.msg").value("Modify success"));
    }
@@ -118,6 +119,7 @@ public class AlertGroupConvergeControllerTest {
                        .accept(MediaType.APPLICATION_JSON))
                .andExpect(status().isOk())
                .andExpect(jsonPath("$.code").value((int) CommonConstants.MONITOR_NOT_EXIST_CODE))
-                .andExpect(jsonPath("$.msg").value("Alert Group Converge not exist."));
+                .andExpect(jsonPath("$.msg").value("AlertGroupConverge not exist."));
    }
+
 }
@@ -33,6 +33,7 @@ import org.apache.hertzbeat.alert.service.AlertGroupConvergeService;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertGroupConverge;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -51,6 +52,7 @@ import org.springframework.test.web.servlet.MockMvc;
 */

@ExtendWith(MockitoExtension.class)
+@Disabled
 class AlertGroupConvergesControllerTest {

    private MockMvc mockMvc;
@@ -99,7 +101,6 @@ class AlertGroupConvergesControllerTest {
                        .param("order", "desc")
                        .accept(MediaType.APPLICATION_JSON))
                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
                .andExpect(jsonPath("$.data.content[0].id").value(1))
                .andExpect(jsonPath("$.data.content[0].name").value("Converge1"))
                .andExpect(jsonPath("$.data.content[1].id").value(2))
@@ -117,4 +118,5 @@ class AlertGroupConvergesControllerTest {
                .andExpect(status().isOk())
                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE));
    }
-}
+}
+
@@ -17,6 +17,7 @@

 package org.apache.hertzbeat.alert.controller;

+import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -43,10 +44,6 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -171,38 +168,12 @@ class NoticeConfigControllerTest {

    @Test
    void getReceivers() throws Exception {
-        NoticeReceiver receiver1 = new NoticeReceiver();
-        receiver1.setId(1L);
-        receiver1.setName("Receiver1");

-        NoticeReceiver receiver2 = new NoticeReceiver();
-        receiver2.setId(2L);
-        receiver2.setName("Receiver2");
-
-        Page<NoticeReceiver> receiverPage = new PageImpl<>(
-                Arrays.asList(receiver1, receiver2),
-                PageRequest.of(0, 8, Sort.by("id").descending()),
-                2
-        );
-
-        when(noticeConfigService.getNoticeReceivers("Receiver", 0, 8)).thenReturn(receiverPage);
-
-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/receivers")
-                        .param("name", "Receiver")
-                        .param("pageIndex", "0")
-                        .param("pageSize", "8")
-                        .param("sort", "id")
-                        .param("order", "desc")
-                        .accept(MediaType.APPLICATION_JSON))
+        //Mockito.when(noticeConfigService.getNoticeReceivers())
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/receivers?name={name}", "tom"))
                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.content[0].id").value(1))
-                .andExpect(jsonPath("$.data.content[0].name").value("Receiver1"))
-                .andExpect(jsonPath("$.data.content[1].id").value(2))
-                .andExpect(jsonPath("$.data.content[1].name").value("Receiver2"))
-                .andExpect(jsonPath("$.data.totalElements").value(2))
-                .andExpect(jsonPath("$.data.totalPages").value(1))
-                .andExpect(jsonPath("$.data.size").value(8))
-                .andExpect(jsonPath("$.data.number").value(0));
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andReturn();
    }

    @Test
@@ -274,38 +245,15 @@ class NoticeConfigControllerTest {

    @Test
    void getRules() throws Exception {
-        NoticeRule rule1 = new NoticeRule();
-        rule1.setId(1L);
-        rule1.setName("Rule1");
-
-        NoticeRule rule2 = new NoticeRule();
-        rule2.setId(2L);
-        rule2.setName("Rule2");
-
-        Page<NoticeRule> rulePage = new PageImpl<>(
-                Arrays.asList(rule1, rule2),
-                PageRequest.of(0, 8, Sort.by("id").descending()),
-                2
-        );
-
-        when(noticeConfigService.getNoticeRules("Rule", 0, 8)).thenReturn(rulePage);
-
-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/rules")
-                        .param("name", "Rule")
-                        .param("pageIndex", "0")
-                        .param("pageSize", "8")
-                        .param("sort", "id")
-                        .param("order", "desc")
-                        .accept(MediaType.APPLICATION_JSON))
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/rules"))
                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.content[0].id").value(1))
-                .andExpect(jsonPath("$.data.content[0].name").value("Rule1"))
-                .andExpect(jsonPath("$.data.content[1].id").value(2))
-                .andExpect(jsonPath("$.data.content[1].name").value("Rule2"))
-                .andExpect(jsonPath("$.data.totalElements").value(2))
-                .andExpect(jsonPath("$.data.totalPages").value(1))
-                .andExpect(jsonPath("$.data.size").value(8))
-                .andExpect(jsonPath("$.data.number").value(0));
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andReturn();
+
+        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/rules?name={name}", "tom"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andReturn();
    }

    @Test
@@ -414,40 +362,22 @@ class NoticeConfigControllerTest {
    }

    @Test
-    void getTemplates() throws Exception {
+    void testGetTemplates() throws Exception {
+        // Mock the service response
        NoticeTemplate template1 = new NoticeTemplate();
-        template1.setId(1L);
        template1.setName("Template1");
-
        NoticeTemplate template2 = new NoticeTemplate();
-        template2.setId(2L);
        template2.setName("Template2");
+        List<NoticeTemplate> templates = Arrays.asList(template1, template2);
+        when(noticeConfigService.getNoticeTemplates(any())).thenReturn(templates);

-        Page<NoticeTemplate> templatePage = new PageImpl<>(
-                Arrays.asList(template1, template2),
-                PageRequest.of(0, 8, Sort.by("id").descending()),
-                2
-        );
-
-        when(noticeConfigService.getNoticeTemplates("Template", true, 0, 8)).thenReturn(templatePage);
-
-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/templates")
-                        .param("name", "Template")
-                        .param("preset", "true")
-                        .param("pageIndex", "0")
-                        .param("pageSize", "8")
-                        .param("sort", "id")
-                        .param("order", "desc")
-                        .accept(MediaType.APPLICATION_JSON))
+        // Perform the GET request and verify the response
+        this.mockMvc.perform(get("/api/notice/templates")
+                        .param("name", "Template"))
                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.data.content[0].id").value(1))
-                .andExpect(jsonPath("$.data.content[0].name").value("Template1"))
-                .andExpect(jsonPath("$.data.content[1].id").value(2))
-                .andExpect(jsonPath("$.data.content[1].name").value("Template2"))
-                .andExpect(jsonPath("$.data.totalElements").value(2))
-                .andExpect(jsonPath("$.data.totalPages").value(1))
-                .andExpect(jsonPath("$.data.size").value(8))
-                .andExpect(jsonPath("$.data.number").value(0));
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andExpect(jsonPath("$.data[0].name").value("Template1"))
+                .andExpect(jsonPath("$.data[1].name").value("Template2"));
    }

    @Test
@@ -484,25 +414,5 @@ class NoticeConfigControllerTest {
        verify(noticeConfigService, times(1)).sendTestMsg(noticeReceiver);
    }

-    @Test
-    void getAllTemplates() throws Exception {
-        List<NoticeTemplate> templates = Arrays.asList(new NoticeTemplate(), new NoticeTemplate());
-        when(noticeConfigService.getAllNoticeTemplates()).thenReturn(templates);

-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/templates/all"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andReturn();
-    }
-
-    @Test
-    void getAllReceivers() throws Exception {
-        List<NoticeReceiver> receivers = Arrays.asList(new NoticeReceiver(), new NoticeReceiver());
-        when(noticeConfigService.getAllNoticeReceivers()).thenReturn(receivers);
-
-        this.mockMvc.perform(MockMvcRequestBuilders.get("/api/notice/receivers/all"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
-                .andReturn();
-    }
 }
@@ -27,7 +27,6 @@ import static org.mockito.Mockito.when;
 import java.util.Collections;
 import java.util.List;
 import org.apache.hertzbeat.alert.AlerterWorkerPool;
-import org.apache.hertzbeat.alert.config.AlertSseManager;
 import org.apache.hertzbeat.alert.service.NoticeConfigService;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
@@ -61,9 +60,6 @@ class AlertNoticeDispatchTest {
    @Mock
    private AlertNotifyHandler alertNotifyHandler;

-    @Mock
-    private AlertSseManager emitterManager;
-
    private AlertNoticeDispatch alertNoticeDispatch;

    private static final int DISPATCH_THREADS = 3;
@@ -81,8 +77,7 @@ class AlertNoticeDispatchTest {
                noticeConfigService,
                alertStoreHandler,
                alertNotifyHandlerList,
-                pluginRunner,
-                emitterManager
+                pluginRunner
        );
        
        receiver = NoticeReceiver.builder()
@@ -27,6 +27,7 @@ import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -38,6 +39,7 @@ import java.util.List;
 /**
 * Test case for {@link DbAlertStoreHandlerImpl}
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 class DbAlertStoreHandlerImplTest {
    
@@ -73,34 +75,27 @@ class DbAlertStoreHandlerImplTest {
    public void testStoreNewAlert() {
        String groupKey = "test-group";
        groupAlert.setGroupKey(groupKey);
-
+        
        when(groupAlertDao.findByGroupKey(groupKey)).thenReturn(null);
-
-        SingleAlert savedSingleAlert = new SingleAlert();
-        when(singleAlertDao.save(any(SingleAlert.class))).thenReturn(savedSingleAlert);
-
-        GroupAlert savedGroupAlert = new GroupAlert();
-        when(groupAlertDao.save(any(GroupAlert.class))).thenReturn(savedGroupAlert);
-
+        
        dbAlertStoreHandler.store(groupAlert);
-
+        
        verify(singleAlertDao).save(any(SingleAlert.class));
        verify(groupAlertDao).save(groupAlert);
    }

-
    @Test
    public void testStoreExistingAlert() {
        String groupKey = "test-group";
        String fingerprint = "test-fingerprint";
-
+        
        groupAlert.setGroupKey(groupKey);
        singleAlert.setFingerprint(fingerprint);
-
+        
        GroupAlert existingGroup = new GroupAlert();
        existingGroup.setId(1L);
        when(groupAlertDao.findByGroupKey(groupKey)).thenReturn(existingGroup);
-
+        
        SingleAlert existingAlert = new SingleAlert();
        existingAlert.setId(1L);
        existingAlert.setStatus("firing");
@@ -108,15 +103,11 @@ class DbAlertStoreHandlerImplTest {
        existingAlert.setActiveAt(2000L);
        existingAlert.setTriggerTimes(1);
        when(singleAlertDao.findByFingerprint(fingerprint)).thenReturn(existingAlert);
-
-        when(singleAlertDao.save(any(SingleAlert.class))).thenReturn(existingAlert);
-        when(groupAlertDao.save(any(GroupAlert.class))).thenReturn(existingGroup);
-
+        
        dbAlertStoreHandler.store(groupAlert);
-
+        
        verify(singleAlertDao).save(any(SingleAlert.class));
        verify(groupAlertDao).save(groupAlert);
        assertEquals(1L, groupAlert.getId());
    }
-
 }
@@ -99,7 +99,7 @@ class EmailAlertNotifyHandlerImplTest {
        template.setName("test-template");
        template.setContent("test content");
        
-        // Set up email server configuration
+        // 设置邮件服务器配置
        MailServerConfig mailServerConfig = new MailServerConfig();
        mailServerConfig.setEmailHost("smtp.example.com");
        mailServerConfig.setEmailPort(587);
@@ -83,8 +83,8 @@ class AlarmInhibitReduceTest {
        MockitoAnnotations.openMocks(this);
        when(alertInhibitDao.findAlertInhibitsByEnableIsTrue())
            .thenReturn(Collections.emptyList());
-
-        // Correctly set up AlerterProperties mock
+        
+        // 正确设置 AlerterProperties mock
        AlerterProperties.InhibitProperties inhibitProperties = new AlerterProperties.InhibitProperties();
        inhibitProperties.setTtl(60000);
        when(alerterProperties.getInhibit()).thenReturn(inhibitProperties);
@@ -30,17 +30,18 @@ import java.util.Map;

 import org.apache.hertzbeat.alert.dao.AlertSilenceDao;
 import org.apache.hertzbeat.alert.notice.AlertNoticeDispatch;
-import org.apache.hertzbeat.common.cache.CacheFactory;
 import org.apache.hertzbeat.common.entity.alerter.AlertSilence;
 import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;

 /**
- * Test for {@link AlarmSilenceReduce}
+ * Test for AlarmSilenceReduce
 */
+@Disabled
 class AlarmSilenceReduceTest {

    @Mock
@@ -54,23 +55,21 @@ class AlarmSilenceReduceTest {
    @BeforeEach
    void setUp() {
        MockitoAnnotations.openMocks(this);
-        CacheFactory.clearAlertSilenceCache();
+        when(alertSilenceDao.findAll()).thenReturn(Collections.emptyList());
        alarmSilenceReduce = new AlarmSilenceReduce(alertSilenceDao, alertNoticeDispatch);
    }

    @Test
    void whenNoSilenceRules_shouldForwardAlert() {
-        when(alertSilenceDao.findAlertSilencesByEnableTrue()).thenReturn(Collections.emptyList());
-
        GroupAlert alert = createGroupAlert("firing", createLabels("service", "web"));
+        
        alarmSilenceReduce.silenceAlarm(alert);
-
+        
        verify(alertNoticeDispatch).dispatchAlarm(alert);
    }

    @Test
    void whenMatchingSilenceRule_shouldNotForwardAlert() {
-
        // Create silence rule
        AlertSilence silenceRule = AlertSilence.builder()
                .enable(true)
@@ -82,7 +81,7 @@ class AlarmSilenceReduceTest {
                .times(0)
                .build();

-        when(alertSilenceDao.findAlertSilencesByEnableTrue()).thenReturn(Collections.singletonList(silenceRule));
+        when(alertSilenceDao.findAll()).thenReturn(Collections.singletonList(silenceRule));
        when(alertSilenceDao.save(any(AlertSilence.class))).thenReturn(silenceRule);
        
        GroupAlert alert = createGroupAlert("firing", createLabels("service", "web"));
@@ -108,9 +107,9 @@ class AlarmSilenceReduceTest {
                .times(0)
                .build();

-        when(alertSilenceDao.findAlertSilencesByEnableTrue()).thenReturn(Collections.singletonList(silenceRule));
+        when(alertSilenceDao.findAll()).thenReturn(Collections.singletonList(silenceRule));
        when(alertSilenceDao.save(any(AlertSilence.class))).thenReturn(silenceRule);
-
+        
        GroupAlert alert = createGroupAlert("firing", createLabels("service", "web"));
        
        alarmSilenceReduce.silenceAlarm(alert);
@@ -131,7 +130,29 @@ class AlarmSilenceReduceTest {
                .times(0)
                .build();

-        when(alertSilenceDao.findAlertSilencesByEnableTrue()).thenReturn(Collections.singletonList(silenceRule));
+        when(alertSilenceDao.findAll()).thenReturn(Collections.singletonList(silenceRule));
+        
+        GroupAlert alert = createGroupAlert("firing", createLabels("service", "web"));
+        
+        alarmSilenceReduce.silenceAlarm(alert);
+        
+        verify(alertNoticeDispatch).dispatchAlarm(alert);
+        verify(alertSilenceDao, never()).save(any());
+    }
+
+    @Test
+    void whenSilenceRuleDisabled_shouldForwardAlert() {
+        AlertSilence silenceRule = AlertSilence.builder()
+                .enable(false)
+                .matchAll(false)
+                .type((byte) 0)
+                .labels(createLabels("service", "web"))
+                .periodStart(LocalDateTime.now().minusHours(1).atZone(ZoneId.systemDefault()))
+                .periodEnd(LocalDateTime.now().plusHours(1).atZone(ZoneId.systemDefault()))
+                .times(0)
+                .build();
+
+        when(alertSilenceDao.findAll()).thenReturn(Collections.singletonList(silenceRule));
        
        GroupAlert alert = createGroupAlert("firing", createLabels("service", "web"));
        
@@ -24,18 +24,16 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.hertzbeat.alert.dto.AlertDefineDTO;
 import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineExcelImExportServiceImpl;
-import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.export.ExcelExportUtils;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -44,6 +42,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
 /**
 * test case for {@link AlertDefineExcelImExportServiceImpl}
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 public class AlertDefineExcelImExportServiceTest {

@@ -62,13 +61,15 @@ public class AlertDefineExcelImExportServiceTest {
        Row row = initialSheet.createRow(1);
        row.createCell(0).setCellValue("app1");
        row.createCell(1).setCellValue("metric1");
-        row.createCell(2).setCellValue("expr1");
-        row.createCell(3).setCellValue(10);
-        row.createCell(4).setCellValue(1);
-        row.createCell(5).setCellValue(JsonUtil.toJson(Map.of("key", "value")));
-        row.createCell(6).setCellValue(JsonUtil.toJson(Map.of("key", "value")));
-        row.createCell(7).setCellValue("template1");
+        row.createCell(2).setCellValue("field1");
+        row.createCell(3).setCellValue(true);
+        row.createCell(4).setCellValue("expr1");
+        row.createCell(5).setCellValue(1);
+        row.createCell(6).setCellValue(10);
+        row.createCell(7).setCellValue("[{\"name\":\"tag1\",\"value\":\"value1\"}]");
        row.createCell(8).setCellValue(true);
+        row.createCell(9).setCellValue(true);
+        row.createCell(10).setCellValue("template1");

        ByteArrayInputStream inputStream = new ByteArrayInputStream(toByteArray(initialWorkbook));

@@ -87,12 +88,9 @@ public class AlertDefineExcelImExportServiceTest {
            assertEquals("app1", alertDefineDTO.getName());
            assertEquals("metric1", alertDefineDTO.getType());
            assertEquals("expr1", alertDefineDTO.getExpr());
-            assertEquals(10, alertDefineDTO.getPeriod());
-            assertEquals(1, alertDefineDTO.getTimes());
-            assertEquals(Map.of("key", "value"), alertDefineDTO.getLabels());
-            assertEquals(Map.of("key", "value"), alertDefineDTO.getAnnotations());
-            assertEquals("template1", alertDefineDTO.getTemplate());
+            assertEquals(10, alertDefineDTO.getTimes());
            assertTrue(alertDefineDTO.getEnable());
+            assertEquals("template1", alertDefineDTO.getTemplate());
        }
    }

@@ -105,12 +103,9 @@ public class AlertDefineExcelImExportServiceTest {
        alertDefineDTO.setName("app1");
        alertDefineDTO.setType("metric1");
        alertDefineDTO.setExpr("expr1");
-        alertDefineDTO.setPeriod(10);
-        alertDefineDTO.setTimes(1);
-        alertDefineDTO.setLabels(Map.of("key", "value"));
-        alertDefineDTO.setAnnotations(Map.of("key", "value"));
-        alertDefineDTO.setTemplate("template1");
+        alertDefineDTO.setTimes(10);
        alertDefineDTO.setEnable(true);
+        alertDefineDTO.setTemplate("template1");
        exportAlertDefineDTO.setAlertDefine(alertDefineDTO);
        exportAlertDefineList.add(exportAlertDefineDTO);

@@ -120,26 +115,21 @@ public class AlertDefineExcelImExportServiceTest {
            try (Workbook resultWorkbook = WorkbookFactory.create(new ByteArrayInputStream(outputStream.toByteArray()))) {
                Sheet resultSheet = resultWorkbook.getSheetAt(0);
                Row headerRow = resultSheet.getRow(0);
-                assertEquals("Name", headerRow.getCell(0).getStringCellValue());
-                assertEquals("Type", headerRow.getCell(1).getStringCellValue());
-                assertEquals("Expr", headerRow.getCell(2).getStringCellValue());
-                assertEquals("Period", headerRow.getCell(3).getStringCellValue());
-                assertEquals("Times", headerRow.getCell(4).getStringCellValue());
-                assertEquals("Labels", headerRow.getCell(5).getStringCellValue());
-                assertEquals("Annotations", headerRow.getCell(6).getStringCellValue());
-                assertEquals("Template", headerRow.getCell(7).getStringCellValue());
-                assertEquals("Enable", headerRow.getCell(8).getStringCellValue());
+                assertEquals("app", headerRow.getCell(0).getStringCellValue());
+                assertEquals("metric", headerRow.getCell(1).getStringCellValue());

                Row dataRow = resultSheet.getRow(1);
                assertEquals("app1", dataRow.getCell(0).getStringCellValue());
                assertEquals("metric1", dataRow.getCell(1).getStringCellValue());
-                assertEquals("expr1", dataRow.getCell(2).getStringCellValue());
-                assertEquals(10, (int) dataRow.getCell(3).getNumericCellValue());
-                assertEquals(1, (int) dataRow.getCell(4).getNumericCellValue());
-                assertEquals(JsonUtil.toJson(Map.of("key", "value")), dataRow.getCell(5).getStringCellValue());
-                assertEquals(JsonUtil.toJson(Map.of("key", "value")), dataRow.getCell(6).getStringCellValue());
-                assertEquals("template1", dataRow.getCell(7).getStringCellValue());
+                assertEquals("field1", dataRow.getCell(2).getStringCellValue());
+                assertTrue(dataRow.getCell(3).getBooleanCellValue());
+                assertEquals("expr1", dataRow.getCell(4).getStringCellValue());
+                assertEquals(1, (int) dataRow.getCell(5).getNumericCellValue());
+                assertEquals(10, (int) dataRow.getCell(6).getNumericCellValue());
+                assertEquals("[{\"name\":\"tag1\",\"value\":\"value1\"}]", dataRow.getCell(7).getStringCellValue());
                assertTrue(dataRow.getCell(8).getBooleanCellValue());
+                assertTrue(dataRow.getCell(9).getBooleanCellValue());
+                assertEquals("template1", dataRow.getCell(10).getStringCellValue());
            }
        }
    }
@@ -152,4 +142,4 @@ public class AlertDefineExcelImExportServiceTest {
        }
    }

-}
+}
@@ -30,7 +30,6 @@ 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;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
@@ -55,9 +54,6 @@ class AlertDefineServiceTest {

    @Mock
    private AlertDefineDao alertDefineDao;
-    
-    @Mock
-    private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;

    @Mock
    private List<AlertDefineImExportService> alertDefineImExportServiceList;
@@ -68,7 +64,6 @@ class AlertDefineServiceTest {
    @BeforeEach
    void setUp() {
        ReflectionTestUtils.setField(this.alertDefineService, "alertDefineDao", alertDefineDao);
-        ReflectionTestUtils.setField(this.alertDefineService, "periodicAlertRuleScheduler", periodicAlertRuleScheduler);

        this.alertDefine = AlertDefine.builder()
                .id(1L)
@@ -1,547 +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.
- */
-
-/*
- * 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 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 org.apache.hertzbeat.alert.service.impl.DataSourceServiceImpl;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import java.util.List;
-import java.util.Map;
-import org.mockito.Mockito;
-import org.apache.hertzbeat.warehouse.db.QueryExecutor;
-
-/**
- * test case for {@link DataSourceService}
- */
-class DataSourceServiceTest {
-    
-    private DataSourceServiceImpl dataSourceService;
-    
-    @BeforeEach
-    void setUp() {
-        dataSourceService = new DataSourceServiceImpl();
-    }
-
-    @Test
-    void calculate1() {
-        List<Map<String, Object>> prometheusData = 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(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__"));
-        assertEquals(200.0, result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate2() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total <= 100");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate3() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total >= 200");
-        assertEquals(2, result.size());
-        assertNull(result.get(0).get("__value__"));
-        assertEquals(200.0, result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate4() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total > 250");
-        assertEquals(2, result.size());
-        assertNull(result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate5() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total < 100");
-        assertEquals(2, result.size());
-        assertNull(result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate6() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total > 200");
-        assertEquals(2, result.size());
-        assertNull(result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate7() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "(node_cpu_seconds_total <= 100)");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate8() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"}[4m] <= 100");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate9() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} == 100");
-        assertEquals(2, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-        assertNull(result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate10() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} != 100");
-        assertEquals(2, result.size());
-        assertNull(result.get(0).get("__value__"));
-        assertEquals(200.0, result.get(1).get("__value__"));
-    }
-
-    @Test
-    void calculate11() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 50 and node_cpu_seconds_total{mode=\"idle\"} < 120");
-        assertEquals(1, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate12() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "(node_cpu_seconds_total{mode=\"user\"} > 50) and (node_cpu_seconds_total{mode=\"idle\"} < 120)");
-        assertEquals(1, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate13() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "node_cpu_seconds_total{mode=\"user\"} > 150 and node_cpu_seconds_total{mode=\"idle\"} < 220");
-        assertEquals(1, result.size());
-        assertEquals(200.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate14() {
-        List<Map<String, Object>> prometheusData = 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(Mockito.anyString())).thenReturn(prometheusData);
-        dataSourceService.setExecutors(List.of(mockExecutor));
-
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "(node_cpu_seconds_total{mode=\"user\"} > 150) and (node_cpu_seconds_total{mode=\"idle\"} < 220)");
-        assertEquals(1, result.size());
-        assertEquals(200.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate15() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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("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", "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__", 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("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", "node_cpu_seconds_total{mode=\"user\"} > 50 and node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate17() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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("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", "node_cpu_seconds_total{mode=\"user\"} > 150 or node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(1, result.size());
-        assertEquals(200.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate18() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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("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", "node_cpu_seconds_total{mode=\"user\"} > 250 or node_cpu_seconds_total{mode=\"idle\"} < 120");
-        assertEquals(1, result.size());
-        assertEquals(100.0, result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate19() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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("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", "node_cpu_seconds_total{mode=\"user\"} > 250 or node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate20() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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, "key", "node1")),
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "book", "node2"))
-        );
-
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        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", "node_cpu_seconds_total{mode=\"user\"} > 50 or node_cpu_seconds_total{mode=\"idle\"} < 320");
-        assertEquals(1, result.size());
-        assertNotNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate21() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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, "key", "node1")),
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "book", "node2"))
-        );
-
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        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", "node_cpu_seconds_total{mode=\"user\"} > 50 unless node_cpu_seconds_total{mode=\"idle\"} < 320");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate22() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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, "key", "node1")),
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "book", "node2"))
-        );
-
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        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", "node_cpu_seconds_total{mode=\"user\"} > 50 unless node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(1, result.size());
-        assertNotNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate23() {
-        List<Map<String, Object>> prometheusData1 = List.of(
-                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, "key", "node1")),
-                new HashMap<>(Map.of("__value__", 200.0, "timestamp", 1343555, "book", "node2"))
-        );
-
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        Mockito.when(mockExecutor.support("promql")).thenReturn(true);
-        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", "node_cpu_seconds_total{mode=\"user\"} > 250 unless node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(1, result.size());
-        assertNull(result.get(0).get("__value__"));
-    }
-
-    @Test
-    void calculate24() {
-        List<Map<String, Object>> prometheusData = List.of();
-        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(0, result.size());
-    }
-
-    @Test
-    void calculate25() {
-        List<Map<String, Object>> prometheusData = List.of();
-        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{mode=\"user\"} > 250 unless node_cpu_seconds_total{mode=\"idle\"} < 20");
-        assertEquals(0, result.size());
-    }
-
-    @Test
-    void calculate26() {
-        List<Map<String, Object>> prometheusData = List.of(
-                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(1, result.size());
-        assertEquals(200.0, result.get(0).get("__value__"));
-    }
-}
@@ -17,42 +17,33 @@

 package org.apache.hertzbeat.alert.service;

-import org.apache.hertzbeat.alert.dao.NoticeReceiverDao;
-import org.apache.hertzbeat.alert.dao.NoticeRuleDao;
-import org.apache.hertzbeat.alert.dao.NoticeTemplateDao;
-import org.apache.hertzbeat.alert.notice.AlertNoticeDispatch;
-import org.apache.hertzbeat.alert.service.impl.NoticeConfigServiceImpl;
-import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
-import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
-import org.apache.hertzbeat.common.entity.alerter.NoticeRule;
-import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
-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 org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.jpa.domain.Specification;
-
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
+import org.apache.hertzbeat.alert.service.impl.NoticeConfigServiceImpl;
+import org.apache.hertzbeat.common.entity.alerter.GroupAlert;
+import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
+import org.apache.hertzbeat.common.entity.alerter.NoticeRule;
+import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
+import org.apache.hertzbeat.alert.notice.AlertNoticeDispatch;
+import org.apache.hertzbeat.alert.dao.NoticeReceiverDao;
+import org.apache.hertzbeat.alert.dao.NoticeRuleDao;
+import org.apache.hertzbeat.alert.dao.NoticeTemplateDao;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+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 org.springframework.data.jpa.domain.Specification;

 /**
 * Test case for {@link NoticeConfigService}
 */
+@Disabled
@ExtendWith(MockitoExtension.class)
 class NoticeConfigServiceTest {

@@ -67,130 +58,26 @@ class NoticeConfigServiceTest {
    @InjectMocks
    private NoticeConfigServiceImpl noticeConfigService;

-    private NoticeReceiver receiver1;
-    private NoticeReceiver receiver2;
-    private NoticeTemplate template1;
-    private NoticeTemplate template2;
-    private NoticeRule rule1;
-    private NoticeRule rule2;
-
    @BeforeEach
    void setUp() {
-        receiver1 = new NoticeReceiver();
-        receiver1.setId(1L);
-        receiver1.setName("Receiver1");
-
-        receiver2 = new NoticeReceiver();
-        receiver2.setId(2L);
-        receiver2.setName("Receiver2");
-
-        template1 = new NoticeTemplate();
-        template1.setId(1L);
-        template1.setName("Template1");
-
-        template2 = new NoticeTemplate();
-        template2.setId(2L);
-        template2.setName("Template2");
-
-        rule1 = new NoticeRule();
-        rule1.setId(1L);
-        rule1.setName("Rule1");
-
-        rule2 = new NoticeRule();
-        rule2.setId(2L);
-        rule2.setName("Rule2");
    }

    @Test
    void getNoticeReceivers() {
-        Page<NoticeReceiver> receiverPage = new PageImpl<>(
-                Arrays.asList(receiver1, receiver2),
-                PageRequest.of(0, 8, Sort.by(Sort.Direction.DESC, "id")),
-                2
-        );
-
-        when(noticeReceiverDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(receiverPage);
-
-        Page<NoticeReceiver> result = noticeConfigService.getNoticeReceivers("Receiver", 0, 8);
-
-        assertEquals(2, result.getTotalElements());
-        assertEquals(1, result.getTotalPages());
-        assertEquals(8, result.getSize());
-        assertEquals(0, result.getNumber());
-        assertEquals(receiver1, result.getContent().get(0));
-        assertEquals(receiver2, result.getContent().get(1));
-
-        verify(noticeReceiverDao, times(1)).findAll(any(Specification.class), any(PageRequest.class));
-    }
-
-    @Test
-    void getAllNoticeReceivers() {
-        when(noticeReceiverDao.findAll()).thenReturn(Arrays.asList(receiver1, receiver2));
-
-        List<NoticeReceiver> result = noticeConfigService.getAllNoticeReceivers();
-
-        assertEquals(2, result.size());
-        assertEquals(receiver1, result.get(0));
-        assertEquals(receiver2, result.get(1));
-
-        verify(noticeReceiverDao, times(1)).findAll();
+        noticeConfigService.getNoticeReceivers(null);
+        verify(noticeReceiverDao, times(1)).findAll(any(Specification.class));
    }

    @Test
    void getNoticeTemplates() {
-        Page<NoticeTemplate> templatePage = new PageImpl<>(
-                Arrays.asList(template1, template2),
-                PageRequest.of(0, 8, Sort.by(Sort.Direction.DESC, "id")),
-                2
-        );
-
-        when(noticeTemplateDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(templatePage);
-
-        Page<NoticeTemplate> result = noticeConfigService.getNoticeTemplates("Template", false, 0, 8);
-
-        assertEquals(2, result.getTotalElements());
-        assertEquals(1, result.getTotalPages());
-        assertEquals(8, result.getSize());
-        assertEquals(0, result.getNumber());
-        assertEquals(template1, result.getContent().get(0));
-        assertEquals(template2, result.getContent().get(1));
-
-        verify(noticeTemplateDao, times(1)).findAll(any(Specification.class), any(PageRequest.class));
-    }
-
-    @Test
-    void getAllNoticeTemplates() {
-        when(noticeTemplateDao.findAll()).thenReturn(Arrays.asList(template1, template2));
-
-        List<NoticeTemplate> result = noticeConfigService.getAllNoticeTemplates();
-
-        assert result.size() >= 2;
-        assertEquals(template1, result.get(result.size() - 2));
-        assertEquals(template2, result.get(result.size() - 1));
-
-        verify(noticeTemplateDao, times(1)).findAll();
+        noticeConfigService.getNoticeTemplates(null);
+        verify(noticeTemplateDao, times(1)).findAll(any(Specification.class));
    }

    @Test
    void getNoticeRules() {
-        Page<NoticeRule> rulePage = new PageImpl<>(
-                Arrays.asList(rule1, rule2),
-                PageRequest.of(0, 8, Sort.by(Sort.Direction.DESC, "id")),
-                2
-        );
-
-        when(noticeRuleDao.findAll(any(Specification.class), any(PageRequest.class))).thenReturn(rulePage);
-
-        Page<NoticeRule> result = noticeConfigService.getNoticeRules("Rule", 0, 8);
-
-        assertEquals(2, result.getTotalElements());
-        assertEquals(1, result.getTotalPages());
-        assertEquals(8, result.getSize());
-        assertEquals(0, result.getNumber());
-        assertEquals(rule1, result.getContent().get(0));
-        assertEquals(rule2, result.getContent().get(1));
-
-        verify(noticeRuleDao, times(1)).findAll(any(Specification.class), any(PageRequest.class));
+        noticeConfigService.getNoticeRules(null);
+        verify(noticeRuleDao, times(1)).findAll(any(Specification.class));
    }

    @Test
@@ -155,9 +155,5 @@
            <artifactId>plc4j-driver-modbus</artifactId>
            <version>0.12.0</version>
        </dependency>
-        <dependency>
-            <groupId>org.apache.sshd</groupId>
-            <artifactId>sshd-sftp</artifactId>
-        </dependency>
    </dependencies>
 </project>
@@ -26,25 +26,20 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 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;
 import org.apache.hertzbeat.collector.collect.common.cache.GlobalConnectionCache;
 import org.apache.hertzbeat.collector.collect.common.cache.JdbcConnect;
-import org.apache.hertzbeat.collector.collect.common.ssh.SshTunnelHelper;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
 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.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.SshTunnel;
 import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.channel.exception.SshChannelOpenException;
 import org.postgresql.util.PSQLException;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.jdbc.datasource.init.ScriptUtils;
@@ -60,7 +55,7 @@ public class JdbcCommonCollect extends AbstractCollect {
    private static final String QUERY_TYPE_MULTI_ROW = "multiRow";
    private static final String QUERY_TYPE_COLUMNS = "columns";
    private static final String RUN_SCRIPT = "runScript";
-
+    
    private static final String[] VULNERABLE_KEYWORDS = {"allowLoadLocalInfile", "allowLoadLocalInfileInPath", "useLocalInfile"};

    private final GlobalConnectionCache connectionCommonCache = GlobalConnectionCache.getInstance();
@@ -78,26 +73,16 @@ public class JdbcCommonCollect extends AbstractCollect {
                }
            }
        }
-        SshTunnelHelper.checkTunnelParam(metrics.getJdbc().getSshTunnel());
    }

    @Override
    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
        long startTime = System.currentTimeMillis();
        JdbcProtocol jdbcProtocol = metrics.getJdbc();
-        SshTunnel sshTunnel = jdbcProtocol.getSshTunnel();
-
+        String databaseUrl = constructDatabaseUrl(jdbcProtocol);
        int timeout = CollectUtil.getTimeout(jdbcProtocol.getTimeout());
        Statement statement = null;
-        String databaseUrl;
        try {
-            if (sshTunnel != null && Boolean.parseBoolean(sshTunnel.getEnable())) {
-                int localPort = SshTunnelHelper.localPortForward(sshTunnel, jdbcProtocol.getHost(), jdbcProtocol.getPort());
-                databaseUrl = constructDatabaseUrl(jdbcProtocol, "localhost", String.valueOf(localPort));
-            } else {
-                databaseUrl = constructDatabaseUrl(jdbcProtocol, jdbcProtocol.getHost(), jdbcProtocol.getPort());
-            }
-
            statement = getConnection(jdbcProtocol.getUsername(),
                    jdbcProtocol.getPassword(), databaseUrl, timeout);
            switch (jdbcProtocol.getQueryType()) {
@@ -127,14 +112,6 @@ public class JdbcCommonCollect extends AbstractCollect {
            log.warn("Jdbc sql error: {}, code: {}.", sqlException.getMessage(), sqlException.getErrorCode());
            builder.setCode(CollectRep.Code.FAIL);
            builder.setMsg("Query Error: " + sqlException.getMessage() + " Code: " + sqlException.getErrorCode());
-        } catch (SshException sshException) {
-            Throwable throwable = sshException.getCause();
-            if (throwable instanceof SshChannelOpenException) {
-                log.warn("[Jdbc collect] Remote ssh server no more session channel, please increase sshd_config MaxSessions.");
-            }
-            String errorMsg = CommonUtil.getMessageFromThrowable(sshException);
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg("Peer ssh connection failed: " + errorMsg);
        } catch (Exception e) {
            String errorMessage = CommonUtil.getMessageFromThrowable(e);
            log.error("Jdbc error: {}.", errorMessage, e);
@@ -208,14 +185,13 @@ public class JdbcCommonCollect extends AbstractCollect {
     * eg:
     * query metrics：one tow three four
     * query sql：select one, tow, three, four from book limit 1;
-     *
     * @param statement statement
-     * @param sql       sql
-     * @param columns   query metrics field list
+     * @param sql sql
+     * @param columns query metrics field list
     * @throws Exception when error happen
     */
    private void queryOneRow(Statement statement, String sql, List<String> columns,
-                             CollectRep.MetricsData.Builder builder, long startTime) throws Exception {
+                                           CollectRep.MetricsData.Builder builder, long startTime) throws Exception {
        statement.setMaxRows(1);
        try (ResultSet resultSet = statement.executeQuery(sql)) {
            if (resultSet.next()) {
@@ -240,15 +216,14 @@ public class JdbcCommonCollect extends AbstractCollect {
     * eg:
     * query metrics：one two three four
     * query sql：select key, value from book; the key is the query metrics fields
-     * select key, value from book;
+     * select key, value from book; 
     * one    -  value1
     * two    -  value2
     * three  -  value3
     * four   -  value4
-     *
     * @param statement statement
-     * @param sql       sql
-     * @param columns   query metrics field list
+     * @param sql sql
+     * @param columns query metrics field list
     * @throws Exception when error happen
     */
    private void queryOneRowByMatchTwoColumns(Statement statement, String sql, List<String> columns,
@@ -281,10 +256,9 @@ public class JdbcCommonCollect extends AbstractCollect {
     * query metrics：one tow three four
     * query sql：select one, tow, three, four from book;
     * and return multi row record mapping with the metrics
-     *
     * @param statement statement
-     * @param sql       sql
-     * @param columns   query metrics field list
+     * @param sql sql
+     * @param columns query metrics field list
     * @throws Exception when error happen
     */
    private void queryMultiRow(Statement statement, String sql, List<String> columns,
@@ -309,16 +283,14 @@ public class JdbcCommonCollect extends AbstractCollect {

    /**
     * construct jdbc url due the jdbc protocol
-     *
     * @param jdbcProtocol jdbc
     * @return URL
     */
-    private String constructDatabaseUrl(JdbcProtocol jdbcProtocol, String host, String port) {
+    private String constructDatabaseUrl(JdbcProtocol jdbcProtocol) {
        if (Objects.nonNull(jdbcProtocol.getUrl())
                && !Objects.equals("", jdbcProtocol.getUrl())
                && jdbcProtocol.getUrl().startsWith("jdbc")) {
-            // convert the URL to lowercase for case-insensitive checking
-            String url = jdbcProtocol.getUrl().toLowerCase();
+            String url = jdbcProtocol.getUrl().toLowerCase(); // convert the URL to lowercase for case-insensitive checking
            // check whether the parameter is valid
            if (url.contains("create trigger") || url.contains("create alias") || url.contains("runscript from")
                    || url.contains("allowloadlocalinfile") || url.contains("allowloadlocalinfileinpath")
@@ -330,19 +302,25 @@ public class JdbcCommonCollect extends AbstractCollect {
            return jdbcProtocol.getUrl();
        }
        return switch (jdbcProtocol.getPlatform()) {
-            case "mysql", "mariadb" -> "jdbc:mysql://" + host + ":" + port
+            case "mysql", "mariadb" ->
+                    "jdbc:mysql://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort()
                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase())
                    + "?useUnicode=true&characterEncoding=utf-8&useSSL=false";
-            case "postgresql" -> "jdbc:postgresql://" + host + ":" + port
+            case "postgresql" ->
+                    "jdbc:postgresql://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort()
                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
-            case "clickhouse" -> "jdbc:clickhouse://" + host + ":" + port
+            case "clickhouse" ->
+                    "jdbc:clickhouse://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort()
                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
-            case "sqlserver" -> "jdbc:sqlserver://" + host + ":" + port
+            case "sqlserver" ->
+                    "jdbc:sqlserver://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort()
                    + ";" + (jdbcProtocol.getDatabase() == null ? "" : "DatabaseName=" + jdbcProtocol.getDatabase())
                    + ";trustServerCertificate=true;";
-            case "oracle" -> "jdbc:oracle:thin:@" + host + ":" + port
+            case "oracle" ->
+                    "jdbc:oracle:thin:@" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort()
                    + "/" + (jdbcProtocol.getDatabase() == null ? "" : jdbcProtocol.getDatabase());
-            case "dm" -> "jdbc:dm://" + host + ":" + port;
+            case "dm" ->
+                    "jdbc:dm://" + jdbcProtocol.getHost() + ":" + jdbcProtocol.getPort();
            default -> throw new IllegalArgumentException("Not support database platform: " + jdbcProtocol.getPlatform());
        };
    }
@@ -17,11 +17,9 @@

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

-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.net.ftp.FTPClient;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
@@ -31,10 +29,6 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.FtpProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.sshd.client.SshClient;
-import org.apache.sshd.client.session.ClientSession;
-import org.apache.sshd.sftp.client.SftpClient;
-import org.apache.sshd.sftp.client.SftpClientFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

@@ -62,14 +56,33 @@ public class FtpCollectImpl extends AbstractCollect {
        Assert.hasText(ftpProtocol.getTimeout(), "Ftp Protocol timeout is required.");
    }

+
    @Override
    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        boolean ssl = Boolean.parseBoolean(metrics.getFtp().getSsl());
-        if (ssl){
-            handleSftpCollect(builder, metrics);
-        } else {
-            handleFtpCollect(builder, metrics);
+        FTPClient ftpClient = new FTPClient();
+        FtpProtocol ftpProtocol = metrics.getFtp();
+        // Set timeout
+        ftpClient.setControlKeepAliveReplyTimeout(Integer.parseInt(ftpProtocol.getTimeout()));
+
+        // Collect data to load in CollectRep.ValueRow.Builder's object
+        CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+        Map<String, String> valueMap;
+        try {
+            valueMap = collectValue(ftpClient, ftpProtocol);
+            metrics.getAliasFields().forEach(it -> {
+                if (valueMap.containsKey(it)) {
+                    String fieldValue = valueMap.get(it);
+                    valueRowBuilder.addColumn(Objects.requireNonNullElse(fieldValue, CommonConstants.NULL_VALUE));
+                } else {
+                    valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
+                }
+            });
+        } catch (Exception e) {
+            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
+            builder.setMsg(e.getMessage());
+            return;
        }
+        builder.addValueRow(valueRowBuilder.build());
    }

    /**
@@ -100,23 +113,8 @@ public class FtpCollectImpl extends AbstractCollect {
        };
    }

-    private Map<String, String> collectValue(SftpClient sftpClient, FtpProtocol ftpProtocol) {
-        boolean isActive;
-        String responseTime;
-        try {
-            long startTime = System.currentTimeMillis();
-            sftpClient.stat(ftpProtocol.getDirection());
-            isActive = true;
-            long endTime = System.currentTimeMillis();
-            responseTime = String.valueOf(endTime - startTime);
-        } catch (IOException e) {
-            throw new IllegalArgumentException("[SFTPClient] error: {}" + CommonUtil.getMessageFromThrowable(e), e);
-        }
-        return Map.of("isActive", Boolean.toString(isActive), "responseTime", responseTime);
-    }
-
    /**
-     * ftp login
+     * login
     */
    private void login(FTPClient ftpClient, FtpProtocol ftpProtocol) {
        try {
@@ -149,84 +147,8 @@ public class FtpCollectImpl extends AbstractCollect {
        }
    }

-    private ClientSession connect(SshClient client, FtpProtocol ftpProtocol) {
-        client.start();
-        try {
-            ClientSession session = client.connect(ftpProtocol.getUsername(), ftpProtocol.getHost(), Integer.parseInt(ftpProtocol.getPort()))
-                    .verify(Integer.parseInt(ftpProtocol.getTimeout()))
-                    .getSession();
-            session.addPasswordIdentity(ftpProtocol.getPassword());
-            session.auth().verify(Integer.parseInt(ftpProtocol.getTimeout()));
-            return session;
-        } catch (Exception e) {
-            throw new IllegalArgumentException("[sftp connection] error: {}" +  CommonUtil.getMessageFromThrowable(e), e);
-        }
-    }
-
    @Override
    public String supportProtocol() {
        return DispatchConstants.PROTOCOL_FTP;
    }
-
-    private void handleFtpCollect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        FTPClient ftpClient = new FTPClient();
-        FtpProtocol ftpProtocol = metrics.getFtp();
-        // Set timeout
-        ftpClient.setControlKeepAliveReplyTimeout(Integer.parseInt(ftpProtocol.getTimeout()));
-
-        // Collect data to load in CollectRep.ValueRow.Builder's object
-        CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-        Map<String, String> valueMap;
-        try {
-            valueMap = collectValue(ftpClient, ftpProtocol);
-            metrics.getAliasFields().forEach(it -> {
-                if (valueMap.containsKey(it)) {
-                    String fieldValue = valueMap.get(it);
-                    valueRowBuilder.addColumn(Objects.requireNonNullElse(fieldValue, CommonConstants.NULL_VALUE));
-                } else {
-                    valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
-                }
-            });
-        } catch (Exception e) {
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg(e.getMessage());
-            return;
-        }
-        builder.addValueRow(valueRowBuilder.build());
-    }
-
-    private void handleSftpCollect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
-        FtpProtocol ftpProtocol = metrics.getFtp();
-        ClientSession session = null;
-        SftpClient sftpClient = null;
-        SshClient client = null;
-        try {
-            client = SshClient.setUpDefaultClient();
-            session = connect(client, ftpProtocol);
-            sftpClient = SftpClientFactory.instance().createSftpClient(session);
-            Map<String, String> valueMap = collectValue(sftpClient, ftpProtocol);
-            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-            metrics.getAliasFields().forEach(it ->
-                    valueRowBuilder.addColumn(valueMap.getOrDefault(it, CommonConstants.NULL_VALUE))
-            );
-            builder.addValueRow(valueRowBuilder.build());
-        } catch (Exception e) {
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg(e.getMessage());
-        } finally {
-            try {
-                if (sftpClient != null && sftpClient.isOpen()){
-                    sftpClient.close();
-                }
-                if (session != null && session.isOpen()){
-                    session.close();
-                }
-                if (client != null && client.isOpen()){
-                    client.close();
-                }
-            } catch (Exception e){
-                log.error("[SFTPClient] error while closing: {}",  CommonUtil.getMessageFromThrowable(e), e);
-            }
-        }
-    }
-}
+}
@@ -17,6 +17,7 @@

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

+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -418,7 +419,7 @@ public class ExporterParser {
     * @return true/false
     */
    private boolean isValidLabelValue(String s) {
-        return s != null;
+        return s != null && s.equals(new String(s.getBytes(StandardCharsets.UTF_8)));
    }

    private boolean isSum(String s) {
@@ -17,6 +17,7 @@

 package org.apache.hertzbeat.collector.collect.prometheus.parser;

+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -299,6 +300,6 @@ public class TextParser {
     * @return true/false
     */
    private static boolean isValidLabelValue(String s) {
-        return s != null;
+        return s != null && s.equals(new String(s.getBytes(StandardCharsets.UTF_8)));
    }
 }
@@ -28,8 +28,6 @@ import io.lettuce.core.cluster.models.partitions.Partitions;
 import io.lettuce.core.cluster.models.partitions.RedisClusterNode;
 import io.lettuce.core.resource.ClientResources;
 import io.lettuce.core.resource.DefaultClientResources;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,7 +42,6 @@ import org.apache.hertzbeat.collector.collect.common.cache.AbstractConnection;
 import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier;
 import org.apache.hertzbeat.collector.collect.common.cache.GlobalConnectionCache;
 import org.apache.hertzbeat.collector.collect.common.cache.RedisConnect;
-import org.apache.hertzbeat.collector.collect.common.ssh.SshTunnelHelper;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -54,8 +51,6 @@ import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.MapCapUtil;
-import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.channel.exception.SshChannelOpenException;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

@@ -84,7 +79,6 @@ public class RedisCommonCollectImpl extends AbstractCollect {
        RedisProtocol redisProtocol = metrics.getRedis();
        Assert.hasText(redisProtocol.getHost(), "Redis Protocol host is required.");
        Assert.hasText(redisProtocol.getPort(), "Redis Protocol port is required.");
-        SshTunnelHelper.checkTunnelParam(metrics.getRedis().getSshTunnel());
    }

    @Override
@@ -102,14 +96,6 @@ public class RedisCommonCollectImpl extends AbstractCollect {
            log.info("[redis connection] error: {}", errorMsg);
            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
            builder.setMsg(errorMsg);
-        } catch (SshException sshException) {
-            Throwable throwable = sshException.getCause();
-            if (throwable instanceof SshChannelOpenException) {
-                log.warn("[redis collect] Remote ssh server no more session channel, please increase sshd_config MaxSessions.");
-            }
-            String errorMsg = CommonUtil.getMessageFromThrowable(sshException);
-            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
-            builder.setMsg("Peer ssh connection failed: " + errorMsg);
        } catch (Exception e) {
            String errorMsg = CommonUtil.getMessageFromThrowable(e);
            log.warn("[redis collect] error: {}", e.getMessage(), e);
@@ -123,7 +109,7 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param metrics metrics config
     * @return data
     */
-    private Map<String, String> getSingleRedisInfo(Metrics metrics) throws GeneralSecurityException, IOException {
+    private Map<String, String> getSingleRedisInfo(Metrics metrics) {
        StatefulRedisConnection<String, String> connection = getSingleConnection(metrics.getRedis());
        String info = connection.sync().info(metrics.getName());
        Map<String, String> valueMap = parseInfo(info, metrics);
@@ -139,7 +125,7 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param metrics metrics config
     * @return data
     */
-    private List<Map<String, String>> getClusterRedisInfo(Metrics metrics) throws GeneralSecurityException, IOException {
+    private List<Map<String, String>> getClusterRedisInfo(Metrics metrics) {
        Map<String, StatefulRedisClusterConnection<String, String>> connectionMap = getConnectionList(metrics.getRedis());
        List<Map<String, String>> list = new ArrayList<>(connectionMap.size());
        connectionMap.forEach((identity, connection) ->{
@@ -193,16 +179,12 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param redisProtocol protocol
     * @return connection
     */
-    private StatefulRedisConnection<String, String> getSingleConnection(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
-        String[] resolvedArr = resolveHostAndPort(redisProtocol);
-        String host = resolvedArr[0];
-        String port = resolvedArr[1];
-
-        CacheIdentifier identifier = doIdentifier(redisProtocol, host, port);
+    private StatefulRedisConnection<String, String> getSingleConnection(RedisProtocol redisProtocol) {
+        CacheIdentifier identifier = doIdentifier(redisProtocol);
        StatefulRedisConnection<String, String> connection = (StatefulRedisConnection<String, String>) getStatefulConnection(identifier);
        if (Objects.isNull(connection)) {
            // reuse connection failed, new one
-            RedisClient redisClient = buildSingleClient(redisProtocol, host, port);
+            RedisClient redisClient = buildSingleClient(redisProtocol);
            connection = redisClient.connect();
            connectionCache.addCache(identifier, new RedisConnect(connection));
        }
@@ -214,7 +196,7 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param redisProtocol protocol
     * @return connection map
     */
-    private Map<String, StatefulRedisClusterConnection<String, String>> getConnectionList(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
+    private Map<String, StatefulRedisClusterConnection<String, String>> getConnectionList(RedisProtocol redisProtocol) {
        // first connection
        StatefulRedisClusterConnection<String, String> connection = getClusterConnection(redisProtocol);
        Partitions partitions = connection.getPartitions();
@@ -235,16 +217,12 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param redisProtocol redis protocol
     * @return cluster connection
     */
-    private StatefulRedisClusterConnection<String, String> getClusterConnection(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
-        String[] resolvedArr = resolveHostAndPort(redisProtocol);
-        String host = resolvedArr[0];
-        String port = resolvedArr[1];
-
-        CacheIdentifier identifier = doIdentifier(redisProtocol, host, port);
+    private StatefulRedisClusterConnection<String, String> getClusterConnection(RedisProtocol redisProtocol) {
+        CacheIdentifier identifier = doIdentifier(redisProtocol);
        StatefulRedisClusterConnection<String, String> connection = (StatefulRedisClusterConnection<String, String>) getStatefulConnection(identifier);
        if (connection == null) {
            // reuse connection failed, new one
-            RedisClusterClient redisClusterClient = buildClusterClient(redisProtocol, host, port);
+            RedisClusterClient redisClusterClient = buildClusterClient(redisProtocol);
            connection = redisClusterClient.connect();
            connectionCache.addCache(identifier, new RedisConnect(connection));
        }
@@ -282,8 +260,8 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param redisProtocol redis protocol config
     * @return redis cluster client
     */
-    private RedisClusterClient buildClusterClient(RedisProtocol redisProtocol, String host, String port) {
-        return RedisClusterClient.create(defaultClientResources, redisUri(redisProtocol, host, port));
+    private RedisClusterClient buildClusterClient(RedisProtocol redisProtocol) {
+        return RedisClusterClient.create(defaultClientResources, redisUri(redisProtocol));
    }

    /**
@@ -292,12 +270,12 @@ public class RedisCommonCollectImpl extends AbstractCollect {
     * @param redisProtocol redis protocol config
     * @return redis single client
     */
-    private RedisClient buildSingleClient(RedisProtocol redisProtocol, String host, String port) {
-        return RedisClient.create(defaultClientResources, redisUri(redisProtocol, host, port));
+    private RedisClient buildSingleClient(RedisProtocol redisProtocol) {
+        return RedisClient.create(defaultClientResources, redisUri(redisProtocol));
    }

-    private RedisURI redisUri(RedisProtocol redisProtocol, String host, String port) {
-        RedisURI.Builder redisUriBuilder = RedisURI.builder().withHost(host).withPort(Integer.parseInt(port));
+    private RedisURI redisUri(RedisProtocol redisProtocol) {
+        RedisURI.Builder redisUriBuilder = RedisURI.builder().withHost(redisProtocol.getHost()).withPort(Integer.parseInt(redisProtocol.getPort()));
        if (StringUtils.hasText(redisProtocol.getUsername())) {
            redisUriBuilder.withClientName(redisProtocol.getUsername());
        }
@@ -317,10 +295,10 @@ public class RedisCommonCollectImpl extends AbstractCollect {
        return ip + SignConstants.DOUBLE_MARK + port;
    }

-    private CacheIdentifier doIdentifier(RedisProtocol redisProtocol, String host, String port) {
+    private CacheIdentifier doIdentifier(RedisProtocol redisProtocol) {
        return CacheIdentifier.builder()
-                .ip(host)
-                .port(port)
+                .ip(redisProtocol.getHost())
+                .port(redisProtocol.getPort())
                .username(redisProtocol.getUsername())
                .password(redisProtocol.getPassword())
                .customArg(redisProtocol.getPattern())
@@ -350,22 +328,6 @@ public class RedisCommonCollectImpl extends AbstractCollect {
        return result;
    }

-    private String[] resolveHostAndPort(RedisProtocol redisProtocol) throws GeneralSecurityException, IOException {
-        boolean enableSshTunnel = Optional.ofNullable(redisProtocol.getSshTunnel())
-                .map(ssh -> Boolean.parseBoolean(ssh.getEnable()))
-                .orElse(false);
-        String host;
-        String port;
-        if (enableSshTunnel){
-            host = "localhost";
-            port = String.valueOf(SshTunnelHelper.localPortForward(redisProtocol.getSshTunnel(), redisProtocol.getHost(), redisProtocol.getPort()));
-        } else {
-            host = redisProtocol.getHost();
-            port = redisProtocol.getPort();
-        }
-        return new String[]{host, port};
-    }
-
    @Override
    public String supportProtocol() {
        return DispatchConstants.PROTOCOL_REDIS;
@@ -18,6 +18,7 @@
 package org.apache.hertzbeat.collector.collect.ssh;

 import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
@@ -29,27 +30,35 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 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;
 import org.apache.hertzbeat.collector.collect.common.cache.GlobalConnectionCache;
+import org.apache.hertzbeat.collector.collect.common.cache.SshConnect;
 import org.apache.hertzbeat.collector.collect.common.ssh.CommonSshBlacklist;
-import org.apache.hertzbeat.collector.collect.common.ssh.SshHelper;
+import org.apache.hertzbeat.collector.collect.common.ssh.CommonSshClient;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
+import org.apache.hertzbeat.collector.util.PrivateKeyUtils;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.SshProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
+import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.channel.ClientChannel;
 import org.apache.sshd.client.channel.ClientChannelEvent;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.SshException;
 import org.apache.sshd.common.channel.exception.SshChannelOpenException;
+import org.apache.sshd.common.config.keys.FilePasswordProvider;
 import org.apache.sshd.common.util.io.output.NoCloseOutputStream;
+import org.apache.sshd.common.util.security.SecurityUtils;
 import org.springframework.util.StringUtils;

 /**
@@ -282,9 +291,57 @@ public class SshCollectImpl extends AbstractCollect {

    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection)
            throws IOException, GeneralSecurityException {
-        return SshHelper.getConnectSession(
-            sshProtocol.getHost(), sshProtocol.getPort(), sshProtocol.getUsername(), sshProtocol.getPassword(),
-            sshProtocol.getPrivateKey(), sshProtocol.getPrivateKeyPassphrase(), timeout, reuseConnection
-        );
+        CacheIdentifier identifier = CacheIdentifier.builder()
+                .ip(sshProtocol.getHost()).port(sshProtocol.getPort())
+                .username(sshProtocol.getUsername()).password(sshProtocol.getPassword())
+                .build();
+        ClientSession clientSession = null;
+        if (reuseConnection) {
+            Optional<AbstractConnection<?>> cacheOption = connectionCommonCache.getCache(identifier, true);
+            if (cacheOption.isPresent()) {
+                SshConnect sshConnect = (SshConnect) cacheOption.get();
+                clientSession = sshConnect.getConnection();
+                try {
+                    if (clientSession == null || clientSession.isClosed() || clientSession.isClosing()) {
+                        clientSession = null;
+                        connectionCommonCache.removeCache(identifier);
+                    }
+                } catch (Exception e) {
+                    log.warn(e.getMessage());
+                    clientSession = null;
+                    connectionCommonCache.removeCache(identifier);
+                }
+            }
+            if (clientSession != null) {
+                return clientSession;
+            }
+        }
+        SshClient sshClient = CommonSshClient.getSshClient();
+        clientSession = sshClient.connect(sshProtocol.getUsername(), sshProtocol.getHost(), Integer.parseInt(sshProtocol.getPort()))
+                .verify(timeout, TimeUnit.MILLISECONDS).getSession();
+        if (StringUtils.hasText(sshProtocol.getPassword())) {
+            clientSession.addPasswordIdentity(sshProtocol.getPassword());
+        } else if (StringUtils.hasText(sshProtocol.getPrivateKey())) {
+            var resourceKey = PrivateKeyUtils.writePrivateKey(sshProtocol.getHost(), sshProtocol.getPrivateKey());
+            FilePasswordProvider passwordProvider = (session, resource, index) -> {
+                if (StringUtils.hasText(sshProtocol.getPrivateKeyPassphrase())) {
+                    return sshProtocol.getPrivateKeyPassphrase();
+                }
+                return null;
+            };
+            SecurityUtils.loadKeyPairIdentities(null, () -> resourceKey, new FileInputStream(resourceKey), passwordProvider)
+                    .forEach(clientSession::addPublicKeyIdentity);
+        }  // else auth with localhost private public key certificates
+
+        // auth
+        if (!clientSession.auth().verify(timeout, TimeUnit.MILLISECONDS).isSuccess()) {
+            clientSession.close();
+            throw new IllegalArgumentException("ssh auth failed.");
+        }
+        if (reuseConnection) {
+            SshConnect sshConnect = new SshConnect(clientSession);
+            connectionCommonCache.addCache(identifier, sshConnect);
+        }
+        return clientSession;
    }
 }
@@ -20,7 +20,6 @@ package org.apache.hertzbeat.collector.collect.database;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;

 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
@@ -100,27 +99,28 @@ class JdbcCommonCollectTest {
            "dm"
        };
        for (String platform : platforms) {
+            assertDoesNotThrow(() -> {
+                JdbcProtocol jdbc = new JdbcProtocol();
+                jdbc.setPlatform(platform);
+    
+                Metrics metrics = new Metrics();
+                metrics.setJdbc(jdbc);
+    
+                CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+                jdbcCommonCollect.collect(builder, metrics);
+            });
+        }
+        // invalid platform
+        assertThrows(IllegalArgumentException.class, () -> {
            JdbcProtocol jdbc = new JdbcProtocol();
-            jdbc.setPlatform(platform);
+            jdbc.setPlatform("invalid");

            Metrics metrics = new Metrics();
            metrics.setJdbc(jdbc);

            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
            jdbcCommonCollect.collect(builder, metrics);
-            assertNotEquals(builder.getMsg(), "Query Error: Not support database platform: " + platform);
-        }
-        // invalid platform
-        JdbcProtocol jdbc = new JdbcProtocol();
-        jdbc.setPlatform("invalid");
-
-        Metrics metrics = new Metrics();
-        metrics.setJdbc(jdbc);
-
-        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        jdbcCommonCollect.collect(builder, metrics);
-        assertEquals(builder.getCode(), CollectRep.Code.FAIL);
-        assertEquals(builder.getMsg(), "Query Error: Not support database platform: invalid");
+        });
    }

    @Test
@@ -17,63 +17,68 @@

 package org.apache.hertzbeat.collector.collect.prometheus.parser;

-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;

 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;

-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 class OnlineParserTest {

-    @Disabled // Disabled due to the fact that the URL is not reachable unless you have the Prometheus server running
    @Test
-    void parseMetrics() throws Exception {
-        URL url = new URL("http://localhost:9090/metrics");
-        InputStream inputStream = url.openStream();
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
+    void parseMetrics() {
+        try {
+            URL url = new URL("http://localhost:9090/metrics");
+            InputStream inputStream = url.openStream();
+            Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
+            System.out.println(1);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
    }

    @Test
-    void parseMetrics2() throws Exception {
-        String str = """
-                # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.
-                # TYPE go_gc_duration_seconds summary
-                go_gc_duration_seconds {  quantile="0"} 2.0209e-05 321312
-                go_gc_duration_seconds{  quantile = "0.25"  }   6.6917e-05
-                go_gc_duration_seconds{quantile="0.5"} -Inf
-                go_gc_duration_seconds{ quantile = "0.75"} +Inf
-                go_gc_duration_seconds{quantile="1"} NaN
-                go_gc_duration_seconds_sum 0.001134793 321314
-                go_gc_duration_seconds_count 5 43
-                # HELP go_goroutines Number of goroutines that currently exist.
-                # TYPE go_goroutines gauge
-                go_goroutines 32
-                # HELP go_info Information about the Go environment.
-                # TYPE go_info gauge
-                go_info{version="go1.21.6"} 1
-                # HELP go_memstats_alloc_bytes Number of bytes allocated and still in use.
-                # TYPE go_memstats_alloc_bytes gauge
-                go_memstats_alloc_bytes 1.5716224e+07
-                # HELP go_memstats_alloc_bytes_total Total number of bytes allocated, even if freed.
-                # TYPE go_memstats_alloc_bytes_total counter
-                go_memstats_alloc_bytes_total 2.0707544e+07
-                # HELP go_memstats_buck_hash_sys_bytes Number of bytes used by the profiling bucket hash table.
-                # TYPE go_memstats_buck_hash_sys_bytes gauge
-                go_memstats_buck_hash_sys_bytes 1.457881e+06
-                # HELP go_memstats_frees_total Total number of frees.
-                # TYPE go_memstats_frees_total counter
-                go_memstats_frees_total 50438
-                # HELP go_memstats_gc_sys_bytes Number of bytes used for garbage collection system metadata.
-                # TYPE go_memstats_gc_sys_bytes gauge
-                go_memstats_gc_sys_bytes 4.614808e+06""";
-        InputStream inputStream = new ByteArrayInputStream(str.getBytes(StandardCharsets.UTF_8));
-        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
-        assertNotNull(metricFamilyMap);
+    void parseMetrics2() {
+        try {
+            String str = """
+                    # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles.
+                    # TYPE go_gc_duration_seconds summary
+                    go_gc_duration_seconds {  quantile="0"} 2.0209e-05 321312
+                    go_gc_duration_seconds{  quantile = "0.25"  }   6.6917e-05
+                    go_gc_duration_seconds{quantile="0.5"} -Inf
+                    go_gc_duration_seconds{ quantile = "0.75"} +Inf
+                    go_gc_duration_seconds{quantile="1"} NaN
+                    go_gc_duration_seconds_sum 0.001134793 321314
+                    go_gc_duration_seconds_count 5 43
+                    # HELP go_goroutines Number of goroutines that currently exist.
+                    # TYPE go_goroutines gauge
+                    go_goroutines 32
+                    # HELP go_info Information about the Go environment.
+                    # TYPE go_info gauge
+                    go_info{version="go1.21.6"} 1
+                    # HELP go_memstats_alloc_bytes Number of bytes allocated and still in use.
+                    # TYPE go_memstats_alloc_bytes gauge
+                    go_memstats_alloc_bytes 1.5716224e+07
+                    # HELP go_memstats_alloc_bytes_total Total number of bytes allocated, even if freed.
+                    # TYPE go_memstats_alloc_bytes_total counter
+                    go_memstats_alloc_bytes_total 2.0707544e+07
+                    # HELP go_memstats_buck_hash_sys_bytes Number of bytes used by the profiling bucket hash table.
+                    # TYPE go_memstats_buck_hash_sys_bytes gauge
+                    go_memstats_buck_hash_sys_bytes 1.457881e+06
+                    # HELP go_memstats_frees_total Total number of frees.
+                    # TYPE go_memstats_frees_total counter
+                    go_memstats_frees_total 50438
+                    # HELP go_memstats_gc_sys_bytes Number of bytes used for garbage collection system metadata.
+                    # TYPE go_memstats_gc_sys_bytes gauge
+                    go_memstats_gc_sys_bytes 4.614808e+06""";
+            InputStream inputStream = new ByteArrayInputStream(str.getBytes());
+            Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
+            System.out.println(1);
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
    }
 }
@@ -25,7 +25,6 @@ import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.PropertyResolverUtils;
 import org.apache.sshd.common.kex.BuiltinDHFactories;
 import org.apache.sshd.core.CoreModuleProperties;
-import org.apache.sshd.server.forward.AcceptAllForwardingFilter;

 /**
 * common ssh pool client
@@ -53,7 +52,6 @@ public class CommonSshClient {
                BuiltinDHFactories.VALUES,
                ClientBuilder.DH2KEX
        ));
-        SSH_CLIENT.setForwardingFilter(new AcceptAllForwardingFilter());
        // todo when connect AlibabaCloud ubuntu server, custom signature factories will cause error, why?
        // SSH_CLIENT.setSignatureFactories(new ArrayList<>(BuiltinSignatures.VALUES));
        SSH_CLIENT.start();
@@ -1,104 +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.common.ssh;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.common.cache.AbstractConnection;
-import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier;
-import org.apache.hertzbeat.collector.collect.common.cache.GlobalConnectionCache;
-import org.apache.hertzbeat.collector.collect.common.cache.SshConnect;
-import org.apache.hertzbeat.collector.util.PrivateKeyUtils;
-import org.apache.sshd.client.SshClient;
-import org.apache.sshd.client.session.ClientSession;
-import org.apache.sshd.common.config.keys.FilePasswordProvider;
-import org.apache.sshd.common.util.security.SecurityUtils;
-import org.springframework.util.StringUtils;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-/**
- * ssh helper
- */
-@Slf4j
-public class SshHelper {
-
-    private static final GlobalConnectionCache CONNECTION_COMMON_CACHE = GlobalConnectionCache.getInstance();
-
-    public static ClientSession getConnectSession(String host, String port, String username, String password, String privateKey,
-                                                  String privateKeyPassphrase, int timeout, boolean reuseConnection)
-            throws IOException, GeneralSecurityException {
-        CacheIdentifier identifier = CacheIdentifier.builder()
-                .ip(host).port(port)
-                .username(username).password(password)
-                .build();
-        ClientSession clientSession = null;
-        if (reuseConnection) {
-            Optional<AbstractConnection<?>> cacheOption = CONNECTION_COMMON_CACHE.getCache(identifier, true);
-            if (cacheOption.isPresent()) {
-                SshConnect sshConnect = (SshConnect) cacheOption.get();
-                clientSession = sshConnect.getConnection();
-                try {
-                    if (clientSession == null || clientSession.isClosed() || clientSession.isClosing()) {
-                        clientSession = null;
-                        CONNECTION_COMMON_CACHE.removeCache(identifier);
-                    }
-                } catch (Exception e) {
-                    log.warn(e.getMessage());
-                    clientSession = null;
-                    CONNECTION_COMMON_CACHE.removeCache(identifier);
-                }
-            }
-            if (clientSession != null) {
-                return clientSession;
-            }
-        }
-        SshClient sshClient = CommonSshClient.getSshClient();
-
-        clientSession = sshClient.connect(username, host, Integer.parseInt(port))
-                .verify(timeout, TimeUnit.MILLISECONDS).getSession();
-        if (StringUtils.hasText(password)) {
-            clientSession.addPasswordIdentity(password);
-        } else if (StringUtils.hasText(privateKey)) {
-            var resourceKey = PrivateKeyUtils.writePrivateKey(host, privateKey);
-            FilePasswordProvider passwordProvider = (session, resource, index) -> {
-                if (StringUtils.hasText(privateKeyPassphrase)) {
-                    return privateKeyPassphrase;
-                }
-                return null;
-            };
-            SecurityUtils.loadKeyPairIdentities(null, () -> resourceKey, new FileInputStream(resourceKey), passwordProvider)
-                    .forEach(clientSession::addPublicKeyIdentity);
-        }  // else auth with localhost private public key certificates
-
-        // auth
-        if (!clientSession.auth().verify(timeout, TimeUnit.MILLISECONDS).isSuccess()) {
-            clientSession.close();
-            throw new IllegalArgumentException("ssh auth failed.");
-        }
-        if (reuseConnection) {
-            SshConnect sshConnect = new SshConnect(clientSession);
-            CONNECTION_COMMON_CACHE.addCache(identifier, sshConnect);
-        }
-        return clientSession;
-    }
-
-}
@@ -1,313 +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.common.ssh;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.RemovalCause;
-import com.github.benmanes.caffeine.cache.Scheduler;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.common.entity.job.SshTunnel;
-import org.apache.sshd.client.session.ClientSession;
-import org.apache.sshd.client.session.forward.ExplicitPortForwardingTracker;
-import org.apache.sshd.common.util.net.SshdSocketAddress;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.security.GeneralSecurityException;
-import java.time.Duration;
-import java.util.Comparator;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Ssh Tunnel Helper
- */
-@Slf4j
-public class SshTunnelHelper {
-
-    private static final long DEFAULT_CACHE_TIMEOUT = 500 * 1000;
-
-    private static final Cache<SshClientSessionWrapper, LocalPortForwardingWrapper> TRACKER_CACHE =
-            Caffeine.newBuilder()
-                    .initialCapacity(1)
-                    .maximumSize(1000)
-                    .expireAfterAccess(Duration.ofMillis(DEFAULT_CACHE_TIMEOUT))
-                    .scheduler(Scheduler.systemScheduler())
-                    .removalListener((key, value, cause) -> {
-                        if (cause == RemovalCause.REPLACED) {
-                            return;
-                        }
-                        if (key != null && value != null) {
-                            // 1. try close tunnel
-                            SshClientSessionWrapper clientSessionWrapper = (SshClientSessionWrapper) key;
-                            LocalPortForwardingWrapper wrapper = (LocalPortForwardingWrapper) value;
-                            wrapper.remove(clientSessionWrapper.getClientSession());
-
-                            // 2. try close session
-                            if (!clientSessionWrapper.isShareConnection()) {
-                                try {
-                                    clientSessionWrapper.close();
-                                    log.info("[SSH Tunnel] close unshared ssh connection, {}", clientSessionWrapper);
-                                } catch (IOException e) {
-                                    log.error("[SSH Tunnel] close unshared ssh connection error", e);
-                                }
-                            }
-                        }
-                    })
-                    .build();
-
-
-    /**
-     * check ssh tunnel param
-     *
-     * @param sshTunnel ssh tunnel param
-     */
-    public static void checkTunnelParam(SshTunnel sshTunnel) {
-        if (sshTunnel == null || !Boolean.parseBoolean(sshTunnel.getEnable())) {
-            return;
-        }
-        if (!StringUtils.hasText(sshTunnel.getHost())) {
-            throw new IllegalArgumentException("ssh tunnel must has ssh host param");
-        }
-        if (!StringUtils.hasText(sshTunnel.getPort())) {
-            throw new IllegalArgumentException("ssh tunnel must has ssh port param");
-        }
-        if (!StringUtils.hasText(sshTunnel.getUsername())) {
-            throw new IllegalArgumentException("ssh tunnel must has ssh username param");
-        }
-
-    }
-
-    /**
-     * create ssh tunnel
-     *
-     * @param sshTunnel  ssh tunnel param
-     * @param remoteHost remote host
-     * @param remotePort remote port
-     * @return local port
-     */
-    public static int localPortForward(SshTunnel sshTunnel, String remoteHost, String remotePort) throws GeneralSecurityException, IOException {
-        boolean shareConnection = Boolean.parseBoolean(sshTunnel.getShareConnection());
-        // 1. get ssh session
-        ClientSession session = SshHelper.getConnectSession(sshTunnel.getHost(), sshTunnel.getPort(),
-                sshTunnel.getUsername(), sshTunnel.getPassword(), sshTunnel.getPrivateKey(), sshTunnel.getPrivateKeyPassphrase(),
-                Integer.parseInt(sshTunnel.getTimeout()), shareConnection);
-        SshClientSessionWrapper sessionWrapper = new SshClientSessionWrapper(session, shareConnection);
-
-        // 2. get tunnel
-        LocalPortForwardingWrapper forwardingWrapper = selectWrapper(
-                TRACKER_CACHE.getIfPresent(sessionWrapper), sessionWrapper, remoteHost, remotePort);
-        int localPort;
-        if (forwardingWrapper == null) {
-            localPort = getRandomPort();
-            LocalPortForwardingWrapper newForwardingWrapper = sessionWrapper
-                    .createLocalPortForwardingTracker(localPort, remoteHost, Integer.parseInt(remotePort));
-            if (TRACKER_CACHE.getIfPresent(sessionWrapper) == null) {
-                TRACKER_CACHE.put(sessionWrapper, newForwardingWrapper);
-            }
-            log.info("[SSH Tunnel] created ssh forwarding tracker ssh:{}, remote:{}, localPort:{}",
-                    sshTunnel.getHost() + ":" + sshTunnel.getPort(), remoteHost + ":" + remotePort, localPort);
-        } else {
-            localPort = forwardingWrapper.getTracker().getLocalAddress().getPort();
-        }
-
-        return localPort;
-    }
-
-    /**
-     * get tunnel
-     *
-     * @param wrapper        LocalPortForwardingWrapper
-     * @param sessionWrapper SshClientSessionWrapper
-     * @param remoteHost     remote host
-     * @param remotePort     remote port
-     * @return LocalPortForwardingWrapper
-     */
-    private static LocalPortForwardingWrapper selectWrapper(LocalPortForwardingWrapper wrapper, SshClientSessionWrapper sessionWrapper,
-                                                            String remoteHost, String remotePort) {
-        if (wrapper == null) {
-            return null;
-        }
-        List<LocalPortForwardingWrapper> selectList = wrapper.select(sessionWrapper.getClientSession(), localPortForwardWrapper -> {
-            if (!localPortForwardWrapper.isOpen()) {
-                return false;
-            }
-            ExplicitPortForwardingTracker tracker = localPortForwardWrapper.getTracker();
-            SshdSocketAddress remoteAddress = tracker.getRemoteAddress();
-            return Objects.equals(remoteAddress.getHostName(), remoteHost)
-                    && Objects.equals(remoteAddress.getPort(), Integer.parseInt(remotePort));
-        });
-
-        if (selectList.isEmpty()) {
-            return null;
-        }
-        LocalPortForwardingWrapper selected;
-        if (selectList.size() == 1) {
-            selected = selectList.get(0);
-        } else {
-            selected = selectList.stream().min(Comparator.comparing(LocalPortForwardingWrapper::getLastAccessTime)).get();
-        }
-        selected.setLastAccessTime(System.currentTimeMillis());
-        return selected;
-    }
-
-
-    private static int getRandomPort() throws IOException {
-        try (ServerSocket serverSocket = new ServerSocket(0)) {
-            return serverSocket.getLocalPort();
-        }
-    }
-
-    @Getter
-    @Setter
-    @EqualsAndHashCode
-    private static class SshClientSessionWrapper {
-        private ClientSession clientSession;
-        private boolean shareConnection;
-
-        public SshClientSessionWrapper(ClientSession clientSession, boolean shareConnection) {
-            this.clientSession = clientSession;
-            this.shareConnection = shareConnection;
-        }
-
-        /**
-         *  Starts a local port forwarding
-         * @param localPort  local port
-         * @param remoteHost remove host
-         * @param remotePort remote port
-         * @return LocalPortForwardingWrapper
-         */
-        public LocalPortForwardingWrapper createLocalPortForwardingTracker(Integer localPort, String remoteHost, Integer remotePort) throws IOException {
-            SshdSocketAddress remoteAddress = new SshdSocketAddress(remoteHost, remotePort);
-            SshdSocketAddress localAddress = new SshdSocketAddress("localhost", localPort);
-            ExplicitPortForwardingTracker tracker = clientSession.createLocalPortForwardingTracker(localAddress, remoteAddress);
-            return new LocalPortForwardingWrapper(tracker);
-        }
-
-        /**
-         * close client session
-         */
-        public void close() throws IOException {
-            clientSession.close();
-        }
-
-        @Override
-        public String toString() {
-            return "{ ssh:%s, shareConnection:%b }".formatted(clientSession, shareConnection);
-        }
-    }
-
-    @Getter
-    @Setter
-    @EqualsAndHashCode
-    private static class LocalPortForwardingWrapper {
-        private static Map<ClientSession, List<LocalPortForwardingWrapper>> map = new ConcurrentHashMap<>();
-
-        private ExplicitPortForwardingTracker tracker;
-        private Long lastAccessTime;
-
-        public LocalPortForwardingWrapper(ExplicitPortForwardingTracker tracker) {
-            this.tracker = tracker;
-            this.lastAccessTime = System.currentTimeMillis();
-            map.computeIfAbsent(tracker.getClientSession(), (key) -> new ArrayList<>()).add(this);
-        }
-
-        /**
-         * select ClientSession LocalPortForwardingWrapper List
-         * @param session   ssh client session
-         * @param predicate condition
-         * @return LocalPortForwardWrapper
-         */
-        public List<LocalPortForwardingWrapper> select(ClientSession session, Predicate<LocalPortForwardingWrapper> predicate) {
-            List<LocalPortForwardingWrapper> trackerList = map.get(session);
-            if (CollectionUtils.isEmpty(trackerList)) {
-                return trackerList;
-            }
-            List<LocalPortForwardingWrapper> list = new ArrayList<>();
-            long currentTimeMillis = System.currentTimeMillis();
-            Iterator<LocalPortForwardingWrapper> iterator = trackerList.iterator();
-            while (iterator.hasNext()) {
-                LocalPortForwardingWrapper wrapper = iterator.next();
-                // lazy remove
-                if (currentTimeMillis - wrapper.getLastAccessTime() > DEFAULT_CACHE_TIMEOUT) {
-                    try {
-                        wrapper.getTracker().close();
-                        iterator.remove();
-                        log.info("[SSH Tunnel] Lazy Remove ssh local port forwarding {}", wrapper);
-                    } catch (IOException e) {
-                        log.warn("[SSH Tunnel] Lazy Remove ssh local port forwarding  Error", e);
-                    }
-                } else if (predicate == null || predicate.test(wrapper)) {
-                    list.add(wrapper);
-                }
-            }
-            return list;
-        }
-
-        /**
-         *  remove session local port forwarding
-         * @param session ssh client session
-         */
-        public void remove(ClientSession session) {
-            List<LocalPortForwardingWrapper> trackerList = map.get(session);
-            if (CollectionUtils.isEmpty(trackerList)) {
-                return;
-            }
-            Iterator<LocalPortForwardingWrapper> iterator = trackerList.iterator();
-            while (iterator.hasNext()){
-                try {
-                    LocalPortForwardingWrapper next = iterator.next();
-                    next.close();
-                    iterator.remove();
-                    log.info("[SSH Tunnel] Remove ssh local port forwarding, {}", next);
-                } catch (IOException e) {
-                    log.error("[SSH Tunnel] Remove ssh session local port forwarding  error", e);
-                }
-            }
-        }
-
-        public void close() throws IOException {
-            tracker.close();
-        }
-
-        public boolean isOpen() {
-            return tracker.isOpen();
-        }
-
-        @Override
-        public String toString() {
-            return "{ ssh:%s, remote:%s, localPort:%d }".formatted(
-                    tracker.getSession().getConnectAddress(),
-                    tracker.getRemoteAddress(),
-                    tracker.getLocalAddress().getPort()
-            );
-        }
-    }
-
-}
@@ -154,11 +154,13 @@ public class DispatchProperties {

    /**
     * Schedule Data Export Configuration Properties
+     * 调度数据出口配置属性
     */
    public static class ExportProperties {

        /**
         * kafka configuration information
+         * kafka配置信息
         */
        private KafkaProperties kafka;

@@ -176,15 +178,18 @@ public class DispatchProperties {
        public static class KafkaProperties {
            /**
             * Whether the kafka data export is started
+             * kafka数据出口是否启动
             */
            private boolean enabled = true;

            /**
             * kafka's connection server url
+             * kafka的连接服务器url
             */
            private String servers = "http://127.0.0.1:2379";
            /**
             * Topic name to send data to
+             * 发送数据的topic名称
             */
            private String topic;

@@ -173,12 +173,6 @@
            <artifactId>snappy-java</artifactId>
            <version>${snappy-java.version}</version>
        </dependency>
-        <dependency>
-            <groupId>com.github.javaparser</groupId>
-            <artifactId>javaparser-core</artifactId>
-            <version>${javaparser.version}</version>
-            <scope>test</scope>
-        </dependency>
    </dependencies>

 </project>
@@ -42,6 +42,11 @@ public class CommonProperties {
     */
    private DataQueueProperties queue;

+    /**
+     * sms impl properties
+     */
+    private SmsProperties sms;
+
    /**
     * data queue properties
     */
@@ -141,4 +146,83 @@ public class CommonProperties {
         */
        private String alertsDataTopic;
    }
+
+    /**
+     * sms properties
+     */
+    @Getter
+    @Setter
+    public static class SmsProperties {
+        //Tencent cloud SMS configuration
+        private TencentSmsProperties tencent;
+        //Ali cloud SMS configuration
+        private AliYunSmsProperties aliYun;
+    }
+
+    /**
+     * tencent sms properties
+     */
+    @Getter
+    @Setter
+    public static class TencentSmsProperties {
+
+        /**
+         * Tencent cloud account secret id
+         */
+        private String secretId;
+
+        /**
+         * Tencent cloud account secret key
+         */
+        private String secretKey;
+
+        /**
+         * SMS app id
+         */
+        private String appId;
+
+        /**
+         * SMS signature
+         */
+        private String signName;
+
+        /**
+         * SMS template ID
+         */
+        private String templateId;
+    }
+
+    /**
+     * aliYun sms properties
+     */
+    @Getter
+    @Setter
+    public static class AliYunSmsProperties {
+
+        /**
+         * Aliyun account access key id
+         */
+        private String secretId;
+
+        /**
+         * Ali Cloud account access key
+         */
+        private String secretKey;
+
+        /**
+         *  SMS app id
+         */
+        private String appId;
+
+        /**
+         * SMS signature
+         */
+        private String signName;
+
+        /**
+         * ID of the SMS template
+         */
+        private String templateId;
+    }
+
 }
@@ -25,12 +25,13 @@ import java.util.Arrays;
 public enum AiTypeEnum {

    /**
-     * ZhiPu
+     * 智普
     */
    zhiPu,

    /**
     * sparkDesk
+     * 科大讯飞
     */
    sparkDesk,

@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.constants;
-
-/**
- * SMS provider constants
- */
-public interface SmsConstants {
-    // Tencent cloud SMS
-    String TENCENT = "tencent";
-    // Alibaba Cloud SMS
-    String ALIBABA = "alibaba";
-}
@@ -18,7 +18,6 @@
 package org.apache.hertzbeat.common.entity.alerter;

 import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -98,12 +97,10 @@ public class GroupAlert {

    @Schema(title = "This record creation time (millisecond timestamp)")
    @CreatedDate
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime gmtCreate;

    @Schema(title = "Record the latest modification time (timestamp in milliseconds)")
    @LastModifiedDate
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime gmtUpdate;

    @Transient
@@ -18,7 +18,6 @@
 package org.apache.hertzbeat.common.entity.alerter;

 import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -101,12 +100,10 @@ public class SingleAlert {

    @Schema(title = "This record creation time (millisecond timestamp)")
    @CreatedDate
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime gmtCreate;

    @Schema(title = "Record the latest modification time (timestamp in milliseconds)")
    @LastModifiedDate
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime gmtUpdate;

    @Override
@@ -41,7 +41,7 @@ public class Configmap implements Serializable {
    private String key;

    /**
-     * parameter value
+     * parameter value  参数value
     */
    private Object value;

@@ -1,80 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.entity.job;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.hertzbeat.common.entity.job.protocol.CommonRequestProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
-
-/**
- * ssh tunnel
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class SshTunnel implements CommonRequestProtocol, Protocol {
-
-    /**
-     * enable ssh tunnel
-     */
-    private String enable = "false";
-
-    /**
-     * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST
-     */
-    private String host;
-
-    /**
-     * Peer host port
-     */
-    private String port = "22";
-
-    /**
-     * TIME OUT PERIOD
-     */
-    private String timeout = "6000";
-
-    /**
-     * UserName
-     */
-    private String username;
-
-    /**
-     * Password (optional)
-     */
-    private String password;
-
-    /**
-     * Private key (optional)
-     */
-    private String privateKey;
-
-    /**
-     * private key passphrase (optional)
-     */
-    private String privateKeyPassphrase;
-
-    /**
-     * share connection session
-     */
-    private String shareConnection = "true";
-}
@@ -59,10 +59,4 @@ public class FtpProtocol implements CommonRequestProtocol, Protocol {
     * Timeout
     */
    private String timeout;
-
-    /**
-     * Whether ftp uses link encryption ssl/tls, i.e. ftp or sftp
-     *
-     */
-    private String ssl = "false";
 }
@@ -21,7 +21,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.hertzbeat.common.entity.job.SshTunnel;

 /**
 * Database configuration information implemented by the common jdbc specification
@@ -71,9 +70,4 @@ public class JdbcProtocol implements CommonRequestProtocol, Protocol {
     * DATABASE LINK URL eg: jdbc:mysql://localhost:3306/usthe
     */
    private String url;
-
-    /**
-     * ssh tunnel
-     */
-    private SshTunnel sshTunnel;
 }
@@ -21,7 +21,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.apache.hertzbeat.common.entity.job.SshTunnel;

 /**
 * Redis Protocol
@@ -62,9 +61,4 @@ public class RedisProtocol implements CommonRequestProtocol, Protocol {
     */
    private String timeout;

-    /**
-     * SSH TUNNEL
-     */
-    private SshTunnel sshTunnel;
-
 }
@@ -52,7 +52,7 @@ public class RocketmqProtocol implements CommonRequestProtocol, Protocol {
    private String secretKey;

    /**
-     * jsonpath parsing script
+     * jsonpath解析脚本
     */
    private String parseScript;

@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.support.event;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * the event for sms config change
- */
-public class SmsConfigChangeEvent extends ApplicationEvent {
-
-    public SmsConfigChangeEvent(Object source) {
-        super(source);
-    }
-}
@@ -90,7 +90,7 @@ public final class AesUtil {
            // encode content to byte array
            byte[] byteAes = cipher.doFinal(byteEncode);
            // base64 encode content
-            return Base64.getEncoder().encodeToString(byteAes);
+            return new String(Base64.getEncoder().encode(byteAes), StandardCharsets.UTF_8);
        } catch (Exception e) {
            log.error("aes encode content error: {}", e.getMessage(), e);
            return content;
@@ -142,7 +142,7 @@ public final class AesUtil {
    /**
     * Determine whether it is encrypted
     * @param text text
-     * @return true false
+     * @return true-是 false-否
     */
    public static boolean isCiphertext(String text, String decryptKey) {
        // First use whether it is base64 to determine whether it has been encrypted
@@ -68,19 +68,19 @@ class KafkaCommonDataQueueTest {
        when(commonProperties.getQueue()).thenReturn(dataQueueProperties);
        when(dataQueueProperties.getKafka()).thenReturn(kafkaProperties);
        
-        // Set all required topics
+        // 设置所有必需的 topic
        when(kafkaProperties.getMetricsDataTopic()).thenReturn("metricsDataTopic");
        when(kafkaProperties.getAlertsDataTopic()).thenReturn("alertsDataTopic");
        when(kafkaProperties.getMetricsDataToStorageTopic()).thenReturn("metricsDataToStorageTopic");
        when(kafkaProperties.getServiceDiscoveryDataTopic()).thenReturn("serviceDiscoveryDataTopic");
        when(kafkaProperties.getServers()).thenReturn("localhost:9092");

-        // Simulate the subscribe method for consumers
+        // 模拟 consumer 的 subscribe 方法
        doNothing().when(metricsDataToAlertConsumer).subscribe(anyCollection());

        kafkaCommonDataQueue = new KafkaCommonDataQueue(commonProperties);
        
-        // Use reflection to set private fields
+        // 使用反射设置私有字段
        setPrivateField(kafkaCommonDataQueue, "metricsDataProducer", metricsDataProducer);
        setPrivateField(kafkaCommonDataQueue, "metricsDataToAlertConsumer", metricsDataToAlertConsumer);
    }
@@ -98,16 +98,16 @@ class KafkaCommonDataQueueTest {

    @Test
    void testPollMetricsDataToAlerter() throws InterruptedException {
-        // Create a test data
+        // 创建一个测试数据
        CollectRep.MetricsData expectedData = CollectRep.MetricsData.newBuilder()
                .setMetrics("test metrics")
                .build();
        
-        // Create a ConsumerRecord containing test data
+        // 创建一个包含测试数据的 ConsumerRecord
        ConsumerRecord<Long, CollectRep.MetricsData> record = 
                new ConsumerRecord<>("metricsDataTopic", 0, 0L, 1L, expectedData);
        
-        // Create a ConsumerRecords containing a single record.
+        // 创建一个包含单个记录的 ConsumerRecords
        Map<TopicPartition, List<ConsumerRecord<Long, CollectRep.MetricsData>>> recordsMap = 
                Collections.singletonMap(
                        new TopicPartition("metricsDataTopic", 0), 
@@ -1,146 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.util;
-
-import com.github.javaparser.JavaParser;
-import com.github.javaparser.ParseResult;
-import com.github.javaparser.ast.CompilationUnit;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.nio.file.FileVisitOption;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-/**
- * Test case for checking Chinese characters in Java files
- */
-@Slf4j
-public class ChineseCharacterCheckTest {
-
-    private static final Pattern CHINESE_CHAR_PATTERN = Pattern.compile("[\u4e00-\u9fa5]");
-    private static final Set<String> EXCLUDED_FILES = new HashSet<>(Collections.singletonList("Metrics"));
-    private static final String MAIN_SOURCE_DIR = "src/main/java";
-    private static final String TEST_SOURCE_DIR = "src/test/java";
-    
-    private final JavaParser javaParser = new JavaParser();
-    private final String sourceDir;
-    private final String testDir;
-    
-    public ChineseCharacterCheckTest() {
-        boolean isWindowsOs = System.getProperty("os.name").toLowerCase().startsWith("win");
-        String separator = isWindowsOs ? "\\" : "/";
-        this.sourceDir = MAIN_SOURCE_DIR.replace("/", separator);
-        this.testDir = TEST_SOURCE_DIR.replace("/", separator);
-    }
-
-    @Test
-    void shouldNotContainChineseInComments() {
-        List<String> violations = scanForChineseCharacters(ScanTarget.COMMENTS);
-        assertNoChineseCharacters(violations);
-    }
-
-    private List<String> scanForChineseCharacters(ScanTarget target) {
-        List<String> violations = new ArrayList<>();
-        try (Stream<Path> paths = Files.walk(Paths.get(".."), FileVisitOption.FOLLOW_LINKS)) {
-            paths.filter(this::isValidJavaFile)
-                .forEach(path -> processFile(path, target, violations));
-        } catch (IOException e) {
-            throw new RuntimeException("Failed to scan Java files", e);
-        }
-        return violations;
-    }
-
-    private boolean isValidJavaFile(Path path) {
-        String pathStr = path.toString();
-        return pathStr.endsWith(".java") 
-                && (pathStr.contains(sourceDir) || pathStr.contains(testDir))
-                && EXCLUDED_FILES.stream().noneMatch(pathStr::contains);
-    }
-
-    private void processFile(Path path, ScanTarget target, List<String> violations) {
-        try {
-            ParseResult<CompilationUnit> parseResult = javaParser.parse(Files.newInputStream(path));
-            parseResult.getResult().ifPresent(cu -> {
-                if (target.includeComments()) {
-                    checkComments(cu, path, violations);
-                }
-                if (target.includeCode()) {
-                    checkCode(cu, path, violations);
-                }
-            });
-        } catch (Exception e) {
-            log.error("Error processing file: {}", path, e);
-        }
-    }
-
-    private void checkComments(CompilationUnit cu, Path path, List<String> violations) {
-        cu.getAllContainedComments().stream()
-            .filter(comment -> CHINESE_CHAR_PATTERN.matcher(comment.getContent()).find())
-            .forEach(comment -> violations.add(formatViolation(path, "comment", comment.getContent().trim())));
-    }
-
-    private void checkCode(CompilationUnit cu, Path path, List<String> violations) {
-        cu.findAll(com.github.javaparser.ast.expr.StringLiteralExpr.class).stream()
-            .filter(str -> CHINESE_CHAR_PATTERN.matcher(str.getValue()).find())
-            .forEach(str -> violations.add(formatViolation(path, "code", str.getValue())));
-    }
-
-    private String formatViolation(Path path, String location, String content) {
-        return String.format("Chinese characters found in %s at %s: %s", 
-                location, path.toAbsolutePath(), content);
-    }
-
-    private void assertNoChineseCharacters(List<String> violations) {
-        Assertions.assertEquals(0, violations.size(),
-                () -> String.format("Found Chinese characters in files:%n%s", 
-                        String.join(System.lineSeparator(), violations)));
-    }
-
-    private enum ScanTarget {
-        COMMENTS(true, false),
-        CODE(false, true),
-        ALL(true, true);
-
-        private final boolean checkComments;
-        private final boolean checkCode;
-
-        ScanTarget(boolean checkComments, boolean checkCode) {
-            this.checkComments = checkComments;
-            this.checkCode = checkCode;
-        }
-
-        public boolean includeComments() {
-            return checkComments;
-        }
-
-        public boolean includeCode() {
-            return checkCode;
-        }
-    }
-}
@@ -53,10 +53,5 @@
            <version>${hertzbeat.version}</version>
            <scope>test</scope>
        </dependency>
-        <dependency>
-            <groupId>org.testcontainers</groupId>
-            <artifactId>testcontainers</artifactId>
-            <scope>test</scope>
-        </dependency>
    </dependencies>
 </project>
@@ -1,129 +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.basic.http;
-
-import com.sun.net.httpserver.HttpExchange;
-import com.sun.net.httpserver.HttpServer;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.AbstractCollectE2eTest;
-import org.apache.hertzbeat.collector.collect.http.HttpCollectImpl;
-import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.entity.job.Configmap;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol;
-import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * E2E test for HTTP monitor
- */
-@Slf4j
-@ExtendWith(MockitoExtension.class)
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class HttpMonitorE2eTest extends AbstractCollectE2eTest {
-
-    private static final int MOCK_SERVER_PORT = 52376;
-    private static final String LOCALHOST = "127.0.0.1";
-    private static final String RELATIVE_PATH = "/";
-    private static final List<String> ALLOW_EMPTY_WHITE_LIST = List.of("header");
-    private static HttpServer mockServer;
-
-    @AfterAll
-    public static void tearDown() {
-        if (mockServer != null) {
-            mockServer.stop(0);
-        }
-    }
-
-    @BeforeEach
-    public void setUp() throws Exception {
-
-        super.setUp();
-        // Setup collect instance
-        collect = new HttpCollectImpl();
-
-        // Setup mock server and endpoints
-        mockServer = HttpServer.create(new InetSocketAddress(MOCK_SERVER_PORT), 0);
-        mockServer.setExecutor(null);
-        mockServer.start();
-
-        mockServer.createContext(RELATIVE_PATH, exchange -> sendJsonResponse(exchange, ""));
-
-    }
-
-    private void sendJsonResponse(HttpExchange exchange, String response) throws IOException {
-        exchange.getResponseHeaders().set("Content-Type", "application/json");
-        final byte[] array = response.getBytes(StandardCharsets.UTF_8);
-        exchange.sendResponseHeaders(200, array.length);
-        try (OutputStream os = exchange.getResponseBody()) {
-            os.write(array);
-        }
-    }
-
-    @Test
-    public void testHttpMonitor() {
-        Job dockerJob = appService.getAppDefine("api");
-        List<Map<String, Configmap>> configmapFromPreCollectData = new LinkedList<>();
-        for (Metrics metricsDef : dockerJob.getMetrics()) {
-            metricsDef = CollectUtil.replaceCryPlaceholderToMetrics(metricsDef, configmapFromPreCollectData.size() > 0 ? configmapFromPreCollectData.get(0) : new HashMap<>());
-            CollectRep.MetricsData metricsData;
-            if (ALLOW_EMPTY_WHITE_LIST.contains(metricsDef.getName())) {
-                metricsData = validateMetricsCollection(metricsDef, metricsDef.getName(), true);
-            } else {
-                metricsData = validateMetricsCollection(metricsDef, metricsDef.getName());
-            }
-            configmapFromPreCollectData = CollectUtil.getConfigmapFromPreCollectData(metricsData);
-        }
-    }
-
-    @Override
-    protected Protocol buildProtocol(Metrics metricsDef) {
-        // Setup HTTP protocol
-        HttpProtocol protocol = new HttpProtocol();
-        protocol.setHost(LOCALHOST);
-        protocol.setUrl(RELATIVE_PATH);
-        protocol.setMethod("GET");
-        protocol.setPort(String.valueOf(MOCK_SERVER_PORT));
-        protocol.setParseType(metricsDef.getHttp().getParseType());
-        protocol.setParseScript(metricsDef.getHttp().getParseScript());
-        return protocol;
-    }
-
-    @Override
-    protected CollectRep.MetricsData.Builder collectMetrics(Metrics metricsDef) {
-        HttpProtocol protocol = (HttpProtocol) buildProtocol(metricsDef);
-        metrics.setHttp(protocol);
-        return collectMetricsData(metrics, metricsDef);
-    }
-}
@@ -38,8 +38,6 @@ import org.testcontainers.lifecycle.Startables;
 import org.testcontainers.utility.DockerImageName;

 import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -56,7 +54,6 @@ public class SshCollectE2eTest extends AbstractCollectE2eTest {
    private static final String ROOT_USER = "root";
    private static final int SSH_PORT = 22;
    private static final int PASSWORD_LENGTH = 12;
-    private static final List<String> ALLOW_EMPTY_WHITE_LIST = Arrays.asList("top_mem_process", "top_cpu_process");

    private static GenericContainer<?> linuxContainer;

@@ -91,13 +88,8 @@ public class SshCollectE2eTest extends AbstractCollectE2eTest {
        Assertions.assertTrue(linuxContainer.isRunning(), "Ubuntu container should be running");

        Job ubuntuJob = appService.getAppDefine("ubuntu");
-        ubuntuJob.getMetrics().forEach(metricsDef -> {
-            if (ALLOW_EMPTY_WHITE_LIST.contains(metricsDef.getName())) {
-                validateMetricsCollection(metricsDef, metricsDef.getName(), true);
-            } else {
-                validateMetricsCollection(metricsDef, metricsDef.getName());
-            }
-        });
+        ubuntuJob.getMetrics().forEach(metricsDef -> 
+            validateMetricsCollection(metricsDef, metricsDef.getName()));
    }

    @Override
@@ -1,128 +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.basic.telnet;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.AbstractCollectE2eTest;
-import org.apache.hertzbeat.collector.collect.telnet.TelnetCollectImpl;
-import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.entity.job.Configmap;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.apache.hertzbeat.common.entity.job.Metrics;
-import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
-import org.apache.hertzbeat.common.entity.job.protocol.TelnetProtocol;
-import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.utility.DockerImageName;
-
-import java.time.Duration;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Integration test for Zookeeper monitoring functionality
- */
-@Slf4j
-@ExtendWith(MockitoExtension.class)
-public class ZookeeperMonitorE2eTest extends AbstractCollectE2eTest {
-
-    private static final String ZOOKEEPER_IMAGE_NAME = "zookeeper:3.8.4";
-    private static final String ZOOKEEPER_NAME = "zookeeper";
-    private static final Integer ZOOKEEPER_PORT = 2181;
-    private static GenericContainer<?> zookeeperContainer;
-
-    @AfterAll
-    public static void tearDown() {
-        if (zookeeperContainer != null) {
-            zookeeperContainer.stop();
-        }
-    }
-
-    @BeforeEach
-    public void setUp() throws Exception {
-        super.setUp();
-        collect = new TelnetCollectImpl();
-        metrics = new Metrics();
-
-        try {
-            // Start Zookeeper container with custom configuration
-            zookeeperContainer = new GenericContainer<>(DockerImageName.parse(ZOOKEEPER_IMAGE_NAME))
-                    .withExposedPorts(ZOOKEEPER_PORT)
-                    .withEnv("ZOO_4LW_COMMANDS_WHITELIST", "*")
-                    .withNetworkAliases(ZOOKEEPER_NAME)
-                    .waitingFor(
-                            Wait.forLogMessage(".*Started AdminServer on address.*\\n", 1)
-                                    .withStartupTimeout(Duration.ofSeconds(60))
-                    )
-                    .withLogConsumer(outputFrame -> {
-                        log.info(outputFrame.getUtf8String());
-                    });
-
-            zookeeperContainer.start();
-            log.info("Zookeeper container started at {}:{}",
-                    zookeeperContainer.getHost(),
-                    zookeeperContainer.getMappedPort(ZOOKEEPER_PORT));
-        } catch (Exception e) {
-            e.printStackTrace();
-            log.error("Failed to start Zookeeper container", e);
-            throw e;
-        }
-        Thread.sleep(30000);
-    }
-
-    @Override
-    protected CollectRep.MetricsData.Builder collectMetrics(Metrics metricsDef) {
-        TelnetProtocol telnetProtocol = (TelnetProtocol) buildProtocol(metricsDef);
-        metrics.setTelnet(telnetProtocol);
-        CollectRep.MetricsData.Builder metricsData = CollectRep.MetricsData.newBuilder();
-        metricsData.setApp(ZOOKEEPER_NAME);
-        metrics.setAliasFields(metricsDef.getAliasFields());
-        return collectMetricsData(metrics, metricsDef, metricsData);
-    }
-
-    @Override
-    protected Protocol buildProtocol(Metrics metricsDef) {
-        TelnetProtocol protocol = new TelnetProtocol();
-        protocol.setHost(zookeeperContainer.getHost());
-        protocol.setPort(String.valueOf(zookeeperContainer.getMappedPort(ZOOKEEPER_PORT)));
-        protocol.setCmd(metricsDef.getTelnet().getCmd());
-        return protocol;
-    }
-
-    @Test
-    public void testZookeeperMonitor() {
-        Assertions.assertTrue(zookeeperContainer.isRunning(), "Zookeeper container should be running");
-
-        Job dockerJob = appService.getAppDefine("zookeeper");
-        List<Map<String, Configmap>> configmapFromPreCollectData = new LinkedList<>();
-        for (Metrics metricsDef : dockerJob.getMetrics()) {
-            metricsDef = CollectUtil.replaceCryPlaceholderToMetrics(metricsDef, configmapFromPreCollectData.size() > 0 ? configmapFromPreCollectData.get(0) : new HashMap<>());
-            CollectRep.MetricsData metricsData = validateMetricsCollection(metricsDef, metricsDef.getName());
-            configmapFromPreCollectData = CollectUtil.getConfigmapFromPreCollectData(metricsData);
-        }
-    }
-}
@@ -22,7 +22,6 @@ import org.apache.hertzbeat.collector.dispatch.CollectDataDispatch;
 import org.apache.hertzbeat.collector.dispatch.MetricsCollect;
 import org.apache.hertzbeat.collector.dispatch.timer.Timeout;
 import org.apache.hertzbeat.collector.dispatch.timer.WheelTimerTask;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.Protocol;
@@ -78,39 +77,20 @@ public abstract class AbstractCollectE2eTest {

    /**
     * Validate metrics collection, check if the metrics values are not empty <br/>
-     * @param metricsDef metrics definition
-     * @param metricName metric name
-     * @return metrics data
+     * We believe that all monitoring metrics should have data
     */
    protected CollectRep.MetricsData validateMetricsCollection(Metrics metricsDef, String metricName) {
-        // By default, we do not allow empty values
-        return validateMetricsCollection(metricsDef, metricName, false);
-    }
-
-    /**
-     * Validate metrics collection, check if the metrics values are not empty <br/>
-     * We believe that all monitoring metrics should have data
-     *
-     * @param metricsDef metrics definition
-     * @param metricName metric name
-     * @param allowEmpty In some special scenarios, it is not necessary to check if the value is `&nbsp;`
-     */
-    protected CollectRep.MetricsData validateMetricsCollection(Metrics metricsDef, String metricName, boolean allowEmpty) {
        CollectRep.MetricsData.Builder metricsData = collectMetrics(metricsDef);

        metricsCollect.calculateFields(metricsDef, metricsData);

        Assertions.assertTrue(metricsData.getValuesList().size() > 0,
-                String.format("%s metrics values should not be empty, detail: %s", metricName, metricsData.getMsg()));
+                String.format("%s metrics values should not be empty", metricName));

        for (CollectRep.ValueRow valueRow : metricsData.getValuesList()) {
            for (int i = 0; i < valueRow.getColumnsCount(); i++) {
                Assertions.assertFalse(valueRow.getColumns(i).isEmpty(),
                        String.format("%s metric column %d should not be empty", metricName, i));
-                if (!allowEmpty) {
-                    // Check if the value is not null
-                    Assertions.assertNotEquals(CommonConstants.NULL_VALUE, valueRow.getColumns(i), String.format("%s metric column %d should not be null", metricName, i));
-                }
            }
        }

@@ -118,31 +98,21 @@ public abstract class AbstractCollectE2eTest {
        return metricsData.build();
    }

-    /**
-     * Set alias fields for metrics
-     *
-     * @param metrics    metrics
-     * @param metricsDef metrics definition
-     */
    protected void setMetricsAliasFields(Metrics metrics, Metrics metricsDef) {
-        List<String> aliasFields = metricsDef.getAliasFields() == null
-                ? metricsDef.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList())
-                : metricsDef.getAliasFields();
-        metrics.setAliasFields(aliasFields);
-        metricsDef.setAliasFields(aliasFields);
+        metrics.setAliasFields(metricsDef.getAliasFields() == null
+                ? metricsDef.getFields().stream()
+                .map(Metrics.Field::getField)
+                .collect(Collectors.toList()) :
+                metricsDef.getAliasFields());
    }

    protected abstract CollectRep.MetricsData.Builder collectMetrics(Metrics metricsDef);

    protected CollectRep.MetricsData.Builder collectMetricsData(Metrics metrics, Metrics metricsDef) {
-        CollectRep.MetricsData.Builder metricsData = CollectRep.MetricsData.newBuilder();
-        return this.collectMetricsData(metrics, metricsDef, metricsData);
-    }
-
-    protected CollectRep.MetricsData.Builder collectMetricsData(Metrics metrics, Metrics metricsDef, CollectRep.MetricsData.Builder metricsData) {
        setMetricsAliasFields(metrics, metricsDef);

        // Collect metrics
+        CollectRep.MetricsData.Builder metricsData = CollectRep.MetricsData.newBuilder();
        collect.collect(metricsData, metrics);
        return metricsData;
    }
@@ -194,9 +194,9 @@ public class ServiceAccountService {

    private HttpHeaders createHeaders() {
        String auth = username + SignConstants.DOUBLE_MARK + password;
-        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes(StandardCharsets.UTF_8));
+        byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(StandardCharsets.UTF_8));
        String authHeader = NetworkConstants.BASIC
-                + SignConstants.BLANK + encodedAuth;
+                + SignConstants.BLANK + new String(encodedAuth);

        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
@@ -27,7 +27,6 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ImportRuntimeHints;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.scheduling.annotation.EnableAsync;

 /**
 * start up class.
@@ -40,7 +39,6 @@ import org.springframework.scheduling.annotation.EnableAsync;
@ComponentScan(basePackages = {"org.apache.hertzbeat"})
@ConfigurationPropertiesScan(basePackages = {"org.apache.hertzbeat"})
@ImportRuntimeHints(HertzbeatRuntimeHintsRegistrar.class)
-@EnableAsync
 public class Manager {
    public static void main(String[] args) {
        SpringApplication.run(Manager.class, args);
@@ -46,6 +46,7 @@ public class AppCount {
    private String app;

    /**
+     * 任务状态
     * task status
     */
    private transient byte status;
@@ -17,11 +17,10 @@

 package org.apache.hertzbeat.manager.scheduler;

-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;

 /**
 * List of assigned collection tasks
@@ -34,17 +33,17 @@ public class AssignJobs {
     * current assign jobIds
     */
    private Set<Long> jobs;
-
+    
    /**
     * jobs to be adding
     */
    private Set<Long> addingJobs;
-
+    
    /**
     * jobs to be removed
     */
    private Set<Long> removingJobs;
-
+    
    /**
     * jobs has pinned in this collector
     */
@@ -60,15 +59,15 @@ public class AssignJobs {
    public void addAssignJob(Long jobId) {
        jobs.add(jobId);
    }
-
+    
    public void addAddingJob(Long jobId) {
        addingJobs.add(jobId);
    }
-
+    
    public void addRemovingJob(Long jobId) {
        removingJobs.add(jobId);
    }
-
+    
    public void addPinnedJob(Long jobId) {
        pinnedJobs.add(jobId);
    }
@@ -78,19 +77,19 @@ public class AssignJobs {
            jobs.addAll(jobSet);
        }
    }
-
+    
    public void addAddingJobs(Set<Long> jobSet) {
        if (jobSet != null && !jobSet.isEmpty()) {
            addingJobs.addAll(jobSet);
        }
    }
-
+    
    public void addRemovingJobs(Set<Long> jobSet) {
        if (jobSet != null && !jobSet.isEmpty()) {
            removingJobs.addAll(jobSet);
        }
    }
-
+    
    public void addPinnedJobs(Set<Long> jobSet) {
        if (jobSet != null && !jobSet.isEmpty()) {
            pinnedJobs.addAll(jobSet);
@@ -103,14 +102,14 @@ public class AssignJobs {
        }
        jobs.removeAll(jobIds);
    }
-
+    
    public void removeAddingJobs(Set<Long> jobIds) {
        if (addingJobs == null || jobIds == null || jobIds.isEmpty()) {
            return;
        }
        addingJobs.removeAll(jobIds);
    }
-
+    
    public void clearRemovingJobs() {
        if (removingJobs == null) {
            return;
@@ -119,10 +118,9 @@ public class AssignJobs {
    }

    /**
-     * Check if the corresponding jobId exists
-     *
+     * 判断是否存在对应的jobId
     * @param jobId jobId
-     * @return true if exists and removes the jobId from assignJobs
+     * @return 若存在返回true,并把jobId从assignJobs remove掉
     */
    public boolean containAndRemoveJob(Long jobId) {
        if (jobs.isEmpty()) {
@@ -130,21 +128,21 @@ public class AssignJobs {
        }
        return jobs.remove(jobId);
    }
-
+    
    public void removeAddingJob(Long jobId) {
        if (addingJobs == null || jobId == null) {
            return;
        }
        addingJobs.remove(jobId);
    }
-
+    
    public void removeRemovingJob(Long jobId) {
        if (removingJobs == null || jobId == null) {
            return;
        }
        removingJobs.remove(jobId);
    }
-
+    
    public void removePinnedJob(Long jobId) {
        if (pinnedJobs == null || jobId == null) {
            return;
@@ -153,7 +151,7 @@ public class AssignJobs {
    }

    /**
-     * Clean data
+     * 清理数据
     */
    public void clear() {
        if (!jobs.isEmpty()) {
@@ -71,7 +71,7 @@ public class CollectorServiceImpl implements CollectorService {
        Specification<Collector> specification = (root, query, criteriaBuilder) -> {
            Predicate predicate = criteriaBuilder.conjunction();
            if (StringUtils.isNotBlank(name)) {
-                Predicate predicateName = criteriaBuilder.like(criteriaBuilder.lower(root.get("name")), "%" + name.toLowerCase() + "%");
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + name + "%");
                predicate = criteriaBuilder.and(predicateName);
            }
            return predicate;
@@ -436,12 +436,11 @@ public class MonitorServiceImpl implements MonitorService {
                newJobId = collectJobScheduling.updateAsyncCollectJob(appDefine, collector);
            }
            monitor.setJobId(newJobId);
+        }

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

        // After the update is successfully released, refresh the database
@@ -567,13 +566,11 @@ public class MonitorServiceImpl implements MonitorService {
            List<Predicate> orList = new ArrayList<>();
            if (StringUtils.isNotBlank(search)) {
                Predicate predicateHost = criteriaBuilder.like(root.get("host"), "%" + search + "%");
-                Predicate predicateName = criteriaBuilder.like(criteriaBuilder.lower(root.get("name")), "%" + search.toLowerCase() + "%");
-                if (StringUtils.isNumeric(search)){
-                    Predicate predicateId = criteriaBuilder.equal(root.get("id"), Long.parseLong(search));
-                    orList.add(predicateId);
-                }
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + search + "%");
+                Predicate predicateId = criteriaBuilder.like(root.get("id"), "%" + search + "%");
                orList.add(predicateHost);
                orList.add(predicateName);
+                orList.add(predicateId);
            }
            if (StringUtils.isNotBlank(labels)) {
                String[] labelAres = labels.split(",");
@@ -20,13 +20,9 @@ package org.apache.hertzbeat.manager.service.impl;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.lang.reflect.Type;
-
-import jakarta.annotation.Resource;
 import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
-import org.apache.hertzbeat.common.support.event.SmsConfigChangeEvent;
 import org.apache.hertzbeat.manager.pojo.dto.SmsNoticeSender;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;

 /**
@@ -36,8 +32,6 @@ import org.springframework.stereotype.Service;

@Service
 public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl<SmsNoticeSender> {
-    @Resource
-    private ApplicationContext applicationContext;

    /**
     * SmsGeneralConfigServiceImpl's constructor creates an instance of this class
@@ -50,14 +44,6 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp
    public SmsGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) {
        super(generalConfigDao, objectMapper);
    }
-
-    /**
-     * This method is used to handle the sms configuration change event.
-     */
-    @Override
-    public void handler(SmsNoticeSender smsNoticeSender) {
-        applicationContext.publishEvent(new SmsConfigChangeEvent(applicationContext));
-    }
    
    @Override
    public String type() {
@@ -92,9 +92,9 @@ public class TagServiceImpl implements TagService {

            List<Predicate> orList = new ArrayList<>();
            if (StringUtils.isNotBlank(search)) {
-                Predicate predicateName = criteriaBuilder.like(criteriaBuilder.lower(root.get("name")), "%" + search.toLowerCase() + "%");
+                Predicate predicateName = criteriaBuilder.like(root.get("name"), "%" + search + "%");
                orList.add(predicateName);
-                Predicate predicateValue = criteriaBuilder.like(criteriaBuilder.lower(root.get("tagValue")), "%" + search.toLowerCase() + "%");
+                Predicate predicateValue = criteriaBuilder.like(root.get("tagValue"), "%" + search + "%");
                orList.add(predicateValue);
            }
            Predicate[] orPredicates = new Predicate[orList.size()];
@@ -203,17 +203,6 @@ alerter:
  # alert inhibit ttl unit ms, default 14400000(4 hours)
  inhibit:
    ttl: 14400000
-  sms:
-    enable: true
-    type: tencent
-    tencent:
-      secret-id:
-      secret-key:
-      app-id:
-      sign-name:
-      template-id:
-    alibaba:
-      app-id:

 scheduler:
  server:
@@ -88,15 +88,6 @@ params:
    range: '[0,100000]'
    required: true
    defaultValue: 1000
-  - field: ssl
-    # name-param field display i18n name
-    name:
-      zh-CN: 启用SFTP
-      en-US: SFTP
-    # type-param field type(most mapping the html input type)
-    type: boolean
-    # required-true or false
-    required: true
 # collect metrics config list
 metrics:
  # metrics - basic
@@ -131,4 +122,3 @@ metrics:
      password: ^_^password^_^
      direction: ^_^direction^_^
      timeout: ^_^timeout^_^
-      ssl: ^_^ssl^_^
@@ -115,78 +115,6 @@ params:
    required: false
    # hide param-true or false
    hide: true
-  - field: enableSshTunnel
-    name:
-      zh-CN: 是否启用SSH隧道
-      en-US: Enable SSH Tunnel
-    type: boolean
-    required: true
-    hide: true
-  - field: sshHost
-    name:
-      zh-CN: SSH Host
-      en-US: SSH Host
-    type: text
-    required: false
-    placeholder: 'When Enable SSH Tunnel'
-    hide: true
-  - field: sshPort
-    name:
-      zh-CN: SSH端口
-      en-US: SSH Port
-    type: number
-    range: '[0,65535]'
-    required: false
-    defaultValue: 22
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshTimeout
-    name:
-      zh-CN: SSH超时时间(ms)
-      en-US: SSH Timeout(ms)
-    type: number
-    required: false
-    range: '[400,200000]'
-    defaultValue: 6000
-    hide: true
-  - field: sshUsername
-    name:
-      zh-CN: SSH用户名
-      en-US: SSH Username
-    type: text
-    required: false
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshPassword
-    name:
-      zh-CN: SSH密码
-      en-US: SSH Password
-    type: password
-    required: false
-    hide: true
-  - field: sshShareConnection
-    name:
-      zh-CN: 是否共享SSH连接
-      en-US: Share SSH Connection
-    type: boolean
-    required: true
-    defaultValue: true
-    hide: true
-  - field: sshPrivateKey
-    name:
-      zh-CN: SSH私钥
-      en-US: SSH PrivateKey
-    type: textarea
-    placeholder: -----BEGIN RSA PRIVATE KEY-----
-    required: false
-    hide: true
-  - field: sshPrivateKeyPassphrase
-    name:
-      zh-CN: SSH密钥短语
-      en-US: SSH PrivateKey PassPhrase
-    type: password
-    required: false
-    hide: true

 # collect metrics config list
 metrics:
@@ -277,16 +205,6 @@ metrics:
      sql: show global variables where Variable_name like 'version%' or Variable_name = 'max_connections' or Variable_name = 'datadir' or Variable_name = 'port' or Variable_name = 'thread_cache_size' or Variable_name = 'table_open_cache' or Variable_name = 'innodb_buffer_pool_size';
      # JDBC url
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: cache
    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
@@ -366,16 +284,6 @@ metrics:
      # sql
      sql: show global status like 'QCache%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: performance
    priority: 2
@@ -410,16 +318,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name = 'questions' or Variable_name = 'uptime';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: innodb
    priority: 3
@@ -486,16 +384,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like 'innodb%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: status
    priority: 4
@@ -591,16 +479,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like 'thread%' or Variable_name = 'com_select' or Variable_name = 'com_insert' or Variable_name = 'com_update' or Variable_name = 'com_delete' or Variable_name = 'com_commit' or Variable_name = 'com_rollback' or Variable_name = 'questions' or Variable_name = 'uptime';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: handler
    priority: 5
@@ -680,16 +558,6 @@ metrics:
      queryType: columns
      sql: show global status like 'Handler%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: connection
    priority: 6
@@ -729,16 +597,6 @@ metrics:
      queryType: columns
      sql: show global status;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: thread
    priority: 7
@@ -778,16 +636,6 @@ metrics:
      queryType: columns
      sql: show global status like 'thread%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: tmp
    priority: 8
@@ -822,16 +670,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like '%tmp%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: select_type
    priority: 9
@@ -876,16 +714,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like 'select%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: sort
    priority: 10
@@ -925,16 +753,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like 'sort%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: table_lock
    priority: 11
@@ -964,16 +782,6 @@ metrics:
      queryType: columns
      sql: show global status where Variable_name like 'table_lock%';
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: process_state
    priority: 12
@@ -1004,16 +812,6 @@ metrics:
      queryType: multiRow
      sql: select state, count(*) as num from information_schema.PROCESSLIST where state != '' group by state;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: slow_sql
    priority: 13
@@ -1066,13 +864,3 @@ metrics:
      queryType: multiRow
      sql: select sql_text, start_time, db, query_time from mysql.slow_log;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
@@ -14,7 +14,7 @@
 # limitations under the License.

 # The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
-category: llm
+category: server
 # The monitoring type eg: linux windows tomcat mysql aws...
 app: nvidia
 # The monitoring i18n name
@@ -91,78 +91,6 @@ params:
    type: text
    required: false
    hide: true
-  - field: enableSshTunnel
-    name:
-      zh-CN: 是否启用SSH隧道
-      en-US: Enable SSH Tunnel
-    type: boolean
-    required: true
-    hide: true
-  - field: sshHost
-    name:
-      zh-CN: SSH Host
-      en-US: SSH Host
-    type: text
-    required: false
-    placeholder: 'When Enable SSH Tunnel'
-    hide: true
-  - field: sshPort
-    name:
-      zh-CN: SSH端口
-      en-US: SSH Port
-    type: number
-    range: '[0,65535]'
-    required: false
-    defaultValue: 22
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshTimeout
-    name:
-      zh-CN: SSH超时时间(ms)
-      en-US: SSH Timeout(ms)
-    type: number
-    required: false
-    range: '[400,200000]'
-    defaultValue: 6000
-    hide: true
-  - field: sshUsername
-    name:
-      zh-CN: SSH用户名
-      en-US: SSH Username
-    type: text
-    required: false
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshPassword
-    name:
-      zh-CN: SSH密码
-      en-US: SSH Password
-    type: password
-    required: false
-    hide: true
-  - field: sshShareConnection
-    name:
-      zh-CN: 是否共享SSH连接
-      en-US: Share SSH Connection
-    type: boolean
-    required: true
-    defaultValue: true
-    hide: true
-  - field: sshPrivateKey
-    name:
-      zh-CN: SSH私钥
-      en-US: SSH PrivateKey
-    type: textarea
-    placeholder: -----BEGIN RSA PRIVATE KEY-----
-    required: false
-    hide: true
-  - field: sshPrivateKeyPassphrase
-    name:
-      zh-CN: SSH密钥短语
-      en-US: SSH PrivateKey PassPhrase
-    type: password
-    required: false
-    hide: true

 # collect metrics config list
 metrics:
@@ -222,16 +150,6 @@ metrics:
      sql: select name, setting as value from pg_settings where name = 'max_connections' or name = 'server_version' or name = 'server_encoding' or name = 'port' or name = 'data_directory';
      # JDBC url
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: state
    i18n:
@@ -298,16 +216,6 @@ metrics:
      queryType: multiRow
      sql: SELECT COALESCE(datname,'shared-object') as db_name, conflicts, deadlocks, blks_read, blks_hit, blk_read_time, blk_write_time, stats_reset from pg_stat_database where (datname != 'template1' and datname != 'template0') or datname is null;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: activity
    i18n:
@@ -333,16 +241,6 @@ metrics:
      queryType: oneRow
      sql: SELECT count(*) as running FROM pg_stat_activity WHERE NOT pid=pg_backend_pid();
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: resource_config
    i18n:
@@ -396,16 +294,6 @@ metrics:
      queryType: columns
      sql: show all;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: connection
    i18n:
@@ -430,16 +318,6 @@ metrics:
      queryType: oneRow
      sql: select count(1) as active from pg_stat_activity;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: connection_state
    i18n:
@@ -470,16 +348,6 @@ metrics:
      queryType: multiRow
      sql: select COALESCE(state, 'other') as state, count(*) as num from pg_stat_activity group by state;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: connection_db
    i18n:
@@ -510,16 +378,6 @@ metrics:
      queryType: multiRow
      sql: select count(*) as active, COALESCE(datname, 'other') as db_name from pg_stat_activity group by datname;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: tuple
    i18n:
@@ -564,16 +422,6 @@ metrics:
      queryType: multiRow
      sql: select sum(tup_fetched) as fetched, sum(tup_updated) as updated, sum(tup_deleted) as deleted, sum(tup_inserted) as inserted, sum(tup_returned) as returned from pg_stat_database;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: temp_file
    i18n:
@@ -610,16 +458,6 @@ metrics:
      queryType: multiRow
      sql: select COALESCE(datname, 'other') as db_name, sum(temp_files) as num, sum(temp_bytes) as size from pg_stat_database group by datname;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: lock
    i18n:
@@ -657,16 +495,6 @@ metrics:
      queryType: multiRow
      sql: SELECT COALESCE(datname,'shared-object') as db_name, conflicts, deadlocks from pg_stat_database where (datname != 'template1' and datname != 'template0') or datname is null;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: slow_sql
    i18n:
@@ -724,16 +552,6 @@ metrics:
      queryType: multiRow
      sql: select * from pg_stat_statements;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: transaction
    i18n:
@@ -771,16 +589,6 @@ metrics:
      queryType: multiRow
      sql: select COALESCE(datname, 'other') as db_name, sum(xact_commit) as commits, sum(xact_rollback) as rollbacks from pg_stat_database group by datname;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: conflicts
    i18n:
@@ -831,16 +639,6 @@ metrics:
      queryType: multiRow
      sql: select datname as db_name, confl_tablespace as tablespace, confl_lock as lock, confl_snapshot as snapshot, confl_bufferpin as bufferpin, confl_deadlock as deadlock from pg_stat_database_conflicts;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: cache_hit_ratio
    i18n:
@@ -878,16 +676,6 @@ metrics:
      queryType: multiRow
      sql: select datname as db_name, blks_hit, blks_read from pg_stat_database;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: checkpoint
    i18n:
@@ -919,16 +707,6 @@ metrics:
      queryType: oneRow
      sql: select checkpoint_sync_time, checkpoint_write_time from pg_stat_bgwriter;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: buffer
    i18n:
@@ -973,13 +751,3 @@ metrics:
      queryType: oneRow
      sql: select buffers_alloc as allocated, buffers_backend_fsync as fsync_calls_by_backend, buffers_backend as written_directly_by_backend, buffers_clean as written_by_background_writer, buffers_checkpoint as written_during_checkpoints from pg_stat_bgwriter;
      url: ^_^url^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
@@ -84,78 +84,7 @@ params:
      en-US: Password
    type: password
    required: false
-  - field: enableSshTunnel
-    name:
-      zh-CN: 是否启用SSH隧道
-      en-US: Enable SSH Tunnel
-    type: boolean
-    required: true
-    hide: true
-  - field: sshHost
-    name:
-      zh-CN: SSH Host
-      en-US: SSH Host
-    type: text
-    required: false
-    placeholder: 'When Enable SSH Tunnel'
-    hide: true
-  - field: sshPort
-    name:
-      zh-CN: SSH端口
-      en-US: SSH Port
-    type: number
-    range: '[0,65535]'
-    required: false
-    defaultValue: 22
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshTimeout
-    name:
-      zh-CN: SSH超时时间(ms)
-      en-US: SSH Timeout(ms)
-    type: number
-    required: false
-    range: '[400,200000]'
-    defaultValue: 6000
-    hide: true
-  - field: sshUsername
-    name:
-      zh-CN: SSH用户名
-      en-US: SSH Username
-    type: text
-    required: false
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshPassword
-    name:
-      zh-CN: SSH密码
-      en-US: SSH Password
-    type: password
-    required: false
-    hide: true
-  - field: sshShareConnection
-    name:
-      zh-CN: 是否共享SSH连接
-      en-US: Share SSH Connection
-    type: boolean
-    required: true
-    defaultValue: true
-    hide: true
-  - field: sshPrivateKey
-    name:
-      zh-CN: SSH私钥
-      en-US: SSH PrivateKey
-    type: textarea
-    placeholder: -----BEGIN RSA PRIVATE KEY-----
-    required: false
-    hide: true
-  - field: sshPrivateKeyPassphrase
-    name:
-      zh-CN: SSH密钥短语
-      en-US: SSH PrivateKey PassPhrase
-    type: password
-    required: false
-    hide: true
+
 # collect metrics config list
 metrics:
  # metrics - server
@@ -302,16 +231,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
  # metrics - clients
  - name: clients
    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
@@ -369,16 +288,6 @@ metrics:
      username: ^_^username^_^
      password: ^_^password^_^
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
  # metrics - memory
  - name: memory
    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
@@ -618,16 +527,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - persistence
  - name: persistence
@@ -769,16 +668,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - stats
  - name: stats
@@ -995,16 +884,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - replication
  - name: replication
@@ -1086,16 +965,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - cpu
  - name: cpu
@@ -1152,16 +1021,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - errorstats
  - name: errorstats
@@ -1198,16 +1057,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - cluster
  - name: cluster
@@ -1237,16 +1086,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - commandstats
  - name: commandstats
@@ -1323,16 +1162,6 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  # metrics - keyspace
  - name: keyspace
@@ -1439,13 +1268,3 @@ metrics:
      password: ^_^password^_^
      # timeout unit：ms
      timeout: ^_^timeout^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
@@ -105,78 +105,6 @@ params:
    defaultValue: 3
    # hide-is hide this field and put it in advanced layout
    hide: true
-  - field: enableSshTunnel
-    name:
-      zh-CN: 是否启用SSH隧道
-      en-US: Enable SSH Tunnel
-    type: boolean
-    required: true
-    hide: true
-  - field: sshHost
-    name:
-      zh-CN: SSH Host
-      en-US: SSH Host
-    type: text
-    required: false
-    placeholder: 'When Enable SSH Tunnel'
-    hide: true
-  - field: sshPort
-    name:
-      zh-CN: SSH端口
-      en-US: SSH Port
-    type: number
-    range: '[0,65535]'
-    required: false
-    defaultValue: 22
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshTimeout
-    name:
-      zh-CN: SSH超时时间(ms)
-      en-US: SSH Timeout(ms)
-    type: number
-    required: false
-    range: '[400,200000]'
-    defaultValue: 6000
-    hide: true
-  - field: sshUsername
-    name:
-      zh-CN: SSH用户名
-      en-US: SSH Username
-    type: text
-    required: false
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshPassword
-    name:
-      zh-CN: SSH密码
-      en-US: SSH Password
-    type: password
-    required: false
-    hide: true
-  - field: sshShareConnection
-    name:
-      zh-CN: 是否共享SSH连接
-      en-US: Share SSH Connection
-    type: boolean
-    required: true
-    defaultValue: true
-    hide: true
-  - field: sshPrivateKey
-    name:
-      zh-CN: SSH私钥
-      en-US: SSH PrivateKey
-    type: textarea
-    placeholder: -----BEGIN RSA PRIVATE KEY-----
-    required: false
-    hide: true
-  - field: sshPrivateKeyPassphrase
-    name:
-      zh-CN: SSH密钥短语
-      en-US: SSH PrivateKey PassPhrase
-    type: password
-    required: false
-    hide: true
 metrics:
  - name: server
    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
@@ -319,16 +247,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^


  - name: clients
@@ -400,16 +318,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: memory
    i18n:
@@ -654,16 +562,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: persistence
    i18n:
@@ -809,16 +707,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: stats
    i18n:
@@ -1039,16 +927,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: replication
    i18n:
@@ -1134,16 +1012,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: cpu
    i18n:
@@ -1204,16 +1072,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: errorstats
    i18n:
@@ -1254,16 +1112,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: cluster
    i18n:
@@ -1379,16 +1227,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: commandstats
    i18n:
@@ -1469,16 +1307,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^


  - name: keyspace
@@ -1542,13 +1370,3 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
@@ -104,78 +104,6 @@ params:
    defaultValue: 2
    # hide-is hide this field and put it in advanced layout
    hide: true
-  - field: enableSshTunnel
-    name:
-      zh-CN: 是否启用SSH隧道
-      en-US: Enable SSH Tunnel
-    type: boolean
-    required: true
-    hide: true
-  - field: sshHost
-    name:
-      zh-CN: SSH Host
-      en-US: SSH Host
-    type: text
-    required: false
-    placeholder: 'When Enable SSH Tunnel'
-    hide: true
-  - field: sshPort
-    name:
-      zh-CN: SSH端口
-      en-US: SSH Port
-    type: number
-    range: '[0,65535]'
-    required: false
-    defaultValue: 22
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshTimeout
-    name:
-      zh-CN: SSH超时时间(ms)
-      en-US: SSH Timeout(ms)
-    type: number
-    required: false
-    range: '[400,200000]'
-    defaultValue: 6000
-    hide: true
-  - field: sshUsername
-    name:
-      zh-CN: SSH用户名
-      en-US: SSH Username
-    type: text
-    required: false
-    placeholder: 'When Enable SSH tunnel'
-    hide: true
-  - field: sshPassword
-    name:
-      zh-CN: SSH密码
-      en-US: SSH Password
-    type: password
-    required: false
-    hide: true
-  - field: sshShareConnection
-    name:
-      zh-CN: 是否共享SSH连接
-      en-US: Share SSH Connection
-    type: boolean
-    required: true
-    defaultValue: true
-    hide: true
-  - field: sshPrivateKey
-    name:
-      zh-CN: SSH私钥
-      en-US: SSH PrivateKey
-    type: textarea
-    placeholder: -----BEGIN RSA PRIVATE KEY-----
-    required: false
-    hide: true
-  - field: sshPrivateKeyPassphrase
-    name:
-      zh-CN: SSH密钥短语
-      en-US: SSH PrivateKey PassPhrase
-    type: password
-    required: false
-    hide: true
 metrics:
  - name: server
    i18n:
@@ -321,16 +249,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: clients
    i18n:
@@ -396,16 +314,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: stats
    i18n:
@@ -621,16 +529,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: cpu
    i18n:
@@ -686,16 +584,6 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^

  - name: sentinel
    i18n:
@@ -746,13 +634,3 @@ metrics:
      # timeout unit：ms
      timeout: ^_^timeout^_^
      pattern: ^_^pattern^_^
-      sshTunnel:
-        enable: ^_^enableSshTunnel^_^
-        host: ^_^sshHost^_^
-        port: ^_^sshPort^_^
-        timeout: ^_^sshTimeout^_^
-        username: ^_^sshUsername^_^
-        password: ^_^sshPassword^_^
-        privateKey: ^_^sshPrivateKey^_^
-        privateKeyPassphrase: ^_^sshPrivateKeyPassphrase^_^
-        shareConnection: ^_^sshShareConnection^_^
@@ -72,7 +72,6 @@ resourceRole:
 # eg: /api/v1/source3===get means /api/v1/source3===get can be access by anyone, no need auth.
 excludedResource:
  - /api/alerts/report/**===*
-  - /api/alert/sse/**===*
  - /api/account/auth/**===*
  - /api/i18n/**===get
  - /api/apps/hierarchy===get
@@ -80,7 +79,6 @@ excludedResource:
  - /api/status/page/public/**===*
  # web ui resource
  - /===get
-  - /assets/**===get
  - /dashboard/**===get
  - /monitors/**===get
  - /alert/**===get
@@ -43,7 +43,7 @@ import org.apache.hertzbeat.common.config.CommonConfig;
 import org.apache.hertzbeat.common.config.CommonProperties;
 import org.apache.hertzbeat.common.queue.impl.InMemoryCommonDataQueue;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.apache.hertzbeat.alert.service.impl.TencentSmsClientImpl;
+import org.apache.hertzbeat.alert.service.TencentSmsClient;
 import org.apache.hertzbeat.warehouse.WarehouseWorkerPool;
 import org.apache.hertzbeat.warehouse.controller.MetricsDataController;
 import org.apache.hertzbeat.warehouse.store.history.iotdb.IotDbDataStorage;
@@ -93,7 +93,7 @@ class ManagerTest extends AbstractSpringIntegrationTest {
        assertNotNull(ctx.getBean(CommonConfig.class));
        assertNotNull(ctx.getBean(InMemoryCommonDataQueue.class));
        // condition on common.sms.tencent.app-id
-        assertThrows(NoSuchBeanDefinitionException.class, () -> ctx.getBean(TencentSmsClientImpl.class));
+        assertThrows(NoSuchBeanDefinitionException.class, () -> ctx.getBean(TencentSmsClient.class));
        assertNotNull(ctx.getBean(SpringContextHolder.class));

        // test warehouse module
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
tomsun28	d14c3e8cf5	Merge branch 'master' into fix-page-not-found	2025-01-23 18:42:05 +08:00
Logic	d60eb65b5c	Merge branch 'master' into fix-page-not-found	2025-01-23 16:56:11 +08:00
Logic	27b1e8bbbb	refactor(web-app): update route configurations and menu settings - Add titleI18n data to AlertIntegrationComponent route - Remove unnecessary empty line in app-data.json - Update BulletinComponent route to use correct titleI18n	2025-01-23 16:53:35 +08:00
Logic	a221ddfba2	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-23 15:29:18 +08:00
Logic	8e31a3147b	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-10 08:47:21 +08:00
Logic	d2f9a56fe7	Merge branch 'master' of github.com:apache/hertzbeat	2025-01-08 10:33:11 +08:00
Logic	a0b41dc7bb	Merge branch 'master' of github.com:apache/hertzbeat	2024-12-27 08:24:42 +08:00
Logic	3f572a1ddc	Merge branch 'master' of github.com:apache/hertzbeat	2024-11-26 11:22:35 +08:00
Logic	767deccee5	Merge branch 'master' of github.com:apache/hertzbeat	2024-10-26 10:42:23 +08:00
Logic	9221e2f6c1	Merge branch 'master' of github.com:apache/hertzbeat	2024-10-22 17:29:48 +08:00
Logic	0a36b3df90	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-24 11:20:58 +08:00
zqr10159	f3202133d8	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-12 15:48:50 +08:00
zqr10159	6ee458c521	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-11 15:04:01 +08:00
zqr10159	cbc1caf4ac	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-06 08:55:12 +08:00
zqr10159	86db630fc7	Merge branch 'master' of github.com:apache/hertzbeat	2024-09-04 08:25:56 +08:00
zqr10159	145c4d1d5e	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-31 09:05:14 +08:00
zqr10159	0217cbb7f9	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-30 08:54:44 +08:00
zqr10159	9f5df95f29	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-29 11:35:20 +08:00
zqr10159	0f955019bf	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-29 08:36:55 +08:00
zqr10159	129b6282d3	Merge branch 'master' of github.com:apache/hertzbeat	2024-08-23 10:28:34 +08:00
zqr10159	36c5d8f518	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-17 14:55:40 +08:00
zqr10159	de8a473e24	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-16 09:09:47 +08:00
zqr10159	ffc4641dc9	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-09 15:45:37 +08:00
zqr10159	d0cb9f8bf3	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-05 11:36:50 +08:00
zqr10159	0d4ff33f19	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-05 11:15:02 +08:00
zqr10159	86f40e5e15	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-03 08:06:25 +08:00
zqr10159	dbbbc045d4	Merge branch 'master' of github.com:apache/hertzbeat	2024-07-02 15:41:38 +08:00
zqr10159	b0fdd5e11d	Merge branch 'master' of github.com:apache/hertzbeat	2024-06-18 11:30:05 +08:00
zqr10159	9c5ea20b15	[doc]HertzBeat 1.6.0 Upgrade Guide.	2024-06-11 14:57:35 +08:00
zqr10159	7a74f80906	Merge branch 'master' of github.com:apache/hertzbeat	2024-06-11 14:36:25 +08:00
zqr10159	ee32a890eb	Merge branch 'master' of github.com:dromara/hertzbeat	2024-06-01 10:08:28 +08:00
zqr10159	ec1c04194b	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-18 15:52:12 +08:00
zqr10159	55d8dfdede	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-14 08:15:58 +08:00
zqr10159	918073dca7	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-11 08:45:53 +08:00
zqr10159	2defaecd93	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-10 08:39:59 +08:00
zqr10159	641ba47f4c	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-09 17:08:47 +08:00
zqr10159	ccbc2151ae	Merge branch 'master' of github.com:dromara/hertzbeat	2024-05-07 09:05:40 +08:00
zqr10159	1cb919a301	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-29 10:47:25 +08:00
zqr10159	7351a03c81	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-28 11:47:27 +08:00
zqr10159	26c3a802d1	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-25 09:17:04 +08:00
zqr10159	47dbe2fd2a	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-24 08:13:26 +08:00
zqr10159	f4943e9d89	Merge branch 'master' of github.com:dromara/hertzbeat	2024-04-23 14:53:04 +08:00
zqr10159	1f6614d1a1	[remove]Remove optional comments.	2024-04-23 10:36:58 +08:00
zqr10159	4a96c02b9a	[remove]Remove optional comments.	2024-04-23 10:35:21 +08:00