Merge branch 'master' into a_small_modified

[Feature] Add log mcp for java (#3254 )
[improve] fix.
2026-09-17 09:40:58 +00:00 · 2025-04-17 17:09:41 +08:00 · 2025-04-17 16:19:15 +08:00 · 2025-04-16 23:03:28 +08:00 · 2025-04-16 23:00:14 +08:00 · 2025-04-16 11:49:46 +08:00
705 changed files with 25112 additions and 7299 deletions
@@ -2325,6 +2325,78 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "JuJinPark",
+      "name": "jujin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44892459?v=4",
+      "profile": "https://github.com/JuJinPark",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LL-LIN",
+      "name": "LL-LIN",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43002118?v=4",
+      "profile": "https://github.com/LL-LIN",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bigcyy",
+      "name": "Yang Chen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/73413979?v=4",
+      "profile": "https://bigcyy.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sarthakeash",
+      "name": "Sarthak Arora",
+      "avatar_url": "https://avatars.githubusercontent.com/u/74091160?v=4",
+      "profile": "https://github.com/sarthakeash",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PengJingzhao",
+      "name": "彭镜肇",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97368949?v=4",
+      "profile": "https://github.com/PengJingzhao",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gagaradio",
+      "name": "Walter Jia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18532370?v=4",
+      "profile": "https://github.com/gagaradio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "boyucjz",
+      "name": "boyucjz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18730041?v=4",
+      "profile": "https://github.com/boyucjz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Cyanty",
+      "name": "Cyanty",
+      "avatar_url": "https://avatars.githubusercontent.com/u/153884653?v=4",
+      "profile": "https://github.com/Cyanty",
+      "contributions": [
+        "code"
+      ]
    }
  ],
  "contributorsPerLine": 7,
@@ -17,7 +17,9 @@

 /home export-ignore
 /hip export-ignore
+/template-marketplace export-ignore
 /.github export-ignore
 /.idea export-ignore
+/.devcontainer export-ignore
 .gitattributes export-ignore  
 .gitignore export-ignore
@@ -31,6 +31,8 @@ name: "CodeQL"
 on:
  schedule:
    - cron: '21 13 * * 4'
+  push:
+    branches: [ action* ]

 jobs:
  analyze:
@@ -19,7 +19,7 @@ name: DOC CI

 on:
  push:
-    branches: [ master, dev ]
+    branches: [ master, dev, action* ]
    paths:
      - 'home/**'
  pull_request:
@@ -17,7 +17,8 @@

 name: 'HertzBeat Doc Pdf Builder'
 on:
-  page_build
+  push:
+    branches: [ page_build* ]

 jobs:
  build:
@@ -22,7 +22,7 @@ name: Frontend CI

 on:
  push:
-    branches: [ master, dev ]
+    branches: [ master, dev, action* ]
    paths:
      - 'web-app/**'
  pull_request:
@@ -22,7 +22,7 @@ name: License Checker

 on:
  push:
-    branches: [ master, dev ]
+    branches: [ master, dev, action* ]
  pull_request:
    branches: [ master, dev ]

@@ -42,7 +42,7 @@ jobs:
      run: |
        mvn clean install
        mvn clean package -Prelease -DskipTests
-        cd collector
+        cd hertzbeat-collector
        mvn clean package -Pcluster -DskipTests

    - uses: docker/setup-qemu-action@v3
@@ -13,6 +13,7 @@ mvnw.bat
 package-lock.json
 *.zip
 jdk/
+data/

 ### STS ###
 .apt_generated
@@ -54,3 +55,5 @@ node_modules
 application-dev.yml
 application-mysql.yml
 application-pg.yml
+/package.json
+/yarn.lock
@@ -0,0 +1,7 @@
+FROM gitpod/workspace-full
+
+USER gitpod
+
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
+    sdk install java 17.0.3-ms && \
+    sdk default java 17.0.3-ms"
@@ -1,3 +1,6 @@
+image:
+    file: .gitpod.Dockerfile
+
 tasks:

    - name: Run backend
@@ -15,8 +18,6 @@ tasks:

    - name: Setup backend
      init: |
-          sdk install java 17.0.11.fx-zulu < /dev/null
-          sdk default java 17.0.11.fx-zulu < /dev/null
          mvn clean install -DskipTests
      command: |
          gp sync-done setup-backend
@@ -1,5 +1,5 @@
 Apache HertzBeat (incubating)
-Copyright 2024 The Apache Software Foundation
+Copyright 2024-2025 The Apache Software Foundation

 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -510,6 +510,16 @@ Thanks to these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yasminvo"><img src="https://avatars.githubusercontent.com/u/107528848?v=4?s=100" width="100px;" alt="yasminvo"/><br /><sub><b>yasminvo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yasminvo" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yyahang"><img src="https://avatars.githubusercontent.com/u/90464876?v=4?s=100" width="100px;" alt="yyahang"/><br /><sub><b>yyahang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yyahang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JuJinPark"><img src="https://avatars.githubusercontent.com/u/44892459?v=4?s=100" width="100px;" alt="jujin"/><br /><sub><b>jujin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LL-LIN"><img src="https://avatars.githubusercontent.com/u/43002118?v=4?s=100" width="100px;" alt="LL-LIN"/><br /><sub><b>LL-LIN</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LL-LIN" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://bigcyy.github.io/"><img src="https://avatars.githubusercontent.com/u/73413979?v=4?s=100" width="100px;" alt="Yang Chen"/><br /><sub><b>Yang Chen</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sarthakeash"><img src="https://avatars.githubusercontent.com/u/74091160?v=4?s=100" width="100px;" alt="Sarthak Arora"/><br /><sub><b>Sarthak Arora</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PengJingzhao"><img src="https://avatars.githubusercontent.com/u/97368949?v=4?s=100" width="100px;" alt="彭镜肇"/><br /><sub><b>彭镜肇</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PengJingzhao" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gagaradio"><img src="https://avatars.githubusercontent.com/u/18532370?v=4?s=100" width="100px;" alt="Walter Jia"/><br /><sub><b>Walter Jia</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gagaradio" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -509,6 +509,16 @@ Thanks these wonderful people, welcome to join us:
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yasminvo"><img src="https://avatars.githubusercontent.com/u/107528848?v=4?s=100" width="100px;" alt="yasminvo"/><br /><sub><b>yasminvo</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yasminvo" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/notbugggg"><img src="https://avatars.githubusercontent.com/u/147966331?v=4?s=100" width="100px;" alt="不关银渐层的事哦"/><br /><sub><b>不关银渐层的事哦</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=notbugggg" title="Code">💻</a></td>
      <td align="center" valign="top" width="14.28%"><a href="https://github.com/yyahang"><img src="https://avatars.githubusercontent.com/u/90464876?v=4?s=100" width="100px;" alt="yyahang"/><br /><sub><b>yyahang</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=yyahang" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/JuJinPark"><img src="https://avatars.githubusercontent.com/u/44892459?v=4?s=100" width="100px;" alt="jujin"/><br /><sub><b>jujin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=JuJinPark" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LL-LIN"><img src="https://avatars.githubusercontent.com/u/43002118?v=4?s=100" width="100px;" alt="LL-LIN"/><br /><sub><b>LL-LIN</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=LL-LIN" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://bigcyy.github.io/"><img src="https://avatars.githubusercontent.com/u/73413979?v=4?s=100" width="100px;" alt="Yang Chen"/><br /><sub><b>Yang Chen</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=bigcyy" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/sarthakeash"><img src="https://avatars.githubusercontent.com/u/74091160?v=4?s=100" width="100px;" alt="Sarthak Arora"/><br /><sub><b>Sarthak Arora</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=sarthakeash" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PengJingzhao"><img src="https://avatars.githubusercontent.com/u/97368949?v=4?s=100" width="100px;" alt="彭镜肇"/><br /><sub><b>彭镜肇</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=PengJingzhao" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/gagaradio"><img src="https://avatars.githubusercontent.com/u/18532370?v=4?s=100" width="100px;" alt="Walter Jia"/><br /><sub><b>Walter Jia</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=gagaradio" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a></td>
    </tr>
  </tbody>
 </table>
@@ -73,6 +73,11 @@
      "field": "successCode",
      "type": 4,
      "paramValue": "200, 201"
+    },
+    {
+      "field": "enableUrlEncoding",
+      "type": 1,
+      "paramValue": true
    }
  ]
 }
@@ -17,11 +17,14 @@

 package org.apache.hertzbeat.alert.calculate;

+
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,17 +58,21 @@ public class RealTimeAlertCalculator {
    private static final int CALCULATE_THREADS = 3;
    
    private static final String KEY_INSTANCE = "__instance__";
+    private static final String KEY_INSTANCE_NAME = "__instancename__";
+    private static final String KEY_INSTANCE_HOST = "__instancehost__";
    private static final String KEY_APP = "__app__";
    private static final String KEY_METRICS = "__metrics__";
    private static final String KEY_PRIORITY = "__priority__";
    private static final String KEY_CODE = "__code__";
    private static final String KEY_AVAILABLE  = "__available__";
+    private static final String KEY_LABELS = "__labels__";
    private static final String UP = "up";
    private static final String DOWN = "down";
    private static final String KEY_ROW = "__row__";

    private static final Pattern APP_PATTERN = Pattern.compile("equals\\(__app__,\"([^\"]+)\"\\)");
    private static final Pattern AVAILABLE_PATTERN = Pattern.compile("equals\\(__available__,\"([^\"]+)\"\\)");
+    private static final Pattern LABEL_PATTERN = Pattern.compile("contains\\(__labels__,\\s*\"([^\"]+)\"\\)");
    private static final Pattern INSTANCE_PATTERN = Pattern.compile("equals\\(__instance__,\"(\\d+)\"\\)");
    private static final Pattern METRICS_PATTERN = Pattern.compile("equals\\(__metrics__,\"([^\"]+)\"\\)");

@@ -125,25 +132,35 @@ public class RealTimeAlertCalculator {
    private void calculate(CollectRep.MetricsData metricsData) {
        long currentTimeMilli = System.currentTimeMillis();
        String instance = String.valueOf(metricsData.getId());
+        String instanceName = metricsData.getInstanceName();
+        String instanceHost = metricsData.getInstanceHost();
        String app = metricsData.getApp();
        String metrics = metricsData.getMetrics();
        int priority = metricsData.getPriority();
        int code = metricsData.getCode().getNumber();
+        Map<String, String> labels = metricsData.getLabels();
+        Map<String, String> annotations = metricsData.getAnnotations();
        List<AlertDefine> thresholds = this.alertDefineService.getRealTimeAlertDefines();
-        // Filter thresholds by app, metrics and instance
-        thresholds = filterThresholdsByAppAndMetrics(thresholds, app, metrics, instance, priority);
+        // Filter thresholds by app, metrics, labels and instance
+        thresholds = filterThresholdsByAppAndMetrics(thresholds, app, metrics, labels, instance, priority);
        if (thresholds.isEmpty()) {
            return;
        }
        Map<String, Object> commonContext = new HashMap<>(8);
        commonContext.put(KEY_INSTANCE, instance);
+        commonContext.put(KEY_INSTANCE_NAME, instanceName);
+        commonContext.put(KEY_INSTANCE_HOST, instanceHost);
        commonContext.put(KEY_APP, app);
        commonContext.put(KEY_PRIORITY, priority);
        commonContext.put(KEY_CODE, code);
        commonContext.put(KEY_METRICS, metrics);
+        commonContext.put(KEY_LABELS, String.join(",", kvLabelsToKvStringSet(labels)));
        if (priority == 0) {
            commonContext.put(KEY_AVAILABLE, metricsData.getCode() == CollectRep.Code.SUCCESS ? UP : DOWN);
        }
+        if (labels != null) {
+            commonContext.putAll(labels);
+        }
        List<CollectRep.Field> fields = metricsData.getFields();
        Map<String, Object> fieldValueMap = new HashMap<>(8);
        int valueRowCount = metricsData.getValuesCount();
@@ -160,21 +177,26 @@ public class RealTimeAlertCalculator {
            if (StringUtils.isBlank(expr)) {
                continue;
            }
+            Map<String, String> commonFingerPrints = new HashMap<>(8);
+            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
+            // here use the alert name as finger, not care the alert name may be changed
+            commonFingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_NAME, instanceName);
+            commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_HOST, instanceHost);
+            commonFingerPrints.putAll(define.getLabels());
+            if (labels != null) {
+                commonFingerPrints.putAll(labels);
+            }
            {
                // trigger the expr before the metrics data, due the available up down or others
                try {
                    boolean match = execAlertExpression(fieldValueMap, expr, true);
                    try {
-                        Map<String, String> fingerPrints = new HashMap<>(8);
-                        fingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
-                        // here use the alert name as finger, not care the alert name may be changed
-                        fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                        fingerPrints.putAll(define.getLabels());
                        if (match) {
                            // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
-                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
+                            afterThresholdRuleMatch(currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
                        } else {
-                            handleRecoveredAlert(fingerPrints);
+                            handleRecoveredAlert(commonFingerPrints);
                        }
                        // if this threshold pre compile success, ignore blew
                        continue;
@@ -192,9 +214,7 @@ public class RealTimeAlertCalculator {
                fieldValueMap.put(KEY_ROW, valueRowCount);
                fieldValueMap.putAll(commonContext);
                fingerPrints.clear();
-                fingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
-                fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                fingerPrints.putAll(define.getLabels());
+                fingerPrints.putAll(commonFingerPrints);
                for (int index = 0; index < valueRow.getColumnsList().size(); index++) {
                    String valueStr = valueRow.getColumns(index);
                    if (CommonConstants.NULL_VALUE.equals(valueStr)) {
@@ -228,7 +248,7 @@ public class RealTimeAlertCalculator {
                    boolean match = execAlertExpression(fieldValueMap, expr, false);
                    try {
                        if (match) {
-                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
+                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
                        } else {
                            handleRecoveredAlert(fingerPrints);
                        }
@@ -250,7 +270,7 @@ public class RealTimeAlertCalculator {
     * @param priority  Current priority
     * @return Filtered alert definitions
     */
-    private List<AlertDefine> filterThresholdsByAppAndMetrics(List<AlertDefine> thresholds, String app, String metrics, String instance, int priority) {
+    private List<AlertDefine> filterThresholdsByAppAndMetrics(List<AlertDefine> thresholds, String app, String metrics, Map<String, String> labels, String instance, int priority) {
        return thresholds.stream()
                .filter(define -> {
                    if (StringUtils.isBlank(define.getExpr())) {
@@ -280,19 +300,29 @@ public class RealTimeAlertCalculator {

                    // Extract and check instance - optional with multiple values
                    Matcher instanceMatcher = INSTANCE_PATTERN.matcher(expr);
-                    // If no instance specified in expr, accept all instances
-                    if (!instanceMatcher.find()) {
+                    Matcher labelMatcher = LABEL_PATTERN.matcher(expr);
+                    // If no instance and instance labels specified in expr, accept all instances
+                    if (!instanceMatcher.find() && !labelMatcher.find()) {
                        return true;
                    }
                    
                    // Reset matcher to check all instances
                    instanceMatcher.reset();
+                    labelMatcher.reset();
                    // If instances specified, current instance must match one of them
                    while (instanceMatcher.find()) {
                        if (Objects.equals(instance, instanceMatcher.group(1))) {
                            return true;
                        }
                    }
+                    // If instance labels specified, current instance must match one of them
+                    Set<String> labelKvStringSet = kvLabelsToKvStringSet(labels);
+                    while (labelMatcher.find()) {
+                        String label = labelMatcher.group(1);
+                        if (labelKvStringSet.contains(label)) {
+                            return true;
+                        }
+                    }
                    return false;
                })
                .collect(Collectors.toList());
@@ -311,20 +341,31 @@ public class RealTimeAlertCalculator {
        pendingAlertMap.remove(fingerprint);
    }

-    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints, 
-                                         Map<String, Object> fieldValueMap, AlertDefine define) {
+    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
+                                         Map<String, Object> fieldValueMap, AlertDefine define, Map<String, String> annotations) {
        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
+            Map<String, String> alertLabels = new HashMap<>(8);
+            alertLabels.putAll(fingerPrints);
+            Map<String, String> alertAnnotations = new HashMap<>(8);
+            if (annotations != null) {
+                alertAnnotations.putAll(annotations);
+            }
+            if (define.getAnnotations() != null) {
+                alertAnnotations.putAll(define.getAnnotations());
+            }
+            // render var content in annotations
+            for (Map.Entry<String, String> entry : alertAnnotations.entrySet()) {
+                entry.setValue(AlertTemplateUtil.render(entry.getValue(), fieldValueMap));
+            }
            SingleAlert newAlert = SingleAlert.builder()
-                    .labels(labels)
-                    // todo render var content in annotations
-                    .annotations(define.getAnnotations())
+                    .labels(alertLabels)
+                    .annotations(alertAnnotations)
+                    // render var content in content
                    .content(AlertTemplateUtil.render(define.getTemplate(), fieldValueMap))
                    .status(CommonConstants.ALERT_STATUS_PENDING)
                    .triggerTimes(1) 
@@ -392,4 +433,13 @@ public class RealTimeAlertCalculator {
        return Arrays.hashCode(keyList.toArray(new String[0])) + "-"
                + Arrays.hashCode(valueList.toArray(new String[0]));
    }
+
+    private Set<String> kvLabelsToKvStringSet(Map<String, String> labels) {
+        if (labels == null || labels.isEmpty()) {
+            return Collections.singleton("");
+        }
+        return labels.entrySet().stream()
+                .map(item -> item.getKey() + ":" + item.getValue())
+                .collect(Collectors.toSet());
+    }
 }
@@ -17,30 +17,39 @@

 package org.apache.hertzbeat.alert.config;

+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * Alibaba Cloud SMS configuration properties
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class AlibabaSmsProperties {
    /**
     * Alibaba Cloud access key id
     */
+    @NotBlank(message = "AccessKeyId cannot be empty")
    private String accessKeyId;
    
    /**
     * Alibaba Cloud access key secret
     */
+    @NotBlank(message = "AccessKeySecret cannot be empty")
    private String accessKeySecret;
    
    /**
     * SMS signature
     */
+    @NotBlank(message = "SignName cannot be empty")
    private String signName;
    
    /**
     * SMS template Code
     */
+    @NotBlank(message = "TemplateCode cannot be null")
    private String templateCode;
 }
@@ -15,26 +15,32 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.pojo.dto;
+package org.apache.hertzbeat.alert.config;

 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;

 /**
- * Alibaba Sms Sender configuration dto
+ * AWS Cloud SMS configuration properties
 */
@Data
-public class SmsAlibabaConfig {
-    
+public class AwsSmsProperties {
+    /**
+     * AWS Cloud access key id
+     */
    @NotBlank(message = "AccessKeyId cannot be empty")
    private String accessKeyId;
-    
+
+    /**
+     * AWS Cloud access key secret
+     */
    @NotBlank(message = "AccessKeySecret cannot be empty")
    private String accessKeySecret;

-    @NotBlank(message = "SignName cannot be empty")
-    private String signName;
+    /**
+     * AWS Cloud region
+     */
+    @NotBlank(message = "region cannot be empty")
+    private String region;

-    @NotBlank(message = "TemplateCode cannot be null")
-    private String templateCode;
 }
@@ -17,7 +17,10 @@

 package org.apache.hertzbeat.alert.config;

+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

@@ -25,6 +28,8 @@ import org.springframework.stereotype.Component;
 * SMS configuration
 */
@Data
+@AllArgsConstructor
+@NoArgsConstructor
@Component
@ConfigurationProperties(prefix = "alerter.sms")
 public class SmsConfig {
@@ -37,6 +42,7 @@ public class SmsConfig {
    /**
     * sms service provider
     */
+    @NotBlank(message = "Type cannot be empty")
    private String type;

    /**
@@ -54,6 +60,16 @@ public class SmsConfig {
     */
    private UniSmsProperties unisms;

+    /**
+     * Aws configuration
+     */
+    private AwsSmsProperties aws;
+
+    /**
+     * Twilio SMS configuration
+     */
+    private TwilioSmsProperties twilio;
+
    /**
     * Smslocal SMS configuration
     */
@@ -18,12 +18,16 @@
 package org.apache.hertzbeat.alert.config;


+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * Smslocal SMS Properties
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SmslocalSmsProperties {
    /**
     * SmsLocal account api key
@@ -17,35 +17,45 @@

 package org.apache.hertzbeat.alert.config;

+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * Tencent Cloud SMS properties
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class TencentSmsProperties {
    /**
     * Tencent cloud account secret id
     */
+    @NotBlank(message = "SecretId cannot be empty")
    private String secretId;

    /**
     * Tencent cloud account secret key
     */
+    @NotBlank(message = "SecretKey cannot be empty")
    private String secretKey;

    /**
     * SMS app id
     */
+    @NotBlank(message = "AppId cannot be null")
    private String appId;

    /**
     * SMS signature
     */
+    @NotBlank(message = "SignName cannot be empty")
    private String signName;

    /**
     * SMS template ID
     */
+    @NotBlank(message = "templateId cannot be null")
    private String templateId;
 }
@@ -15,7 +15,7 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.pojo.dto;
+package org.apache.hertzbeat.alert.config;

 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
@@ -23,23 +23,27 @@ import lombok.Data;
 import lombok.NoArgsConstructor;

 /**
- * Sms Sender configuration dto
+ * Twilio SMS configuration properties
 */
@Data
-@NoArgsConstructor
@AllArgsConstructor
-public class SmsNoticeSender {
-    
-    @NotBlank(message = "Type cannot be empty")
-    private String type;
-    
-    private SmsTencentConfig tencent;
-    
-    private SmsAlibabaConfig alibaba;
+@NoArgsConstructor
+public class TwilioSmsProperties {
+    /**
+     * Twilio Account SID
+     */
+    @NotBlank(message = "Account SID cannot be empty")
+    private String accountSid;

-    private SmsUniSmsConfig unisms;
+    /**
+     * Twilio Auth Token
+     */
+    @NotBlank(message = "Auth Token cannot be empty")
+    private String authToken;

-    private SmslocalConfig smslocal;
-
-    private boolean enable = true;
-}
+    /**
+     * Twilio Issued Phone Number
+     */
+    @NotBlank(message = "Twilio Phone Number cannot be empty")
+    private String twilioPhoneNumber;
+}
@@ -17,16 +17,22 @@

 package org.apache.hertzbeat.alert.config;

+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;

 /**
 * UniSMS properties
 */
@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class UniSmsProperties {
    /**
     * UniSMS access key id
     */
+    @NotBlank(message = "accessKeyId cannot be empty")
    private String accessKeyId;
    
    /**
@@ -37,15 +43,18 @@ public class UniSmsProperties {
    /**
     * SMS signature
     */
+    @NotBlank(message = "signature cannot be null")
    private String signature;
    
    /**
     * SMS template ID
     */
+    @NotBlank(message = "templateId cannot be null")
    private String templateId;
    
    /**
     * Authentication mode: simple or hmac, default is simple
     */
+    @NotBlank(message = "authMode cannot be null")
    private String authMode = "simple";
 } 
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * SkyWalking Alert Content Entity
+ * @see <a href="https://skywalking.apache.org/docs/main/latest/en/setup/backend/backend-alarm/">backend-alarm</a>
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class SkyWalkingExternAlert {
+
+    private Long scopeId;
+
+    private String scope;
+
+    private String name;
+
+    private String id0;
+
+    private String id1;
+
+    private String ruleName;
+
+    private String alarmMessage;
+
+    private Long startTime;
+
+    private List<Tag> tags;
+
+    /**
+     * SkyWalking Tag Entity
+     */
+    @Data
+    public static class Tag {
+
+        private String key;
+
+        private String value;
+    }
+}
@@ -118,11 +118,11 @@ public class TencentCloudExternAlert {
    /**
     * Transaction alarm
     */
-    private static final String EVENT = "event";
+    public static final String EVENT = "event";

    /**
     * Indicator alarm
     */
-    private static final String METRIC = "metric";
+    public static final String METRIC = "metric";

 }
@@ -48,6 +48,7 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            TelegramBotNotifyDTO notifyBody = TelegramBotNotifyDTO.builder()
                    .chatId(receiver.getTgUserId())
                    .text(renderContent(noticeTemplate, alert))
+                    .messageThreadId(receiver.getTgMessageThreadId())
                    .disableWebPagePreview(true)
                    .build();
            HttpHeaders headers = new HttpHeaders();
@@ -84,6 +85,8 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
        private String text;
        @JsonProperty("disable_web_page_preview")
        private Boolean disableWebPagePreview;
+        @JsonProperty("message_thread_id")
+        private String messageThreadId;
    }

    @NoArgsConstructor
@@ -21,7 +21,9 @@ 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.SmsLocalSmsClientImpl;
+import org.apache.hertzbeat.alert.service.impl.AwsSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.TencentSmsClientImpl;
+import org.apache.hertzbeat.alert.service.impl.TwilioSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.UniSmsClientImpl;
 import org.apache.hertzbeat.alert.service.impl.AlibabaSmsClientImpl;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
@@ -32,7 +34,9 @@ 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.AWS;
 import static org.apache.hertzbeat.common.constants.SmsConstants.TENCENT;
+import static org.apache.hertzbeat.common.constants.SmsConstants.TWILIO;
 import static org.apache.hertzbeat.common.constants.SmsConstants.UNISMS;
 import static org.apache.hertzbeat.common.constants.SmsConstants.SMSLOCAL;

@@ -136,9 +140,15 @@ public class SmsClientFactory {
            case SMSLOCAL:
                currentSmsClient = new SmsLocalSmsClientImpl(smsConfig.getSmslocal());
                break;
+            case AWS:
+                currentSmsClient = new AwsSmsClientImpl(smsConfig.getAws());
+                break;
+            case TWILIO:
+                currentSmsClient = new TwilioSmsClientImpl(smsConfig.getTwilio());
+                break;
            default:
                log.warn("[SmsClientFactory] Unsupported SMS provider type: {}", smsConfig.getType());
                break;
        }
    }
-} 
+}
@@ -0,0 +1,287 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.config.AwsSmsProperties;
+import org.apache.hertzbeat.alert.service.SmsClient;
+import org.apache.hertzbeat.alert.util.CryptoUtils;
+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.hertzbeat.common.util.JsonUtil;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+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 java.net.URI;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.apache.hertzbeat.common.constants.SmsConstants.AWS;
+
+/**
+ * AWS Cloud SMS Client Implementation<br>
+ * API doc:<a href="https://docs.aws.amazon.com/pinpoint/latest/apireference_smsvoicev2/API_SendTextMessage.html">https://docs.aws.amazon.com/pinpoint/latest/apireference_smsvoicev2/API_SendTextMessage.html</a><br>
+ * Signature doc:<a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html"</a>https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_sigv-create-signed-request.html</a>
+ */
+@Slf4j
+public class AwsSmsClientImpl implements SmsClient {
+
+
+    private static final String SERVICE = "sms-voice";
+    private static final String MESSAGE_TEMPLATE = "Instance: %s, Priority: %s, Content: %s";
+
+    private final String accessKey;
+    private final String secretKey;
+    private final String region;
+
+    public AwsSmsClientImpl(AwsSmsProperties config) {
+        if (config != null) {
+            this.accessKey = config.getAccessKeyId();
+            this.secretKey = config.getAccessKeySecret();
+            this.region = config.getRegion();
+        } else {
+            this.accessKey = "";
+            this.secretKey = "";
+            this.region = "";
+        }
+    }
+
+    @Override
+    public void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
+        // Extract alert info
+        String instance = null;
+        String priority = null;
+        String content = null;
+        if (alert.getCommonLabels() != null) {
+            instance = alert.getCommonLabels().get("instance") == null ? alert.getGroupKey() : alert.getCommonLabels().get("instance");
+            priority = alert.getCommonLabels().get("priority") == null ? "unknown" : 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);
+            }
+        }
+        this.send(receiver.getPhone(), createMessage(instance, priority, content));
+    }
+
+    private String createMessage(String instance, String priority, String content) {
+        return String.format(MESSAGE_TEMPLATE, instance, priority, content);
+    }
+
+    private void send(String phoneNumber, String message) {
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("MessageBody", message);
+        payload.put("DestinationPhoneNumber", phoneNumber);
+        payload.put("MessageType", "TRANSACTIONAL");
+
+        Instant now = Instant.now();
+        String amzDate = DateTimeFormatter.ofPattern("yyyyMMdd'T'HHmmss'Z'").withZone(ZoneOffset.UTC).format(now);
+        String endpoint = "https://" + SERVICE + "." + region + ".amazonaws.com";
+
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            String payloadInString = new ObjectMapper().writeValueAsString(payload);
+            URI requestUri = new URI(endpoint);
+
+            HttpPost httpPost = createHttpPost(requestUri, amzDate, payloadInString);
+            log.info("Sending AWS SMS request to {}", requestUri + "," + "headers: " + Arrays.toString(httpPost.getAllHeaders()));
+            executeRequest(httpClient, httpPost, phoneNumber);
+        } catch (Exception e) {
+            log.warn("Failed to send SMS: {}", e.getMessage());
+            throw new SendMessageException(e.getMessage());
+        }
+    }
+
+
+    private HttpPost createHttpPost(URI requestUri, String amzDate, String payloadInString) throws Exception {
+        // Define headers once to avoid repetition (Order of headers must be maintained)
+        Map<String, String> headers = new LinkedHashMap<>();
+        headers.put("content-type", "application/x-amz-json-1.0");
+        headers.put("host", SERVICE + "." + this.region + ".amazonaws.com");
+        headers.put("x-amz-date", amzDate);
+        headers.put("x-amz-target", "PinpointSMSVoiceV2.SendTextMessage");
+
+        // Build authorization header using the same headers
+        AwsAuthenticationBuilder authBuilder = new AwsAuthenticationBuilder()
+                .credential(this.accessKey, this.secretKey)
+                .region(this.region);
+        headers.forEach(authBuilder::header);
+        String authorizationHeader = authBuilder.build(requestUri, "POST", SERVICE, payloadInString);
+
+        // Create HTTP post and set all headers
+        HttpPost httpPost = new HttpPost(requestUri);
+        httpPost.setHeader("Authorization", authorizationHeader);
+        headers.forEach(httpPost::setHeader);
+
+        httpPost.setEntity(new StringEntity(payloadInString, ContentType.APPLICATION_JSON));
+        return httpPost;
+    }
+
+    private void executeRequest(CloseableHttpClient httpClient, HttpPost httpPost, String phoneNumber) throws Exception {
+        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
+            int statusCode = response.getStatusLine().getStatusCode();
+            String responseBody = EntityUtils.toString(response.getEntity());
+            log.info("SMS response status: {}, body: {}", statusCode, responseBody);
+
+            if (statusCode != 200) {
+                throw new SendMessageException("HTTP request failed with status code: " + statusCode + ", response: " + responseBody);
+            }
+
+            JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
+            if (jsonResponse == null) {
+                throw new SendMessageException(statusCode + ":" + responseBody);
+            }
+
+            JsonNode responseNode = jsonResponse.get("MessageId");
+            if (responseNode == null) {
+                throw new SendMessageException(statusCode + ":" + responseBody);
+            }
+
+            String messageId = responseNode.asText();
+            log.info("Successfully sent SMS to phone: {}, messageId: {}", phoneNumber, messageId);
+        }
+    }
+
+    @Override
+    public String getType() {
+        return AWS;
+    }
+
+    @Override
+    public boolean checkConfig() {
+        return !(accessKey.isBlank() || secretKey.isBlank() || region.isBlank());
+    }
+
+
+    private static class AwsAuthenticationBuilder {
+        private String accessKey;
+        private String secretKey;
+        private String region;
+        private String service;
+        private URI requestUri;
+        private String method;
+        private String payload;
+        private final Map<String, String> headers = new LinkedHashMap<>();
+
+        public AwsAuthenticationBuilder region(String region) {
+            this.region = region;
+            return this;
+        }
+
+        public AwsAuthenticationBuilder credential(String accessKey, String secretKey) {
+            this.accessKey = accessKey;
+            this.secretKey = secretKey;
+            return this;
+        }
+
+        public AwsAuthenticationBuilder header(String header, String value) {
+            this.headers.put(header, value);
+            return this;
+        }
+
+        public String build(URI requestUri, String method, String service, String payload) throws Exception {
+            this.requestUri = requestUri;
+            this.method = method;
+            this.service = service;
+            this.payload = payload;
+            return "%s Credential=%s/%s, SignedHeaders=%s, Signature=%s".formatted(
+                    getAlgorithm(),
+                    this.accessKey,
+                    getCredentialScope(),
+                    getSignedHeaders(),
+                    getSignature()
+            );
+        }
+
+        private String getCredentialScope() {
+            return getDateStamp() + "/" + region + "/" + service + "/aws4_request";
+        }
+
+        private String getSignedHeaders() {
+            return String.join(";", headers.keySet());
+        }
+
+        private String getDateTime() {
+            return headers.get("x-amz-date");
+        }
+
+        private String getDateStamp() {
+            return getDateTime().substring(0, 8);
+        }
+
+        private String getSignature() {
+            String canonicalRequest = getCanonicalRequest();
+            String stringToSign = String.join("\n",
+                    getAlgorithm(),
+                    getDateTime(),
+                    getCredentialScope(),
+                    CryptoUtils.sha256Hex(canonicalRequest));
+
+            byte[] signingKey = getSignatureKey(secretKey, getDateStamp(), region, service);
+            return CryptoUtils.hmacSha256Hex(signingKey, stringToSign);
+        }
+
+        private String getCanonicalRequest() {
+            return String.join("\n",
+                    method,
+                    requestUri.getPath().isEmpty() ? "/" : requestUri.getPath(),
+                    requestUri.getQuery() != null ? requestUri.getQuery() : "",
+                    getCanonicalHeaders(),
+                    getSignedHeaders(),
+                    CryptoUtils.sha256Hex(payload)
+            );
+        }
+
+        private String getCanonicalHeaders() {
+            return headers.entrySet().stream()
+                    .map(entry -> entry.getKey() + ":" + entry.getValue())
+                    .collect(Collectors.joining("\n")) + "\n";
+        }
+
+        private String getAlgorithm() {
+            return "AWS4-HMAC-SHA256";
+        }
+
+        private byte[] getSignatureKey(String key, String dateStamp, String regionName, String serviceName) {
+            byte[] secret = ("AWS4" + key).getBytes(StandardCharsets.UTF_8);
+            byte[] date = CryptoUtils.hmac256(secret, dateStamp);
+            byte[] region = CryptoUtils.hmac256(date, regionName);
+            byte[] service = CryptoUtils.hmac256(region, serviceName);
+            return CryptoUtils.hmac256(service, "aws4_request");
+        }
+
+
+    }
+}
+
+
@@ -305,7 +305,7 @@ public class NoticeConfigServiceImpl implements NoticeConfigService, CommandLine
        Map<String, String> labels = new HashMap<>(8);
        labels.put(CommonConstants.LABEL_INSTANCE, "1000000");
        labels.put(CommonConstants.LABEL_ALERT_NAME, "CPU Usage Alert");
-        labels.put(CommonConstants.LABEL_HOST, "127.0.0.1");
+        labels.put(CommonConstants.LABEL_INSTANCE_HOST, "127.0.0.1");
        Map<String, String> annotations = new HashMap<>(8);
        annotations.put("suggest", "Please check the CPU usage of the server");
        SingleAlert singleAlert1 = SingleAlert.builder()
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.dto.SkyWalkingExternAlert;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.ExternAlertService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * SkyWalking external alarm service impl
+ */
+@Slf4j
+@Service
+public class SkyWalkingExternAlertService implements ExternAlertService {
+
+    @Autowired
+    private AlarmCommonReduce alarmCommonReduce;
+
+
+    @Override
+    public void addExternAlert(String content) {
+        TypeReference<List<SkyWalkingExternAlert>> typeReference = new TypeReference<>() {};
+        List<SkyWalkingExternAlert> alerts = JsonUtil.fromJson(content, typeReference);
+        if (alerts == null || alerts.isEmpty()) {
+            log.warn("Parse SkyWalking extern alert content failed! content: {}", content);
+            return;
+        }
+        for (SkyWalkingExternAlert alert : alerts) {
+            SingleAlert singleAlert = SingleAlert.builder()
+                    .content(alert.getAlarmMessage())
+                    .status(CommonConstants.ALERT_STATUS_FIRING)
+                    .activeAt(Instant.now().toEpochMilli())
+                    .startAt(alert.getStartTime() != null ? alert.getStartTime() : Instant.now().toEpochMilli())
+                    .labels(acquireAlertLabels(alert))
+                    .annotations(acquireAlertAnnotations(alert))
+                    .triggerTimes(1)
+                    .build();
+            alarmCommonReduce.reduceAndSendAlarm(singleAlert);   
+        }
+    }
+
+    @Override
+    public String supportSource() {
+        return "skywalking";
+    }
+
+    private Map<String, String> acquireAlertLabels(SkyWalkingExternAlert externAlert){
+        Map<String, String> labels = new HashMap<>(8);
+        labels.put("__source__", "skywalking");
+        List<SkyWalkingExternAlert.Tag> tags = externAlert.getTags();
+        if (tags == null || tags.isEmpty()){
+            return labels;
+        }
+        tags.forEach(tag -> labels.put(tag.getKey(), tag.getValue()));
+        return labels;
+    }
+
+    private Map<String, String> acquireAlertAnnotations(SkyWalkingExternAlert externAlert){
+        Map<String, String> annotations = new HashMap<>(8);
+        annotations.putIfAbsent("scope", externAlert.getScope());
+        annotations.putIfAbsent("name", externAlert.getName());
+        annotations.putIfAbsent("id0", externAlert.getId0());
+        annotations.putIfAbsent("id1", externAlert.getId1());
+        annotations.putIfAbsent("ruleName", externAlert.getRuleName());
+        return annotations;
+    }
+
+}
@@ -18,14 +18,22 @@
 package org.apache.hertzbeat.alert.service.impl;

 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.dto.TencentCloudExternAlert;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.ExternAlertService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 /**
 * Default external alarm service impl
 */
@@ -43,8 +51,7 @@ public class TencentExternAlertService implements ExternAlertService {
            log.warn("parse extern alert content failed! content: {}", content);
            return;
        }
-        // todo convert TenCloudAlertReport to SingleAlert
-        SingleAlert alert = new SingleAlert();
+        SingleAlert alert = new TencentCloudAlertConverter().convert(report);
        alarmCommonReduce.reduceAndSendAlarm(alert);
    }

@@ -52,4 +59,169 @@ public class TencentExternAlertService implements ExternAlertService {
    public String supportSource() {
        return "tencent";
    }
+
+    /**
+     * Converter: TencentCloud alert to SingleAlert
+     */
+    public static class TencentCloudAlertConverter {
+
+        /**
+         * Metric alert content template
+         */
+        private final String metricTemplate = "Tencent Cloud Metric Alert: {metricShowName} {calcType} {calcValue}{calcUnit}, Current: {currentValue}{unit}";
+
+        /**
+         * Event alert content template
+         */
+        private final String eventTemplate = "Tencent Cloud Event Alert: {productShowName} - {eventShowName}";
+
+
+        /**
+         * Convert TencentCloud alert to SingleAlert
+         */
+        public SingleAlert convert(TencentCloudExternAlert tencentAlert) {
+            // Building basic information
+            SingleAlert.SingleAlertBuilder builder = SingleAlert.builder()
+                    .status(convertStatus(tencentAlert.getAlarmStatus()))
+                    .startAt(parseTime(tencentAlert.getFirstOccurTime()))
+                    .activeAt(parseTime(tencentAlert.getFirstOccurTime()))
+                    .triggerTimes(1);
+            // If it is a recovery state, set the end time.
+            if ("0".equals(tencentAlert.getAlarmStatus())) {
+                builder.endAt(parseTime(tencentAlert.getRecoverTime()));
+            }
+
+            // Build labels
+            Map<String, String> labels = new HashMap<>();
+            buildLabels(labels, tencentAlert);
+
+            // Build annotations
+            Map<String, String> annotations = new HashMap<>();
+            buildAnnotations(annotations, tencentAlert);
+
+            // Build content
+            String content = generateContent(tencentAlert);
+
+            return builder
+                    .labels(labels)
+                    .annotations(annotations)
+                    .content(content)
+                    .build();
+        }
+
+        private void buildLabels(Map<String, String> labels, TencentCloudExternAlert alert) {
+            labels.put("__source__", "tencent_cloud");
+            labels.put("alert_type", alert.getAlarmType());
+            if (TencentCloudExternAlert.METRIC.equals(alert.getAlarmType())) {
+                labels.put("metric_name", alert.getAlarmPolicyInfo().getConditions().getMetricName());
+                labels.put("namespace", alert.getAlarmObjInfo().getNamespace());
+            } else {
+                labels.put("event_name", alert.getAlarmPolicyInfo().getConditions().getEventName());
+                labels.put("product_name", alert.getAlarmPolicyInfo().getConditions().getProductName());
+            }
+        }
+
+        private void buildAnnotations(Map<String, String> annotations, TencentCloudExternAlert alert) {
+            TencentCloudExternAlert.AlarmPolicyInfo alarmPolicyInfo = alert.getAlarmPolicyInfo();
+            TencentCloudExternAlert.AlarmObjInfo alarmObjInfo = alert.getAlarmObjInfo();
+            TencentCloudExternAlert.Dimensions dimensions = alert.getAlarmObjInfo().getDimensions();
+
+            putIfNotNull(annotations, "policy_id", alarmPolicyInfo.getPolicyId());
+            putIfNotNull(annotations, "policy_type", alarmPolicyInfo.getPolicyType());
+            putIfNotNull(annotations, "policy_name", alarmPolicyInfo.getPolicyName());
+            putIfNotNull(annotations, "policy_type_cname", alarmPolicyInfo.getPolicyTypeCname());
+
+            putIfNotNull(annotations, "namespace", alarmObjInfo.getNamespace());
+            putIfNotNull(annotations, "region", alarmObjInfo.getRegion());
+            putIfNotNull(annotations, "app_id", alarmObjInfo.getAppId());
+            putIfNotNull(annotations, "uin", alarmObjInfo.getUin());
+
+            putIfNotNull(annotations, "instance_id", dimensions.getUnInstanceId());
+            putIfNotNull(annotations, "obj_id", dimensions.getObjId());
+
+        }
+
+        /**
+         * Generate alert content with template
+         */
+        private String generateContent(TencentCloudExternAlert alert) {
+            if (TencentCloudExternAlert.METRIC.equals(alert.getAlarmType())) {
+                return generateMetricContent(alert);
+            } else {
+                return generateEventContent(alert);
+            }
+        }
+
+        /**
+         * Generate metric alert content
+         */
+        private String generateMetricContent(TencentCloudExternAlert alert) {
+            TencentCloudExternAlert.Conditions conditions = alert.getAlarmPolicyInfo().getConditions();
+            Map<String, String> params = new HashMap<>();
+
+            params.put("metricShowName", conditions.getMetricShowName());
+
+            if (StringUtils.isNotEmpty(conditions.getCalcType())
+                    && StringUtils.isNotEmpty(conditions.getCalcValue())) {
+                params.put("calcType", conditions.getCalcType());
+                params.put("calcValue", conditions.getCalcValue());
+                params.put("calcUnit", Objects.toString(conditions.getCalcUnit(), ""));
+            } else {
+                params.put("calcType", "");
+                params.put("calcValue", "N/A");
+                params.put("calcUnit", "");
+            }
+
+            if (StringUtils.isNotEmpty(conditions.getCurrentValue())) {
+                params.put("currentValue", conditions.getCurrentValue());
+                params.put("unit", Objects.toString(conditions.getUnit(), ""));
+            } else {
+                params.put("currentValue", "N/A");
+                params.put("unit", "");
+            }
+            return replacePlaceholders(metricTemplate, params);
+        }
+
+        /**
+         * Generate event alert content
+         */
+        private String generateEventContent(TencentCloudExternAlert alert) {
+            TencentCloudExternAlert.Conditions conditions = alert.getAlarmPolicyInfo().getConditions();
+            Map<String, String> params = new HashMap<>();
+            params.put("productShowName", conditions.getProductShowName());
+            params.put("eventShowName", conditions.getEventShowName());
+            return replacePlaceholders(eventTemplate, params);
+        }
+
+        /**
+         * Replace placeholders in template with actual values
+         */
+        private String replacePlaceholders(String template, Map<String, String> params) {
+            String result = template;
+            for (Map.Entry<String, String> entry : params.entrySet()) {
+                result = result.replace("{" + entry.getKey() + "}", Objects.toString(entry.getValue(), "NULL"));
+            }
+            return result;
+        }
+
+        private String convertStatus(String alarmStatus) {
+            return "1".equals(alarmStatus) ? CommonConstants.ALERT_STATUS_FIRING : CommonConstants.ALERT_STATUS_RESOLVED;
+        }
+
+        private Long parseTime(String timeStr) {
+            try {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                return sdf.parse(timeStr).getTime();
+            } catch (ParseException e) {
+                log.error("Failed to parse time: {}", timeStr);
+                throw new IllegalArgumentException("Failed to parse time: " + timeStr, e);
+            }
+        }
+
+        private void putIfNotNull(Map<String, String> map, String key, String value){
+            if (StringUtils.isNotEmpty(value)){
+                map.put(key, value);
+            }
+        }
+    }
 }
@@ -17,6 +17,7 @@

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

+import jakarta.xml.bind.DatatypeConverter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.alert.config.TencentSmsProperties;
 import org.apache.hertzbeat.alert.service.SmsClient;
@@ -34,7 +35,6 @@ import org.apache.http.util.EntityUtils;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import com.fasterxml.jackson.databind.JsonNode;

-import javax.xml.bind.DatatypeConverter;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.config.TwilioSmsProperties;
+import org.apache.hertzbeat.alert.service.SmsClient;
+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.hertzbeat.common.util.JsonUtil;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+import static org.apache.hertzbeat.common.constants.SmsConstants.TWILIO;
+
+/**
+ * Twilio SMS Client Implementation<br>
+ * API doc: <a href=
+ * "https://www.twilio.com/docs/sms/api">https://www.twilio.com/docs/sms/api</a>
+ */
+@Slf4j
+public class TwilioSmsClientImpl implements SmsClient {
+
+    private static final String API_URL_FORMAT = "https://api.twilio.com/2010-04-01/Accounts/%s/Messages.json";
+    private static final String MESSAGE_TEMPLATE = "Instance: %s, Priority: %s, Content: %s";
+
+    private final String accountSid;
+    private final String authToken;
+    private final String twilioPhoneNumber;
+
+    public TwilioSmsClientImpl(TwilioSmsProperties config) {
+        if (config != null) {
+            this.accountSid = config.getAccountSid();
+            this.authToken = config.getAuthToken();
+            this.twilioPhoneNumber = config.getTwilioPhoneNumber();
+        } else {
+            this.accountSid = "";
+            this.authToken = "";
+            this.twilioPhoneNumber = "";
+        }
+    }
+
+    @Override
+    public void sendMessage(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) {
+        String instance = null;
+        String priority = null;
+        String content = null;
+        if (alert.getCommonLabels() != null) {
+            instance = alert.getCommonLabels().get("instance") == null ? alert.getGroupKey()
+                    : alert.getCommonLabels().get("instance");
+            priority = alert.getCommonLabels().get("priority") == null ? "unknown"
+                    : 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);
+            }
+        }
+        this.send(receiver.getPhone(), createMessage(instance, priority, content));
+    }
+
+    private String createMessage(String instance, String priority, String content) {
+        return String.format(MESSAGE_TEMPLATE, instance, priority, content);
+    }
+
+    private void send(String phoneNumber, String message) {
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            String endpoint = String.format(API_URL_FORMAT, accountSid);
+            URI requestUri = new URI(endpoint);
+
+            HttpPost httpPost = createHttpPost(requestUri, phoneNumber, message);
+            log.info("Sending Twilio SMS request to {}", requestUri);
+            executeRequest(httpClient, httpPost, phoneNumber);
+        } catch (Exception e) {
+            log.warn("Failed to send SMS: {}", e.getMessage());
+            throw new SendMessageException(e.getMessage());
+        }
+    }
+
+    private HttpPost createHttpPost(URI requestUri, String toNumber, String message) {
+        HttpPost httpPost = new HttpPost(requestUri);
+
+        String auth = accountSid + ":" + authToken;
+        String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
+        httpPost.setHeader("Authorization", "Basic " + encodedAuth);
+
+        List<BasicNameValuePair> parameters = new ArrayList<>();
+        parameters.add(new BasicNameValuePair("To", toNumber));
+        parameters.add(new BasicNameValuePair("From", twilioPhoneNumber));
+        parameters.add(new BasicNameValuePair("Body", message));
+
+        try {
+            httpPost.setEntity(new UrlEncodedFormEntity(parameters));
+            return httpPost;
+        } catch (Exception e) {
+            log.error("Failed to create HTTP request: {}", e.getMessage());
+            throw new SendMessageException(e.getMessage());
+        }
+    }
+
+    private void executeRequest(CloseableHttpClient httpClient, HttpPost httpPost, String phoneNumber)
+            throws Exception {
+        try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
+            int statusCode = response.getStatusLine().getStatusCode();
+            String responseBody = EntityUtils.toString(response.getEntity());
+            log.info("SMS response status: {}, body: {}", statusCode, responseBody);
+
+            if (statusCode < 200 || statusCode >= 300) {
+
+                if (responseBody.contains("21608")) {
+                    throw new SendMessageException(
+                            "The Twilio trial account can only send SMS to verified phone numbers");
+                } else {
+                    throw new SendMessageException(
+                            "HTTP request failed with status code: " + statusCode + ", response: " + responseBody);
+                }
+            }
+
+            JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
+            if (jsonResponse == null) {
+                throw new SendMessageException(statusCode + ":" + responseBody);
+            }
+
+            JsonNode sidNode = jsonResponse.get("sid");
+            if (sidNode == null) {
+                throw new SendMessageException(statusCode + ":" + responseBody);
+            }
+
+            String sid = sidNode.asText();
+            log.info("Successfully sent SMS to phone: {}, sid: {}", phoneNumber, sid);
+        }
+    }
+
+    @Override
+    public String getType() {
+        return TWILIO;
+    }
+
+    @Override
+    public boolean checkConfig() {
+        return !(accountSid.isBlank() || authToken.isBlank() || twilioPhoneNumber.isBlank());
+    }
+}
@@ -89,7 +89,18 @@ public class CryptoUtils {
     * @return lowercase hexadecimal string
     */
    public static String hmacSha256Hex(String key, String data) {
-        byte[] hmacResult = hmac256(key.getBytes(UTF8), data);
+        return hmacSha256Hex(hmac256(key.getBytes(UTF8), data), data);
+    }
+
+    /**
+     * Calculate HMAC-SHA256 signature and convert to lowercase hexadecimal string
+     * Note: This is necessary as, converting a String to byte[] and back may yield different results due to encoding differences or data loss.
+     * @param key secret key in byte array
+     * @param data data to be signed
+     * @return lowercase hexadecimal string
+     */
+    public static String hmacSha256Hex(byte[] key, String data) {
+        byte[] hmacResult = hmac256(key, data);
        return DatatypeConverter.printHexBinary(hmacResult).toLowerCase();
    }
 } 
@@ -0,0 +1,133 @@
+/*
+ * 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.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+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.AlertInhibitService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.AlertInhibit;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.util.HashMap;
+
+/**
+ * test case for {@link AlertInhibitControllerTest}
+ */
+@ExtendWith(MockitoExtension.class)
+public class AlertInhibitControllerTest {
+
+    private MockMvc mockMvc;
+
+    @Mock
+    private AlertInhibitService alertInhibitService;
+
+    @InjectMocks
+    private AlertInhibitController alertInhibitController;
+
+    private AlertInhibit alertInhibit;
+
+    @BeforeEach
+    void setUp() {
+        this.mockMvc = standaloneSetup(alertInhibitController).build();
+
+        HashMap<String, String> sourceLabels = new HashMap<>();
+        HashMap<String, String> targetLabels = new HashMap<>();
+
+        alertInhibit = AlertInhibit.builder()
+                .id(1L)
+                .name("test")
+                .sourceLabels(sourceLabels)
+                .targetLabels(targetLabels)
+                .creator("test")
+                .build();
+    }
+
+    @Test
+    void testAddNewAlertInhibit() throws Exception {
+
+        doNothing().when(alertInhibitService).validate(any(AlertInhibit.class), eq(false));
+        doNothing().when(alertInhibitService).addAlertInhibit(any(AlertInhibit.class));
+
+        mockMvc.perform(post("/api/alert/inhibit")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(JsonUtil.toJson(alertInhibit)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andExpect(jsonPath("$.msg").value("Add success"));
+
+    }
+
+    @Test
+    void testModifyAlertInhibit() throws Exception {
+
+        doNothing().when(alertInhibitService).validate(any(AlertInhibit.class), eq(true));
+        doNothing().when(alertInhibitService).modifyAlertInhibit(any(AlertInhibit.class));
+
+        mockMvc.perform(put("/api/alert/inhibit")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(JsonUtil.toJson(alertInhibit)))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE))
+                .andExpect(jsonPath("$.msg").value("Modify success"));
+
+
+    }
+
+    @Test
+    void testGetAlertInhibitExists() throws Exception {
+
+        when(alertInhibitService.getAlertInhibit(1L)).thenReturn(alertInhibit);
+
+        mockMvc.perform(get("/api/alert/inhibit/{id}", 1L)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.data.id").value(alertInhibit.getId()));
+    }
+
+    @Test
+    void testGetAlertInhibitNotExists() throws Exception {
+
+        when(alertInhibitService.getAlertInhibit(1L)).thenReturn(null);
+
+        mockMvc.perform(get("/api/alert/inhibit/{id}", 1L)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value((int) CommonConstants.MONITOR_NOT_EXIST_CODE))
+                .andExpect(jsonPath("$.msg").value("AlertInhibit not exist."));
+    }
+
+
+}
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service;
+
+import org.apache.hertzbeat.alert.config.AwsSmsProperties;
+import org.apache.hertzbeat.alert.service.impl.AwsSmsClientImpl;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Test case for {@link AwsSmsClientImpl}
+ */
+class AwsSmsClientImplTest {
+
+
+    @Test
+    void getType() {
+        AwsSmsProperties awsSmsProperties = new AwsSmsProperties();
+        awsSmsProperties.setAccessKeyId("accessKeyId");
+        awsSmsProperties.setAccessKeySecret("accessKeySecret");
+        awsSmsProperties.setRegion("region");
+        AwsSmsClientImpl awsSmsClient = new AwsSmsClientImpl(awsSmsProperties);
+
+        assertEquals("aws", awsSmsClient.getType());
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+        "accessKeyId, accessKeySecret, region, true",
+        "accessKeyId, accessKeySecret, '', false",
+        "accessKeyId, '', region, false",
+        "accessKeyId, accessKeySecret, '', false",
+        "accessKeyId, '', '', false",
+        "'', accessKeySecret, region, false",
+        "'', accessKeySecret, '', false",
+        "'', '', region, false",
+        "'', accessKeySecret, '', false",
+    })
+    void checkConfig(String accessKeyId, String accessKeySecret, String region, boolean expected) {
+        AwsSmsProperties awsSmsProperties = new AwsSmsProperties();
+        awsSmsProperties.setAccessKeyId(accessKeyId);
+        awsSmsProperties.setAccessKeySecret(accessKeySecret);
+        awsSmsProperties.setRegion(region); 
+        AwsSmsClientImpl awsSmsClient = new AwsSmsClientImpl(awsSmsProperties);
+
+        assertEquals(expected, awsSmsClient.checkConfig());
+    }
+  
+
+
+}
@@ -41,12 +41,12 @@ 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.apache.hertzbeat.warehouse.db.QueryExecutor;
 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}
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service;
+
+import org.apache.hertzbeat.alert.config.TwilioSmsProperties;
+import org.apache.hertzbeat.alert.service.impl.TwilioSmsClientImpl;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * Test case for {@link TwilioSmsClientImpl}
+ */
+class TwilioSmsClientImplTest {
+
+    @Test
+    void getType() {
+        TwilioSmsProperties twilioSmsProperties = new TwilioSmsProperties();
+        twilioSmsProperties.setAccountSid("accountSid");
+        twilioSmsProperties.setAuthToken("authToken");
+        twilioSmsProperties.setTwilioPhoneNumber("twilioPhoneNumber");
+        TwilioSmsClientImpl twilioSmsClient = new TwilioSmsClientImpl(twilioSmsProperties);
+
+        assertEquals("twilio", twilioSmsClient.getType());
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "accountSid, authToken, twilioPhoneNumber, true",
+            "accountSid, authToken, '', false",
+            "accountSid, '', twilioPhoneNumber, false",
+            "accountSid, '', '', false",
+            "'', authToken, twilioPhoneNumber, false",
+            "'', authToken, '', false",
+            "'', '', twilioPhoneNumber, false",
+            "'', '', '', false",
+    })
+    void checkConfig(String accountSid, String authToken, String twilioPhoneNumber, boolean expected) {
+        TwilioSmsProperties twilioSmsProperties = new TwilioSmsProperties();
+        twilioSmsProperties.setAccountSid(accountSid);
+        twilioSmsProperties.setAuthToken(authToken);
+        twilioSmsProperties.setTwilioPhoneNumber(twilioPhoneNumber);
+        TwilioSmsClientImpl twilioSmsClient = new TwilioSmsClientImpl(twilioSmsProperties);
+
+        assertEquals(expected, twilioSmsClient.checkConfig());
+    }
+}
@@ -155,6 +155,11 @@
            <artifactId>plc4j-driver-modbus</artifactId>
            <version>0.12.0</version>
        </dependency>
+        <dependency>
+            <groupId>org.apache.plc4x</groupId>
+            <artifactId>plc4j-driver-s7</artifactId>
+            <version>0.12.0</version>
+        </dependency>
        <dependency>
            <groupId>org.apache.sshd</groupId>
            <artifactId>sshd-sftp</artifactId>
@@ -63,6 +63,25 @@ public class JdbcCommonCollect extends AbstractCollect {

    private static final String[] VULNERABLE_KEYWORDS = {"allowLoadLocalInfile", "allowLoadLocalInfileInPath", "useLocalInfile"};

+    private static final String[] BLACK_LIST = {
+            // dangerous SQL commands - may cause database structure damage or data leakage
+            "create trigger", "create alias", "runscript from", "shutdown", "drop table",
+            "drop database", "create function", "alter system", "grant all", "revoke all",
+
+            // file IO related - may cause server files to be read or written
+            "allowloadlocalinfile", "allowloadlocalinfileinpath", "uselocalinfile",
+
+            // code execution related - may result in remote code execution
+            "init=", "javaobjectserializer=", "runscript", "serverstatusdiffinterceptor",
+            "queryinterceptors=", "statementinterceptors=", "exceptioninterceptors=",
+
+            // multiple statement execution - may lead to SQL injection
+            "allowmultiqueries",
+
+            // deserialization related - may result in remote code execution
+            "autodeserialize", "detectcustomcollations",
+    };
+
    private final GlobalConnectionCache connectionCommonCache = GlobalConnectionCache.getInstance();


@@ -331,17 +350,24 @@ public class JdbcCommonCollect extends AbstractCollect {
        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();
-            // 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")
-                    || url.contains("uselocalinfile") || url.contains("autodeserialize") || url.contains("detectcustomcollations")
-                    || url.contains("serverstatusdiffinterceptor")) {
-                throw new IllegalArgumentException("Invalid JDBC URL: contains malicious characters.");
+            // limit url length
+            if (jdbcProtocol.getUrl().length() > 2048) {
+                throw new IllegalArgumentException("JDBC URL length exceeds maximum limit of 2048 characters");
            }
-            // when has config jdbc url, use it 
-            return jdbcProtocol.getUrl();
+            // remove special characters
+            String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F]", "");
+            String url = cleanedUrl.toLowerCase();
+            // backlist check
+            for (String keyword : BLACK_LIST) {
+                if (url.contains(keyword)) {
+                    throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
+                }
+            }
+            // url format check
+            if (!url.matches("^jdbc:[a-zA-Z0-9]+://[^\\s]+$")) {
+                throw new IllegalArgumentException("Invalid JDBC URL format");
+            }
+            return cleanedUrl;
        }
        return switch (jdbcProtocol.getPlatform()) {
            case "mysql", "mariadb" -> "jdbc:mysql://" + host + ":" + port
@@ -18,11 +18,14 @@
 package org.apache.hertzbeat.collector.collect.http;

 import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.io.StringReader;
 import java.net.ConnectException;
@@ -34,19 +37,22 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javax.net.ssl.SSLException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
 import org.apache.hertzbeat.collector.collect.http.promethus.AbstractPrometheusParse;
 import org.apache.hertzbeat.collector.collect.http.promethus.PrometheusParseCreator;
-import org.apache.hertzbeat.collector.collect.http.promethus.exporter.ExporterParser;
-import org.apache.hertzbeat.collector.collect.http.promethus.exporter.MetricFamily;
+import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily;
+import org.apache.hertzbeat.collector.collect.prometheus.parser.OnlineParser;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
@@ -63,11 +69,9 @@ import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
-import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.client.config.RequestConfig;
@@ -77,8 +81,6 @@ import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.auth.DigestScheme;
-import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.protocol.HttpContext;
 import org.apache.http.util.EntityUtils;
@@ -86,20 +88,30 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.web.util.UriUtils;
 import org.xml.sax.InputSource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Collections;

 /**
 * http https collect
 */
@Slf4j
 public class HttpCollectImpl extends AbstractCollect {
-    private static final Map<Long, ExporterParser> EXPORTER_PARSER_TABLE = new ConcurrentHashMap<>();
-    private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
-            HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
-            HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
+    private final Set<Integer> defaultSuccessStatusCodes = Set.of(
+            HttpStatus.SC_OK,
+            HttpStatus.SC_CREATED,
+            HttpStatus.SC_ACCEPTED,
+            HttpStatus.SC_MULTIPLE_CHOICES,
+            HttpStatus.SC_MOVED_PERMANENTLY,
+            HttpStatus.SC_MOVED_TEMPORARILY);

    @Override
    public void preCheck(Metrics metrics) throws IllegalArgumentException {
@@ -132,10 +144,11 @@ public class HttpCollectImpl extends AbstractCollect {
                builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                return;
            }
-            // todo This code converts an InputStream directly to a String. For large data in Prometheus exporters,
-            // this could create large objects, potentially impacting JVM memory space significantly.
-            // Option 1: Parse using InputStream, but this requires significant code changes;
-            // Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
+            /*
+             this could create large objects, potentially impacting JVM memory space significantly.
+             Option 1: Parse using InputStream, but this requires significant code changes;
+             Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
+             */
            String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
            if (!StringUtils.hasText(resp)) {
                log.info("http response entity is empty, status: {}.", statusCode);
@@ -149,15 +162,17 @@ public class HttpCollectImpl extends AbstractCollect {
                    case DispatchConstants.PARSE_PROM_QL ->
                            parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
                    case DispatchConstants.PARSE_PROMETHEUS ->
-                            parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
+                            parseResponseByPrometheusExporter(response.getEntity().getContent(), metrics.getAliasFields(), builder);
                    case DispatchConstants.PARSE_XML_PATH ->
-                            parseResponseByXmlPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
+                            parseResponseByXmlPath(resp, metrics, builder, responseTime);
                    case DispatchConstants.PARSE_WEBSITE ->
                            parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime);
                    case DispatchConstants.PARSE_SITE_MAP ->
                            parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
                    case DispatchConstants.PARSE_HEADER ->
                            parseResponseByHeader(builder, metrics.getAliasFields(), response);
+                    case DispatchConstants.PARSE_CONFIG ->
+                            parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                    default ->
                            parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                }
@@ -328,8 +343,207 @@ public class HttpCollectImpl extends AbstractCollect {
        }
    }

-    private void parseResponseByXmlPath(String resp, List<String> aliasFields, HttpProtocol http,
-                                        CollectRep.MetricsData.Builder builder) {
+    private void parseResponseByXmlPath(String resp, Metrics metrics,
+                                        CollectRep.MetricsData.Builder builder, Long responseTime) {
+        HttpProtocol http = metrics.getHttp();
+        List<String> aliasFields = metrics.getAliasFields();
+        String xpathExpression = http.getParseScript();
+        if (!StringUtils.hasText(xpathExpression)) {
+            log.warn("Http collect parse type is xmlPath, but the xpath expression is empty.");
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg("XPath expression is empty");
+            return;
+        }
+        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
+
+        try {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+            dbf.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            dbf.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+            dbf.setXIncludeAware(false);
+            dbf.setExpandEntityReferences(false);
+
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document document = db.parse(new InputSource(new StringReader(resp)));
+
+            XPathFactory xpathFactory = XPathFactory.newInstance();
+            XPath xpath = xpathFactory.newXPath();
+
+            NodeList nodeList = (NodeList) xpath.evaluate(xpathExpression, document, XPathConstants.NODESET);
+
+            if (nodeList == null || nodeList.getLength() == 0) {
+                log.debug("XPath expression '{}' returned no nodes.", xpathExpression);
+                boolean requestedSummaryFields = aliasFields.stream()
+                        .anyMatch(alias -> NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)
+                                || CollectorConstants.KEYWORD.equalsIgnoreCase(alias));
+
+                if (requestedSummaryFields) {
+                    CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+                    for (String alias : aliasFields) {
+                        if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                            valueRowBuilder.addColumn(responseTime.toString());
+                        } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
+                            valueRowBuilder.addColumn(Integer.toString(keywordNum));
+                        } else {
+                            valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
+                        }
+                    }
+                    builder.addValueRow(valueRowBuilder.build());
+                }
+                return;
+            }
+
+            for (int i = 0; i < nodeList.getLength(); i++) {
+                Node node = nodeList.item(i);
+                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+
+                for (String alias : aliasFields) {
+                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(responseTime.toString());
+                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
+                    } else {
+                        try {
+                            String value = (String) xpath.evaluate(alias, node, XPathConstants.STRING);
+                            valueRowBuilder.addColumn(StringUtils.hasText(value) ? value : CommonConstants.NULL_VALUE);
+                        } catch (XPathExpressionException e) {
+                            log.warn("Failed to evaluate XPath '{}' for node [{}]: {}", alias, node.getNodeName(), e.getMessage());
+                            valueRowBuilder.addColumn(CommonConstants.NULL_VALUE);
+                        }
+                    }
+                }
+                builder.addValueRow(valueRowBuilder.build());
+            }
+
+        } catch (Exception e) {
+            log.warn("Failed to parse XML response with XPath '{}': {}", xpathExpression, e.getMessage(), e);
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg("Failed to parse XML response: " + e.getMessage());
+        }
+    }
+
+
+
+    /**
+     * Parses the response body in Properties/Config format.
+     * Two modes are supported:
+     * 1. single-object mode: if http.parseScript is null, aliasFields are treated as indicator names.
+     * - If there is a locator in the indicator definition, use the locator as the key of the Properties.
+     * - Otherwise, use aliasField (metric name) as the key for Properties.
+     * Generate a single row of data.
+     * 2. array mode: if http.parseScript is not empty (e.g. “users”), treat it as an array base path.
+     * Treat aliasFields as the attribute name of an array element, and generate a single row of data for each array index. locator is invalid in this mode.
+     *
+     * @param resp Response body string
+     * @param aliasFields List of metrics aliases (i.e., the list of fields in metrics.fields).
+     * @param http http protocol configuration
+     * @param builder The metrics data builder.
+     * @param responseTime response time
+     */
+    private void parseResponseByConfig(String resp, List<String> aliasFields, HttpProtocol http,
+                                       CollectRep.MetricsData.Builder builder, Long responseTime) {
+        if (!StringUtils.hasText(resp)) {
+            log.warn("Http collect parse type is config, but response body is empty.");
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg("Response body is empty");
+            return;
+        }
+
+        Properties properties = new Properties();
+        try (StringReader reader = new StringReader(resp)) {
+            properties.load(reader);
+        } catch (IOException e) {
+            log.warn("Failed to parse config response: {}", e.getMessage(), e);
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg("Failed to parse config response: " + e.getMessage());
+            return;
+        }
+        String arrayBasePath = http.getParseScript();
+        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
+
+        if (!StringUtils.hasText(arrayBasePath)) {
+            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+            for (String alias : aliasFields) {
+                if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                    valueRowBuilder.addColumn(responseTime.toString());
+                } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
+                    valueRowBuilder.addColumn(Integer.toString(keywordNum));
+                } else {
+                    String value = properties.getProperty(alias);
+                    valueRowBuilder.addColumn(value != null ? value : CommonConstants.NULL_VALUE);
+                }
+            }
+            CollectRep.ValueRow valueRow = valueRowBuilder.build();
+            if (hasMeaningfulDataInRow(valueRow, aliasFields)) {
+                builder.addValueRow(valueRow);
+            } else {
+                log.warn("No meaningful data found in single config object response for aliasFields: {}", aliasFields);
+            }
+        } else {
+            Pattern pattern = Pattern.compile("^" + Pattern.quote(arrayBasePath) + "\\[(\\d+)]\\.");
+            Set<Integer> existingIndices = new HashSet<>();
+            for (String key : properties.stringPropertyNames()) {
+                Matcher matcher = pattern.matcher(key);
+                if (matcher.find()) {
+                    try {
+                        int index = Integer.parseInt(matcher.group(1));
+                        existingIndices.add(index);
+                    } catch (NumberFormatException e) {
+                        log.error("Could not parse index from key: {}", key);
+                    }
+                }
+            }
+            if (existingIndices.isEmpty()) {
+                log.warn("Could not find any array elements for base path '{}' in config response.", arrayBasePath);
+                return;
+            }
+            List<Integer> sortedIndices = new ArrayList<>(existingIndices);
+            Collections.sort(sortedIndices);
+            for (int i : sortedIndices) {
+                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+                for (String alias : aliasFields) {
+                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(responseTime.toString());
+                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
+                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
+                    } else {
+                        String currentKey = arrayBasePath + "[" + i + "]." + alias;
+                        String value = properties.getProperty(currentKey);
+                        valueRowBuilder.addColumn(value != null ? value : CommonConstants.NULL_VALUE);
+                    }
+                }
+                CollectRep.ValueRow valueRow = valueRowBuilder.build();
+                if (hasMeaningfulDataInRow(valueRow, aliasFields)) {
+                    builder.addValueRow(valueRowBuilder.build());
+                }
+            }
+        }
+    }
+
+    private boolean hasMeaningfulDataInRow(CollectRep.ValueRow valueRow, List<String> aliasFields) {
+        if (valueRow.getColumnsCount() == 0) {
+            return false;
+        }
+        if (valueRow.getColumnsCount() != aliasFields.size()) {
+            log.error("Column count ({}) mismatch with aliasFields size ({}) when checking meaningful data.",
+                    valueRow.getColumnsCount(), aliasFields.size());
+            return false;
+        }
+
+        boolean hasMeaningfulData = false;
+        for (int i = 0; i < valueRow.getColumnsCount(); i++) {
+            String columnValue = valueRow.getColumns(i);
+            String alias = aliasFields.get(i);
+            if (!CommonConstants.NULL_VALUE.equals(columnValue) && (!NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias) && !CollectorConstants.KEYWORD.equalsIgnoreCase(alias))) {
+                hasMeaningfulData = true;
+                break;
+            }
+            if ((NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias) || CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) && !CommonConstants.NULL_VALUE.equals(columnValue)) {
+                hasMeaningfulData = true;
+            }
+        }
+        return hasMeaningfulData;
    }

    private void parseResponseByJsonPath(String resp, List<String> aliasFields, HttpProtocol http,
@@ -386,36 +600,22 @@ public class HttpCollectImpl extends AbstractCollect {
        prometheusParser.handle(resp, aliasFields, http, builder);
    }

-    private void parseResponseByPrometheusExporter(String resp, List<String> aliasFields,
-                                                   CollectRep.MetricsData.Builder builder) {
-        if (!EXPORTER_PARSER_TABLE.containsKey(builder.getId())) {
-            EXPORTER_PARSER_TABLE.put(builder.getId(), new ExporterParser());
+    private void parseResponseByPrometheusExporter(InputStream content, List<String> aliasFields, CollectRep.MetricsData.Builder builder) throws IOException {
+        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(content);
+        if (metricFamilyMap == null || metricFamilyMap.isEmpty()) {
+            return;
        }
-        ExporterParser parser = EXPORTER_PARSER_TABLE.get(builder.getId());
-        Map<String, MetricFamily> metricFamilyMap = parser.textToMetric(resp);
        String metrics = builder.getMetrics();
        if (metricFamilyMap.containsKey(metrics)) {
            MetricFamily metricFamily = metricFamilyMap.get(metrics);
            for (MetricFamily.Metric metric : metricFamily.getMetricList()) {
-                Map<String, String> labelMap = metric.getLabelPair()
+                Map<String, String> labelMap = metric.getLabels()
                        .stream()
                        .collect(Collectors.toMap(MetricFamily.Label::getName, MetricFamily.Label::getValue));
                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
                for (String aliasField : aliasFields) {
                    if ("value".equals(aliasField)) {
-                        if (metric.getCounter() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getCounter().getValue()));
-                        } else if (metric.getGauge() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getGauge().getValue()));
-                        } else if (metric.getUntyped() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getUntyped().getValue()));
-                        } else if (metric.getInfo() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getInfo().getValue()));
-                        } else if (metric.getSummary() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getSummary().getValue()));
-                        } else if (metric.getHistogram() != null) {
-                            valueRowBuilder.addColumn(String.valueOf(metric.getHistogram().getValue()));
-                        }
+                        valueRowBuilder.addColumn(String.valueOf(metric.getValue()));
                    } else {
                        String columnValue = labelMap.get(aliasField);
                        valueRowBuilder.addColumn(columnValue == null ? CommonConstants.NULL_VALUE : columnValue);
@@ -472,11 +672,10 @@ public class HttpCollectImpl extends AbstractCollect {
                CredentialsProvider provider = new BasicCredentialsProvider();
                UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(auth.getDigestAuthUsername(),
                        auth.getDigestAuthPassword());
-                provider.setCredentials(AuthScope.ANY, credentials);
-                AuthCache authCache = new BasicAuthCache();
-                authCache.put(new HttpHost(httpProtocol.getHost(), Integer.parseInt(httpProtocol.getPort())), new DigestScheme());
+                AuthScope authScope = new AuthScope(httpProtocol.getHost(), Integer.parseInt(httpProtocol.getPort()));
+                provider.setCredentials(authScope, credentials);
+
                clientContext.setCredentialsProvider(provider);
-                clientContext.setAuthCache(authCache);
                return clientContext;
            }
        }
@@ -509,13 +708,37 @@ public class HttpCollectImpl extends AbstractCollect {
        }
        // params
        Map<String, String> params = httpProtocol.getParams();
+        boolean enableUrlEncoding = Boolean.parseBoolean(httpProtocol.getEnableUrlEncoding());
+        StringBuilder queryParams = new StringBuilder();
+
        if (params != null && !params.isEmpty()) {
            for (Map.Entry<String, String> param : params.entrySet()) {
-                if (StringUtils.hasText(param.getValue())) {
-                    requestBuilder.addParameter(param.getKey(), TimeExpressionUtil.calculate(param.getValue()));
+                String key = param.getKey();
+                String value = param.getValue();
+
+                if (!StringUtils.hasText(key)) {
+                    continue;
+                }
+
+                if (!queryParams.isEmpty()) {
+                    queryParams.append("&");
+                }
+
+                if (enableUrlEncoding) {
+                    key = UriUtils.encodeQueryParam(key, "UTF-8");
+                }
+                queryParams.append(key);
+
+                if (StringUtils.hasText(value)) {
+                    String calculatedValue = TimeExpressionUtil.calculate(value);
+                    if (enableUrlEncoding) {
+                        calculatedValue = UriUtils.encodeQueryParam(calculatedValue, "UTF-8");
+                    }
+                    queryParams.append("=").append(calculatedValue);
                }
            }
        }
+
        // The default request header can be overridden if customized
        // keep-alive
        requestBuilder.addHeader(HttpHeaders.CONNECTION, NetworkConstants.KEEP_ALIVE);
@@ -525,8 +748,7 @@ public class HttpCollectImpl extends AbstractCollect {
        if (headers != null && !headers.isEmpty()) {
            for (Map.Entry<String, String> header : headers.entrySet()) {
                if (StringUtils.hasText(header.getValue())) {
-                    requestBuilder.addHeader(CollectUtil.replaceUriSpecialChar(header.getKey()),
-                            CollectUtil.replaceUriSpecialChar(header.getValue()));
+                    requestBuilder.addHeader(header.getKey(), header.getValue());
                }
            }
        }
@@ -557,14 +779,32 @@ public class HttpCollectImpl extends AbstractCollect {

        // if it has payload, would override post params
        if (StringUtils.hasLength(httpProtocol.getPayload()) && (HttpMethod.POST.matches(httpMethod) || HttpMethod.PUT.matches(httpMethod))) {
-            requestBuilder.setEntity(new StringEntity(httpProtocol.getPayload(), StandardCharsets.UTF_8));
+            requestBuilder.setEntity(new StringEntity(TimeExpressionUtil.calculate(httpProtocol.getPayload()), StandardCharsets.UTF_8));
        }

-        // uri
-        String uri = CollectUtil.replaceUriSpecialChar(httpProtocol.getUrl());
-        if (IpDomainUtil.isHasSchema(httpProtocol.getHost())) {
+        // uri encode
+        String uri;
+        if (enableUrlEncoding) {
+            // if the url contains parameters directly
+            if (httpProtocol.getUrl().contains("?")) {
+                String path = httpProtocol.getUrl().substring(0, httpProtocol.getUrl().indexOf("?"));
+                String query = httpProtocol.getUrl().substring(httpProtocol.getUrl().indexOf("?") + 1);
+                uri = UriUtils.encodePath(path, "UTF-8") + "?" + UriUtils.encodeQuery(query, "UTF-8");
+            } else {
+                uri = UriUtils.encodePath(httpProtocol.getUrl(), "UTF-8");
+            }
+        } else {
+            uri = httpProtocol.getUrl();
+        }

-            requestBuilder.setUri(httpProtocol.getHost() + ":" + httpProtocol.getPort() + uri);
+        // append query params
+        if (!queryParams.isEmpty()) {
+            uri += (uri.contains("?") ? "&" : "?") + queryParams;
+        }
+
+        String finalUri;
+        if (IpDomainUtil.isHasSchema(httpProtocol.getHost())) {
+            finalUri = httpProtocol.getHost() + ":" + httpProtocol.getPort() + uri;
        } else {
            String ipAddressType = IpDomainUtil.checkIpAddressType(httpProtocol.getHost());
            String baseUri = NetworkConstants.IPV6.equals(ipAddressType)
@@ -572,12 +812,19 @@ public class HttpCollectImpl extends AbstractCollect {
                    : String.format("%s:%s%s", httpProtocol.getHost(), httpProtocol.getPort(), uri);
            boolean ssl = Boolean.parseBoolean(httpProtocol.getSsl());
            if (ssl) {
-                requestBuilder.setUri(NetworkConstants.HTTPS_HEADER + baseUri);
+                finalUri = NetworkConstants.HTTPS_HEADER + baseUri;
            } else {
-                requestBuilder.setUri(NetworkConstants.HTTP_HEADER + baseUri);
+                finalUri = NetworkConstants.HTTP_HEADER + baseUri;
            }
        }

+        try {
+            requestBuilder.setUri(finalUri);
+        } catch (IllegalArgumentException e) {
+            log.warn("Invalid URI with illegal characters: {}. User has disabled URL encoding, not applying any encoding.", finalUri);
+            throw e;
+        }
+
        // custom timeout
        int timeout = CollectUtil.getTimeout(httpProtocol.getTimeout(), 0);
        if (timeout > 0) {
@@ -1,432 +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.http.promethus.exporter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.collector.collect.http.promethus.ParseException;
-import org.apache.hertzbeat.common.util.StrBuffer;
-
-/**
- * Resolves the data passed by prometheus's exporter interface http:xxx/metrics
- * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies
- */
-@Slf4j
-public class ExporterParser {
-    private static final String HELP = "HELP";
-    private static final String TYPE = "TYPE";
-    private static final String EOF = "EOF";
-    private static final String METRIC_NAME_LABEL = ".name";
-    private static final String QUANTILE_LABEL = "quantile";
-    private static final String BUCKET_LABEL = "le";
-    private static final String NAME_LABEL = "__name__";
-    private static final String SUM_SUFFIX = "_sum";
-    private static final String COUNT_SUFFIX = "_count";
-
-    private static final char LEFT_CURLY_BRACKET = '{';
-    private static final char RIGHT_CURLY_BRACKET = '}';
-    private static final char EQUALS = '=';
-    private static final char QUOTES = '"';
-    private static final char ENTER = '\n';
-    private static final char SPACE = ' ';
-    private static final char COMMA = ',';
-    private final Lock lock = new ReentrantLock();
-    private MetricFamily currentMetricFamily;
-    private String currentQuantile;
-    private String currentBucket;
-
-    public Map<String, MetricFamily> textToMetric(String resp) {
-        // key: metric name, value: metric family
-        Map<String, MetricFamily> metricMap = new ConcurrentHashMap<>(10);
-        lock.lock();
-        try {
-            String[] lines = resp.split("\n");
-            for (String line : lines) {
-                this.parseLine(metricMap, new StrBuffer(line));
-            }
-            return metricMap;
-        } catch (Exception e) {
-            log.error("parse prometheus exporter data error, msg: {}", e.getMessage());
-        } finally {
-            lock.unlock();
-        }
-        return metricMap;
-    }
-
-    private void parseLine(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        switch (buffer.charAt(0)) {
-            case '#' -> {
-                buffer.read();
-                this.currentMetricFamily = null;
-                this.parseComment(metricMap, buffer);
-            }
-            case ENTER -> {
-            }
-            default -> {
-                this.currentBucket = null;
-                this.currentQuantile = null;
-                this.parseMetric(buffer);
-            }
-        }
-    }
-
-    private void parseComment(Map<String, MetricFamily> metricMap, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        String token = this.readTokenUnitWhitespace(buffer);
-        if (EOF.equals(token)) {
-            return;
-        }
-        if (!HELP.equals(token) && !TYPE.equals(token)) {
-            log.error("parse comment error {}, start without {} or {}", buffer.toStr(), HELP, TYPE);
-            return;
-        }
-        String metricName = this.readTokenAsMetricName(buffer);
-        this.currentMetricFamily = metricMap.computeIfAbsent(metricName, key -> new MetricFamily());
-        this.currentMetricFamily.setName(metricName);
-        switch (token) {
-            case HELP -> this.parseHelp(buffer);
-            case TYPE -> this.parseType(buffer);
-            default -> {
-            }
-        }
-    }
-
-    private void parseHelp(StrBuffer line) {
-        line.skipBlankTabs();
-        this.currentMetricFamily.setHelp(line.toStr());
-    }
-
-    private void parseType(StrBuffer line) {
-        line.skipBlankTabs();
-        String type = line.toStr().toLowerCase();
-        MetricType metricType = MetricType.getType(type);
-        if (metricType == null) {
-            throw new ParseException("pare type error");
-        }
-        this.currentMetricFamily.setMetricType(metricType);
-    }
-
-    private void parseMetric(StrBuffer buffer) {
-        String metricName = this.readTokenAsMetricName(buffer);
-        MetricFamily.Label label = new MetricFamily.Label();
-        label.setName(METRIC_NAME_LABEL);
-        label.setValue(metricName);
-
-        if (metricName.isEmpty()) {
-            log.error("error parse metric, metric name is null, line: {}", buffer.toStr());
-            return;
-        }
-
-        List<MetricFamily.Metric> metricList = this.currentMetricFamily.getMetricList();
-        if (metricList == null) {
-            metricList = new ArrayList<>();
-            this.currentMetricFamily.setMetricList(metricList);
-        }
-
-        // TODO For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
-        MetricFamily.Metric metric = new MetricFamily.Metric();
-        metricList.add(metric);
-
-        metric.setLabelPair(new ArrayList<>());
-        metric.getLabelPair().add(label);
-        this.readLabels(metric, buffer);
-    }
-
-    private void readLabels(MetricFamily.Metric metric, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        if (buffer.charAt(0) == LEFT_CURLY_BRACKET) {
-            buffer.read();
-            this.startReadLabelName(metric, buffer);
-        } else {
-            this.readLabelValue(metric, null, buffer);
-        }
-    }
-
-    private void startReadLabelName(MetricFamily.Metric metric, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        if (buffer.charAt(0) == RIGHT_CURLY_BRACKET) {
-            buffer.read();
-            buffer.skipBlankTabs();
-            if (buffer.isEmpty()) {
-                return;
-            }
-            this.readLabelValue(metric, new MetricFamily.Label(), buffer);
-            return;
-        }
-        String labelName = this.readTokenAsLabelName(buffer);
-        if (labelName.isEmpty() || labelName.equals(NAME_LABEL)) {
-            throw new ParseException("invalid label name" + labelName + ", label name size = 0 or label name equals " + NAME_LABEL);
-        }
-        MetricFamily.Label label = new MetricFamily.Label();
-        label.setName(labelName);
-        if (buffer.read() != EQUALS) {
-            throw new ParseException("parse error, not match the format of labelName=labelValue");
-        }
-        this.startReadLabelValue(metric, label, buffer);
-    }
-
-    private void startReadLabelValue(MetricFamily.Metric metric, MetricFamily.Label label, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        char c = buffer.read();
-        if (c != QUOTES) {
-            throw new ParseException("expected '\"' at start of label value, line: " + buffer.toStr());
-        }
-        String labelValue = this.readTokenAsLabelValue(buffer);
-        label.setValue(labelValue);
-        if (!this.isValidLabelValue(labelValue)) {
-            throw new ParseException("no valid label value: " + labelValue);
-        }
-        if (this.currentMetricFamily.getMetricType().equals(MetricType.SUMMARY) && label.getName().equals(QUANTILE_LABEL)) {
-            this.currentQuantile = labelValue;
-        } else if (this.currentMetricFamily.getMetricType().equals(MetricType.HISTOGRAM) && label.getName().equals(BUCKET_LABEL)) {
-            this.currentBucket = labelValue;
-        }
-        metric.getLabelPair().add(label);
-
-        if (buffer.isEmpty()) {
-            return;
-        }
-        c = buffer.read();
-        switch (c) {
-            case COMMA -> this.startReadLabelName(metric, buffer);
-            case RIGHT_CURLY_BRACKET -> this.readLabelValue(metric, label, buffer);
-            default -> throw new ParseException("expected '}' or ',' at end of label value, line: " + buffer.toStr());
-        }
-    }
-
-    private void readLabelValue(MetricFamily.Metric metric, MetricFamily.Label label, StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        if (buffer.isEmpty()) {
-            return;
-        }
-        switch (this.currentMetricFamily.getMetricType()) {
-            case INFO -> {
-                MetricFamily.Info info = new MetricFamily.Info();
-                info.setValue(buffer.toDouble());
-                metric.setInfo(info);
-            }
-            case COUNTER -> {
-                MetricFamily.Counter counter = new MetricFamily.Counter();
-                counter.setValue(buffer.toDouble());
-                metric.setCounter(counter);
-            }
-            case GAUGE -> {
-                MetricFamily.Gauge gauge = new MetricFamily.Gauge();
-                gauge.setValue(buffer.toDouble());
-                metric.setGauge(gauge);
-            }
-            case UNTYPED -> {
-                MetricFamily.Untyped untyped = new MetricFamily.Untyped();
-                untyped.setValue(buffer.toDouble());
-                metric.setUntyped(untyped);
-            }
-            case SUMMARY -> {
-                // For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
-                MetricFamily.Summary summary = new MetricFamily.Summary();
-                summary.setValue(buffer.toDouble());
-                metric.setSummary(summary);
-            }
-            case HISTOGRAM -> {
-                // For the time being, the data is displayed in the form of labels. If there is a better chart display method in the future, we will optimize it.
-                MetricFamily.Histogram histogram = new MetricFamily.Histogram();
-                histogram.setValue(buffer.toDouble());
-                metric.setHistogram(histogram);
-            }
-            default -> throw new ParseException("no such type in metricFamily");
-        }
-    }
-
-    /**
-     * Reads the token before the first whitespace
-     *
-     * @param buffer A line data object
-     * @return token unit
-     */
-    private String readTokenUnitWhitespace(StrBuffer buffer) {
-        StringBuilder builder = new StringBuilder();
-        while (!buffer.isEmpty()) {
-            char c = buffer.read();
-            if (c == SPACE) {
-                break;
-            }
-            builder.append(c);
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Gets the name of the metric
-     *
-     * @param buffer A line data object
-     * @return token name
-     */
-    private String readTokenAsMetricName(StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        StringBuilder builder = new StringBuilder();
-        if (this.isValidMetricNameStart(buffer.charAt(0))) {
-            while (!buffer.isEmpty()) {
-                char c = buffer.read();
-                if (!this.isValidMetricNameContinuation(c)) {
-                    buffer.rollback();
-                    break;
-                }
-                builder.append(c);
-            }
-            return builder.toString();
-        }
-        throw new ParseException("parse metric name error");
-    }
-
-    /**
-     * Gets the name of the label
-     *
-     * @param buffer A line data object
-     * @return label name
-     */
-    private String readTokenAsLabelName(StrBuffer buffer) {
-        buffer.skipBlankTabs();
-        StringBuilder builder = new StringBuilder();
-        char c = buffer.read();
-        if (this.isValidLabelNameStart(c)) {
-            builder.append(c);
-            while (!buffer.isEmpty()) {
-                c = buffer.read();
-                if (!this.isValidLabelNameContinuation(c)) {
-                    buffer.rollback();
-                    break;
-                }
-                builder.append(c);
-            }
-            return builder.toString();
-        }
-        throw new ParseException("parse label name error");
-    }
-
-    /**
-     * Gets the value of the label
-     *
-     * @param buffer A line data object
-     * @return label value
-     */
-    private String readTokenAsLabelValue(StrBuffer buffer) {
-        StringBuilder builder = new StringBuilder();
-        boolean escaped = false;
-        while (!buffer.isEmpty()) {
-            char c = buffer.read();
-            // Handle '\\' escape sequences
-            if (escaped) {
-                switch (c) {
-                    case QUOTES, '\\' -> builder.append(c);
-                    case 'n' -> builder.append('\n');
-                    default -> throw new ParseException("parse label value error");
-                }
-                escaped = false;
-            } else {
-                switch (c) {
-                    case QUOTES -> {
-                        return builder.toString();
-                    }
-                    case ENTER -> throw new ParseException("parse label value error, next line");
-                    case '\\' -> escaped = true;
-                    default -> builder.append(c);
-                }
-            }
-        }
-        return builder.toString();
-    }
-
-    /**
-     * Checks whether a character conforms to the first character rule for metric names
-     *
-     * @param c metric character
-     * @return true/false
-     */
-    private boolean isValidMetricNameStart(char c) {
-        return isValidLabelNameStart(c) || c == ':';
-    }
-
-    /**
-     * Checks whether a character conforms to rules for metric name characters other than the first
-     *
-     * @param c metric character
-     * @return true/false
-     */
-    private boolean isValidMetricNameContinuation(char c) {
-        return isValidLabelNameContinuation(c) || c == ':';
-    }
-
-    /**
-     * Checks whether a character conforms to the first character rule for label names
-     *
-     * @param c metric character
-     * @return true/false
-     */
-    private boolean isValidLabelNameStart(char c) {
-        return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || c == '_';
-    }
-
-    /**
-     * Checks whether a character conforms to rules for label name characters other than the first
-     *
-     * @param c metric character
-     * @return true/false
-     */
-    private boolean isValidLabelNameContinuation(char c) {
-        return isValidLabelNameStart(c) || (c >= '0' && c <= '9');
-    }
-
-    /**
-     * Checks if a string is a valid UTF-8 encoded string
-     *
-     * @param s label value
-     * @return true/false
-     */
-    private boolean isValidLabelValue(String s) {
-        return s != null;
-    }
-
-    private boolean isSum(String s) {
-        return s != null && s.endsWith(SUM_SUFFIX);
-    }
-
-    private boolean isCount(String s) {
-        return s != null && s.endsWith(COUNT_SUFFIX);
-    }
-
-}
@@ -1,252 +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.http.promethus.exporter;
-
-import java.util.ArrayList;
-import java.util.List;
-import lombok.Data;
-import lombok.ToString;
-
-/**
- * MetricFamily.
- */
-@Data
-@ToString
-public class MetricFamily {
-    /**
-     * metric name
-     */
-    private String name;
-
-    /**
-     * metric help
-     */
-    private String help;
-
-    /**
-     * metric type
-     */
-    private MetricType metricType;
-
-    /**
-     * Specific metric
-     */
-    private List<Metric> metricList;
-
-    /**
-     * Metric
-     */
-    @Data
-    public static class Metric {
-
-        /**
-         * Label data, mainly corresponding to the content within {}
-         */
-        private List<Label> labelPair;
-
-        /**
-         * info
-         */
-        private Info info;
-
-        /**
-         * gauge
-         */
-        private Gauge gauge;
-
-        /**
-         * counter
-         */
-        private Counter counter;
-
-        /**
-         * summary
-         */
-        private Summary summary;
-
-        /**
-         * untyped
-         */
-        private Untyped untyped;
-
-        /**
-         * histogram
-         */
-        private Histogram histogram;
-
-        /**
-         * timestampMs
-         */
-        private Long timestampMs;
-    }
-
-    /**
-     * Label
-     */
-    @Data
-    public static class Label {
-
-        /**
-         * name
-         */
-        private String name;
-
-        /**
-         * value
-         */
-        private String value;
-    }
-
-    /**
-     * Info
-     */
-    @Data
-    public static class Info {
-
-        /**
-         * value
-         */
-        private double value;
-
-    }
-
-    /**
-     * Counter
-     */
-    @Data
-    public static class Counter {
-
-        /**
-         * value
-         */
-        private double value;
-
-        // Exemplar
-    }
-
-    /**
-     * Gauge
-     */
-    @Data
-    public static class Gauge {
-
-        /**
-         * value
-         */
-        private double value;
-    }
-
-    /**
-     * untyped
-     */
-    @Data
-    public static class Untyped {
-
-        /**
-         * value
-         */
-        private double value;
-    }
-
-    /**
-     * Summary
-     */
-    @Data
-    public static class Summary {
-
-        /**
-         * value
-         */
-        private double value;
-
-        /**
-         * count
-         */
-        private long count;
-
-        /**
-         * sum
-         */
-        private double sum;
-
-        /**
-         * quantileList
-         */
-        private List<Quantile> quantileList = new ArrayList<>();
-    }
-
-    /**
-     * Quantile
-     */
-    @Data
-    public static class Quantile {
-        /**
-         * Corresponding to the quantile field in Prometheus
-         */
-        private double xLabel;
-
-        /**
-         * value
-         */
-        private double value;
-    }
-
-    /**
-     * Histogram
-     */
-    @Data
-    public static class Histogram {
-
-        /**
-         * value
-         */
-        private double value;
-
-        /**
-         * count
-         */
-        private long count;
-
-        /**
-         * sum
-         */
-        private double sum;
-
-        /**
-         * bucketList
-         */
-        private List<Bucket> bucketList = new ArrayList<>();
-    }
-
-    /**
-     * Bucket
-     */
-    @Data
-    public static class Bucket {
-
-        /**
-         * cumulativeCount
-         */
-        private long cumulativeCount;
-
-        /**
-         * upperBound
-         */
-        private double upperBound;
-    }
-}
@@ -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.collector.collect.http.promethus.exporter;
-
-/**
- * prometheus metrics type
- */
-public enum MetricType {
-    // for string metric info
-    INFO("info"),
-    // Represents a monotonically increasing counter, e.g., counting occurrences
-    COUNTER("counter"),
-    // A metric type that can fluctuate up and down, e.g., CPU usage rate
-    GAUGE("gauge"),
-    SUMMARY("summary"),
-    UNTYPED("untyped"),
-    HISTOGRAM("histogram");
-
-    private final String value;
-
-    MetricType(String value) {
-        this.value = value;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public static MetricType getType(String value) {
-        for (MetricType metricType : values()) {
-            if (metricType.getValue().equals(value)) {
-                return metricType;
-            }
-        }
-        return null;
-    }
-}
@@ -19,6 +19,7 @@ package org.apache.hertzbeat.collector.collect.prometheus;

 import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InterruptedIOException;
 import java.net.ConnectException;
 import java.net.UnknownHostException;
@@ -34,7 +35,6 @@ import javax.net.ssl.SSLException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
 import org.apache.hertzbeat.collector.collect.prometheus.parser.MetricFamily;
-import org.apache.hertzbeat.collector.collect.prometheus.parser.TextParser;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -46,6 +46,7 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
+import org.apache.hertzbeat.collector.collect.prometheus.parser.OnlineParser;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
@@ -64,7 +65,6 @@ import org.apache.http.impl.auth.DigestScheme;
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.EntityUtils;
 import org.springframework.http.MediaType;
 import org.springframework.util.StringUtils;

@@ -99,25 +99,12 @@ public class PrometheusAutoCollectImpl {
                builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                return null;
            }
-            // todo: The InputStream is directly converted to a String here
-            //       For large data in the Prometheus exporter, this can generate large objects, which could severely impact JVM memory space
-            // todo: Option one: Use InputStream for parsing, but this requires significant code changes
-            //       Option two: Manually trigger garbage collection, which can be referenced from Dubbo for long i
-            String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-            long collectTime = System.currentTimeMillis();
-            builder.setTime(collectTime);
-            if (resp == null || !StringUtils.hasText(resp)) {
-                log.error("http response content is empty, status: {}.", statusCode);
+            try {
+                return parseResponseByPrometheusExporter(response.getEntity().getContent(), builder);
+            } catch (Exception e) {
+                log.info("parse error: {}.", e.getMessage(), e);
                builder.setCode(CollectRep.Code.FAIL);
-                builder.setMsg("http response content is empty");
-            } else {
-                try {
-                    return parseResponseByPrometheusExporter(resp, metrics.getAliasFields(), builder);
-                } catch (Exception e) {
-                    log.info("parse error: {}.", e.getMessage(), e);
-                    builder.setCode(CollectRep.Code.FAIL);
-                    builder.setMsg("parse response data error:" + e.getMessage());
-                }   
+                builder.setMsg("parse response data error:" + e.getMessage());
            }
        } catch (ClientProtocolException e1) {
            String errorMsg = CommonUtil.getMessageFromThrowable(e1);
@@ -168,12 +155,13 @@ public class PrometheusAutoCollectImpl {
        }
    }
    
-    private List<CollectRep.MetricsData> parseResponseByPrometheusExporter(String resp, List<String> aliasFields,
-                                                                           CollectRep.MetricsData.Builder builder) {
-        Map<String, MetricFamily> metricFamilyMap = TextParser.textToMetricFamilies(resp);
+    private List<CollectRep.MetricsData> parseResponseByPrometheusExporter(InputStream inputStream, CollectRep.MetricsData.Builder builder) throws IOException {
+        Map<String, MetricFamily> metricFamilyMap = OnlineParser.parseMetrics(inputStream);
        List<CollectRep.MetricsData> metricsDataList = new LinkedList<>();
+        if (metricFamilyMap == null) {
+            return metricsDataList;
+        }
        for (Map.Entry<String, MetricFamily> entry : metricFamilyMap.entrySet()) {
-            builder.clearMetrics();
            builder.clearFields();
            builder.clearValues();
            String metricsName = entry.getKey();
@@ -17,16 +17,17 @@

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

+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;

 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;


@@ -36,9 +37,47 @@ import java.util.concurrent.ConcurrentHashMap;
@Slf4j
 public class OnlineParser {

+    private static final Map<Integer, Integer> escapeMap = new HashMap<>(8);
+    
+    static {
+        escapeMap.put((int) 'n', (int) '\n');
+        escapeMap.put((int) 'b', (int) '\b');
+        escapeMap.put((int) 't', (int) '\t');
+        escapeMap.put((int) 'r', (int) '\r');
+        escapeMap.put((int) 'f', (int) '\f');
+        escapeMap.put((int) '\'', (int) '\'');
+        escapeMap.put((int) '\"', (int) '\"');
+        escapeMap.put((int) '\\', (int) '\\');
+    }
+
+    private OnlineParser() {
+    }
+
+    public static Map<String, MetricFamily> parseMetrics(InputStream inputStream) throws IOException {
+        Map<String, MetricFamily> metricFamilyMap = new ConcurrentHashMap<>(10);
+        try {
+            int i = getChar(inputStream);
+            while (i != -1) {
+                if (i == '#' || i == '\n') {
+                    skipToLineEnd(inputStream).maybeEol().maybeEof().noElse();
+                } else {
+                    StringBuilder stringBuilder = new StringBuilder();
+                    stringBuilder.append((char) i);
+                    parseMetric(inputStream, metricFamilyMap, stringBuilder);
+                }
+                i = getChar(inputStream);
+            }
+        } catch (FormatException e) {
+            log.error("prometheus parser failed because of wrong input format. {}", e.getMessage());
+            return null;
+        }
+        return metricFamilyMap;
+    }
+
    private static class FormatException extends Exception {

-        public FormatException() {}
+        public FormatException() {
+        }

        public FormatException(String message) {
            super(message);
@@ -117,91 +156,92 @@ public class OnlineParser {
            return this.i;
        }

-        private int getInt() throws FormatException {
+        private int getInt() {
            return this.i;
        }

    }

-    private static CharChecker parseOneChar(InputStream inputStream) throws IOException {
+    private static int getChar(InputStream inputStream) throws IOException, FormatException {
        int i = inputStream.read();
-        return new CharChecker(i);
+        if (i == '\\') {
+            i = inputStream.read();
+            if (escapeMap.containsKey(i)) {
+                return escapeMap.get(i);
+            } else {
+                throw new FormatException("Escape character failed.");
+            }
+        } else {
+            return i;
+        }
    }

-    private static CharChecker parseOneDouble(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
-        int i = inputStream.read();
-        while ((i >= '0' && i <= '9') || (i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || i == '-' || i == '+' || i == 'e' || i == '.') {
+    private static CharChecker parseOneDouble(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
+        int i = getChar(inputStream);
+        while (i >= '0' && i <= '9' || i >= 'a' && i <= 'z' || i >= 'A' && i <= 'Z' || i == '-' || i == '+' || i == '.') {
            stringBuilder.append((char) i);
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

-    private static CharChecker skipOneLong(InputStream inputStream) throws IOException {
-        int i = inputStream.read();
+    private static CharChecker skipOneLong(InputStream inputStream) throws IOException, FormatException {
+        int i = getChar(inputStream);
        while (i >= '0' && i <= '9') {
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

-    private static CharChecker parseMetricName(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
-        int i = inputStream.read();
+    private static CharChecker parseMetricName(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
+        int i = getChar(inputStream);
        while ((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_' || i == ':') {
            stringBuilder.append((char) i);
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

-    private static CharChecker parseLabelName(InputStream inputStream, StringBuilder stringBuilder) throws IOException {
-        int i = inputStream.read();
+    private static CharChecker parseLabelName(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
+        int i = getChar(inputStream);
        while ((i >= 'a' && i <= 'z') || (i >= 'A' && i <= 'Z') || (i >= '0' && i <= '9') || i == '_') {
            stringBuilder.append((char) i);
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

    private static CharChecker parseLabelValue(InputStream inputStream, StringBuilder stringBuilder) throws IOException, FormatException {
-        int i = inputStream.read();
+        int i = getChar(inputStream);
        while (i != '"' && i != -1) {
            if (i == '\\') {
-                i = inputStream.read();
+                i = getChar(inputStream);
                switch (i) {
-                    case 'n':
-                        stringBuilder.append('\n');
-                        break;
-                    case '\\':
-                        stringBuilder.append('\\');
-                        break;
-                    case '\"':
-                        stringBuilder.append('\"');
-                        break;
-                    default:
-                        throw new FormatException();
+                    case 'n' -> stringBuilder.append('\n');
+                    case '\\' -> stringBuilder.append('\\');
+                    case '\"' -> stringBuilder.append('\"');
+                    default -> throw new FormatException();
                }
-            }
-            else {
+            } else {
                stringBuilder.append((char) i);
            }
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

-    private static CharChecker skipSpaces(InputStream inputStream) throws IOException {
-        int i = inputStream.read();
+    private static CharChecker skipSpaces(InputStream inputStream) throws IOException, FormatException {
+        int i = getChar(inputStream);
        while (i == ' ') {
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }

-    private static CharChecker skipToLineEnd(InputStream inputStream) throws IOException {
-        int i = inputStream.read();
+    private static CharChecker skipToLineEnd(InputStream inputStream) throws IOException, FormatException {
+        int i = getChar(inputStream);
        while (i != '\n' && i != -1) {
-            i = inputStream.read();
+            i = getChar(inputStream);
        }
        return new CharChecker(i);
    }
@@ -256,7 +296,7 @@ public class OnlineParser {
    }

    private static CharChecker parseMetric(InputStream inputStream, Map<String, MetricFamily> metricFamilyMap, StringBuilder stringBuilder) throws IOException, FormatException {
-        MetricFamily metricFamily = null;
+        MetricFamily metricFamily;
        MetricFamily.Metric metric = new MetricFamily.Metric();
        int i = parseMetricName(inputStream, stringBuilder).maybeSpace().maybeLeftBracket().noElse();
        String metricName = stringBuilder.toString();
@@ -267,18 +307,18 @@ public class OnlineParser {
            metricFamily.setMetricList(new ArrayList<>());
            metricFamily.setName(metricName);
            metricFamilyMap.put(metricName, metricFamily);
-        }
-        else {
+        } else {
            metricFamily = metricFamilyMap.get(metricName);
        }

        if (i == ' ') {
            i = skipSpaces(inputStream).getInt();
        }
+
+        List<MetricFamily.Label> labelList = new LinkedList<>();
+        metric.setLabels(labelList);
        if (i == '{') {
-            List<MetricFamily.Label> labelList = new LinkedList<>();
            parseLabels(inputStream, stringBuilder, labelList);
-            metric.setLabels(labelList);
            i = skipSpaces(inputStream).getInt();
        }

@@ -304,26 +344,4 @@ public class OnlineParser {
        metricFamily.getMetricList().add(metric);
        return new CharChecker(i);
    }
-
-    public static Map<String, MetricFamily> parseMetrics(InputStream inputStream) throws IOException {
-        Map<String, MetricFamily> metricFamilyMap = new ConcurrentHashMap<>(10);
-        int i = inputStream.read();
-        try {
-            while (i != -1) {
-                if (i == '#' || i == '\n') {
-                    skipToLineEnd(inputStream).maybeEol().maybeEof().noElse();
-                } else {
-                    StringBuilder stringBuilder = new StringBuilder();
-                    stringBuilder.append((char) i);
-                    parseMetric(inputStream, metricFamilyMap, stringBuilder);
-                }
-                i = inputStream.read();
-            }
-        } catch (FormatException e) {
-            log.error("prometheus parser failed because of wrong input format. {}", e.getMessage());
-            return null;
-        }
-        return metricFamilyMap;
-    }
-
 }
@@ -29,8 +29,10 @@ import org.apache.hertzbeat.common.util.StrBuffer;
 /**
 * Resolves the data passed by prometheus's exporter interface http:xxx/metrics
 * Reference: prometheus text_parse.go code, entry: TextToMetricFamilies
+ * recommend use OnlineParser
 */
@Slf4j
+@Deprecated(since = "1.7.0")
 public class TextParser {
    private static final String NAME_LABEL = "__name__";
    private static final char LEFT_CURLY_BRACKET = '{';
@@ -44,7 +46,6 @@ public class TextParser {

    /**
     * parser prometheus exporter text metrics data
-     * todo use inputStream bytebuffer instead of resp string
     * @param resp txt data
     * @return metrics family
     */
@@ -58,13 +58,13 @@ public class PushCollectImpl extends AbstractCollect {
    private static final Map<Long, Long> timeMap = new ConcurrentHashMap<>();

    // ms
-    private static final Integer timeout = 3000;
+    private static final Integer DEFAULT_TIMEOUT = 3000;

    private static final Integer SUCCESS_CODE = 200;

    // It's hard to determine how long ago the first data collection was, because there's no way to know when the last collection occurred.
    // This makes it difficult to avoid re-collecting data after a restart. The default is 30 seconds
-    private static final Integer firstCollectInterval = 30000;
+    private static final Integer FIRST_COLLECT_INTERVAL = 30000;

    @Override
    public void preCheck(Metrics metrics) throws IllegalArgumentException {
@@ -80,7 +80,7 @@ public class PushCollectImpl extends AbstractCollect {
        long monitorId = builder.getId();
        PushProtocol pushProtocol = metrics.getPush();

-        Long time = timeMap.getOrDefault(monitorId, curTime - firstCollectInterval);
+        Long time = timeMap.getOrDefault(monitorId, curTime - FIRST_COLLECT_INTERVAL);
        timeMap.put(monitorId, curTime);

        HttpContext httpContext = createHttpContext(pushProtocol);
@@ -145,10 +145,10 @@ public class PushCollectImpl extends AbstractCollect {

        //requestBuilder.setUri(pushProtocol.getUri());

-        if (timeout > 0) {
+        if (DEFAULT_TIMEOUT > 0) {
            RequestConfig requestConfig = RequestConfig.custom()
-                    .setConnectTimeout(timeout)
-                    .setSocketTimeout(timeout)
+                    .setConnectTimeout(DEFAULT_TIMEOUT)
+                    .setSocketTimeout(DEFAULT_TIMEOUT)
                    .setRedirectsEnabled(true)
                    .build();
            requestBuilder.setConfig(requestConfig);
@@ -0,0 +1,95 @@
+/*
+ * 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.s7;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.collector.collect.plc.AbstractPlcCollectImpl;
+import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
+import org.apache.hertzbeat.common.entity.job.Metrics;
+import org.apache.hertzbeat.common.entity.job.protocol.PlcProtocol;
+import org.apache.hertzbeat.common.entity.job.protocol.S7Protocol;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.apache.plc4x.java.api.PlcConnection;
+import org.apache.plc4x.java.api.messages.PlcReadRequest;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ * plc collect
+ */
+@Slf4j
+public class S7CollectImpl extends AbstractPlcCollectImpl {
+
+    @Override
+    public void preCheck(Metrics metrics) throws IllegalArgumentException {
+        S7Protocol s7 = metrics.getS7();
+        List<String> registerAddressList = s7.getRegisterAddresses();
+        // check RackId
+        if (!StringUtils.hasText(s7.getRackId())) {
+            s7.setRackId("0");
+        }
+        // check SlotId
+        if (!StringUtils.hasText(s7.getSlotId())) {
+            s7.setSlotId("0");
+        }
+        // check controllerType
+        if (!StringUtils.hasText(s7.getControllerType())) {
+            s7.setControllerType("S7_1500");
+        }
+        if (!StringUtils.hasText(s7.getTimeout())) {
+            s7.setTimeout("5000");
+        }
+        PlcProtocol plc = metrics.getPlc() == null ? new PlcProtocol() : metrics.getPlc();
+        plc.setRegisterAddresses(registerAddressList);
+        BeanUtils.copyProperties(s7, plc);
+        metrics.setPlc(plc);
+        super.preCheck(metrics);
+    }
+
+    @Override
+    public void collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
+        super.collect(builder, metrics);
+    }
+
+    @Override
+    public String supportProtocol() {
+        return DispatchConstants.PROTOCOL_S7;
+    }
+
+    @Override
+    protected String getConnectionString(Metrics metrics) {
+        S7Protocol s7Protocol = metrics.getS7();
+        return "s7://" + s7Protocol.getHost() + ":" + s7Protocol.getPort() + "?remote-rack:" + s7Protocol.getRackId()
+                + "&remote-slot:" + s7Protocol.getSlotId() + "&controller-type=" + s7Protocol.getControllerType();
+    }
+
+    @Override
+    protected PlcReadRequest buildRequest(Metrics metrics, PlcConnection connection) {
+        S7Protocol s7Protocol = metrics.getS7();
+        List<String> registerAddressList = s7Protocol.getRegisterAddresses();
+        // Create a new read request:
+        PlcReadRequest.Builder requestBuilder = connection.readRequestBuilder();
+        for (int i = 0; i < registerAddressList.size(); i++) {
+            String s1 = registerAddressList.get(i);
+            requestBuilder.addTagAddress(metrics.getS7().getAddressSyntax() + ":" + i, s1);
+        }
+        return requestBuilder.build();
+    }
+}
@@ -79,11 +79,12 @@ public class SshCollectImpl extends AbstractCollect {
        long startTime = System.currentTimeMillis();
        SshProtocol sshProtocol = metrics.getSsh();
        boolean reuseConnection = Boolean.parseBoolean(sshProtocol.getReuseConnection());
+        boolean useProxy = Boolean.parseBoolean(sshProtocol.getUseProxy());
        int timeout = CollectUtil.getTimeout(sshProtocol.getTimeout(), DEFAULT_TIMEOUT);
        ClientChannel channel = null;
        ClientSession clientSession = null;
        try {
-            clientSession = getConnectSession(sshProtocol, timeout, reuseConnection);
+            clientSession = getConnectSession(sshProtocol, timeout, reuseConnection, useProxy);
            if (CommonSshBlacklist.isCommandBlacklisted(sshProtocol.getScript())) {
                builder.setCode(CollectRep.Code.FAIL);
                builder.setMsg("The command is blacklisted: " + sshProtocol.getScript());
@@ -156,7 +157,7 @@ public class SshCollectImpl extends AbstractCollect {
                    log.error(e.getMessage(), e);
                }
            }
-            if (clientSession != null && !reuseConnection) {
+            if (clientSession != null && !reuseConnection && !useProxy) {
                try {
                    clientSession.close();
                } catch (Exception e) {
@@ -280,11 +281,8 @@ public class SshCollectImpl extends AbstractCollect {
        connectionCommonCache.removeCache(identifier);
    }

-    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection)
+    private ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection, boolean useProxy)
            throws IOException, GeneralSecurityException {
-        return SshHelper.getConnectSession(
-            sshProtocol.getHost(), sshProtocol.getPort(), sshProtocol.getUsername(), sshProtocol.getPassword(),
-            sshProtocol.getPrivateKey(), sshProtocol.getPrivateKeyPassphrase(), timeout, reuseConnection
-        );
+        return SshHelper.getConnectSession(sshProtocol, timeout, reuseConnection, useProxy);
    }
 }
@@ -47,31 +47,28 @@ public class DnsCollectImplTest {
                .address("www.google.com")
                .timeout("3000")
                .port("53")
+                .tcp("tcp")
                .build();
    }

    @Test
    public void testPreCheck() {
-        assertThrows(IllegalArgumentException.class, () -> {
-            Metrics metrics = new Metrics();
-            metrics.setName("question");
-            metrics.setDns(dnsProtocol);
-            dnsCollect.preCheck(metrics);
-        });
+        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+        //metrics is null
+        dnsCollect.collect(builder, null);
+        assertEquals(CollectRep.Code.FAIL, builder.getCode());

-        //query class is blank
+        //invalid DnsProtocol
+        Metrics metrics = new Metrics();
        assertThrows(IllegalArgumentException.class, () -> {
            DnsProtocol dns = DnsProtocol.builder().build();
-
-            Metrics metrics = new Metrics();
            metrics.setDns(dns);
            dnsCollect.preCheck(metrics);
        });

-        // no exception throws
+        //validated DnsProtocol
        assertDoesNotThrow(() -> {
-            dnsProtocol.setTcp("tcp");
-            Metrics metrics = new Metrics();
+            metrics.setName("question");
            metrics.setDns(dnsProtocol);
            dnsCollect.preCheck(metrics);
        });
@@ -80,28 +77,23 @@ public class DnsCollectImplTest {
    @Test
    public void testCollect() {
        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-        long monitorId = 666;
-        String app = "testDNS";
-        Metrics metrics = new Metrics();
-        metrics.setName("question");
-        metrics.setDns(dnsProtocol);
-        metrics.setAliasFields(Collections.singletonList("section"));
-        dnsCollect.collect(builder, metrics);
+        Metrics metrics0 = Metrics.builder()
+                .name("question")
+                .dns(dnsProtocol)
+                .aliasFields(Collections.singletonList("section"))
+                .build();
+        dnsCollect.collect(builder, metrics0);
+        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
        assertNotNull(builder.getValues(0).getColumns(0));

-        // dns is null, no exception throws
-        assertDoesNotThrow(() -> {
-            dnsCollect.collect(builder, null);
-        });
-
        // metric name is header
-        assertDoesNotThrow(() -> {
-            Metrics metrics1 = new Metrics();
-            metrics1.setName("header");
-            metrics1.setDns(dnsProtocol);
-            metrics1.setAliasFields(Collections.singletonList("section"));
-            dnsCollect.collect(builder, metrics1);
-        });
+        Metrics metrics1 = Metrics.builder()
+                .name("header")
+                .dns(dnsProtocol)
+                .aliasFields(Collections.singletonList("section"))
+                .build();
+        dnsCollect.collect(builder, metrics1);
+        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
    }

    @Test
@@ -18,7 +18,14 @@
 package org.apache.hertzbeat.collector.collect.http;

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

+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.HttpProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
@@ -41,7 +48,7 @@ class HttpCollectImplTest {
        assertThrows(IllegalArgumentException.class, () -> {
            httpCollectImpl.preCheck(null);
        });
-        
+
        assertThrows(IllegalArgumentException.class, () -> {
            Metrics metrics = Metrics.builder().build();
            httpCollectImpl.preCheck(metrics);
@@ -65,4 +72,92 @@ class HttpCollectImplTest {
        String protocol = httpCollectImpl.supportProtocol();
        assert "http".equals(protocol);
    }
+
+    @Test
+    void parseResponseByXmlPath() throws Exception {
+        // Create a sample XML response
+        String xmlResponse = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <root>
+                    <server>
+                        <name>Server1</name>
+                        <status>Running</status>
+                        <metrics>
+                            <cpu>75.5</cpu>
+                            <memory>1024</memory>
+                            <disk>500</disk>
+                        </metrics>
+                    </server>
+                    <server>
+                        <name>Server2</name>
+                        <status>Stopped</status>
+                        <metrics>
+                            <cpu>0.0</cpu>
+                            <memory>0</memory>
+                            <disk>500</disk>
+                        </metrics>
+                    </server>
+                </root>
+                """;
+    
+        // Set up HttpProtocol with XML path parsing
+        HttpProtocol http = HttpProtocol.builder()
+                .parseType(DispatchConstants.PARSE_XML_PATH)
+                .parseScript("//server")  // XPath to select all server nodes
+                .build();
+    
+        // Set up Metrics with fields that have XPath expressions
+        List<Metrics.Field> fields = new ArrayList<>();
+        fields.add(Metrics.Field.builder().field("name").build());
+        fields.add(Metrics.Field.builder().field("status").build());
+        fields.add(Metrics.Field.builder().field("metrics/cpu").build());
+        fields.add(Metrics.Field.builder().field("metrics/memory").build());
+    
+        Metrics metrics = Metrics.builder()
+                .http(http)
+                .fields(fields)
+                .aliasFields(Arrays.asList("name", "status", "metrics/cpu", "metrics/memory"))
+                .build();
+    
+        // Create a custom builder that captures added rows
+        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
+        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
+            @Override
+            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
+                capturedRows.add(valueRow);
+                return super.addValueRow(valueRow);
+            }
+        };
+    
+        // Use reflection to access the private parseResponseByXmlPath method
+        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
+                "parseResponseByXmlPath", 
+                String.class, 
+                Metrics.class, 
+                CollectRep.MetricsData.Builder.class, 
+                Long.class);
+        parseMethod.setAccessible(true);
+    
+        // Call the method
+        parseMethod.invoke(httpCollectImpl, xmlResponse, metrics, builder, 100L);
+    
+        // Verify the results
+        assertEquals(2, capturedRows.size(), "Should have parsed 2 server nodes");
+    
+        // Check first server
+        CollectRep.ValueRow firstRow = capturedRows.get(0);
+        assertEquals(4, firstRow.getColumnsCount(), "First row should have 4 columns");
+        assertEquals("Server1", firstRow.getColumns(0), "First server name should be Server1");
+        assertEquals("Running", firstRow.getColumns(1), "First server status should be Running");
+        assertEquals("75.5", firstRow.getColumns(2), "First server CPU should be 75.5");
+        assertEquals("1024", firstRow.getColumns(3), "First server memory should be 1024");
+    
+        // Check second server
+        CollectRep.ValueRow secondRow = capturedRows.get(1);
+        assertEquals(4, secondRow.getColumnsCount(), "Second row should have 4 columns");
+        assertEquals("Server2", secondRow.getColumns(0), "Second server name should be Server2");
+        assertEquals("Stopped", secondRow.getColumns(1), "Second server status should be Stopped");
+        assertEquals("0.0", secondRow.getColumns(2), "Second server CPU should be 0.0");
+        assertEquals("0", secondRow.getColumns(3), "Second server memory should be 0");
+    }
 }
@@ -1,79 +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.http.promethus.exporter;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import java.util.Map;
-import org.junit.jupiter.api.Test;
-
-/**
- * Test case for {@link ExporterParser}
- */
-class ExporterParserTest {
-
-    @Test
-    void textToMetric() {
-        String resp = """
-                # HELP disk_total_bytes Total space for path
-                # TYPE disk_total_bytes gauge
-                disk_total_bytes{path="C:\\\\hertzbeat\\\\repo\\\\testpath",} 4.29496725504E11
-                # HELP go_gc_cycles_automatic_gc_cycles_total Count of completed GC cycles generated by the Go runtime.
-                # TYPE go_gc_cycles_automatic_gc_cycles_total counter
-                go_gc_cycles_automatic_gc_cycles_total 0
-                # HELP go_gc_cycles_forced_gc_cycles_total Count of completed GC cycles forced by the application.
-                # TYPE go_gc_cycles_forced_gc_cycles_total counter
-                go_gc_cycles_forced_gc_cycles_total 0
-                # HELP go_gc_cycles_total_gc_cycles_total Count of all completed GC cycles.
-                # TYPE go_gc_cycles_total_gc_cycles_total counter
-                go_gc_cycles_total_gc_cycles_total 0
-                # 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"} 0
-                go_gc_duration_seconds{quantile="0.25"} 0
-                go_gc_duration_seconds{quantile="0.5"} 0
-                go_gc_duration_seconds{quantile="0.75"} 0
-                go_gc_duration_seconds{quantile="1"} 0
-                # TYPE jvm info
-                # HELP jvm VM version info
-                jvm_info{runtime="OpenJDK Runtime Environment",vendor="Azul Systems, Inc.",version="11.0.13+8-LTS"} 1.0
-                # TYPE jvm_gc_collection_seconds summary
-                # HELP jvm_gc_collection_seconds Time spent in a given JVM garbage collector in seconds.
-                jvm_gc_collection_seconds_count{gc="G1 Young Generation"} 10.0
-                jvm_gc_collection_seconds_sum{gc="G1 Young Generation"} 0.051
-                jvm_gc_collection_seconds_count{gc="G1 Old Generation"} 0.0
-                jvm_gc_collection_seconds_sum{gc="G1 Old Generation"} 0.0
-                # TYPE resource_group_aggregate_usage_secs summary
-                resource_group_aggregate_usage_secs{cluster="standalone",quantile="0.5"} 2.69245E-4
-                resource_group_aggregate_usage_secs{cluster="standalone",quantile="0.9"} 3.49601E-4
-                resource_group_aggregate_usage_secs_count{cluster="standalone"} 13.0
-                resource_group_aggregate_usage_secs_sum{cluster="standalone"} 0.004832498
-                resource_group_aggregate_usage_secs_created{cluster="standalone"} 1.715842140749E9
-                # TYPE metadata_store_ops_latency_ms histogram
-                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="1.0"} 59.0
-                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="3.0"} 61.0
-                metadata_store_ops_latency_ms_bucket{cluster="standalone",name="metadata-store",type="get",status="success",le="5.0"} 61.0
-                # EOF""";
-
-        ExporterParser parser = new ExporterParser();
-        Map<String, MetricFamily> metricFamilyMap = parser.textToMetric(resp);
-        assertEquals(5, metricFamilyMap.get("resource_group_aggregate_usage_secs").getMetricList().size());
-        assertEquals(3, metricFamilyMap.get("metadata_store_ops_latency_ms").getMetricList().size());
-        assertEquals(5, metricFamilyMap.get("go_gc_duration_seconds").getMetricList().size());
-        assertEquals(9, metricFamilyMap.size());
-    }
-}
@@ -25,8 +25,12 @@ import java.io.InputStream;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;

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

 class OnlineParserTest {

@@ -44,13 +48,13 @@ class OnlineParserTest {
        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"} 2.0209e-05
+                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="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
+                go_gc_duration_seconds_sum 0.001134793
+                go_gc_duration_seconds_count 5
                # HELP go_goroutines Number of goroutines that currently exist.
                # TYPE go_goroutines gauge
                go_goroutines 32
@@ -73,7 +77,26 @@ class OnlineParserTest {
                # 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);
+        Map<String, MetricFamily> metricFamilyMap1 = OnlineParser.parseMetrics(inputStream);
+        Map<String, MetricFamily> metricFamilyMap2 = TextParser.textToMetricFamilies(str);
+        assertNotNull(metricFamilyMap1);
+        assertNotNull(metricFamilyMap2);
+        assertEquals(metricFamilyMap1.size(), metricFamilyMap2.size());
+        metricFamilyMap2.forEach((metricFamilyName, metricFamily2) -> {
+            if (!metricFamilyMap1.containsKey(metricFamilyName)) {
+                fail("parse failed, different result from two parser.");
+            }
+            MetricFamily metricFamily1 = metricFamilyMap1.get(metricFamilyName);
+            assertEquals(metricFamily1.getName(), metricFamily1.getName());
+            Set<Double> metricValueSet = metricFamily2.getMetricList().stream().map(MetricFamily.Metric::getValue).collect(Collectors.toSet());
+            metricFamily1.getMetricList().forEach(metric -> {
+                // this is for something different between two algorithms above, and both of them is current on this parsing behavior.
+                if (!(metric.getValue() == Double.POSITIVE_INFINITY || metric.getValue() == Double.NEGATIVE_INFINITY)) {
+                    if (!metricValueSet.contains(metric.getValue())) {
+                        fail();
+                    }
+                }
+            });
+        });
    }
 }
@@ -183,21 +183,18 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
        Job job = timerTask.getJob();
        job.constructPriorMetrics();
        Set<Metrics> metricsSet = job.getNextCollectMetrics(null, true);
-        // Avoid NullPointerException
-        if (null != metricsSet){
-            metricsSet.forEach(metrics -> {
-                MetricsCollect metricsCollect = new MetricsCollect(metrics, timeout, this,
-                        collectorIdentity, unitConvertList);
-                jobRequestQueue.addJob(metricsCollect);
-                if (metrics.getPrometheus() != null) {
-                    metricsTimeoutMonitorMap.put(String.valueOf(job.getId()),
-                            new MetricsTime(System.currentTimeMillis(), metrics, timeout));
-                } else {
-                    metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(),
-                            new MetricsTime(System.currentTimeMillis(), metrics, timeout));
-                }
-            });
-        }
+        metricsSet.forEach(metrics -> {
+            MetricsCollect metricsCollect = new MetricsCollect(metrics, timeout, this,
+                    collectorIdentity, unitConvertList);
+            jobRequestQueue.addJob(metricsCollect);
+            if (metrics.getPrometheus() != null) {
+                metricsTimeoutMonitorMap.put(String.valueOf(job.getId()),
+                        new MetricsTime(System.currentTimeMillis(), metrics, timeout));
+            } else {
+                metricsTimeoutMonitorMap.put(job.getId() + "-" + metrics.getName(),
+                        new MetricsTime(System.currentTimeMillis(), metrics, timeout));
+            }
+        });
    }

    @Override
@@ -237,8 +234,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                    long spendTime = System.currentTimeMillis() - job.getDispatchTime();
                    long interval = job.getInterval() - spendTime / 1000;
                    interval = interval <= 0 ? 0 : interval;
-                    // Reset Construction Execution Metrics Task View 
-                    job.constructPriorMetrics();
                    timerDispatch.cyclicJob(timerJob, interval, TimeUnit.SECONDS);
                }
            } else if (!metricsSet.isEmpty()) {
@@ -335,8 +330,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                long spendTime = System.currentTimeMillis() - job.getDispatchTime();
                long interval = job.getInterval() - spendTime / 1000;
                interval = interval <= 0 ? 0 : interval;
-                // Reset Construction Execution Metrics Task View 
-                job.constructPriorMetrics();
                timerDispatch.cyclicJob(timerJob, interval, TimeUnit.SECONDS);
            }
            // it is an asynchronous periodic cyclic task, directly response the collected data
@@ -75,6 +75,18 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
     * metrics configuration
     */
    protected Metrics metrics;
+    /**
+     * metadata
+     */
+    protected Map<String, String> metadata;
+    /**
+     * labels
+     */
+    protected Map<String, String> labels;
+    /**
+     * annotations
+     */
+    protected Map<String, String> annotations;
    /**
     * time wheel timeout
     */
@@ -119,6 +131,9 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
        this.id = job.getMonitorId();
        this.tenantId = job.getTenantId();
        this.app = job.getApp();
+        this.metadata = job.getMetadata();
+        this.labels = job.getLabels();
+        this.annotations = job.getAnnotations();
        this.collectDataDispatch = collectDataDispatch;
        this.isCyclic = job.isCyclic();
        this.isSd = job.isSd();
@@ -136,9 +151,8 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
        this.startTime = System.currentTimeMillis();
        setNewThreadName(id, app, startTime, metrics);
        CollectRep.MetricsData.Builder response = CollectRep.MetricsData.newBuilder();
-        response.setApp(app);
-        response.setId(id);
-        response.setTenantId(tenantId);
+        response.setApp(app).setId(id).setTenantId(tenantId)
+                .setLabels(labels).setAnnotations(annotations).addMetadataAll(metadata);
        // for prometheus auto
        if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(metrics.getProtocol())) {
            List<CollectRep.MetricsData> metricsData = PrometheusAutoCollectImpl
@@ -288,7 +302,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
                            value = String.valueOf(objValue);
                        }
                    } catch (Exception e) {
-                        log.info("[calculates execute warning] {}.", e.getMessage());
+                        log.warn("[calculates execute warning, use original value.] {}", e.getMessage());
                        value = Optional.ofNullable(fieldValueMap.get(expression.getSourceText()))
                                .map(String::valueOf)
                                .orElse(null);
@@ -29,4 +29,5 @@ org.apache.hertzbeat.collector.collect.mqtt.MqttCollectImpl
 org.apache.hertzbeat.collector.collect.ipmi2.IpmiCollectImpl
 org.apache.hertzbeat.collector.collect.kafka.KafkaCollectImpl
 org.apache.hertzbeat.collector.collect.sd.HttpSdCollectImpl
-org.apache.hertzbeat.collector.collect.modbus.ModbusCollectImpl
+org.apache.hertzbeat.collector.collect.modbus.ModbusCollectImpl
+org.apache.hertzbeat.collector.collect.s7.S7CollectImpl
@@ -39,7 +39,7 @@ spring:

 collector:
  info:
-    version: ${COLLECTOR_VERSION:1.6.1}
+    version: ${COLLECTOR_VERSION:1.7.0}
    ip: ${COLLECTOR_IP:}
  dispatch:
    entrance:
@@ -17,13 +17,18 @@

 package org.apache.hertzbeat.collector.collect.common.ssh;

+import java.io.InputStream;
+import java.security.KeyPair;
+import java.util.List;
 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.hertzbeat.common.entity.job.protocol.SshProtocol;
 import org.apache.sshd.client.SshClient;
+import org.apache.sshd.client.config.hosts.HostConfigEntry;
 import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.common.config.keys.FilePasswordProvider;
 import org.apache.sshd.common.util.security.SecurityUtils;
@@ -101,4 +106,101 @@ public class SshHelper {
        return clientSession;
    }

+    public static ClientSession getConnectSession(SshProtocol sshProtocol, int timeout, boolean reuseConnection, boolean useProxy)
+            throws IOException, GeneralSecurityException {
+        CacheIdentifier identifier = CacheIdentifier.builder()
+                                                    .ip(sshProtocol.getHost()).port(sshProtocol.getPort())
+                                                    .username(sshProtocol.getUsername()).password(sshProtocol.getPassword())
+                                                    .build();
+        ClientSession clientSession = null;
+        // When using ProxyJump, force connection reuse:
+        // Apache MINA SSHD will pass the proxy password error to the target host in proxy scenarios, causing the first connection to fail.
+        // Reusing connections can skip duplicate authentication and avoid this problem.
+        if (reuseConnection || useProxy) {
+            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();
+        HostConfigEntry proxyConfig = new HostConfigEntry();
+        if (useProxy && StringUtils.hasText(sshProtocol.getProxyHost())) {
+            String proxySpec = String.format("%s@%s:%d", sshProtocol.getProxyUsername(), sshProtocol.getProxyHost(), Integer.parseInt(sshProtocol.getProxyPort()));
+            proxyConfig.setHostName(sshProtocol.getHost());
+            proxyConfig.setHost(sshProtocol.getHost());
+            proxyConfig.setPort(Integer.parseInt(sshProtocol.getPort()));
+            proxyConfig.setUsername(sshProtocol.getUsername());
+            proxyConfig.setProxyJump(proxySpec);
+
+            // Apache SSHD requires the password for the proxy to be preloaded into the sshClient instance before connecting
+            if (StringUtils.hasText(sshProtocol.getProxyPassword())) {
+                sshClient.addPasswordIdentity(sshProtocol.getProxyPassword());
+                log.debug("Loaded proxy server password authentication: {}@{}", sshProtocol.getProxyUsername(), sshProtocol.getProxyHost());
+            }
+            if (StringUtils.hasText(sshProtocol.getProxyPrivateKey())) {
+                proxyConfig.setIdentities(List.of(sshProtocol.getProxyPrivateKey()));
+                log.debug("Proxy private key loaded into HostConfigEntry");
+            }
+        }
+
+        if (useProxy && StringUtils.hasText(sshProtocol.getProxyHost())) {
+            try {
+                clientSession = sshClient.connect(proxyConfig)
+                                         .verify(timeout, TimeUnit.MILLISECONDS).getSession();
+            }
+            finally {
+                sshClient.removePasswordIdentity(sshProtocol.getProxyPassword());
+            }
+        } else {
+            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());
+            try (InputStream keyStream = new FileInputStream(resourceKey)) {
+                FilePasswordProvider passwordProvider = (session, resource, index) -> {
+                    if (StringUtils.hasText(sshProtocol.getPrivateKeyPassphrase())) {
+                        return sshProtocol.getPrivateKeyPassphrase();
+                    }
+                    return null;
+                };
+                Iterable<KeyPair> keyPairs = SecurityUtils.loadKeyPairIdentities(null, () -> resourceKey, keyStream, passwordProvider);
+                if (keyPairs != null) {
+                    keyPairs.forEach(clientSession::addPublicKeyIdentity);
+                } else {
+                    log.error("Failed to load private key pairs from: {}", resourceKey);
+                }
+            } catch (IOException e) {
+                log.error("Error reading private key file: {}", e.getMessage());
+            }
+        }  // 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 || useProxy) {
+            SshConnect sshConnect = new SshConnect(clientSession);
+            CONNECTION_COMMON_CACHE.addCache(identifier, sshConnect);
+        }
+        return clientSession;
+    }
 }
@@ -202,6 +202,10 @@ public interface DispatchConstants {
     * Parsing method prometheus exporter data
     */
    String PARSE_PROMETHEUS = "prometheus";
+    /**
+     * Parse response body as config/properties format
+     */
+    String PARSE_CONFIG = "config";
    /**
     * prometheus accept header
     */
@@ -227,4 +231,9 @@ public interface DispatchConstants {
     * protocol modbus
     */
    String PROTOCOL_MODBUS = "modbus";
+
+    /**
+     * protocol modbus
+     */
+    String PROTOCOL_S7 = "s7";
 }
@@ -613,9 +613,8 @@ public class HashedWheelTimer implements Timer {
            HashedWheelBucket bucket = this.bucket;
            if (bucket != null) {
                bucket.remove(this);
-            } else {
-                timer.pendingTimeouts.decrementAndGet();
            }
+            timer.pendingTimeouts.decrementAndGet();
        }

        public boolean compareAndSetState(int expected, int state) {
@@ -642,6 +641,7 @@ public class HashedWheelTimer implements Timer {
            }

            try {
+                remove();
                task.run(this);
            } catch (Throwable t) {
                if (logger.isWarnEnabled()) {
@@ -718,7 +718,6 @@ public class HashedWheelTimer implements Timer {
            while (timeout != null) {
                HashedWheelTimeout next = timeout.next;
                if (timeout.remainingRounds <= 0) {
-                    next = remove(timeout);
                    if (timeout.deadline <= deadline) {
                        timeout.expire();
                    } else {
@@ -726,9 +725,7 @@ public class HashedWheelTimer implements Timer {
                        throw new IllegalStateException(String.format(
                                "timeout.deadline (%d) > deadline (%d)", timeout.deadline, deadline));
                    }
-                } else if (timeout.isCancelled()) {
-                    next = remove(timeout);
-                } else {
+                } else if (!timeout.isCancelled()) {
                    timeout.remainingRounds--;
                }
                timeout = next;
@@ -761,7 +758,6 @@ public class HashedWheelTimer implements Timer {
            timeout.prev = null;
            timeout.next = null;
            timeout.bucket = null;
-            timeout.timer.pendingTimeouts.decrementAndGet();
            return next;
        }

@@ -242,6 +242,7 @@ public class KafkaCollectImpl extends AbstractCollect {
            boolean isKafkaCommand = SupportedCommand.isKafkaCommand(command);
            if (!isKafkaCommand) {
                log.error("Unsupported command: {}", command);
+                builder.setCode(CollectRep.Code.FAIL);
                return;
            }

@@ -273,7 +274,7 @@ public class KafkaCollectImpl extends AbstractCollect {
        }
    }

-    private AdminClient getAdminClient(KafkaProtocol kafkaProtocol) {
+    protected AdminClient getAdminClient(KafkaProtocol kafkaProtocol) {
        CacheIdentifier kafkaAdminClientIdentifier = CacheIdentifier.builder()
                .ip(kafkaProtocol.getHost()).port(kafkaProtocol.getPort())
                .build();
@@ -17,12 +17,24 @@

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

+import org.apache.hertzbeat.collector.collect.kafka.constants.SupportedCommand;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.KafkaProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.apache.kafka.clients.admin.AdminClient;
+import org.apache.kafka.clients.admin.ListTopicsOptions;
+import org.apache.kafka.clients.admin.ListTopicsResult;
+import org.apache.kafka.common.KafkaFuture;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.HashSet;
+import java.util.Set;

 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -31,12 +43,25 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 /**
 * Test case for {@link KafkaCollectImpl}
 */
+@ExtendWith(MockitoExtension.class)
 public class KafkaCollectTest {
+
+    private static final String HOST = "127.0.0.1";
+    private static final String PORT = "9092";
+
    private KafkaCollectImpl collect;

+    @Mock
+    private AdminClient adminClient;
+
    @BeforeEach
    public void setUp() throws Exception {
-        collect = new KafkaCollectImpl();
+        collect = new KafkaCollectImpl(){
+            @Override
+            protected AdminClient getAdminClient(KafkaProtocol protocol) {
+                return adminClient;
+            }
+        };
    }

    @Test
@@ -59,38 +84,51 @@ public class KafkaCollectTest {
        });
        // kafka port is null
        assertThrows(IllegalArgumentException.class, () -> {
-            kafka.setHost("127.0.0.1");
+            kafka.setHost(HOST);
            collect.preCheck(metric);
        });
        // no exception throw
        assertDoesNotThrow(() -> {
-            kafka.setPort("9092");
+            kafka.setPort(PORT);
            collect.preCheck(metric);
        });
    }

    @Test
-    void collect() {
-        // metrics is null
-        assertThrows(NullPointerException.class, () -> {
-            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-            collect.collect(builder, null);
-        });
+    void testCollect() throws Exception {
+        Set<String> topicSet = new HashSet<>();
+        topicSet.add("test-topic");
+
+        ListTopicsResult listTopicsResult = Mockito.mock(ListTopicsResult.class);
+        KafkaFuture<Set<String>> future = Mockito.mock(KafkaFuture.class);
+
+        Mockito.when(adminClient.listTopics(Mockito.any(ListTopicsOptions.class))).thenReturn(listTopicsResult);
+        Mockito.when(listTopicsResult.names()).thenReturn(future);
+        Mockito.when(future.get()).thenReturn(topicSet);
+
+        KafkaProtocol kafka = KafkaProtocol.builder()
+                .host(HOST)
+                .port(PORT)
+                .build();
+
+        Metrics metrics = Metrics.builder()
+                .kclient(kafka)
+                .build();
+
+        // test if not kafka command
+        CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
+        collect.collect(builder, metrics);
+        assertEquals(CollectRep.Code.FAIL, builder.getCode());

-        KafkaProtocol kafka = KafkaProtocol.builder().host("127.0.0.1").port("9092").build();
-        Metrics metrics = Metrics.builder().kclient(kafka).build();
-        //test if not kafka command
-        assertDoesNotThrow(() -> {
-            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-            collect.collect(builder, metrics);
-        });
        //test kafka command
-        assertDoesNotThrow(() -> {
-            CollectRep.MetricsData.Builder builder = CollectRep.MetricsData.newBuilder();
-            metrics.getKclient().setCommand("topic-list");
-            collect.collect(builder, metrics);
-        });
+        kafka.setCommand(SupportedCommand.TOPIC_LIST.getCommand());
+        builder.setCode(CollectRep.Code.forNumber(6));
+        collect.collect(builder, metrics);

+        assertEquals(CollectRep.Code.SUCCESS, builder.getCode());
+        assertEquals(1, builder.getValuesList().size());
+        assertEquals("test-topic", builder.getValues(0).getColumns(0));
+        Mockito.verify(adminClient).listTopics(Mockito.any(ListTopicsOptions.class));
    }

    @Test
@@ -93,9 +93,14 @@ public interface CommonConstants {
    String LABEL_ALERT_NAME = "alertname";

    /**
-     * label key: host
+     * label key: instance host
     */
-    String LABEL_HOST = "host";
+    String LABEL_INSTANCE_HOST = "instancehost";
+
+    /**
+     * label key: instance name
+     */
+    String LABEL_INSTANCE_NAME = "instancename";
    
    /**
     * Alarm severity label key
@@ -450,4 +455,19 @@ public interface CommonConstants {
     * status page incident state resolved
     */
    byte STATUS_PAGE_INCIDENT_STATE_RESOLVED = 3;
+
+    /**
+     * status page incident state resolved
+     */
+    byte MONITOR_TYPE_NORMAL = 0;
+
+    /**
+     * status page incident state resolved
+     */
+    byte MONITOR_TYPE_PUSH_AUTO_CREATE = 1;
+
+    /**
+     * status page incident state resolved
+     */
+    byte MONITOR_TYPE_DISCOVERY_AUTO_CREATE = 2;
 }
@@ -65,6 +65,8 @@ public interface ConfigConstants {
        String INFO = "info";

        String GRAFANA = "grafana";
+
+        String LOG = "log";
    }

 }
@@ -27,12 +27,16 @@ public interface MetricDataConstants {
    String UNIT = "unit";

    // key in Schema metadata
-    String MONITOR_ID = "id";
+    String ID = "id";
    String TENANT_ID = "tenantId";
    String APP = "app";
    String METRICS = "metrics";
+    String LABELS = "labels";
+    String ANNOTATIONS = "annotations";
    String PRIORITY = "priority";
    String TIME = "time";
    String CODE = "code";
    String MSG = "msg";
+    String INSTANCE_NAME = "instancename";
+    String INSTANCE_HOST = "instancehost";
 }
@@ -32,4 +32,10 @@ public interface SmsConstants {

    // Smslocal SMS
    String SMSLOCAL = "smslocal";
+
+    // Aws cloud SMS
+    String AWS = "aws";
+
+    // Twilio SMS
+    String TWILIO = "twilio";
 }
@@ -63,6 +63,7 @@ public class GroupAlert {
    private Long id;
    
    @Schema(title = "Group Key", example = "HighCPUUsage{alertname=\"HighCPUUsage\", instance=\"server1\"}")
+    @Column(length = 2048)
    private String groupKey;
    
    @Schema(title = "Status", example = "resolved")
@@ -122,6 +122,11 @@ public class NoticeReceiver {
            example = "779294123", accessMode = READ_WRITE)
    private String tgUserId;

+    @Schema(title = "Telegram message thread id: The notification method is valid for Telegram Bot",
+            description = "TTelegram message thread id: The notification method is valid for Telegram Bot",
+            example = "779294123", accessMode = READ_WRITE)
+    private String tgMessageThreadId;
+
    @Schema(title = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
            description = "DingTalk,FeiShu,WeWork user id: The notification method is valid for DingTalk,FeiShu,WeWork Bot",
            example = "779294123", accessMode = READ_WRITE)
@@ -59,8 +59,9 @@ public class SingleAlert {
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    @Schema(title = "Threshold Id", example = "87584674384", accessMode = READ_ONLY)
    private Long id;
-    
-    @Schema(title = "Fingerprint", example = "dxsdfdsf")
+
+    @Schema(title = "Fingerprint", example = "alertname:demo")
+    @Column(length = 2048)
    private String fingerprint;
    
    @Schema(title = "Labels", example = "{\"alertname\": \"HighCPUUsage\", \"priority\": \"critical\", \"instance\": \"343483943\"}")
@@ -74,6 +75,7 @@ public class SingleAlert {
    private Map<String, String> annotations;

    @Schema(title = "Content", example = "CPU usage is above 80% for the last 5 minutes on instance server1.example.com.")
+    @Column(length = 4096)
    private String content;

    @Schema(title = "Status", example = "firing|resolved")
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.entity.dto.query;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Metric History Range Query Data
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "Query Request Data")
+public class DatasourceQuery {
+    
+    @Schema(title = "Ref Id, unique id for the query")
+    private String refId;
+    
+    @Schema(title = "datasource name")
+    private String datasource;
+    
+    @Schema(title = "query expr, like prometheus query")
+    private String expr;
+    
+    @Schema(title = "query expr type, like promql or sql or influxql")
+    private String exprType;
+    
+    @Schema(title = "query range type, like range or instant")
+    private String timeType;
+
+    @Schema(title = "query range start time")
+    private Long start;
+
+    @Schema(title = "query range end time")
+    private Long end;
+    
+    @Schema(title = "query time step, like 5m or 1h")
+    private String step;
+}
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.common.entity.dto.query;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.List;
+import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Metric History Range Query Data
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Schema(description = "Metric Query Data")
+public class DatasourceQueryData {
+
+    @Schema(title = "Ref Id, unique id for the query")
+    private String refId;
+    
+    @Schema(title = "query status code, 200 for success, other for error")
+    private Integer status;
+    
+    @Schema(title = "query error message")
+    private String msg;
+    
+    @Schema(title = "query result data frames")
+    private List<SchemaData> frames;
+    
+    /**
+     * Schema Data
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Builder
+    public static final class SchemaData {
+
+        @Schema(title = "Metric Schema")
+        private MetricSchema schema;
+
+        @Schema(title = "metrics row values, first is the timestamp-ts", example = "[[29,32,44],[32,34,true]]")
+        private List<Object[]> data;
+    }
+    
+    /**
+     * Metric Schema
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Builder
+    public static final class MetricSchema {
+
+        @Schema(title = "Metrics Field")
+        private List<MetricField> fields;
+        
+        @Schema(title = "This frame labels")
+        private Map<String, String> labels;
+        
+        @Schema(title = "Meta Information")
+        private Map<String, String> meta;
+    }
+
+    /**
+     * Metric Field
+     */
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Builder
+    public static final class MetricField {
+
+        @Schema(title = "Metric Field Name")
+        private String name;
+
+        @Schema(title = "Field Type: number, string, time, bool")
+        private String type;
+
+        @Schema(title = "Field Unit: %, Mb, Kbps etc.")
+        private String unit;
+    }
+}
@@ -61,6 +61,19 @@ public class Job {
     * Monitoring Task ID
     */
    private long monitorId;
+    /**
+     * metadata info bind with this job
+     * eg: instancename, instancehost
+     */
+    private Map<String, String> metadata;
+    /**
+     * bind labels 
+     */
+    private Map<String, String> labels;
+    /**
+     * bind annotations
+     */
+    private Map<String, String> annotations;
    /**
     * Is hide this app in main menus layout, only for app type, default true.
     */
@@ -159,23 +172,36 @@ public class Job {
     * collector use - construct to initialize metrics execution view
     */
    public synchronized void constructPriorMetrics() {
-        Map<Byte, List<Metrics>> map = metrics.stream()
-            .filter(metrics -> (System.currentTimeMillis() >= metrics.getCollectTime() + metrics.getInterval() * 1000))
-            .peek(metric -> {
-                metric.setCollectTime(System.currentTimeMillis());
-                // Determine whether to configure aliasFields If not, configure the default
-                if ((metric.getAliasFields() == null || metric.getAliasFields().isEmpty()) && metric.getFields() != null) {
-                    metric.setAliasFields(metric.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList()));
-                }
-                // Set the default metrics execution priority, if not filled, the default last priority
-                if (metric.getPriority() == null) {
-                    metric.setPriority(Byte.MAX_VALUE);
-                }
-            })
-            .collect(Collectors.groupingBy(Metrics::getPriority));
+        long now = System.currentTimeMillis();
+        Map<Byte, List<Metrics>> currentCollectMetrics = metrics.stream()
+                .filter(metrics -> (now >= metrics.getCollectTime() + metrics.getInterval() * 1000))
+                .peek(metric -> {
+                    metric.setCollectTime(now);
+                    // Determine whether to configure aliasFields If not, configure the default
+                    if ((metric.getAliasFields() == null || metric.getAliasFields().isEmpty()) && metric.getFields() != null) {
+                        metric.setAliasFields(metric.getFields().stream().map(Metrics.Field::getField).collect(Collectors.toList()));
+                    }
+                    // Set the default metrics execution priority, if not filled, the default last priority
+                    if (metric.getPriority() == null) {
+                        metric.setPriority(Byte.MAX_VALUE);
+                    }
+                })
+                .collect(Collectors.groupingBy(Metrics::getPriority));
+        // the current collect metrics can not empty, if empty, add a default availability metrics
+        // due the metric collect is trigger by the previous metric collect
+        if (currentCollectMetrics.isEmpty()) {
+            Optional<Metrics> defaultMetricOption = metrics.stream().filter(metric -> metric.getPriority() == 0).findFirst();
+            if (defaultMetricOption.isPresent()) {
+                Metrics defaultMetric = defaultMetricOption.get();
+                defaultMetric.setCollectTime(now);
+                currentCollectMetrics.put((byte) 0, Collections.singletonList(defaultMetric));
+            } else {
+                log.error("metrics must has one priority 0 metrics at least.");
+            }
+        }
        // Construct a linked list of task execution order of the metrics
        priorMetrics = new LinkedList<>();
-        map.values().forEach(metric -> {
+        currentCollectMetrics.values().forEach(metric -> {
            Set<Metrics> metricsSet = Collections.synchronizedSet(new HashSet<>(metric));
            priorMetrics.add(metricsSet);
        });
@@ -260,7 +286,7 @@ public class Job {
    public void initIntervals() {
        List<Long> metricsIntervals = new LinkedList<>();
        for (Metrics metrics: getMetrics()) {
-            metrics.setCollectTime(System.currentTimeMillis());
+            metrics.setCollectTime(0L);
            if (metrics.getInterval() <= 0) {
                metrics.setInterval(defaultInterval);
            }
@@ -287,10 +313,10 @@ public class Job {
     * The least common multiple
     */
    public static long lcm(List<Long> array) {
-        if (array != null) {
+        if (array != null && !array.isEmpty()) {
            long result = array.get(0);
            for (int i = 1; i < array.size(); i++) {
-                result = (result * array.get(i)) / gcd(result, array.get(i));
+                result = result / gcd(result, array.get(i)) * array.get(i);
            }
            return result;
        }
@@ -54,6 +54,7 @@ import org.apache.hertzbeat.common.entity.job.protocol.PushProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RedfishProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RedisProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.RocketmqProtocol;
+import org.apache.hertzbeat.common.entity.job.protocol.S7Protocol;
 import org.apache.hertzbeat.common.entity.job.protocol.ScriptProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.SmtpProtocol;
 import org.apache.hertzbeat.common.entity.job.protocol.SnmpProtocol;
@@ -270,6 +271,10 @@ public class Metrics {
     * Monitoring configuration information using the public modBus protocol
     */
    private ModbusProtocol modbus;
+    /**
+     * Monitoring configuration information using the public s7 protocol
+     */
+    private S7Protocol s7;
    /**
     * collector use - Temporarily store subTask metrics response data
     */
@@ -95,6 +95,12 @@ public class HttpProtocol implements CommonRequestProtocol, Protocol {
     */
    private List<String> successCodes;

+    /**
+     * Whether to enable URL encoding for the path. Default is true.
+     * When true, the URL path will be encoded. When false, the URL path will not be encoded.
+     */
+    private String enableUrlEncoding = "true";
+
    /**
     * authentication information
     */
@@ -15,34 +15,45 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.manager.pojo.dto;
+package org.apache.hertzbeat.common.entity.job.protocol;

-import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+import java.util.List;
+
+
 /**
- * Tencent Sms Sender configuration dto
+ * Modbus Protocol
 */
@Data
-@NoArgsConstructor
+@Builder
@AllArgsConstructor
-public class SmsTencentConfig {
-    
-    @NotBlank(message = "SecretId cannot be empty")
-    private String secretId;
+@NoArgsConstructor
+public class S7Protocol implements Protocol {

-    @NotBlank(message = "SecretKey cannot be empty")
-    private String secretKey;
+    /**
+     * IP ADDRESS OR DOMAIN NAME OF THE PEER HOST
+     */
+    private String host;
+    /**
+     * Port number
+     */
+    private String port;

-    @NotBlank(message = "SignName cannot be empty")
-    private String signName;
+    private String driverName;

-    @NotBlank(message = "AppId cannot be null")
-    private String appId;
+    private String addressSyntax;

-    @NotBlank(message = "templateId cannot be null")
-    private String templateId;
+    private String rackId;

+    private String slotId;
+
+    private String controllerType;
+
+    private String timeout;
+
+    private List<String> registerAddresses;
 }
@@ -80,4 +80,34 @@ public class SshProtocol implements CommonRequestProtocol, Protocol {
     * Response data parsing mode：oneRow, multiRow
     */
    private String parseType;
+
+    /**
+     * IP ADDRESS OR DOMAIN NAME OF THE PEER PROXY HOST
+     */
+    private String proxyHost;
+
+    /**
+     * Peer proxy host port
+     */
+    private String proxyPort;
+
+    /**
+     * Proxy UserName
+     */
+    private String proxyUsername;
+
+    /**
+     * Proxy Password (optional)
+     */
+    private String proxyPassword;
+
+    /**
+     * flag of use proxy
+     */
+    private String useProxy = "false";
+
+    /**
+     * Proxy private key (optional)
+     */
+    private String proxyPrivateKey;
 }
@@ -91,6 +91,9 @@ public class Monitor {
    @Max(4)
    private byte status;
    
+    @Schema(title = "Task type 0: Normal, 1: push auto create, 2: discovery auto create")
+    private byte type;
+    
    @Schema(title = "task label", example = "{env:test}", accessMode = READ_WRITE)
    @Convert(converter = JsonMapAttributeConverter.class)
    @Column(length = 4096)
@@ -43,6 +43,7 @@ import org.apache.arrow.vector.types.pojo.FieldType;
 import org.apache.arrow.vector.types.pojo.Schema;
 import org.apache.hertzbeat.common.constants.MetricDataConstants;
 import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
+import org.apache.hertzbeat.common.util.JsonUtil;

@SuppressWarnings("all")
@Slf4j
@@ -138,17 +139,7 @@ public final class CollectRep {
        
        public static Builder newBuilder(MetricsData metricsData) {
            Builder builder = new Builder();
-            // get metadata from metricsData
-            Map<String, String> metadata = metricsData.getMetadata();
-            builder.setId(Long.parseLong(metadata.getOrDefault(MetricDataConstants.MONITOR_ID, "0")))
-                   .setTenantId(Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0")))
-                   .setApp(metadata.getOrDefault(MetricDataConstants.APP, ""))
-                   .setMetrics(metadata.getOrDefault(MetricDataConstants.METRICS, ""))
-                   .setPriority(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0")))
-                   .setTime(Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0")))
-                   .setCode(Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0"))))
-                   .setMsg(metadata.getOrDefault(MetricDataConstants.MSG, ""));
-            
+            builder.addMetadataAll(metricsData.getMetadata());
            metricsData.getFields().forEach(builder::addField);
            metricsData.getValues().forEach(builder::addValueRow);
            return builder;
@@ -191,42 +182,70 @@ public final class CollectRep {
        
        public long getId() {
            Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault("id", "0"));
+            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.ID, "0"));
        }

        public long getTenantId() {
            Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault("tenantId", "0"));
+            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0"));
        }

        public String getApp() {
            Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault("app", "");
+            return metadata.getOrDefault(MetricDataConstants.APP, "");
        }

        public String getMetrics() {
            Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault("metrics", "");
+            return metadata.getOrDefault(MetricDataConstants.METRICS, "");
        }

        public int getPriority() {
            Map<String, String> metadata = getMetadata();
-            return Integer.parseInt(metadata.getOrDefault("priority", "0"));
+            return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0"));
        }

        public long getTime() {
            Map<String, String> metadata = getMetadata();
-            return Long.parseLong(metadata.getOrDefault("time", "0"));
+            return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
        }

        public Code getCode() {
            Map<String, String> metadata = getMetadata();
-            return Code.forNumber(Integer.parseInt(metadata.getOrDefault("code", "0")));
+            return Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0")));
        }

        public String getMsg() {
            Map<String, String> metadata = getMetadata();
-            return metadata.getOrDefault("msg", "");
+            return metadata.getOrDefault(MetricDataConstants.MSG, "");
+        }
+
+        public String getInstanceName() {
+            Map<String, String> metadata = getMetadata();
+            return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
+        }
+
+        public String getInstanceHost() {
+            Map<String, String> metadata = getMetadata();
+            return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
+        }
+
+        public Map<String, String> getLabels() {
+            Map<String, String> metadata = getMetadata();
+            String labelStr = metadata.getOrDefault(MetricDataConstants.LABELS, "");
+            if (labelStr == null || "".equals(labelStr)) {
+                return null;
+            }
+            return JsonUtil.fromJson(labelStr, Map.class);
+        }
+
+        public Map<String, String> getAnnotations() {
+            Map<String, String> metadata = getMetadata();
+            String annotationStr = metadata.getOrDefault(MetricDataConstants.ANNOTATIONS, "");
+            if (annotationStr == null || "".equals(annotationStr)) {
+                return null;
+            }
+            return JsonUtil.fromJson(annotationStr, Map.class);
        }

        private Map<String, String> getMetadata() {
@@ -298,54 +317,82 @@ public final class CollectRep {

        // Builder remains mostly the same, but build() method changes
        public static class Builder {
-            private long id;
-            private long tenantId;
-            private String app = "";
-            private String metrics = "";
-            private int priority;
-            private long time;
-            private Code code = Code.SUCCESS;
-            private String msg = "";
+            
+            private Map<String, String> metadata = new HashMap<>();
            private List<Field> fields = new ArrayList<>();
            private List<ValueRow> values = new ArrayList<>();
            
            public Builder setId(long id) {
-                this.id = id;
+                metadata.put(MetricDataConstants.ID, String.valueOf(id));
                return this;
            }

            public Builder setTenantId(long tenantId) {
-                this.tenantId = tenantId;
+                metadata.put(MetricDataConstants.TENANT_ID, String.valueOf(tenantId));
                return this;
            }

            public Builder setApp(String app) {
-                this.app = app;
+                metadata.put(MetricDataConstants.APP, app != null ? app : "");
                return this;
            }

            public Builder setMetrics(String metrics) {
-                this.metrics = metrics;
+                metadata.put(MetricDataConstants.METRICS, metrics != null ? metrics : "");
+                return this;
+            }
+            
+            public Builder setLabels(Map<String, String> labels) {
+                if (labels == null || labels.isEmpty()) {
+                    return this;
+                }
+                String labelStr = JsonUtil.toJson(labels);
+                metadata.put(MetricDataConstants.LABELS, labelStr);
+                return this;
+            }
+            
+            public Builder setAnnotations(Map<String, String> annotations) {
+                if (annotations == null || annotations.isEmpty()) {
+                    return this;
+                }
+                String annotationStr = JsonUtil.toJson(annotations);
+                metadata.put(MetricDataConstants.ANNOTATIONS, annotationStr);
                return this;
            }

            public Builder setPriority(int priority) {
-                this.priority = priority;
+                metadata.put(MetricDataConstants.PRIORITY, String.valueOf(priority));
                return this;
            }

            public Builder setTime(long time) {
-                this.time = time;
+                metadata.put(MetricDataConstants.TIME, String.valueOf(time));
                return this;
            }

            public Builder setCode(Code code) {
-                this.code = code;
+                metadata.put(MetricDataConstants.CODE, String.valueOf(code != null ? code.value : 0));
                return this;
            }

            public Builder setMsg(String msg) {
-                this.msg = msg;
+                metadata.put(MetricDataConstants.MSG, msg != null ? msg : "");
+                return this;
+            }
+            
+            public Builder addMetadata(String key, String value) {
+                if (key == null || "".equals(key)) {
+                    return this;
+                }
+                metadata.put(key, value);
+                return this;
+            }
+            
+            public Builder addMetadataAll(Map<String, String> meta) {
+                if (meta == null || meta.isEmpty()) {
+                    return this;
+                }
+                this.metadata.putAll(meta);
                return this;
            }

@@ -360,17 +407,6 @@ public final class CollectRep {
            }

            public MetricsData build() {
-                // Create metadata
-                Map<String, String> metadata = new HashMap<>();
-                metadata.put(MetricDataConstants.MONITOR_ID, String.valueOf(id));
-                metadata.put(MetricDataConstants.TENANT_ID, String.valueOf(tenantId));
-                metadata.put(MetricDataConstants.APP, app != null ? app : "");
-                metadata.put(MetricDataConstants.METRICS, metrics != null ? metrics : "");
-                metadata.put(MetricDataConstants.PRIORITY, String.valueOf(priority));
-                metadata.put(MetricDataConstants.TIME, String.valueOf(time));
-                metadata.put(MetricDataConstants.CODE, String.valueOf(code != null ? code.value : 0));
-                metadata.put(MetricDataConstants.MSG, msg != null ? msg : "");
-
                BufferAllocator allocator = new RootAllocator();
                try {
                    // Create Arrow fields with metadata
@@ -407,7 +443,9 @@ public final class CollectRep {
                                        fieldIndex < row.getColumnsList().size()) {
                                    String value = row.getColumns(fieldIndex);
                                    if (value != null) {
-                                        vector.set(rowIndex, value.getBytes(StandardCharsets.UTF_8));
+                                        // Check byte array size, Arrow buffer size is 32768 bytes
+                                        byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
+                                        vector.setSafe(rowIndex, bytes);
                                    }
                                }
                            }
@@ -425,38 +463,65 @@ public final class CollectRep {
                    throw e;
                }
            }
-
-            // Add getter methods
+            
            public long getId() {
-                return id;
+                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.ID, "0"));
            }

            public long getTenantId() {
-                return tenantId;
+                return Long.parseLong(metadata.getOrDefault(MetricDataConstants.TENANT_ID, "0"));
            }

            public String getApp() {
-                return app;
+                return metadata.getOrDefault(MetricDataConstants.APP, "");
            }

            public String getMetrics() {
-                return metrics;
+                return metadata.getOrDefault(MetricDataConstants.METRICS, "");
            }

            public int getPriority() {
-                return priority;
+                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.PRIORITY, "0"));
            }

            public long getTime() {
-                return time;
+                return Integer.parseInt(metadata.getOrDefault(MetricDataConstants.TIME, "0"));
            }

            public Code getCode() {
-                return code;
+                return Code.forNumber(Integer.parseInt(metadata.getOrDefault(MetricDataConstants.CODE, "0")));
            }

            public String getMsg() {
-                return msg;
+                return metadata.getOrDefault(MetricDataConstants.MSG, "");
+            }
+            
+            public String getInstanceName() {
+                return metadata.getOrDefault(MetricDataConstants.INSTANCE_NAME, null);
+            }
+            
+            public String getInstanceHost() {
+                return metadata.getOrDefault(MetricDataConstants.INSTANCE_HOST, null);
+            }
+            
+            public Map<String, String> getLabels() {
+                String labelStr = metadata.getOrDefault(MetricDataConstants.LABELS, "");
+                if (labelStr == null || "".equals(labelStr)) {
+                    return null;
+                }
+                return JsonUtil.fromJson(labelStr, Map.class);
+            }
+            
+            public Map<String, String> getAnnotations() {
+                String annotationStr = metadata.getOrDefault(MetricDataConstants.ANNOTATIONS, "");
+                if (annotationStr == null || "".equals(annotationStr)) {
+                    return null;
+                }
+                return JsonUtil.fromJson(annotationStr, Map.class);
+            }
+            
+            public Map<String, String> getMetadata() {
+                return metadata;
            }

            public List<Field> getFieldsList() {
@@ -491,10 +556,6 @@ public final class CollectRep {
                values = new LinkedList<>();
            }

-            public void clearMetrics() {
-                metrics = null;
-            }
-
            public void clearFields() {
                fields = new LinkedList<>();
            }
@@ -49,4 +49,46 @@ public final class TimePeriodUtil {
            return Duration.parse("PT" + tokenTime);
        }
    }
+
+    /**
+     * transform any timestamp to milliseconds
+     * @param timestamp timestamp
+     * @return milliseconds
+     */
+    public static long normalizeToMilliseconds(Object timestamp) {
+        if (timestamp instanceof String timestampStr) {
+            // string type, may be second, millisecond or decimal second
+            // eg: "1672531199000", "1672531199", "1672531199.123"
+            if (timestampStr.contains(".")) {
+                // contains decimal point, parse as second timestamp
+                double seconds = Double.parseDouble(timestampStr);
+                return (long) (seconds * 1000);
+            } else {
+                // integer form, determine second or millisecond
+                long numericTimestamp = Long.parseLong(timestampStr);
+                return convertNumericTimestamp(numericTimestamp);
+            }
+        } else if (timestamp instanceof Number) {
+            // number eg Integer、Long、Double
+            if (timestamp instanceof Double || timestamp instanceof Float) {
+                // float type, treat as second timestamp
+                double seconds = ((Number) timestamp).doubleValue();
+                return (long) (seconds * 1000);
+            } else {
+                // integer type, directly determine second or millisecond
+                long numericTimestamp = ((Number) timestamp).longValue();
+                return convertNumericTimestamp(numericTimestamp);
+            }
+        } else {
+            throw new IllegalArgumentException("Not support this timestamp type: " + timestamp.getClass().getName());
+        }
+    }
+
+    private static long convertNumericTimestamp(long numericTimestamp) {
+        if (String.valueOf(numericTimestamp).length() <= 10) {
+            return numericTimestamp * 1000;
+        } else {
+            return numericTimestamp;
+        }
+    }
 }
@@ -72,7 +72,7 @@ public abstract class AbstractCollectE2eTest {
        metricsCollect = new MetricsCollect(mock(Metrics.class), timeout, mock(CollectDataDispatch.class), null, List.of());

        // Initialize services and components
-        appService.run();
+        appService.afterPropertiesSet();
        metrics = new Metrics();
    }

@@ -40,6 +40,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 import lombok.extern.slf4j.Slf4j;

@@ -71,6 +72,11 @@ public class DashboardService {
     */
    @Transactional(rollbackFor = Exception.class)
    public ResponseEntity<?> createOrUpdateDashboard(String dashboardJson, Long monitorId) {
+        if (!grafanaProperties.enabled()) {
+            log.info("HertzBeat Grafana config not enabled");
+            throw new RuntimeException("HertzBeat Grafana config not enabled");
+        }
+
        String token = serviceAccountService.getToken();
        String url = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + CREATE_DASHBOARD_API;

@@ -103,6 +109,12 @@ public class DashboardService {
                log.error("create dashboard error: {}", response.getStatusCode());
                throw new RuntimeException("create dashboard error");
            }
+        } catch (HttpClientErrorException.Forbidden ex) {
+            log.error("Grafana Access denied to save dashboard", ex);
+            throw new RuntimeException("Grafana Access denied to save dashboard", ex);
+        } catch (HttpClientErrorException.NotFound ex){
+            log.error("Grafana Dashboard not found", ex);
+            throw new RuntimeException("Grafana Dashboard not found", ex);
        } catch (Exception ex) {
            log.error("create dashboard error", ex);
            throw new RuntimeException("create dashboard error", ex);
@@ -61,6 +61,11 @@ public class DatasourceService {
     * Create a new datasource in Grafana.
     */
    public void existOrCreateDatasource(String token) {
+        if (!warehouseProperties.enabled()) {
+            log.info("HertzBeat VictoriaMetrics config not enabled");
+            return;
+        }
+
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
        headers.setBearerAuth(token);
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.hertzbeat</groupId>
+        <artifactId>hertzbeat</artifactId>
+        <version>2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>hertzbeat-log</artifactId>
+    <name>${project.artifactId}</name>
+    <properties>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+    </properties>
+
+    <dependencies>
+        <!-- hertzbeat common -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-common</artifactId>
+        </dependency>
+        <!-- hertzbeat warehouse -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-warehouse</artifactId>
+        </dependency>
+        <!-- OpenTelemetry -->
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-sdk-logs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-logback-appender-1.0</artifactId>
+        </dependency>
+    </dependencies>
+</project>
@@ -15,19 +15,21 @@
 * limitations under the License.
 */

-package org.apache.hertzbeat.push.dao;
+package org.apache.hertzbeat.log.config;

-import org.apache.hertzbeat.common.entity.push.PushMetrics;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.transaction.annotation.Transactional;
+import org.apache.hertzbeat.common.constants.ConfigConstants;
+import org.apache.hertzbeat.common.constants.SignConstants;
+import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.ComponentScan;

 /**
- * push metrics dao
+ * Log auto configuration.
 */
-public interface PushMetricsDao extends JpaRepository<PushMetrics, Long> {
-    
-    PushMetrics findFirstByMonitorIdOrderByTimeDesc(Long monitorId);
-
-    @Transactional(rollbackFor = Exception.class)
-    void deleteAllByTimeBefore(Long time);
+@ComponentScan(basePackages = ConfigConstants.PkgConstant.PKG
+		+ SignConstants.DOT
+		+ ConfigConstants.FunctionModuleConstants.LOG
+)
+@EnableConfigurationProperties(GreptimeProperties.class)
+public class LogAutoConfiguration {
 }
@@ -0,0 +1,117 @@
+/*
+ *   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.log.config;
+
+import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
+import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.logs.SdkLoggerProvider;
+import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
+import io.opentelemetry.sdk.resources.Resource;
+
+import jakarta.annotation.PostConstruct;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * OpenTelemetryConfig is responsible for initializing OpenTelemetry with the specified service name and GrepTimeDB endpoint.
+ * It ensures that the initialization is done in a thread-safe manner and includes authentication for GrepTimeDB.
+ */
+@Configuration
+@Slf4j
+public class OpenTelemetryConfig {
+
+    @Autowired
+    private GreptimeProperties greptimeProperties;
+
+    /**
+     * Initializes OpenTelemetry with the given service name and GrepTimeDB endpoint.
+     * Includes authentication if configured in GreptimeProperties.
+     */
+    @PostConstruct
+    public void initializeOpenTelemetry() {
+        if (greptimeProperties == null || !greptimeProperties.enabled()) {
+            log.info("GrepTimeDB logging is disabled, skipping OpenTelemetry configuration.");
+            return;
+        }
+
+        try {
+            Resource resource = Resource.getDefault()
+                    .merge(Resource.builder()
+                            .put(SERVICE_NAME, "HertzBeat")
+                            .build());
+
+            Map<String, String> headers = new HashMap<>();
+
+            headers.put("X-Greptime-DB-Name", "public");
+            headers.put("X-Greptime-Log-Table-Name", "hzb_log");
+
+            addAuthenticationHeaders(headers);
+
+            OtlpHttpLogRecordExporter logExporter = OtlpHttpLogRecordExporter.builder()
+                    .setEndpoint(greptimeProperties.httpEndpoint() + "/v1/otlp/v1/logs")
+                    .setHeaders(()-> headers)
+                    .setTimeout(10, TimeUnit.SECONDS)
+                    .build();
+
+            SdkLoggerProvider loggerProvider = SdkLoggerProvider.builder()
+                    .setResource(resource)
+                    .addLogRecordProcessor(
+                            BatchLogRecordProcessor.builder(logExporter)
+                                    .setScheduleDelay(1000, TimeUnit.MILLISECONDS)
+                                    .setMaxExportBatchSize(512)
+                                    .build())
+                    .build();
+
+            OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
+                    .setLoggerProvider(loggerProvider)
+                    .build();
+
+            OpenTelemetryAppender.install(openTelemetry);
+            log.info("OpenTelemetry successfully configured with GrepTimeDB exporter.");
+        } catch (Exception e) {
+            log.error("Failed to initialize OpenTelemetry with GrepTimeDB", e);
+        }
+    }
+
+    /**
+     * Adds authentication headers to the provided map if username and password are configured.
+     *
+     * @param headers the map to which authentication headers will be added
+     */
+    private void addAuthenticationHeaders(Map<String, String> headers) {
+        if (StringUtils.isNotBlank(greptimeProperties.username())
+                && StringUtils.isNotBlank(greptimeProperties.password())) {
+            String credentials = greptimeProperties.username() + ":" + greptimeProperties.password();
+            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+            headers.put("Authorization", "Basic " + encodedCredentials);
+        }
+
+    }
+}
@@ -0,0 +1,17 @@
+# 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.
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.hertzbeat.log.config.LogAutoConfiguration
@@ -89,6 +89,11 @@
            <groupId>org.apache.hertzbeat</groupId>
            <artifactId>hertzbeat-grafana</artifactId>
        </dependency>
+        <!-- log -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-log</artifactId>
+        </dependency>
        <!-- spring -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
@@ -28,6 +28,7 @@ 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;
+import org.springframework.scheduling.annotation.EnableScheduling;

 /**
 * start up class.
@@ -41,6 +42,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
@ConfigurationPropertiesScan(basePackages = {"org.apache.hertzbeat"})
@ImportRuntimeHints(HertzbeatRuntimeHintsRegistrar.class)
@EnableAsync
+@EnableScheduling
 public class Manager {
    public static void main(String[] args) {
        SpringApplication.run(Manager.class, args);
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hertzbeat.manager.pojo.dto;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
-
-/**
- * UniSMS configuration
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class SmsUniSmsConfig {
-    /**
-     * UniSMS access key id
-     */
-    @NotBlank(message = "accessKeyId cannot be empty")
-    private String accessKeyId;
-
-    /**
-     * UniSMS access key secret, required for HMAC mode
-     */
-    private String accessKeySecret;
-
-    /**
-     * SMS signature
-     */
-    @NotBlank(message = "signature cannot be null")
-    private String signature;
-
-    /**
-     * SMS template ID
-     */
-    @NotBlank(message = "templateId cannot be null")
-    private String templateId;
-
-    /**
-     * Authentication mode: simple or hmac, default is simple
-     */
-    @NotBlank(message = "authMode cannot be null")
-    private String authMode = "simple";
-}
@@ -427,6 +427,7 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
        if (jobId == null) {
            return;
        }
+        jobContentCache.remove(jobId);
        for (ConsistentHash.Node node : consistentHash.getAllNodes().values()) {
            AssignJobs assignJobs = node.getAssignJobs();
            if (assignJobs.getPinnedJobs().remove(jobId)
@@ -120,7 +120,11 @@ public class SchedulerInit implements CommandLineRunner {
                appDefine.setDefaultInterval(monitor.getIntervals());
                appDefine.setCyclic(true);
                appDefine.setTimestamp(System.currentTimeMillis());
-
+                Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                        CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+                appDefine.setMetadata(metadata);
+                appDefine.setLabels(monitor.getLabels());
+                appDefine.setAnnotations(monitor.getAnnotations());
                List<Configmap> configmaps = params.stream()
                        .map(param -> new Configmap(param.getField(), param.getParamValue(),
                                param.getType())).collect(Collectors.toList());
@@ -63,7 +63,7 @@ import org.apache.hertzbeat.manager.service.AppService;
 import org.apache.hertzbeat.manager.service.MonitorService;
 import org.apache.hertzbeat.manager.service.ObjectStoreService;
 import org.apache.hertzbeat.warehouse.service.WarehouseService;
-import org.springframework.boot.CommandLineRunner;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -75,12 +75,13 @@ import org.yaml.snakeyaml.Yaml;

 /**
 * Monitoring Type Management Implementation
- * temporarily stores the monitoring configuration and parameter configuration in memory and then stores it in the
+ * Temporarily stores the monitoring configuration and parameter configuration in memory,
+ * and then persists it to a storage system.
 */
@Service
@Order(value = Ordered.HIGHEST_PRECEDENCE)
@Slf4j
-public class AppServiceImpl implements AppService, CommandLineRunner {
+public class AppServiceImpl implements AppService, InitializingBean {

    private static final String PUSH_PROTOCOL_METRICS_NAME = "metrics";

@@ -500,7 +501,7 @@ public class AppServiceImpl implements AppService, CommandLineRunner {
    }

    @Override
-    public void run(String... args) throws Exception {
+    public void afterPropertiesSet() throws Exception {
        var objectStoreConfig = objectStoreConfigService.getConfig();
        refreshStore(objectStoreConfig);
    }
@@ -42,7 +42,6 @@ import org.apache.hertzbeat.common.entity.manager.MonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.entity.manager.SdMonitorParam;
-import org.apache.hertzbeat.common.entity.manager.Tag;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.entity.sd.ServiceDiscoveryProtocol;
 import org.apache.hertzbeat.common.support.event.MonitorDeletedEvent;
@@ -91,7 +90,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -433,6 +431,11 @@ public class MonitorServiceImpl implements MonitorService {
            appDefine.setDefaultInterval(monitor.getIntervals());
            appDefine.setCyclic(true);
            appDefine.setTimestamp(System.currentTimeMillis());
+            Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                    CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+            appDefine.setMetadata(metadata);
+            appDefine.setLabels(monitor.getLabels());
+            appDefine.setAnnotations(monitor.getAnnotations());
            List<Configmap> configmaps = params.stream().map(param ->
                    new Configmap(param.getField(), param.getParamValue(), param.getType())).collect(Collectors.toList());
            appDefine.setConfigmap(configmaps);
@@ -528,7 +531,7 @@ public class MonitorServiceImpl implements MonitorService {
            MonitorDto monitorDto = new MonitorDto();
            List<Param> params = paramDao.findParamsByMonitorId(id);
            monitorDto.setParams(params);
-            if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(monitor.getApp())) {
+            if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(monitor.getApp()) || monitor.getType() == CommonConstants.MONITOR_TYPE_PUSH_AUTO_CREATE) {
                List<CollectRep.MetricsData> metricsDataList = warehouseService.queryMonitorMetricsData(id);
                List<String> metrics = metricsDataList.stream().map(CollectRep.MetricsData::getMetrics).collect(Collectors.toList());
                monitorDto.setMetrics(metrics);
@@ -680,6 +683,11 @@ public class MonitorServiceImpl implements MonitorService {
            appDefine.setDefaultInterval(monitor.getIntervals());
            appDefine.setCyclic(true);
            appDefine.setTimestamp(System.currentTimeMillis());
+            Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                    CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+            appDefine.setMetadata(metadata);
+            appDefine.setLabels(monitor.getLabels());
+            appDefine.setAnnotations(monitor.getAnnotations());
            List<Configmap> configmaps = params.stream().map(param ->
                    new Configmap(param.getField(), param.getParamValue(), param.getType())).collect(Collectors.toList());
            List<ParamDefine> paramDefaultValue = appDefine.getParams().stream()
@@ -790,6 +798,11 @@ public class MonitorServiceImpl implements MonitorService {
                appDefine.setDefaultInterval(monitor.getIntervals());
                appDefine.setCyclic(true);
                appDefine.setTimestamp(System.currentTimeMillis());
+                Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                        CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+                appDefine.setMetadata(metadata);
+                appDefine.setLabels(monitor.getLabels());
+                appDefine.setAnnotations(monitor.getAnnotations());
                List<Param> params = paramDao.findParamsByMonitorId(monitor.getId());
                List<Configmap> configmaps = params.stream().map(param -> new Configmap(param.getField(),
                        param.getParamValue(), param.getType())).collect(Collectors.toList());
@@ -841,6 +854,11 @@ public class MonitorServiceImpl implements MonitorService {
        appDefine.setDefaultInterval(monitor.getIntervals());
        appDefine.setCyclic(true);
        appDefine.setTimestamp(System.currentTimeMillis());
+        Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(), 
+                CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+        appDefine.setMetadata(metadata);
+        appDefine.setLabels(monitor.getLabels());
+        appDefine.setAnnotations(monitor.getAnnotations());
        resetMetricsCommonField(monitor, appDefine, sdMonitorParam);

        List<Configmap> configmaps = params.stream().map(param -> {
@@ -951,6 +969,11 @@ public class MonitorServiceImpl implements MonitorService {
        appDefine.setMonitorId(monitorId);
        appDefine.setCyclic(false);
        appDefine.setTimestamp(System.currentTimeMillis());
+        Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+        appDefine.setMetadata(metadata);
+        appDefine.setLabels(monitor.getLabels());
+        appDefine.setAnnotations(monitor.getAnnotations());
        final Job sdJob = SdMonitorOperator.constructSdJob(appDefine, sdParam);
        List<CollectRep.MetricsData> collectRep;
        if (collector != null) {
@@ -984,6 +1007,11 @@ public class MonitorServiceImpl implements MonitorService {
        appDefine.setMonitorId(monitorId);
        appDefine.setCyclic(false);
        appDefine.setTimestamp(System.currentTimeMillis());
+        Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
+                CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
+        appDefine.setMetadata(metadata);
+        appDefine.setLabels(monitor.getLabels());
+        appDefine.setAnnotations(monitor.getAnnotations());
        List<Configmap> configmaps = params.stream().map(param ->
                new Configmap(param.getField(), param.getParamValue(), param.getType())).collect(Collectors.toList());
        appDefine.setConfigmap(configmaps);
@@ -1011,15 +1039,6 @@ public class MonitorServiceImpl implements MonitorService {
        collectRep.forEach(CollectRep.MetricsData::close);
    }

-    private List<Tag> filterTags(List<Tag> tags) {
-        if (tags == null || tags.isEmpty()) {
-            return new LinkedList<>();
-        }
-        return tags.stream()
-                .filter(tag -> !(tag.getName().equals(CommonConstants.TAG_MONITOR_ID) || tag.getName().equals(CommonConstants.TAG_MONITOR_NAME)))
-                .collect(Collectors.toList());
-    }
-
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void copyMonitor(Long id) {
@@ -1077,6 +1096,11 @@ public class MonitorServiceImpl implements MonitorService {
            appDefine.setDefaultInterval(newMonitor.getIntervals());
            appDefine.setCyclic(true);
            appDefine.setTimestamp(System.currentTimeMillis());
+            Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, newMonitor.getName(),
+                    CommonConstants.LABEL_INSTANCE_HOST, newMonitor.getHost());
+            appDefine.setMetadata(metadata);
+            appDefine.setLabels(newMonitor.getLabels());
+            appDefine.setAnnotations(newMonitor.getAnnotations());
            List<Configmap> configmaps = sourceParams.stream()
                    .map(param -> new Configmap(param.getField(), param.getParamValue(), param.getType()))
                    .collect(Collectors.toList());
@@ -285,11 +285,8 @@ public class PluginServiceImpl implements PluginService {
        String jarPath = new File(this.getClass().getProtectionDomain().getCodeSource().getLocation().getPath()).getAbsolutePath();
        Path extLibPath = Paths.get(new File(jarPath).getParent(), "plugin-lib");
        File extLibDir = extLibPath.toFile();
-
        String fileName = pluginUpload.getJarFile().getOriginalFilename();
-        if (fileName == null) {
-            throw new CommonException("Failed to upload plugin");
-        }
+        validateFileName(fileName);
        fileName = UUID.randomUUID().toString().replace("-", "") + "_" + fileName;
        File destFile = new File(extLibDir, fileName);
        FileUtils.createParentDirectories(destFile);
@@ -321,6 +318,20 @@ public class PluginServiceImpl implements PluginService {
        syncPluginStatus();
    }

+    /**
+     * validate file name if file name is invalid, throw exception
+     *
+     * @param fileName file name
+     */
+    private void validateFileName(String fileName) {
+        if (fileName == null) {
+            throw new CommonException("Failed to upload plugin");
+        }
+        if (fileName.matches(".*(\\.\\.|[\n\t\r/\\\\]).*")) {
+            throw new CommonException("Invalid plugin file name: " + fileName);
+        }
+    }
+
    @Override
    public boolean pluginIsEnable(Class<?> clazz) {
        return Boolean.TRUE.equals(PLUGIN_ENABLE_STATUS.get(clazz.getName()));
@@ -369,7 +380,7 @@ public class PluginServiceImpl implements PluginService {
    }

    private void syncSinglePluginStatus(PluginMetadata plugin) {
-        if (plugin == null || CollectionUtils.isEmpty(plugin.getItems())){
+        if (plugin == null || CollectionUtils.isEmpty(plugin.getItems())) {
            return;
        }
        for (PluginItem item : plugin.getItems()) {
@@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.lang.reflect.Type;

 import jakarta.annotation.Resource;
+import org.apache.hertzbeat.alert.config.SmsConfig;
 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;

@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
 */

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

@@ -55,7 +55,7 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp
     * This method is used to handle the sms configuration change event.
     */
    @Override
-    public void handler(SmsNoticeSender smsNoticeSender) {
+    public void handler(SmsConfig smsConfig) {
        applicationContext.publishEvent(new SmsConfigChangeEvent(applicationContext));
    }
    
@@ -69,11 +69,11 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp
     * a TypeReference of NoticeSender type
     */
    @Override
-    public TypeReference<SmsNoticeSender> getTypeReference() {
+    public TypeReference<SmsConfig> getTypeReference() {
        return new TypeReference<>() {
            @Override
            public Type getType() {
-                return SmsNoticeSender.class;
+                return SmsConfig.class;
            }
        };
    }
@@ -72,14 +72,22 @@ warehouse:
      rpc-port: 6667
      username: root
      password: root
-    redis:
-      enabled: false
-      host: 127.0.0.1
-      port: 6379
-      password: 123456
+  # store real-time metrics data, enable only one below
+  real-time:
    memory:
      enabled: true
      init-size: 16
+    redis:
+      enabled: false
+      # redis mode: single, sentinel, cluster. Default is single
+      mode: single
+      # separate each address with comma when using cluster mode, eg: 127.0.0.1:6379,127.0.0.1:6380
+      address: 127.0.0.1:6379
+      # enter master name when using sentinel mode
+      masterName: mymaster
+      password: 123456
+      # redis db index, default: DB0
+      db: 0

 scheduler:
  server:
@@ -102,4 +110,4 @@ ai:
  # api key
  api-key:
  #At present, only IFLYTEK large model needs to be filled in
-  api-secret:
+  api-secret:
@@ -227,7 +227,14 @@ alerter:
      template-id: YOUR_TEMPLATE_ID
    smslocal:
      api-key: YOUR_API_KEY_HERE
-
+    aws:
+      access-key-id: YOUR_ACCESS_KEY_ID
+      access-key-secret: YOUR_ACCESS_KEY_SECRET
+      region: AWS_REGION_FOR_END_USER_MESSAGING
+    twilio:
+      account-sid: YOUR_ACCOUNT_SID
+      auth-token: YOUR_AUTH_TOKEN
+      twilio-phone-number: YOUR_TWILIO_PHONE_NUMBER
 scheduler:
  server:
    enabled: true
@@ -249,4 +256,4 @@ ai:
  # api key
  api-key:
  #At present, only IFLYTEK large model needs to be filled in
-  api-secret: 
+  api-secret:
@@ -17,71 +17,44 @@

 -- ensure every sql can rerun without error

+-- add repair table sql
+REPAIR TABLE HZB_ALERT_DEFINE;
+
 DELIMITER //
 CREATE PROCEDURE AddOrDropColumns()
 BEGIN
    DECLARE col_exists INT;

-    -- Check and add 'app' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='app';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN app VARCHAR(255);
-END IF;
    -- Drop 'app' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='app';
 IF col_exists = 1 THEN
 ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN app;
 END IF;

-    -- Check and add 'metric' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='metric';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN metric VARCHAR(255);
-END IF;
    -- Drop 'metric' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='metric';
 IF col_exists = 1 THEN
 ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN metric;
 END IF;

-    -- Check and add 'field' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='field';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN field VARCHAR(255);
-END IF;
    -- Drop 'field' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='field';
 IF col_exists = 1 THEN
 ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN field;
 END IF;

-    -- Check and add 'preset' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='preset';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN preset BOOLEAN;
-END IF;
    -- Drop 'preset' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='preset';
 IF col_exists = 1 THEN
 ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN preset;
 END IF;

-    -- Check and add 'priority' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='priority';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN priority INTEGER;
-END IF;
    -- Drop 'priority' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='priority';
 IF col_exists = 1 THEN
 ALTER TABLE HZB_ALERT_DEFINE DROP COLUMN priority;
 END IF;

-    -- Check and add 'tags' column if it does not exist
-SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='tags';
-IF col_exists = 0 THEN
-ALTER TABLE HZB_ALERT_DEFINE ADD COLUMN tags VARCHAR(255);
-END IF;
    -- Drop 'tags' column if it exists
 SELECT COUNT(*) INTO col_exists FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='HZB_ALERT_DEFINE' AND COLUMN_NAME='tags';
 IF col_exists = 1 THEN
@@ -93,4 +66,5 @@ DELIMITER ;


 CALL AddOrDropColumns();
-DROP PROCEDURE IF EXISTS AddOrDropColumns;
+DROP PROCEDURE IF EXISTS AddOrDropColumns;
+commit;
@@ -81,6 +81,17 @@ params:
    required: true
    defaultValue: true
  # field-param field key
+  - field: useProxy
+    # name-param field display i18n name
+    name:
+      zh-CN: 使用代理
+      en-US: Use Proxy Connection
+    # type-param field type(most mapping the html input type)
+    type: boolean
+    # required-true or false
+    required: true
+    defaultValue: false
+  # field-param field key
  - field: username
    # name-param field display i18n name
    name:
@@ -127,6 +138,72 @@ params:
    required: false
    # hide param-true or false
    hide: true
+  # field-param field key
+  - field: proxyHost
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理主机
+      en-US: Proxy Host
+    # type-param field type(most mapping the html input type)
+    type: text
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  - field: proxyPort
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理端口
+      en-US: Proxy Port
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[0,65535]'
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+    # default value
+    defaultValue: 22
+  # field-param field key
+  - field: proxyUsername
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理用户名
+      en-US: Proxy Username
+    # type-param field type(most mapping the html input type)
+    type: text
+    # when type is text, use limit to limit string length
+    limit: 50
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: proxyPassword
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理密码
+      en-US: Proxy Password
+    # type-param field type(most mapping the html input tag)
+    type: password
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
+  # field-param field key
+  - field: proxyPrivateKey
+    # name-param field display i18n name
+    name:
+      zh-CN: 代理主机私钥
+      en-US: proxyPrivateKey
+    # type-param field type(most mapping the html input type)
+    type: textarea
+    placeholder: -----BEGIN RSA PRIVATE KEY-----
+    # required-true or false
+    required: false
+    # hide param-true or false
+    hide: true
 # collect metrics config list
 metrics:
  # metrics - basic, inner monitoring metrics (responseTime - response time)
@@ -174,6 +251,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      # ssh run collect script
      script: (uname -r ; hostname ; uptime | awk -F "," '{print $1}' | sed  "s/ //g") | sed ":a;N;s/\n/^/g;ta" | awk -F '^' 'BEGIN{print "version hostname uptime"} {print $1, $2, $3}'
      # ssh response data parse type: oneRow, multiRow
@@ -243,6 +332,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: "LANG=C lscpu | awk -F: '$1==\"Model name\" {print $2}';awk '/processor/{core++} END{print core}' /proc/cpuinfo;uptime | sed 's/,/ /g' | awk '{for(i=NF-2;i<=NF;i++)print $i }' | xargs;vmstat 1 1 | awk 'NR==3{print $11}';vmstat 1 1 | awk 'NR==3{print $12}';vmstat 1 2 | awk 'NR==4{print $15}'"
      parseType: oneRow

@@ -311,6 +412,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: free -m | awk 'BEGIN{print "total used free buff_cache available"} NR==2{print $2,$3,$4,$6,$7}'
      parseType: multiRow

@@ -356,6 +469,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: vmstat -D | awk 'NR==1{print $1}';vmstat -D | awk 'NR==2{print $1}';vmstat 1 1 | awk 'NR==3{print $10}';vmstat 1 1 | awk 'NR==3{print $9}';vmstat 1 1 | awk 'NR==3{print $16}'
      parseType: oneRow

@@ -396,6 +521,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: cat /proc/net/dev | tail -n +3 | awk 'BEGIN{ print "interface_name receive_bytes transmit_bytes"} {print $1,$2,$10}'
      parseType: multiRow

@@ -444,6 +581,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: df -mP | tail -n +2 | awk 'BEGIN{ print "filesystem used available usage mounted"} {print $1,$3,$4,$5,$6}'
      parseType: multiRow

@@ -486,6 +635,18 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: ps aux | sort -k3nr | awk 'BEGIN{ print "pid cpu_usage mem_usage command" } {printf "%s %s %s ", $2, $3, $4; for (i=11; i<=NF; i++) { printf "%s", $i; if (i < NF) printf " "; } print ""}' | head -n 11
      parseType: multiRow

@@ -528,5 +689,17 @@ metrics:
      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
      timeout: ^_^timeout^_^
      reuseConnection: ^_^reuseConnection^_^
+      # whether to use proxy server for ssh connection
+      useProxy: ^_^useProxy^_^
+      # ssh proxy host: ipv4 domain
+      proxyHost: ^_^proxyHost^_^
+      # ssh proxy port
+      proxyPort: ^_^proxyPort^_^
+      # ssh proxy username
+      proxyUsername: ^_^proxyUsername^_^
+      # ssh proxy password
+      proxyPassword: ^_^proxyPassword^_^
+      # ssh proxy private key
+      proxyPrivateKey: ^_^proxyPrivateKey^_^
      script: ps aux | sort -k4nr | awk 'BEGIN{ print "pid cpu_usage mem_usage command" } {printf "%s %s %s ", $2, $3, $4; for (i=11; i<=NF; i++) { printf "%s", $i; if (i < NF) printf " "; } print ""}' | head -n 11
      parseType: multiRow
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
淞筱	0af35fb551	Merge branch 'master' into a_small_modified	2025-04-17 17:09:41 +08:00
Jast	81ad7d51b6	[Feature] Add log mcp for java (#3254 )	2025-04-17 16:19:15 +08:00
a-little-fool	5813d67cd5	[improve] fix.	2025-04-16 23:03:28 +08:00
a-little-fool	db471bb7ee	[improve] fix.	2025-04-16 23:00:14 +08:00
a-little-fool	808a2938e7	[bug] fix format.	2025-04-16 11:49:46 +08:00
a-little-fool	97b1e906c5	[bug] fix 1.7.0 has a remote command execution vulnerability.	2025-04-16 11:36:31 +08:00
leo	9fa5b17fe4	[bugfix] fix UriComponentsBuilder in PromqlQueryExecutor (#3244 )	2025-04-14 20:37:18 +08:00
tomsun28	9700161fdd	[doc] add new contributors to wall (#3243 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-04-14 16:40:24 +08:00
Yang Chen aias00 tomsun28	f578df1deb	[feat] enable label-based filtering and selection for monitoring thresholds (#3223 ) Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-14 14:26:52 +08:00
leo Ceilzcx tomsun28 aias00	eb58bb76f2	[feature] switch to prometheus online parser & add query datasource (#3215 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Signed-off-by: leo <1552443053@qq.com> Co-authored-by: Ceilzcx <1758619238@qq.com> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-14 14:08:11 +08:00
Cyantyandaias00	066d74629a	[improve] Adjust Grafana configuration priority hierarchy and optimize API request exception handling (#3241 ) Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-14 09:53:44 +08:00
tomsun28	9619638cff	[doc] add new release 1.7.0 blog (#3237 )	2025-04-14 09:45:53 +08:00
Yang Chenandtomsun28	b91f849594	[bugfix] Added jobContentCache.remove(jobId) to cancelAsyncCollectJob (#3240 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-13 20:28:52 +08:00
Logic	e1806f856f	[doc]update Grafana dashboard setup instructions (#3238 )	2025-04-13 19:40:33 +08:00
淞筱	95654e49c5	[doc] add code-style-check zh-ch. (#3236 ) Signed-off-by: 淞筱 <105542329+a-little-fool@users.noreply.github.com>	2025-04-12 13:41:40 +08:00
Walter Jia aias00 aias00 tomsun28	9ceb6e6400	[bugfix] Fix the issue where pendingTimeouts may be incorrect in the HashedWheelTimer. (#3174 ) Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-12 00:20:10 +08:00
淞筱andtomsun28	64cc15fabb	[doc] code style check (#3232 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-12 00:14:21 +08:00
淞筱 Jast tomsun28	27da850ca4	[doc] add alerting silence doc. (#3229 ) Co-authored-by: Jast <shenghang@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-12 00:03:24 +08:00
Jast Administrator tomsun28	1ad52321ea	[Doc] Add Blog (#3224 ) Co-authored-by: Administrator <admin@admin.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-11 23:50:40 +08:00
Cyanty	ff037a6a3a	[Doc] Modify the YML configuration parameters for Spring Boot 2.0/3.0 monitoring (#3231 )	2025-04-10 20:21:11 +08:00
Logic	433f09a4e3	[feature]A preliminary logging module implementation (#3218 )	2025-04-10 15:21:48 +08:00
Jast	706baffd5e	[Doc] Fix dead link (#3227 )	2025-04-09 23:43:19 +08:00
Logic	0b6fb353f1	[feature]add support for Dahua and Uniview devices (#3214 )	2025-04-07 23:05:29 +08:00
leo tomsun28 github-actions[bot]	0385892674	[feature] add pushgateway to push module (#3204 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Signed-off-by: leo <1552443053@qq.com> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-04-05 17:28:11 +08:00
Logic	04e2321175	[test](hertzbeat-collector): add unit test for XML response parsing (#3212 )	2025-04-05 09:18:52 +08:00
彭镜肇 yunfan24 aias00 aias00 tomsun28	8373f0a247	[test] add test for controller AlertInhibitController (#3183 ) Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-03 21:31:06 +08:00
Logic	5ad03687b2	[feature] Implementation of Hikvision camera monitoring and http monitoring xml parsing function (#3211 )	2025-04-03 20:07:18 +08:00
tomsun28andaias00	7127159063	[doc] archive version docs (#3207 ) Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-03 14:30:49 +08:00
Nick Guoandtomsun28	51715797ef	[improve] optimize `DnsCollectTest` with status code. (#3209 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-03 14:01:10 +08:00
liutianyouandtomsun28	47a1b13781	[doc] add doc for alarm grouping and alarm inhibit (#3206 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-03 13:33:15 +08:00
boyucjz cuijianzhong tomsun28 aias00 aias00	d5fc492b98	[feature] support plc s7 protocol for siemens (#3194 ) Co-authored-by: cuijianzhong <shangyuancjz@126.com> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-02 23:09:32 +08:00
liutianyou aias00 aias00 tomsun28	bbc30cd3db	[improve] i18n Portuguese (#3193 ) Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-02 22:46:33 +08:00
liutianyou aias00 aias00 tomsun28	6e50d1f3a7	[improve] support the use of time expressions in HTTP payloads (#3192 ) Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-04-02 22:32:18 +08:00
Nick Guo yunfan24 aias00 aias00	b18412254e	[improve] optimize kafka collection logic and expand test coverage (#3189 ) Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-02 22:26:37 +08:00
Yang Chenandaias00	fc0ef7773c	[bugfix] fix bulletin indicator selection status error (#3201 ) Co-authored-by: aias00 <liuhongyu@apache.org>	2025-04-02 15:48:33 +08:00
aias00	adf71441f8	update download info (#3203 )	2025-04-02 15:44:42 +08:00
tomsun28	e36842420f	[improve] update monitor list ui (#3200 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-31 19:27:22 +08:00
tomsun28andaias00	a2c1123b09	[doc] update new hertzbeat ppmc (#3191 ) Co-authored-by: aias00 <rokkki@163.com>	2025-03-31 14:52:37 +08:00
tomsun28	b4151a4e73	[improve] update monitor detail ui (#3199 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-31 14:33:29 +08:00
jujin	1c1683d9c6	[doc] add blog bout How Does Metrics Collection Work (#3195 )	2025-03-30 14:08:15 +08:00
Sherlock Yin yinyijun tomsun28	46d4fc2dd9	[bugfix] Modify inconsistent icons (#3190 ) Co-authored-by: yinyijun <yingey2011> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-29 10:38:07 +08:00
Sarthak Aroraandtomsun28	ffa2487587	[docs] add collector user guide (#3187 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-29 09:13:06 +08:00
Yang Chen yunfan24 aias00	30c7b22c4c	[doc] add help documentation for Alarms Center (#3181 ) Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: aias00 <rokkki@163.com>	2025-03-29 00:06:40 +08:00
彭镜肇andtomsun28	7a3e23ec59	[improve] update import for package import (#3180 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-28 00:09:45 +08:00
Jast	da6556641a	[Doc] Modify the error records in the document (#3178 )	2025-03-27 23:45:02 +08:00
Rickandrick	b008f16b67	fix: Ai is a typo (#3176 ) Co-authored-by: rick <LinuxSuRen@users.noreply.github.com>	2025-03-26 12:59:17 +08:00
tomsun28andaias00	b77222765c	[improve] update notice copyright years (#3171 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: aias00 <rokkki@163.com>	2025-03-25 10:16:26 +08:00
tomsun28	aeb4188f83	[improve] update git archive export ignore (#3172 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-25 09:39:49 +08:00
Yang Chen	311cb131fd	[bugfix] fix bind Labels are not updated when the Alarm Severity switches (#3170 )	2025-03-24 22:12:06 +08:00
tomsun28andaias00	21558e9b4f	[bugfix] fix postgre mount error, use mariadb instead of mysql in compose (#3168 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: aias00 <rokkki@163.com>	2025-03-24 15:12:56 +08:00
LL-LINandaias00	8d1f306433	[feature] implement labels-based monitors filtering in bulletin creation flow (#3161 ) Co-authored-by: aias00 <rokkki@163.com>	2025-03-24 10:46:52 +08:00
tomsun28	e98af9527e	[release] update release version 1.7.0 version and docs (#3165 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-23 10:39:00 +08:00
Sherlock Yin yinyijun tomsun28	811a07553b	[doc] Add alert integration japanese i18 (#3164 ) Co-authored-by: yinyijun <yinyijun6@mgtv.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-22 14:16:28 +08:00
Sarthak Arora yunfan24 tomsun28	9fd58ced4a	[feature] add twilio sms client support (#3159 ) Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-22 14:12:32 +08:00
LL-LINandtomsun28	a331c045ae	[bugfix] retain sorting state after monitor list auto-refresh (#3156 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-22 11:48:34 +08:00
yunfan24andaias00	63d3d18428	[bugfix] Fix http header being incorrectly encoded. (#3108 ) Co-authored-by: aias00 <rokkki@163.com>	2025-03-22 11:44:16 +08:00
Yang Chen	cec8d8b396	[bugfix]: fix incomplete class documentation in AppServiceImpl (#3162 )	2025-03-21 17:34:43 +08:00
Yang Chen yunfan24 tomsun28	9d68d16a78	[feature] Support TencentCloud alert source (#3149 ) Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-17 20:55:56 +08:00
Kerwin BryantandLogic	290474a715	Abstract Redundant Input Components into ConfigurableFieldComponent for Unified Management (#3152 ) Co-authored-by: Logic <zqr10159@dromara.org>	2025-03-17 18:50:00 +08:00
Yang Chenandyunfan24	0dbc7347b4	[feature] Supports sending messages to a specific Telegram group topic.(#3079 ) (#3143 ) Co-authored-by: yunfan24 <yunfan24@outlook.com>	2025-03-17 14:56:02 +08:00
tomsun28	e2a2d5eaec	[bugfix] fix nightly docker build github action (#3153 )	2025-03-17 10:00:41 +08:00
tomsun28	356cca295d	[webapp] fix less style file over max build error (#3151 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-16 21:58:45 +08:00
yunfan24	5e09c6d9ae	[improve] Merge SMS configuration class. (#3148 )	2025-03-16 21:27:07 +08:00
tomsun28andZhang Yuxuan	54caa84fc1	[bugfix] fix collect dispatch error (#3150 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Zhang Yuxuan <1373529784@qq.com>	2025-03-15 21:49:58 +08:00
不关银渐层的事哦 tomsun28 yunfan24 aias00	d2a332f533	[bugfix] Fixed #3112 , disappear left menu tree item when restart service (#3116 ) Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: yunfan24 <yunfan24@outlook.com> Co-authored-by: aias00 <rokkki@163.com>	2025-03-15 20:47:53 +08:00
tomsun28andLogic	dc2efdf1c2	[improve] support bind metrics label and others into alert (#3146 ) Signed-off-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Logic <zqr10159@dromara.org>	2025-03-15 19:40:48 +08:00
LL-LIN aias00 Logic	4defb733bf	[feature] support SSH proxy jump connections (#3138 ) Co-authored-by: aias00 <rokkki@163.com> Co-authored-by: Logic <zqr10159@dromara.org>	2025-03-14 20:51:58 +08:00
Sherlock Yin yinyijun yinyijun tomsun28	f8e85ec4f1	[feature] Support skywalking alert source (#3144 ) Co-authored-by: yinyijun <yinyijun6@mgtv.com> Co-authored-by: yinyijun <yingey2011> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-14 10:41:35 +08:00
jujinandyunfan24	3468739504	[feature] Add AWS sms client (#3134 ) Co-authored-by: yunfan24 <yunfan24@outlook.com>	2025-03-14 01:01:29 +08:00
Kerwin Bryantandtomsun28	5a92161cd9	[webapp] Fix the issue of the empty dropdown menu on the Kanban board page. (#3142 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-12 23:58:48 +08:00
Kerwin Bryant	4ce6ffd4ee	[improve] Configuring gitpod with java (#3141 )	2025-03-12 23:52:36 +08:00
yunfan24andtomsun28	9f34d201ae	[doc] Add new committer blog (#3140 ) Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-03-11 00:24:44 +08:00
liutianyou	4b8ccf2fea	[improve] improve plugin upload (#3139 )	2025-03-11 00:18:57 +08:00
tomsun28	adf27d2544	[bugfix] fix overflow arrow buffer index (#3137 )	2025-03-10 15:25:22 +08:00
tomsun28	033b9b0706	[improve] fix potential memory leakage and content length issues. (#3128 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-03-10 00:45:12 +08:00