[security] update hertzbeat security model

Signed-off-by: Yang Chen <1597081640@qq.com>
Co-authored-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: aias00 <liuhongyu@apache.org>
Co-authored-by: Jast <shenghang@apache.org>

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -53,4 +53,5 @@ body:
   validations:
     required: false
 - type: markdown
-  value: "Please read the [Contribution Guideline](https://hertzbeat.apache.org/docs/community/contribution) before submitting the PR"
+  attributes:
+    value: "Please read the [Contribution Guideline](https://hertzbeat.apache.org/docs/community/contribution) before submitting the PR"

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java

@@ -139,6 +139,9 @@ public class RealTimeAlertCalculator {
         String instanceHost = metricsData.getInstanceHost();
         String app = metricsData.getApp();
         String metrics = metricsData.getMetrics();
+        if ((CommonConstants.PROMETHEUS_APP_PREFIX + instanceName).equals(metricsData.getApp())) {
+            app = CommonConstants.PROMETHEUS;
+        }
         int priority = metricsData.getPriority();
         int code = metricsData.getCode().getNumber();
         Map<String, String> labels = metricsData.getLabels();

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/AlibabaCloudSlsExternAlert.java

@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+
+/**
+ * Alibaba Cloud 'Simple Log Service(SLS)' alert content entity.
+ *
+ * @see <a href="https://help.aliyun.com/zh/sls/user-guide/variables-in-new-alert-templates"/>
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class AlibabaCloudSlsExternAlert {
+
+    /**
+     * The id of the instance on which the alarm was triggered
+     */
+    @JsonProperty("alert_instance_id")
+    private String alertInstanceId;
+
+    /**
+     * Alarm rule id, unique within project
+     */
+    @JsonProperty("alert_id")
+    private String alertId;
+
+    /**
+     * Alarm rule name
+     */
+    @JsonProperty("alert_name")
+    private String alertName;
+
+    /**
+     * Region
+     */
+    private String region;
+
+    /**
+     * Alarm rule belongs to Project
+     */
+    private String project;
+
+    /**
+     * Time of this evaluation
+     */
+    @JsonProperty("alert_time")
+    private int alertTime;
+
+    /**
+     * First trigger time
+     */
+    @JsonProperty("fire_time")
+    private int fireTime;
+
+    /**
+     * Alarm recovery time
+     * If the alarm status is firing, the value is 0.
+     * If the alarm state is resolved, the value is the specific recovery time.
+     */
+    @JsonProperty("resolve_time")
+    private int resolveTime;
+
+    /**
+     * Alarm status.
+     * firing: Triggers an alarm.
+     * resolved: Notification of resumption.
+     */
+    private String status;
+
+    /**
+     * The total number of entries in the data that triggered the alert,
+     * which may be more than 100, for example after a Cartesian product operation.
+     */
+    @JsonProperty("fire_results_count")
+    private int fireResultsCount;
+
+    /**
+     * Tag list
+     * Example: {"env":"test"}
+     */
+    private Map<String, String> labels;
+
+    /**
+     * Labeled lists
+     * Example: { "title": "Alarm title","desc": "Alarm desc" }
+     */
+    private Map<String, String> annotations;
+
+    /**
+     * Alarm severity.
+     *
+     * 10: Critical
+     * 8: High
+     * 6: Medium
+     * 4: Low
+     * 2: Report only
+     */
+    private int severity;
+
+    /**
+     *
+     */
+    @JsonProperty("signin_url")
+    private String signinUrl;
+
+
+    public String getAnnotation(String key) {
+        if (null == this.annotations || this.annotations.isEmpty()) {
+            return "N/A";
+        }
+        return this.annotations.get(key);
+    }
+
+    /**
+     * Severity
+     */
+    public enum Severity {
+
+        CRITICAL(10, "Critical"),
+
+        HIGH(8, "High"),
+
+        MEDIUM(6, "Medium"),
+
+        LOW(4, "Low"),
+
+        REPORT_ONLY(2, "Report only");
+
+        private static final Map<Integer, Severity> STATUS_MAP;
+
+        static {
+            STATUS_MAP = Arrays.stream(Severity.values()).collect(Collectors.toMap(Severity::getStatus, t -> t,  (oldVal, newVal) -> newVal));
+        }
+
+        private final int status;
+        private final String alias;
+
+        Severity(int status, String alias) {
+            this.status = status;
+            this.alias = alias;
+        }
+
+        public static Optional<Severity> convert(int severity) {
+            return Optional.ofNullable(STATUS_MAP.get(severity));
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public String getAlias() {
+            return alias;
+        }
+    }
+}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/HuaweiCloudExternAlert.java

@@ -0,0 +1,237 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Arrays;
+
+/**
+ * Huawei Cloud (CES) alert content entity.
+ *
+ * @see <a href="https://support.huaweicloud.com/usermanual-ces/ces_01_0218.html"/>
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class HuaweiCloudExternAlert {
+
+    public static final String FIELD_MESSAGE = "message";
+    public static final String FIELD_MESSAGE_ID = "message_id";
+    public static final String FIELD_TIMESTAMP = "timestamp";
+    public static final String FIELD_TOPIC_URN = "topic_urn";
+    public static final String FIELD_TYPE = "type";
+    public static final String FIELD_SUBJECT = "subject";
+    public static final String FIELD_SUBSCRIBE_URL = "subscribe_url";
+
+    /**
+     * Signature information.
+     */
+    private String signature;
+
+    /**
+     * Subject
+     */
+    private String subject;
+
+    /**
+     * The unique identifier of a topic, indicating the topic to which the message belongs.
+     */
+    @JsonProperty("topic_urn")
+    private String topicUrn;
+
+    /**
+     * Message unique identifier.
+     */
+    @JsonProperty("message_id")
+    private String messageId;
+
+    /**
+     * Message
+     */
+    private String message;
+
+    /**
+     * message types, the message types are respectively:
+     * SubscriptionConfirmation、Notification、UnsubscribeConfirmation
+     */
+    private String type;
+
+    /**
+     * Subscription confirms the URL that needs to be accessed
+     */
+    @JsonProperty("subscribe_url")
+    private String subscribeUrl;
+
+    /**
+     * The certificate URL used for message signing, which does not require authentication and can be accessed directly.
+     */
+    @JsonProperty("signing_cert_url")
+    private String signingCertUrl;
+
+    /**
+     * The timestamp of when the message was first sent.
+     */
+    private String timestamp;
+
+    /**
+     * Alert message
+     */
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class AlertMessage {
+
+        private String version;
+
+        private AlertData data;
+    }
+
+    /**
+     * Alert data
+     */
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class AlertData {
+
+        /**
+         * Whether an alarm occurs.
+         * Note: Empty and false are both recovery notifications.
+         * Note: There are no recovery notifications for event types
+         */
+        @JsonProperty("IsAlarm")
+        private Boolean alarm;
+
+        /**
+         * Alarm time
+         */
+        @JsonProperty("AlarmTime")
+        private String alarmTime;
+
+        /**
+         * Resource ID
+         */
+        @JsonProperty("ResourceId")
+        private String resourceId;
+
+        /**
+         * The name of the metric
+         */
+        @JsonProperty("MetricName")
+        private String metricName;
+
+        /**
+         * Specifies the alarm severity, which can be Critical, Major, Minor, or Informational.
+         */
+        @JsonProperty("AlarmLevel")
+        private String alarmLevel;
+
+        /**
+         * Namespace
+         */
+        @JsonProperty("Namespace")
+        private String namespace;
+
+        /**
+         * Region
+         */
+        @JsonProperty("Region")
+        private String region;
+
+        /**
+         * Dimension name
+         */
+        @JsonProperty("DimensionName")
+        private String dimensionName;
+
+        /**
+         * Resource name
+         */
+        @JsonProperty("ResourceName")
+        private String resourceName;
+
+        /**
+         * Alarm record ID
+         */
+        @JsonProperty("AlarmRecordID")
+        private String alarmRecordId;
+
+        /**
+         * Current data
+         */
+        @JsonProperty("CurrentData")
+        private String currentData;
+
+        /**
+         * The comparison conditions for the alarm thresholds can be >, =, <, >=, <=.
+         */
+        @JsonProperty("ComparisonOperator")
+        private String comparisonOperator;
+
+        /**
+         * Alarm value
+         */
+        @JsonProperty("Value")
+        private String value;
+
+        /**
+         * Number of consecutive occurrences of triggered alarms
+         */
+        @JsonProperty("Count")
+        private int count;
+
+    }
+
+    /**
+     * Huawei cloud alert type
+     */
+    public enum AlertType {
+
+        SUBSCRIPTION("SubscriptionConfirmation"),
+
+        UNSUBSCRIBE("UnsubscribeConfirmation"),
+
+        NOTIFICATION("Notification");
+
+        private final String type;
+
+        AlertType(String type) {
+            this.type = type;
+        }
+
+        public static boolean valid(String type) {
+            if (null == type || type.isEmpty()) {
+                return false;
+            }
+            return Arrays.stream(AlertType.values()).anyMatch(alertType -> alertType.getType().equals(type));
+        }
+
+        public String getType() {
+            return type;
+        }
+    }
+
+}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionBaseVisitor.java

@@ -47,14 +47,6 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      */
     @Override public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) { return visitChildren(ctx); }
 
-    /**
-	 * {@inheritDoc}
-	 *
-	 * <p>The default implementation returns the result of calling
-	 * {@link #visitChildren} on {@code ctx}.</p>
-	 */
-    @Override public T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) { return visitChildren(ctx); }
-
     /**
      * {@inheritDoc}
      *
@@ -71,6 +63,22 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      */
     @Override public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) { return visitChildren(ctx); }
 
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) { return visitChildren(ctx); }
+
     /**
      * {@inheritDoc}
      *
@@ -88,7 +96,23 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
     @Override public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) { return visitChildren(ctx); }
 
     /**
-	 * {@inheritDoc}
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
      *
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
@@ -101,7 +125,23 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override public T visitIdentifier(AlertExpressionParser.IdentifierContext ctx) { return visitChildren(ctx); }
+    @Override public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitParameter(AlertExpressionParser.ParameterContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -110,4 +150,204 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * {@link #visitChildren} on {@code ctx}.</p>
      */
     @Override public T visitNumber(AlertExpressionParser.NumberContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitString(AlertExpressionParser.StringContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitDuration(AlertExpressionParser.DurationContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitRelList(AlertExpressionParser.RelListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitRelation(AlertExpressionParser.RelationContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitCompOp(AlertExpressionParser.CompOpContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitCondition(AlertExpressionParser.ConditionContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitPromql(AlertExpressionParser.PromqlContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitLabelList(AlertExpressionParser.LabelListContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx) { return visitChildren(ctx); }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitor.java

@@ -17,6 +17,7 @@
 
 package org.apache.hertzbeat.alert.expr;
 
+import org.antlr.v4.runtime.CommonTokenStream;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 
 import java.util.ArrayList;
@@ -34,9 +35,11 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
     private static final String VALUE = "__value__";
 
     private final QueryExecutor executor;
+    private final CommonTokenStream tokens;
 
-    public AlertExpressionEvalVisitor(QueryExecutor executor) {
+    public AlertExpressionEvalVisitor(QueryExecutor executor, CommonTokenStream tokens) {
         this.executor = executor;
+        this.tokens = tokens;
     }
 
     @Override
@@ -66,10 +69,11 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
                 }
                 // queryValues may be a list of values, or a single value
                 Object matchValue = evaluateCondition(queryValues, operator, threshold);
-                item.put(VALUE, matchValue);
+                Map<String, Object> resultMap = new HashMap(item);
+                resultMap.put(VALUE, matchValue);
                 // if matchValue is null, mean not match the threshold
                 // if not null, mean match the threshold
-                result.add(new HashMap<>(item));
+                result.add(resultMap);
             }
             return result;
         }
@@ -211,12 +215,6 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return new LinkedList<>();
     }
 
-    @Override
-    public List<Map<String, Object>> visitQueryExpr(AlertExpressionParser.QueryExprContext ctx) {
-        String query = ctx.identifier().getText();
-        return executor.execute(query);
-    }
-
     @Override
     public List<Map<String, Object>> visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) {
         double value = Double.parseDouble(ctx.number().getText());
@@ -227,6 +225,28 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return numAsList;
     }
 
+    @Override
+    public List<Map<String, Object>> visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) {
+        String rawPromql = tokens.getText(ctx.promql());
+        return executor.execute(rawPromql);
+    }
+
+    @Override
+    public List<Map<String, Object>> visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) {
+        String rawSql = tokens.getText(ctx.selectSql());
+        return executor.execute(rawSql);
+    }
+
+    @Override
+    public List<Map<String, Object>> visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) {
+        return callSqlOrPromql(tokens.getText(ctx.string()));
+    }
+
+    @Override
+    public List<Map<String, Object>> visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) {
+        return callSqlOrPromql(tokens.getText(ctx.string()));
+    }
+
     private Object evaluateCondition(Object value, String operator, Double threshold) {
         // value may be a list of values, or a single value
         switch (operator) {
@@ -302,4 +322,9 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
                 return null;
         }
     }
+
+    private List<Map<String, Object>> callSqlOrPromql(String text){
+        String script = text.substring(1, text.length() - 1);
+        return executor.execute(script);
+    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionLexer.java

@@ -36,37 +36,66 @@ public class AlertExpressionLexer extends Lexer {
 
 	protected static final DFA[] _decisionToDFA;
 	protected static final PredictionContextCache _sharedContextCache =
-		new PredictionContextCache();
+			new PredictionContextCache();
 	public static final int
-		AND=1, OR=2, UNLESS=3, GT=4, GE=5, LT=6, LE=7, EQ=8, NE=9, LPAREN=10, 
-		RPAREN=11, IDENTIFIER=12, NUMBER=13, WS=14;
+			AND=1, OR=2, UNLESS=3, NOT=4, SELECT=5, FROM=6, WHERE=7, GROUP=8, BY=9,
+			HAVING=10, ORDER=11, LIMIT=12, OFFSET=13, AS=14, ASC=15, DESC=16, IN=17,
+			IS=18, NULL=19, LIKE=20, BETWEEN=21, STAR=22, COUNT=23, SUM=24, AVG=25,
+			MIN=26, MAX=27, STDDEV=28, STDVAR=29, VARIANCE=30, RATE_FUNCTION=31, INCREASE_FUNCTION=32,
+			HISTOGRAM_QUANTILE_FUNCTION=33, TOPK=34, BOTTOMK=35, QUANTILE=36, BY_FUNCTION=37,
+			WITHOUT_FUNCTION=38, GROUP_LEFT_FUNCTION=39, GROUP_RIGHT_FUNCTION=40,
+			IGNORING_FUNCTION=41, ON_FUNCTION=42, SQL_FUNCTION=43, PROMQL_FUNCTION=44,
+			GT=45, GE=46, LT=47, LE=48, EQ=49, NE=50, LPAREN=51, RPAREN=52, LBRACE=53,
+			RBRACE=54, LBRACKET=55, RBRACKET=56, COMMA=57, DOT=58, COLON=59, SEMICOLON=60,
+			SCIENTIFIC_NUMBER=61, FLOAT=62, NUMBER=63, DURATION=64, STRING=65, IDENTIFIER=66,
+			WS=67, LINE_COMMENT=68, BLOCK_COMMENT=69;
 	public static String[] channelNames = {
-		"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
+			"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
 	};
 
 	public static String[] modeNames = {
-		"DEFAULT_MODE"
+			"DEFAULT_MODE"
 	};
 
 	private static String[] makeRuleNames() {
 		return new String[] {
-			"AND", "OR", "UNLESS", "GT", "GE", "LT", "LE", "EQ", "NE", "LPAREN", 
-			"RPAREN", "IDENTIFIER", "NUMBER", "WS"
+				"AND", "OR", "UNLESS", "NOT", "SELECT", "FROM", "WHERE", "GROUP", "BY",
+				"HAVING", "ORDER", "LIMIT", "OFFSET", "AS", "ASC", "DESC", "IN", "IS",
+				"NULL", "LIKE", "BETWEEN", "STAR", "COUNT", "SUM", "AVG", "MIN", "MAX",
+				"STDDEV", "STDVAR", "VARIANCE", "RATE_FUNCTION", "INCREASE_FUNCTION",
+				"HISTOGRAM_QUANTILE_FUNCTION", "TOPK", "BOTTOMK", "QUANTILE", "BY_FUNCTION",
+				"WITHOUT_FUNCTION", "GROUP_LEFT_FUNCTION", "GROUP_RIGHT_FUNCTION", "IGNORING_FUNCTION",
+				"ON_FUNCTION", "SQL_FUNCTION", "PROMQL_FUNCTION", "GT", "GE", "LT", "LE",
+				"EQ", "NE", "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACKET", "RBRACKET",
+				"COMMA", "DOT", "COLON", "SEMICOLON", "SCIENTIFIC_NUMBER", "FLOAT", "NUMBER",
+				"DURATION", "STRING", "IDENTIFIER", "WS", "LINE_COMMENT", "BLOCK_COMMENT"
 		};
 	}
 	public static final String[] ruleNames = makeRuleNames();
 
 	private static String[] makeLiteralNames() {
 		return new String[] {
-			null, "'and'", "'or'", "'unless'", "'>'", "'>='", "'<'", "'<='", "'=='", 
-			"'!='", "'('", "')'"
+				null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, null, "'*'", null,
+				null, null, null, null, null, null, null, null, null, null, null, null,
+				null, null, null, null, null, null, null, null, null, "'>'", "'>='",
+				"'<'", "'<='", null, "'!='", "'('", "')'", "'{'", "'}'", "'['", "']'",
+				"','", "'.'", "':'", "';'"
 		};
 	}
 	private static final String[] _LITERAL_NAMES = makeLiteralNames();
 	private static String[] makeSymbolicNames() {
 		return new String[] {
-			null, "AND", "OR", "UNLESS", "GT", "GE", "LT", "LE", "EQ", "NE", "LPAREN", 
-			"RPAREN", "IDENTIFIER", "NUMBER", "WS"
+				null, "AND", "OR", "UNLESS", "NOT", "SELECT", "FROM", "WHERE", "GROUP",
+				"BY", "HAVING", "ORDER", "LIMIT", "OFFSET", "AS", "ASC", "DESC", "IN",
+				"IS", "NULL", "LIKE", "BETWEEN", "STAR", "COUNT", "SUM", "AVG", "MIN",
+				"MAX", "STDDEV", "STDVAR", "VARIANCE", "RATE_FUNCTION", "INCREASE_FUNCTION",
+				"HISTOGRAM_QUANTILE_FUNCTION", "TOPK", "BOTTOMK", "QUANTILE", "BY_FUNCTION",
+				"WITHOUT_FUNCTION", "GROUP_LEFT_FUNCTION", "GROUP_RIGHT_FUNCTION", "IGNORING_FUNCTION",
+				"ON_FUNCTION", "SQL_FUNCTION", "PROMQL_FUNCTION", "GT", "GE", "LT", "LE",
+				"EQ", "NE", "LPAREN", "RPAREN", "LBRACE", "RBRACE", "LBRACKET", "RBRACKET",
+				"COMMA", "DOT", "COLON", "SEMICOLON", "SCIENTIFIC_NUMBER", "FLOAT", "NUMBER",
+				"DURATION", "STRING", "IDENTIFIER", "WS", "LINE_COMMENT", "BLOCK_COMMENT"
 		};
 	}
 	private static final String[] _SYMBOLIC_NAMES = makeSymbolicNames();
@@ -128,62 +157,363 @@ public class AlertExpressionLexer extends Lexer {
 	public ATN getATN() { return _ATN; }
 
 	public static final String _serializedATN =
-		"\u0004\u0000\u000eZ\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
-		"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
-		"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
-		"\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+
-		"\u0007\u000b\u0002\f\u0007\f\u0002\r\u0007\r\u0001\u0000\u0001\u0000\u0001"+
-		"\u0000\u0001\u0000\u0001\u0001\u0001\u0001\u0001\u0001\u0001\u0002\u0001"+
-		"\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001"+
-		"\u0003\u0001\u0003\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0005\u0001"+
-		"\u0005\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0007\u0001\u0007\u0001"+
-		"\u0007\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\n\u0001\n\u0001\u000b"+
-		"\u0001\u000b\u0005\u000bB\b\u000b\n\u000b\f\u000bE\t\u000b\u0001\f\u0004"+
-		"\fH\b\f\u000b\f\f\fI\u0001\f\u0001\f\u0004\fN\b\f\u000b\f\f\fO\u0003\f"+
-		"R\b\f\u0001\r\u0004\rU\b\r\u000b\r\f\rV\u0001\r\u0001\r\u0000\u0000\u000e"+
-		"\u0001\u0001\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r"+
-		"\u0007\u000f\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e"+
-		"\u0001\u0000\u0004\u0003\u0000AZ__az\n\u0000\"\"..09==A[]]__a{}}\u8000"+
-		"\uff5e\u8000\uff5e\u0001\u000009\u0003\u0000\t\n\r\r  ^\u0000\u0001\u0001"+
-		"\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005\u0001"+
-		"\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001\u0000"+
-		"\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000\u0000"+
-		"\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000\u0000"+
-		"\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000\u0000"+
-		"\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000\u0000"+
-		"\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0001\u001d\u0001\u0000\u0000"+
-		"\u0000\u0003!\u0001\u0000\u0000\u0000\u0005$\u0001\u0000\u0000\u0000\u0007"+
-		"+\u0001\u0000\u0000\u0000\t-\u0001\u0000\u0000\u0000\u000b0\u0001\u0000"+
-		"\u0000\u0000\r2\u0001\u0000\u0000\u0000\u000f5\u0001\u0000\u0000\u0000"+
-		"\u00118\u0001\u0000\u0000\u0000\u0013;\u0001\u0000\u0000\u0000\u0015="+
-		"\u0001\u0000\u0000\u0000\u0017?\u0001\u0000\u0000\u0000\u0019G\u0001\u0000"+
-		"\u0000\u0000\u001bT\u0001\u0000\u0000\u0000\u001d\u001e\u0005a\u0000\u0000"+
-		"\u001e\u001f\u0005n\u0000\u0000\u001f \u0005d\u0000\u0000 \u0002\u0001"+
-		"\u0000\u0000\u0000!\"\u0005o\u0000\u0000\"#\u0005r\u0000\u0000#\u0004"+
-		"\u0001\u0000\u0000\u0000$%\u0005u\u0000\u0000%&\u0005n\u0000\u0000&\'"+
-		"\u0005l\u0000\u0000\'(\u0005e\u0000\u0000()\u0005s\u0000\u0000)*\u0005"+
-		"s\u0000\u0000*\u0006\u0001\u0000\u0000\u0000+,\u0005>\u0000\u0000,\b\u0001"+
-		"\u0000\u0000\u0000-.\u0005>\u0000\u0000./\u0005=\u0000\u0000/\n\u0001"+
-		"\u0000\u0000\u000001\u0005<\u0000\u00001\f\u0001\u0000\u0000\u000023\u0005"+
-		"<\u0000\u000034\u0005=\u0000\u00004\u000e\u0001\u0000\u0000\u000056\u0005"+
-		"=\u0000\u000067\u0005=\u0000\u00007\u0010\u0001\u0000\u0000\u000089\u0005"+
-		"!\u0000\u00009:\u0005=\u0000\u0000:\u0012\u0001\u0000\u0000\u0000;<\u0005"+
-		"(\u0000\u0000<\u0014\u0001\u0000\u0000\u0000=>\u0005)\u0000\u0000>\u0016"+
-		"\u0001\u0000\u0000\u0000?C\u0007\u0000\u0000\u0000@B\u0007\u0001\u0000"+
-		"\u0000A@\u0001\u0000\u0000\u0000BE\u0001\u0000\u0000\u0000CA\u0001\u0000"+
-		"\u0000\u0000CD\u0001\u0000\u0000\u0000D\u0018\u0001\u0000\u0000\u0000"+
-		"EC\u0001\u0000\u0000\u0000FH\u0007\u0002\u0000\u0000GF\u0001\u0000\u0000"+
-		"\u0000HI\u0001\u0000\u0000\u0000IG\u0001\u0000\u0000\u0000IJ\u0001\u0000"+
-		"\u0000\u0000JQ\u0001\u0000\u0000\u0000KM\u0005.\u0000\u0000LN\u0007\u0002"+
-		"\u0000\u0000ML\u0001\u0000\u0000\u0000NO\u0001\u0000\u0000\u0000OM\u0001"+
-		"\u0000\u0000\u0000OP\u0001\u0000\u0000\u0000PR\u0001\u0000\u0000\u0000"+
-		"QK\u0001\u0000\u0000\u0000QR\u0001\u0000\u0000\u0000R\u001a\u0001\u0000"+
-		"\u0000\u0000SU\u0007\u0003\u0000\u0000TS\u0001\u0000\u0000\u0000UV\u0001"+
-		"\u0000\u0000\u0000VT\u0001\u0000\u0000\u0000VW\u0001\u0000\u0000\u0000"+
-		"WX\u0001\u0000\u0000\u0000XY\u0006\r\u0000\u0000Y\u001c\u0001\u0000\u0000"+
-		"\u0000\u0006\u0000CIOQV\u0001\u0006\u0000\u0000";
+			"\u0004\u0000E\u0228\u0006\uffff\uffff\u0002\u0000\u0007\u0000\u0002\u0001"+
+					"\u0007\u0001\u0002\u0002\u0007\u0002\u0002\u0003\u0007\u0003\u0002\u0004"+
+					"\u0007\u0004\u0002\u0005\u0007\u0005\u0002\u0006\u0007\u0006\u0002\u0007"+
+					"\u0007\u0007\u0002\b\u0007\b\u0002\t\u0007\t\u0002\n\u0007\n\u0002\u000b"+
+					"\u0007\u000b\u0002\f\u0007\f\u0002\r\u0007\r\u0002\u000e\u0007\u000e\u0002"+
+					"\u000f\u0007\u000f\u0002\u0010\u0007\u0010\u0002\u0011\u0007\u0011\u0002"+
+					"\u0012\u0007\u0012\u0002\u0013\u0007\u0013\u0002\u0014\u0007\u0014\u0002"+
+					"\u0015\u0007\u0015\u0002\u0016\u0007\u0016\u0002\u0017\u0007\u0017\u0002"+
+					"\u0018\u0007\u0018\u0002\u0019\u0007\u0019\u0002\u001a\u0007\u001a\u0002"+
+					"\u001b\u0007\u001b\u0002\u001c\u0007\u001c\u0002\u001d\u0007\u001d\u0002"+
+					"\u001e\u0007\u001e\u0002\u001f\u0007\u001f\u0002 \u0007 \u0002!\u0007"+
+					"!\u0002\"\u0007\"\u0002#\u0007#\u0002$\u0007$\u0002%\u0007%\u0002&\u0007"+
+					"&\u0002\'\u0007\'\u0002(\u0007(\u0002)\u0007)\u0002*\u0007*\u0002+\u0007"+
+					"+\u0002,\u0007,\u0002-\u0007-\u0002.\u0007.\u0002/\u0007/\u00020\u0007"+
+					"0\u00021\u00071\u00022\u00072\u00023\u00073\u00024\u00074\u00025\u0007"+
+					"5\u00026\u00076\u00027\u00077\u00028\u00078\u00029\u00079\u0002:\u0007"+
+					":\u0002;\u0007;\u0002<\u0007<\u0002=\u0007=\u0002>\u0007>\u0002?\u0007"+
+					"?\u0002@\u0007@\u0002A\u0007A\u0002B\u0007B\u0002C\u0007C\u0002D\u0007"+
+					"D\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0000\u0001\u0001\u0001\u0001"+
+					"\u0001\u0001\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002\u0001\u0002"+
+					"\u0001\u0002\u0001\u0002\u0001\u0003\u0001\u0003\u0001\u0003\u0001\u0003"+
+					"\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004\u0001\u0004"+
+					"\u0001\u0004\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005\u0001\u0005"+
+					"\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006\u0001\u0006"+
+					"\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007\u0001\u0007"+
+					"\u0001\b\u0001\b\u0001\b\u0001\t\u0001\t\u0001\t\u0001\t\u0001\t\u0001"+
+					"\t\u0001\t\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\n\u0001\u000b"+
+					"\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\u000b\u0001\f\u0001"+
+					"\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\f\u0001\r\u0001\r\u0001\r\u0001"+
+					"\u000e\u0001\u000e\u0001\u000e\u0001\u000e\u0001\u000f\u0001\u000f\u0001"+
+					"\u000f\u0001\u000f\u0001\u000f\u0001\u0010\u0001\u0010\u0001\u0010\u0001"+
+					"\u0011\u0001\u0011\u0001\u0011\u0001\u0012\u0001\u0012\u0001\u0012\u0001"+
+					"\u0012\u0001\u0012\u0001\u0013\u0001\u0013\u0001\u0013\u0001\u0013\u0001"+
+					"\u0013\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001\u0014\u0001"+
+					"\u0014\u0001\u0014\u0001\u0014\u0001\u0015\u0001\u0015\u0001\u0016\u0001"+
+					"\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0016\u0001\u0017\u0001"+
+					"\u0017\u0001\u0017\u0001\u0017\u0001\u0018\u0001\u0018\u0001\u0018\u0001"+
+					"\u0018\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u0019\u0001\u001a\u0001"+
+					"\u001a\u0001\u001a\u0001\u001a\u0001\u001b\u0001\u001b\u0001\u001b\u0001"+
+					"\u001b\u0001\u001b\u0001\u001b\u0001\u001b\u0001\u001c\u0001\u001c\u0001"+
+					"\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001c\u0001\u001d\u0001"+
+					"\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001\u001d\u0001"+
+					"\u001d\u0001\u001d\u0001\u001e\u0001\u001e\u0001\u001e\u0001\u001e\u0001"+
+					"\u001e\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001"+
+					"\u001f\u0001\u001f\u0001\u001f\u0001\u001f\u0001 \u0001 \u0001 \u0001"+
+					" \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001 \u0001"+
+					" \u0001 \u0001 \u0001 \u0001 \u0001 \u0001!\u0001!\u0001!\u0001!\u0001"+
+					"!\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001\"\u0001"+
+					"#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001#\u0001$\u0001"+
+					"$\u0001$\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001%\u0001"+
+					"&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001&\u0001"+
+					"&\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001\'\u0001"+
+					"\'\u0001\'\u0001\'\u0001\'\u0001(\u0001(\u0001(\u0001(\u0001(\u0001(\u0001"+
+					"(\u0001(\u0001(\u0001)\u0001)\u0001)\u0001*\u0001*\u0001*\u0001*\u0001"+
+					"+\u0001+\u0001+\u0001+\u0001+\u0001+\u0001+\u0001,\u0001,\u0001-\u0001"+
+					"-\u0001-\u0001.\u0001.\u0001/\u0001/\u0001/\u00010\u00010\u00010\u0003"+
+					"0\u01a3\b0\u00011\u00011\u00011\u00012\u00012\u00013\u00013\u00014\u0001"+
+					"4\u00015\u00015\u00016\u00016\u00017\u00017\u00018\u00018\u00019\u0001"+
+					"9\u0001:\u0001:\u0001;\u0001;\u0001<\u0004<\u01bd\b<\u000b<\f<\u01be\u0001"+
+					"<\u0001<\u0004<\u01c3\b<\u000b<\f<\u01c4\u0003<\u01c7\b<\u0001<\u0001"+
+					"<\u0003<\u01cb\b<\u0001<\u0004<\u01ce\b<\u000b<\f<\u01cf\u0001=\u0004"+
+					"=\u01d3\b=\u000b=\f=\u01d4\u0001=\u0001=\u0004=\u01d9\b=\u000b=\f=\u01da"+
+					"\u0001>\u0004>\u01de\b>\u000b>\f>\u01df\u0001?\u0004?\u01e3\b?\u000b?"+
+					"\f?\u01e4\u0001?\u0004?\u01e8\b?\u000b?\f?\u01e9\u0001@\u0001@\u0001@"+
+					"\u0001@\u0005@\u01f0\b@\n@\f@\u01f3\t@\u0001@\u0001@\u0001@\u0001@\u0001"+
+					"@\u0005@\u01fa\b@\n@\f@\u01fd\t@\u0001@\u0003@\u0200\b@\u0001A\u0001A"+
+					"\u0005A\u0204\bA\nA\fA\u0207\tA\u0001B\u0004B\u020a\bB\u000bB\fB\u020b"+
+					"\u0001B\u0001B\u0001C\u0001C\u0001C\u0001C\u0005C\u0214\bC\nC\fC\u0217"+
+					"\tC\u0001C\u0001C\u0001D\u0001D\u0001D\u0001D\u0005D\u021f\bD\nD\fD\u0222"+
+					"\tD\u0001D\u0001D\u0001D\u0001D\u0001D\u0001\u0220\u0000E\u0001\u0001"+
+					"\u0003\u0002\u0005\u0003\u0007\u0004\t\u0005\u000b\u0006\r\u0007\u000f"+
+					"\b\u0011\t\u0013\n\u0015\u000b\u0017\f\u0019\r\u001b\u000e\u001d\u000f"+
+					"\u001f\u0010!\u0011#\u0012%\u0013\'\u0014)\u0015+\u0016-\u0017/\u0018"+
+					"1\u00193\u001a5\u001b7\u001c9\u001d;\u001e=\u001f? A!C\"E#G$I%K&M\'O("+
+					"Q)S*U+W,Y-[.]/_0a1c2e3g4i5k6m7o8q9s:u;w<y={>}?\u007f@\u0081A\u0083B\u0085"+
+					"C\u0087D\u0089E\u0001\u0000!\u0002\u0000AAaa\u0002\u0000NNnn\u0002\u0000"+
+					"DDdd\u0002\u0000OOoo\u0002\u0000RRrr\u0002\u0000UUuu\u0002\u0000LLll\u0002"+
+					"\u0000EEee\u0002\u0000SSss\u0002\u0000TTtt\u0002\u0000CCcc\u0002\u0000"+
+					"FFff\u0002\u0000MMmm\u0002\u0000WWww\u0002\u0000HHhh\u0002\u0000GGgg\u0002"+
+					"\u0000PPpp\u0002\u0000BBbb\u0002\u0000YYyy\u0002\u0000VVvv\u0002\u0000"+
+					"IIii\u0002\u0000KKkk\u0002\u0000XXxx\u0002\u0000QQqq\u0001\u000009\u0002"+
+					"\u0000++--\u0002\u0000AZaz\u0004\u0000\n\n\r\r\"\"\\\\\u0004\u0000\n\n"+
+					"\r\r\'\'\\\\\u0003\u0000AZ__az\n\u0000\"\"-.09==A[]]__a{}~\u8000\uff5e"+
+					"\u8000\uff5e\u0003\u0000\t\n\r\r  \u0002\u0000\n\n\r\r\u023b\u0000\u0001"+
+					"\u0001\u0000\u0000\u0000\u0000\u0003\u0001\u0000\u0000\u0000\u0000\u0005"+
+					"\u0001\u0000\u0000\u0000\u0000\u0007\u0001\u0000\u0000\u0000\u0000\t\u0001"+
+					"\u0000\u0000\u0000\u0000\u000b\u0001\u0000\u0000\u0000\u0000\r\u0001\u0000"+
+					"\u0000\u0000\u0000\u000f\u0001\u0000\u0000\u0000\u0000\u0011\u0001\u0000"+
+					"\u0000\u0000\u0000\u0013\u0001\u0000\u0000\u0000\u0000\u0015\u0001\u0000"+
+					"\u0000\u0000\u0000\u0017\u0001\u0000\u0000\u0000\u0000\u0019\u0001\u0000"+
+					"\u0000\u0000\u0000\u001b\u0001\u0000\u0000\u0000\u0000\u001d\u0001\u0000"+
+					"\u0000\u0000\u0000\u001f\u0001\u0000\u0000\u0000\u0000!\u0001\u0000\u0000"+
+					"\u0000\u0000#\u0001\u0000\u0000\u0000\u0000%\u0001\u0000\u0000\u0000\u0000"+
+					"\'\u0001\u0000\u0000\u0000\u0000)\u0001\u0000\u0000\u0000\u0000+\u0001"+
+					"\u0000\u0000\u0000\u0000-\u0001\u0000\u0000\u0000\u0000/\u0001\u0000\u0000"+
+					"\u0000\u00001\u0001\u0000\u0000\u0000\u00003\u0001\u0000\u0000\u0000\u0000"+
+					"5\u0001\u0000\u0000\u0000\u00007\u0001\u0000\u0000\u0000\u00009\u0001"+
+					"\u0000\u0000\u0000\u0000;\u0001\u0000\u0000\u0000\u0000=\u0001\u0000\u0000"+
+					"\u0000\u0000?\u0001\u0000\u0000\u0000\u0000A\u0001\u0000\u0000\u0000\u0000"+
+					"C\u0001\u0000\u0000\u0000\u0000E\u0001\u0000\u0000\u0000\u0000G\u0001"+
+					"\u0000\u0000\u0000\u0000I\u0001\u0000\u0000\u0000\u0000K\u0001\u0000\u0000"+
+					"\u0000\u0000M\u0001\u0000\u0000\u0000\u0000O\u0001\u0000\u0000\u0000\u0000"+
+					"Q\u0001\u0000\u0000\u0000\u0000S\u0001\u0000\u0000\u0000\u0000U\u0001"+
+					"\u0000\u0000\u0000\u0000W\u0001\u0000\u0000\u0000\u0000Y\u0001\u0000\u0000"+
+					"\u0000\u0000[\u0001\u0000\u0000\u0000\u0000]\u0001\u0000\u0000\u0000\u0000"+
+					"_\u0001\u0000\u0000\u0000\u0000a\u0001\u0000\u0000\u0000\u0000c\u0001"+
+					"\u0000\u0000\u0000\u0000e\u0001\u0000\u0000\u0000\u0000g\u0001\u0000\u0000"+
+					"\u0000\u0000i\u0001\u0000\u0000\u0000\u0000k\u0001\u0000\u0000\u0000\u0000"+
+					"m\u0001\u0000\u0000\u0000\u0000o\u0001\u0000\u0000\u0000\u0000q\u0001"+
+					"\u0000\u0000\u0000\u0000s\u0001\u0000\u0000\u0000\u0000u\u0001\u0000\u0000"+
+					"\u0000\u0000w\u0001\u0000\u0000\u0000\u0000y\u0001\u0000\u0000\u0000\u0000"+
+					"{\u0001\u0000\u0000\u0000\u0000}\u0001\u0000\u0000\u0000\u0000\u007f\u0001"+
+					"\u0000\u0000\u0000\u0000\u0081\u0001\u0000\u0000\u0000\u0000\u0083\u0001"+
+					"\u0000\u0000\u0000\u0000\u0085\u0001\u0000\u0000\u0000\u0000\u0087\u0001"+
+					"\u0000\u0000\u0000\u0000\u0089\u0001\u0000\u0000\u0000\u0001\u008b\u0001"+
+					"\u0000\u0000\u0000\u0003\u008f\u0001\u0000\u0000\u0000\u0005\u0092\u0001"+
+					"\u0000\u0000\u0000\u0007\u0099\u0001\u0000\u0000\u0000\t\u009d\u0001\u0000"+
+					"\u0000\u0000\u000b\u00a4\u0001\u0000\u0000\u0000\r\u00a9\u0001\u0000\u0000"+
+					"\u0000\u000f\u00af\u0001\u0000\u0000\u0000\u0011\u00b5\u0001\u0000\u0000"+
+					"\u0000\u0013\u00b8\u0001\u0000\u0000\u0000\u0015\u00bf\u0001\u0000\u0000"+
+					"\u0000\u0017\u00c5\u0001\u0000\u0000\u0000\u0019\u00cb\u0001\u0000\u0000"+
+					"\u0000\u001b\u00d2\u0001\u0000\u0000\u0000\u001d\u00d5\u0001\u0000\u0000"+
+					"\u0000\u001f\u00d9\u0001\u0000\u0000\u0000!\u00de\u0001\u0000\u0000\u0000"+
+					"#\u00e1\u0001\u0000\u0000\u0000%\u00e4\u0001\u0000\u0000\u0000\'\u00e9"+
+					"\u0001\u0000\u0000\u0000)\u00ee\u0001\u0000\u0000\u0000+\u00f6\u0001\u0000"+
+					"\u0000\u0000-\u00f8\u0001\u0000\u0000\u0000/\u00fe\u0001\u0000\u0000\u0000"+
+					"1\u0102\u0001\u0000\u0000\u00003\u0106\u0001\u0000\u0000\u00005\u010a"+
+					"\u0001\u0000\u0000\u00007\u010e\u0001\u0000\u0000\u00009\u0115\u0001\u0000"+
+					"\u0000\u0000;\u011c\u0001\u0000\u0000\u0000=\u0125\u0001\u0000\u0000\u0000"+
+					"?\u012a\u0001\u0000\u0000\u0000A\u0133\u0001\u0000\u0000\u0000C\u0146"+
+					"\u0001\u0000\u0000\u0000E\u014b\u0001\u0000\u0000\u0000G\u0153\u0001\u0000"+
+					"\u0000\u0000I\u015c\u0001\u0000\u0000\u0000K\u015f\u0001\u0000\u0000\u0000"+
+					"M\u0167\u0001\u0000\u0000\u0000O\u0172\u0001\u0000\u0000\u0000Q\u017e"+
+					"\u0001\u0000\u0000\u0000S\u0187\u0001\u0000\u0000\u0000U\u018a\u0001\u0000"+
+					"\u0000\u0000W\u018e\u0001\u0000\u0000\u0000Y\u0195\u0001\u0000\u0000\u0000"+
+					"[\u0197\u0001\u0000\u0000\u0000]\u019a\u0001\u0000\u0000\u0000_\u019c"+
+					"\u0001\u0000\u0000\u0000a\u01a2\u0001\u0000\u0000\u0000c\u01a4\u0001\u0000"+
+					"\u0000\u0000e\u01a7\u0001\u0000\u0000\u0000g\u01a9\u0001\u0000\u0000\u0000"+
+					"i\u01ab\u0001\u0000\u0000\u0000k\u01ad\u0001\u0000\u0000\u0000m\u01af"+
+					"\u0001\u0000\u0000\u0000o\u01b1\u0001\u0000\u0000\u0000q\u01b3\u0001\u0000"+
+					"\u0000\u0000s\u01b5\u0001\u0000\u0000\u0000u\u01b7\u0001\u0000\u0000\u0000"+
+					"w\u01b9\u0001\u0000\u0000\u0000y\u01bc\u0001\u0000\u0000\u0000{\u01d2"+
+					"\u0001\u0000\u0000\u0000}\u01dd\u0001\u0000\u0000\u0000\u007f\u01e2\u0001"+
+					"\u0000\u0000\u0000\u0081\u01ff\u0001\u0000\u0000\u0000\u0083\u0201\u0001"+
+					"\u0000\u0000\u0000\u0085\u0209\u0001\u0000\u0000\u0000\u0087\u020f\u0001"+
+					"\u0000\u0000\u0000\u0089\u021a\u0001\u0000\u0000\u0000\u008b\u008c\u0007"+
+					"\u0000\u0000\u0000\u008c\u008d\u0007\u0001\u0000\u0000\u008d\u008e\u0007"+
+					"\u0002\u0000\u0000\u008e\u0002\u0001\u0000\u0000\u0000\u008f\u0090\u0007"+
+					"\u0003\u0000\u0000\u0090\u0091\u0007\u0004\u0000\u0000\u0091\u0004\u0001"+
+					"\u0000\u0000\u0000\u0092\u0093\u0007\u0005\u0000\u0000\u0093\u0094\u0007"+
+					"\u0001\u0000\u0000\u0094\u0095\u0007\u0006\u0000\u0000\u0095\u0096\u0007"+
+					"\u0007\u0000\u0000\u0096\u0097\u0007\b\u0000\u0000\u0097\u0098\u0007\b"+
+					"\u0000\u0000\u0098\u0006\u0001\u0000\u0000\u0000\u0099\u009a\u0007\u0001"+
+					"\u0000\u0000\u009a\u009b\u0007\u0003\u0000\u0000\u009b\u009c\u0007\t\u0000"+
+					"\u0000\u009c\b\u0001\u0000\u0000\u0000\u009d\u009e\u0007\b\u0000\u0000"+
+					"\u009e\u009f\u0007\u0007\u0000\u0000\u009f\u00a0\u0007\u0006\u0000\u0000"+
+					"\u00a0\u00a1\u0007\u0007\u0000\u0000\u00a1\u00a2\u0007\n\u0000\u0000\u00a2"+
+					"\u00a3\u0007\t\u0000\u0000\u00a3\n\u0001\u0000\u0000\u0000\u00a4\u00a5"+
+					"\u0007\u000b\u0000\u0000\u00a5\u00a6\u0007\u0004\u0000\u0000\u00a6\u00a7"+
+					"\u0007\u0003\u0000\u0000\u00a7\u00a8\u0007\f\u0000\u0000\u00a8\f\u0001"+
+					"\u0000\u0000\u0000\u00a9\u00aa\u0007\r\u0000\u0000\u00aa\u00ab\u0007\u000e"+
+					"\u0000\u0000\u00ab\u00ac\u0007\u0007\u0000\u0000\u00ac\u00ad\u0007\u0004"+
+					"\u0000\u0000\u00ad\u00ae\u0007\u0007\u0000\u0000\u00ae\u000e\u0001\u0000"+
+					"\u0000\u0000\u00af\u00b0\u0007\u000f\u0000\u0000\u00b0\u00b1\u0007\u0004"+
+					"\u0000\u0000\u00b1\u00b2\u0007\u0003\u0000\u0000\u00b2\u00b3\u0007\u0005"+
+					"\u0000\u0000\u00b3\u00b4\u0007\u0010\u0000\u0000\u00b4\u0010\u0001\u0000"+
+					"\u0000\u0000\u00b5\u00b6\u0007\u0011\u0000\u0000\u00b6\u00b7\u0007\u0012"+
+					"\u0000\u0000\u00b7\u0012\u0001\u0000\u0000\u0000\u00b8\u00b9\u0007\u000e"+
+					"\u0000\u0000\u00b9\u00ba\u0007\u0000\u0000\u0000\u00ba\u00bb\u0007\u0013"+
+					"\u0000\u0000\u00bb\u00bc\u0007\u0014\u0000\u0000\u00bc\u00bd\u0007\u0001"+
+					"\u0000\u0000\u00bd\u00be\u0007\u000f\u0000\u0000\u00be\u0014\u0001\u0000"+
+					"\u0000\u0000\u00bf\u00c0\u0007\u0003\u0000\u0000\u00c0\u00c1\u0007\u0004"+
+					"\u0000\u0000\u00c1\u00c2\u0007\u0002\u0000\u0000\u00c2\u00c3\u0007\u0007"+
+					"\u0000\u0000\u00c3\u00c4\u0007\u0004\u0000\u0000\u00c4\u0016\u0001\u0000"+
+					"\u0000\u0000\u00c5\u00c6\u0007\u0006\u0000\u0000\u00c6\u00c7\u0007\u0014"+
+					"\u0000\u0000\u00c7\u00c8\u0007\f\u0000\u0000\u00c8\u00c9\u0007\u0014\u0000"+
+					"\u0000\u00c9\u00ca\u0007\t\u0000\u0000\u00ca\u0018\u0001\u0000\u0000\u0000"+
+					"\u00cb\u00cc\u0007\u0003\u0000\u0000\u00cc\u00cd\u0007\u000b\u0000\u0000"+
+					"\u00cd\u00ce\u0007\u000b\u0000\u0000\u00ce\u00cf\u0007\b\u0000\u0000\u00cf"+
+					"\u00d0\u0007\u0007\u0000\u0000\u00d0\u00d1\u0007\t\u0000\u0000\u00d1\u001a"+
+					"\u0001\u0000\u0000\u0000\u00d2\u00d3\u0007\u0000\u0000\u0000\u00d3\u00d4"+
+					"\u0007\b\u0000\u0000\u00d4\u001c\u0001\u0000\u0000\u0000\u00d5\u00d6\u0007"+
+					"\u0000\u0000\u0000\u00d6\u00d7\u0007\b\u0000\u0000\u00d7\u00d8\u0007\n"+
+					"\u0000\u0000\u00d8\u001e\u0001\u0000\u0000\u0000\u00d9\u00da\u0007\u0002"+
+					"\u0000\u0000\u00da\u00db\u0007\u0007\u0000\u0000\u00db\u00dc\u0007\b\u0000"+
+					"\u0000\u00dc\u00dd\u0007\n\u0000\u0000\u00dd \u0001\u0000\u0000\u0000"+
+					"\u00de\u00df\u0007\u0014\u0000\u0000\u00df\u00e0\u0007\u0001\u0000\u0000"+
+					"\u00e0\"\u0001\u0000\u0000\u0000\u00e1\u00e2\u0007\u0014\u0000\u0000\u00e2"+
+					"\u00e3\u0007\b\u0000\u0000\u00e3$\u0001\u0000\u0000\u0000\u00e4\u00e5"+
+					"\u0007\u0001\u0000\u0000\u00e5\u00e6\u0007\u0005\u0000\u0000\u00e6\u00e7"+
+					"\u0007\u0006\u0000\u0000\u00e7\u00e8\u0007\u0006\u0000\u0000\u00e8&\u0001"+
+					"\u0000\u0000\u0000\u00e9\u00ea\u0007\u0006\u0000\u0000\u00ea\u00eb\u0007"+
+					"\u0014\u0000\u0000\u00eb\u00ec\u0007\u0015\u0000\u0000\u00ec\u00ed\u0007"+
+					"\u0007\u0000\u0000\u00ed(\u0001\u0000\u0000\u0000\u00ee\u00ef\u0007\u0011"+
+					"\u0000\u0000\u00ef\u00f0\u0007\u0007\u0000\u0000\u00f0\u00f1\u0007\t\u0000"+
+					"\u0000\u00f1\u00f2\u0007\r\u0000\u0000\u00f2\u00f3\u0007\u0007\u0000\u0000"+
+					"\u00f3\u00f4\u0007\u0007\u0000\u0000\u00f4\u00f5\u0007\u0001\u0000\u0000"+
+					"\u00f5*\u0001\u0000\u0000\u0000\u00f6\u00f7\u0005*\u0000\u0000\u00f7,"+
+					"\u0001\u0000\u0000\u0000\u00f8\u00f9\u0007\n\u0000\u0000\u00f9\u00fa\u0007"+
+					"\u0003\u0000\u0000\u00fa\u00fb\u0007\u0005\u0000\u0000\u00fb\u00fc\u0007"+
+					"\u0001\u0000\u0000\u00fc\u00fd\u0007\t\u0000\u0000\u00fd.\u0001\u0000"+
+					"\u0000\u0000\u00fe\u00ff\u0007\b\u0000\u0000\u00ff\u0100\u0007\u0005\u0000"+
+					"\u0000\u0100\u0101\u0007\f\u0000\u0000\u01010\u0001\u0000\u0000\u0000"+
+					"\u0102\u0103\u0007\u0000\u0000\u0000\u0103\u0104\u0007\u0013\u0000\u0000"+
+					"\u0104\u0105\u0007\u000f\u0000\u0000\u01052\u0001\u0000\u0000\u0000\u0106"+
+					"\u0107\u0007\f\u0000\u0000\u0107\u0108\u0007\u0014\u0000\u0000\u0108\u0109"+
+					"\u0007\u0001\u0000\u0000\u01094\u0001\u0000\u0000\u0000\u010a\u010b\u0007"+
+					"\f\u0000\u0000\u010b\u010c\u0007\u0000\u0000\u0000\u010c\u010d\u0007\u0016"+
+					"\u0000\u0000\u010d6\u0001\u0000\u0000\u0000\u010e\u010f\u0007\b\u0000"+
+					"\u0000\u010f\u0110\u0007\t\u0000\u0000\u0110\u0111\u0007\u0002\u0000\u0000"+
+					"\u0111\u0112\u0007\u0002\u0000\u0000\u0112\u0113\u0007\u0007\u0000\u0000"+
+					"\u0113\u0114\u0007\u0013\u0000\u0000\u01148\u0001\u0000\u0000\u0000\u0115"+
+					"\u0116\u0007\b\u0000\u0000\u0116\u0117\u0007\t\u0000\u0000\u0117\u0118"+
+					"\u0007\u0002\u0000\u0000\u0118\u0119\u0007\u0013\u0000\u0000\u0119\u011a"+
+					"\u0007\u0000\u0000\u0000\u011a\u011b\u0007\u0004\u0000\u0000\u011b:\u0001"+
+					"\u0000\u0000\u0000\u011c\u011d\u0007\u0013\u0000\u0000\u011d\u011e\u0007"+
+					"\u0000\u0000\u0000\u011e\u011f\u0007\u0004\u0000\u0000\u011f\u0120\u0007"+
+					"\u0014\u0000\u0000\u0120\u0121\u0007\u0000\u0000\u0000\u0121\u0122\u0007"+
+					"\u0001\u0000\u0000\u0122\u0123\u0007\n\u0000\u0000\u0123\u0124\u0007\u0007"+
+					"\u0000\u0000\u0124<\u0001\u0000\u0000\u0000\u0125\u0126\u0007\u0004\u0000"+
+					"\u0000\u0126\u0127\u0007\u0000\u0000\u0000\u0127\u0128\u0007\t\u0000\u0000"+
+					"\u0128\u0129\u0007\u0007\u0000\u0000\u0129>\u0001\u0000\u0000\u0000\u012a"+
+					"\u012b\u0007\u0014\u0000\u0000\u012b\u012c\u0007\u0001\u0000\u0000\u012c"+
+					"\u012d\u0007\n\u0000\u0000\u012d\u012e\u0007\u0004\u0000\u0000\u012e\u012f"+
+					"\u0007\u0007\u0000\u0000\u012f\u0130\u0007\u0000\u0000\u0000\u0130\u0131"+
+					"\u0007\b\u0000\u0000\u0131\u0132\u0007\u0007\u0000\u0000\u0132@\u0001"+
+					"\u0000\u0000\u0000\u0133\u0134\u0007\u000e\u0000\u0000\u0134\u0135\u0007"+
+					"\u0014\u0000\u0000\u0135\u0136\u0007\b\u0000\u0000\u0136\u0137\u0007\t"+
+					"\u0000\u0000\u0137\u0138\u0007\u0003\u0000\u0000\u0138\u0139\u0007\u000f"+
+					"\u0000\u0000\u0139\u013a\u0007\u0004\u0000\u0000\u013a\u013b\u0007\u0000"+
+					"\u0000\u0000\u013b\u013c\u0007\f\u0000\u0000\u013c\u013d\u0005_\u0000"+
+					"\u0000\u013d\u013e\u0007\u0017\u0000\u0000\u013e\u013f\u0007\u0005\u0000"+
+					"\u0000\u013f\u0140\u0007\u0000\u0000\u0000\u0140\u0141\u0007\u0001\u0000"+
+					"\u0000\u0141\u0142\u0007\t\u0000\u0000\u0142\u0143\u0007\u0014\u0000\u0000"+
+					"\u0143\u0144\u0007\u0006\u0000\u0000\u0144\u0145\u0007\u0007\u0000\u0000"+
+					"\u0145B\u0001\u0000\u0000\u0000\u0146\u0147\u0007\t\u0000\u0000\u0147"+
+					"\u0148\u0007\u0003\u0000\u0000\u0148\u0149\u0007\u0010\u0000\u0000\u0149"+
+					"\u014a\u0007\u0015\u0000\u0000\u014aD\u0001\u0000\u0000\u0000\u014b\u014c"+
+					"\u0007\u0011\u0000\u0000\u014c\u014d\u0007\u0003\u0000\u0000\u014d\u014e"+
+					"\u0007\t\u0000\u0000\u014e\u014f\u0007\t\u0000\u0000\u014f\u0150\u0007"+
+					"\u0003\u0000\u0000\u0150\u0151\u0007\f\u0000\u0000\u0151\u0152\u0007\u0015"+
+					"\u0000\u0000\u0152F\u0001\u0000\u0000\u0000\u0153\u0154\u0007\u0017\u0000"+
+					"\u0000\u0154\u0155\u0007\u0005\u0000\u0000\u0155\u0156\u0007\u0000\u0000"+
+					"\u0000\u0156\u0157\u0007\u0001\u0000\u0000\u0157\u0158\u0007\t\u0000\u0000"+
+					"\u0158\u0159\u0007\u0014\u0000\u0000\u0159\u015a\u0007\u0006\u0000\u0000"+
+					"\u015a\u015b\u0007\u0007\u0000\u0000\u015bH\u0001\u0000\u0000\u0000\u015c"+
+					"\u015d\u0007\u0011\u0000\u0000\u015d\u015e\u0007\u0012\u0000\u0000\u015e"+
+					"J\u0001\u0000\u0000\u0000\u015f\u0160\u0007\r\u0000\u0000\u0160\u0161"+
+					"\u0007\u0014\u0000\u0000\u0161\u0162\u0007\t\u0000\u0000\u0162\u0163\u0007"+
+					"\u000e\u0000\u0000\u0163\u0164\u0007\u0003\u0000\u0000\u0164\u0165\u0007"+
+					"\u0005\u0000\u0000\u0165\u0166\u0007\t\u0000\u0000\u0166L\u0001\u0000"+
+					"\u0000\u0000\u0167\u0168\u0007\u000f\u0000\u0000\u0168\u0169\u0007\u0004"+
+					"\u0000\u0000\u0169\u016a\u0007\u0003\u0000\u0000\u016a\u016b\u0007\u0005"+
+					"\u0000\u0000\u016b\u016c\u0007\u0010\u0000\u0000\u016c\u016d\u0005_\u0000"+
+					"\u0000\u016d\u016e\u0007\u0006\u0000\u0000\u016e\u016f\u0007\u0007\u0000"+
+					"\u0000\u016f\u0170\u0007\u000b\u0000\u0000\u0170\u0171\u0007\t\u0000\u0000"+
+					"\u0171N\u0001\u0000\u0000\u0000\u0172\u0173\u0007\u000f\u0000\u0000\u0173"+
+					"\u0174\u0007\u0004\u0000\u0000\u0174\u0175\u0007\u0003\u0000\u0000\u0175"+
+					"\u0176\u0007\u0005\u0000\u0000\u0176\u0177\u0007\u0010\u0000\u0000\u0177"+
+					"\u0178\u0005_\u0000\u0000\u0178\u0179\u0007\u0004\u0000\u0000\u0179\u017a"+
+					"\u0007\u0014\u0000\u0000\u017a\u017b\u0007\u000f\u0000\u0000\u017b\u017c"+
+					"\u0007\u000e\u0000\u0000\u017c\u017d\u0007\t\u0000\u0000\u017dP\u0001"+
+					"\u0000\u0000\u0000\u017e\u017f\u0007\u0014\u0000\u0000\u017f\u0180\u0007"+
+					"\u000f\u0000\u0000\u0180\u0181\u0007\u0001\u0000\u0000\u0181\u0182\u0007"+
+					"\u0003\u0000\u0000\u0182\u0183\u0007\u0004\u0000\u0000\u0183\u0184\u0007"+
+					"\u0014\u0000\u0000\u0184\u0185\u0007\u0001\u0000\u0000\u0185\u0186\u0007"+
+					"\u000f\u0000\u0000\u0186R\u0001\u0000\u0000\u0000\u0187\u0188\u0007\u0003"+
+					"\u0000\u0000\u0188\u0189\u0007\u0001\u0000\u0000\u0189T\u0001\u0000\u0000"+
+					"\u0000\u018a\u018b\u0007\b\u0000\u0000\u018b\u018c\u0007\u0017\u0000\u0000"+
+					"\u018c\u018d\u0007\u0006\u0000\u0000\u018dV\u0001\u0000\u0000\u0000\u018e"+
+					"\u018f\u0007\u0010\u0000\u0000\u018f\u0190\u0007\u0004\u0000\u0000\u0190"+
+					"\u0191\u0007\u0003\u0000\u0000\u0191\u0192\u0007\f\u0000\u0000\u0192\u0193"+
+					"\u0007\u0017\u0000\u0000\u0193\u0194\u0007\u0006\u0000\u0000\u0194X\u0001"+
+					"\u0000\u0000\u0000\u0195\u0196\u0005>\u0000\u0000\u0196Z\u0001\u0000\u0000"+
+					"\u0000\u0197\u0198\u0005>\u0000\u0000\u0198\u0199\u0005=\u0000\u0000\u0199"+
+					"\\\u0001\u0000\u0000\u0000\u019a\u019b\u0005<\u0000\u0000\u019b^\u0001"+
+					"\u0000\u0000\u0000\u019c\u019d\u0005<\u0000\u0000\u019d\u019e\u0005=\u0000"+
+					"\u0000\u019e`\u0001\u0000\u0000\u0000\u019f\u01a0\u0005=\u0000\u0000\u01a0"+
+					"\u01a3\u0005=\u0000\u0000\u01a1\u01a3\u0005=\u0000\u0000\u01a2\u019f\u0001"+
+					"\u0000\u0000\u0000\u01a2\u01a1\u0001\u0000\u0000\u0000\u01a3b\u0001\u0000"+
+					"\u0000\u0000\u01a4\u01a5\u0005!\u0000\u0000\u01a5\u01a6\u0005=\u0000\u0000"+
+					"\u01a6d\u0001\u0000\u0000\u0000\u01a7\u01a8\u0005(\u0000\u0000\u01a8f"+
+					"\u0001\u0000\u0000\u0000\u01a9\u01aa\u0005)\u0000\u0000\u01aah\u0001\u0000"+
+					"\u0000\u0000\u01ab\u01ac\u0005{\u0000\u0000\u01acj\u0001\u0000\u0000\u0000"+
+					"\u01ad\u01ae\u0005}\u0000\u0000\u01ael\u0001\u0000\u0000\u0000\u01af\u01b0"+
+					"\u0005[\u0000\u0000\u01b0n\u0001\u0000\u0000\u0000\u01b1\u01b2\u0005]"+
+					"\u0000\u0000\u01b2p\u0001\u0000\u0000\u0000\u01b3\u01b4\u0005,\u0000\u0000"+
+					"\u01b4r\u0001\u0000\u0000\u0000\u01b5\u01b6\u0005.\u0000\u0000\u01b6t"+
+					"\u0001\u0000\u0000\u0000\u01b7\u01b8\u0005:\u0000\u0000\u01b8v\u0001\u0000"+
+					"\u0000\u0000\u01b9\u01ba\u0005;\u0000\u0000\u01bax\u0001\u0000\u0000\u0000"+
+					"\u01bb\u01bd\u0007\u0018\u0000\u0000\u01bc\u01bb\u0001\u0000\u0000\u0000"+
+					"\u01bd\u01be\u0001\u0000\u0000\u0000\u01be\u01bc\u0001\u0000\u0000\u0000"+
+					"\u01be\u01bf\u0001\u0000\u0000\u0000\u01bf\u01c6\u0001\u0000\u0000\u0000"+
+					"\u01c0\u01c2\u0005.\u0000\u0000\u01c1\u01c3\u0007\u0018\u0000\u0000\u01c2"+
+					"\u01c1\u0001\u0000\u0000\u0000\u01c3\u01c4\u0001\u0000\u0000\u0000\u01c4"+
+					"\u01c2\u0001\u0000\u0000\u0000\u01c4\u01c5\u0001\u0000\u0000\u0000\u01c5"+
+					"\u01c7\u0001\u0000\u0000\u0000\u01c6\u01c0\u0001\u0000\u0000\u0000\u01c6"+
+					"\u01c7\u0001\u0000\u0000\u0000\u01c7\u01c8\u0001\u0000\u0000\u0000\u01c8"+
+					"\u01ca\u0007\u0007\u0000\u0000\u01c9\u01cb\u0007\u0019\u0000\u0000\u01ca"+
+					"\u01c9\u0001\u0000\u0000\u0000\u01ca\u01cb\u0001\u0000\u0000\u0000\u01cb"+
+					"\u01cd\u0001\u0000\u0000\u0000\u01cc\u01ce\u0007\u0018\u0000\u0000\u01cd"+
+					"\u01cc\u0001\u0000\u0000\u0000\u01ce\u01cf\u0001\u0000\u0000\u0000\u01cf"+
+					"\u01cd\u0001\u0000\u0000\u0000\u01cf\u01d0\u0001\u0000\u0000\u0000\u01d0"+
+					"z\u0001\u0000\u0000\u0000\u01d1\u01d3\u0007\u0018\u0000\u0000\u01d2\u01d1"+
+					"\u0001\u0000\u0000\u0000\u01d3\u01d4\u0001\u0000\u0000\u0000\u01d4\u01d2"+
+					"\u0001\u0000\u0000\u0000\u01d4\u01d5\u0001\u0000\u0000\u0000\u01d5\u01d6"+
+					"\u0001\u0000\u0000\u0000\u01d6\u01d8\u0005.\u0000\u0000\u01d7\u01d9\u0007"+
+					"\u0018\u0000\u0000\u01d8\u01d7\u0001\u0000\u0000\u0000\u01d9\u01da\u0001"+
+					"\u0000\u0000\u0000\u01da\u01d8\u0001\u0000\u0000\u0000\u01da\u01db\u0001"+
+					"\u0000\u0000\u0000\u01db|\u0001\u0000\u0000\u0000\u01dc\u01de\u0007\u0018"+
+					"\u0000\u0000\u01dd\u01dc\u0001\u0000\u0000\u0000\u01de\u01df\u0001\u0000"+
+					"\u0000\u0000\u01df\u01dd\u0001\u0000\u0000\u0000\u01df\u01e0\u0001\u0000"+
+					"\u0000\u0000\u01e0~\u0001\u0000\u0000\u0000\u01e1\u01e3\u0007\u0018\u0000"+
+					"\u0000\u01e2\u01e1\u0001\u0000\u0000\u0000\u01e3\u01e4\u0001\u0000\u0000"+
+					"\u0000\u01e4\u01e2\u0001\u0000\u0000\u0000\u01e4\u01e5\u0001\u0000\u0000"+
+					"\u0000\u01e5\u01e7\u0001\u0000\u0000\u0000\u01e6\u01e8\u0007\u001a\u0000"+
+					"\u0000\u01e7\u01e6\u0001\u0000\u0000\u0000\u01e8\u01e9\u0001\u0000\u0000"+
+					"\u0000\u01e9\u01e7\u0001\u0000\u0000\u0000\u01e9\u01ea\u0001\u0000\u0000"+
+					"\u0000\u01ea\u0080\u0001\u0000\u0000\u0000\u01eb\u01f1\u0005\"\u0000\u0000"+
+					"\u01ec\u01f0\b\u001b\u0000\u0000\u01ed\u01ee\u0005\\\u0000\u0000\u01ee"+
+					"\u01f0\t\u0000\u0000\u0000\u01ef\u01ec\u0001\u0000\u0000\u0000\u01ef\u01ed"+
+					"\u0001\u0000\u0000\u0000\u01f0\u01f3\u0001\u0000\u0000\u0000\u01f1\u01ef"+
+					"\u0001\u0000\u0000\u0000\u01f1\u01f2\u0001\u0000\u0000\u0000\u01f2\u01f4"+
+					"\u0001\u0000\u0000\u0000\u01f3\u01f1\u0001\u0000\u0000\u0000\u01f4\u0200"+
+					"\u0005\"\u0000\u0000\u01f5\u01fb\u0005\'\u0000\u0000\u01f6\u01fa\b\u001c"+
+					"\u0000\u0000\u01f7\u01f8\u0005\\\u0000\u0000\u01f8\u01fa\t\u0000\u0000"+
+					"\u0000\u01f9\u01f6\u0001\u0000\u0000\u0000\u01f9\u01f7\u0001\u0000\u0000"+
+					"\u0000\u01fa\u01fd\u0001\u0000\u0000\u0000\u01fb\u01f9\u0001\u0000\u0000"+
+					"\u0000\u01fb\u01fc\u0001\u0000\u0000\u0000\u01fc\u01fe\u0001\u0000\u0000"+
+					"\u0000\u01fd\u01fb\u0001\u0000\u0000\u0000\u01fe\u0200\u0005\'\u0000\u0000"+
+					"\u01ff\u01eb\u0001\u0000\u0000\u0000\u01ff\u01f5\u0001\u0000\u0000\u0000"+
+					"\u0200\u0082\u0001\u0000\u0000\u0000\u0201\u0205\u0007\u001d\u0000\u0000"+
+					"\u0202\u0204\u0007\u001e\u0000\u0000\u0203\u0202\u0001\u0000\u0000\u0000"+
+					"\u0204\u0207\u0001\u0000\u0000\u0000\u0205\u0203\u0001\u0000\u0000\u0000"+
+					"\u0205\u0206\u0001\u0000\u0000\u0000\u0206\u0084\u0001\u0000\u0000\u0000"+
+					"\u0207\u0205\u0001\u0000\u0000\u0000\u0208\u020a\u0007\u001f\u0000\u0000"+
+					"\u0209\u0208\u0001\u0000\u0000\u0000\u020a\u020b\u0001\u0000\u0000\u0000"+
+					"\u020b\u0209\u0001\u0000\u0000\u0000\u020b\u020c\u0001\u0000\u0000\u0000"+
+					"\u020c\u020d\u0001\u0000\u0000\u0000\u020d\u020e\u0006B\u0000\u0000\u020e"+
+					"\u0086\u0001\u0000\u0000\u0000\u020f\u0210\u0005/\u0000\u0000\u0210\u0211"+
+					"\u0005/\u0000\u0000\u0211\u0215\u0001\u0000\u0000\u0000\u0212\u0214\b"+
+					" \u0000\u0000\u0213\u0212\u0001\u0000\u0000\u0000\u0214\u0217\u0001\u0000"+
+					"\u0000\u0000\u0215\u0213\u0001\u0000\u0000\u0000\u0215\u0216\u0001\u0000"+
+					"\u0000\u0000\u0216\u0218\u0001\u0000\u0000\u0000\u0217\u0215\u0001\u0000"+
+					"\u0000\u0000\u0218\u0219\u0006C\u0001\u0000\u0219\u0088\u0001\u0000\u0000"+
+					"\u0000\u021a\u021b\u0005/\u0000\u0000\u021b\u021c\u0005*\u0000\u0000\u021c"+
+					"\u0220\u0001\u0000\u0000\u0000\u021d\u021f\t\u0000\u0000\u0000\u021e\u021d"+
+					"\u0001\u0000\u0000\u0000\u021f\u0222\u0001\u0000\u0000\u0000\u0220\u0221"+
+					"\u0001\u0000\u0000\u0000\u0220\u021e\u0001\u0000\u0000\u0000\u0221\u0223"+
+					"\u0001\u0000\u0000\u0000\u0222\u0220\u0001\u0000\u0000\u0000\u0223\u0224"+
+					"\u0005*\u0000\u0000\u0224\u0225\u0005/\u0000\u0000\u0225\u0226\u0001\u0000"+
+					"\u0000\u0000\u0226\u0227\u0006D\u0001\u0000\u0227\u008a\u0001\u0000\u0000"+
+					"\u0000\u0015\u0000\u01a2\u01be\u01c4\u01c6\u01ca\u01cf\u01d4\u01da\u01df"+
+					"\u01e4\u01e9\u01ef\u01f1\u01f9\u01fb\u01ff\u0205\u020b\u0215\u0220\u0002"+
+					"\u0000\u0001\u0000\u0006\u0000\u0000";
 	public static final ATN _ATN =
-		new ATNDeserializer().deserialize(_serializedATN.toCharArray());
+			new ATNDeserializer().deserialize(_serializedATN.toCharArray());
 	static {
 		_decisionToDFA = new DFA[_ATN.getNumberOfDecisions()];
 		for (int i = 0; i < _ATN.getNumberOfDecisions(); i++) {

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionVisitor.java

@@ -39,23 +39,15 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by the {@code AndExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitAndExpr(AlertExpressionParser.AndExprContext ctx);
 
-    /**
-     * Visit a parse tree produced by the {@code QueryExpr}
-     * labeled alternative in AlertExpressionParser#expr
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    T visitQueryExpr(AlertExpressionParser.QueryExprContext ctx);
-
     /**
      * Visit a parse tree produced by the {@code ComparisonExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -63,15 +55,31 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by the {@code UnlessExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx);
 
+    /**
+     * Visit a parse tree produced by the {@code SqlExpr}
+     * labeled alternative in {@link AlertExpressionParser#expr}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code SqlCallExpr}
+     * labeled alternative in {@link AlertExpressionParser#expr}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx);
+
     /**
      * Visit a parse tree produced by the {@code LiteralExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -79,26 +87,56 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by the {@code ParenExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitParenExpr(AlertExpressionParser.ParenExprContext ctx);
 
+    /**
+     * Visit a parse tree produced by the {@code PromqlCallExpr}
+     * labeled alternative in {@link AlertExpressionParser#expr}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx);
+
+    /**
+     * Visit a parse tree produced by the {@code PromqlExpr}
+     * labeled alternative in {@link AlertExpressionParser#expr}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx);
+
     /**
      * Visit a parse tree produced by the {@code OrExpr}
-     * labeled alternative in AlertExpressionParser#expr
+     * labeled alternative in {@link AlertExpressionParser#expr}.
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitOrExpr(AlertExpressionParser.OrExprContext ctx);
 
     /**
-     * Visit a parse tree produced by {@link AlertExpressionParser#identifier}.
+     * Visit a parse tree produced by {@link AlertExpressionParser#functionCall}.
      * @param ctx the parse tree
      * @return the visitor result
      */
-    T visitIdentifier(AlertExpressionParser.IdentifierContext ctx);
+    T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#parameterList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitParameterList(AlertExpressionParser.ParameterListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#parameter}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitParameter(AlertExpressionParser.ParameterContext ctx);
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#number}.
@@ -106,4 +144,179 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
      * @return the visitor result
      */
     T visitNumber(AlertExpressionParser.NumberContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#string}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitString(AlertExpressionParser.StringContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#duration}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitDuration(AlertExpressionParser.DurationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#functionName}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#selectSql}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#selectFieldList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#selectField}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitSelectField(AlertExpressionParser.SelectFieldContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#groupByList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitGroupByList(AlertExpressionParser.GroupByListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#orderByList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitOrderByList(AlertExpressionParser.OrderByListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#orderByField}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#limitClause}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#relList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitRelList(AlertExpressionParser.RelListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#relation}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitRelation(AlertExpressionParser.RelationContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#conditionList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitConditionList(AlertExpressionParser.ConditionListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#compOp}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCompOp(AlertExpressionParser.CompOpContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#condition}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitCondition(AlertExpressionParser.ConditionContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#conditionUnit}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#promql}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitPromql(AlertExpressionParser.PromqlContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#metricSelector}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherItem}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherOp}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#labelList}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitLabelList(AlertExpressionParser.LabelListContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#instantVectorOp}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#aggregationOperator}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#binaryOperator}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx);
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudSlsExternAlertService.java

@@ -0,0 +1,185 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.alert.dto.AlibabaCloudSlsExternAlert;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.ExternAlertService;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.IpDomainUtil;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * Alibaba Cloud 'Simple Log Service(SLS)'  external alarm service impl
+ */
+@Slf4j
+@Service
+public class AlibabaCloudSlsExternAlertService implements ExternAlertService {
+
+    private final AlarmCommonReduce alarmCommonReduce;
+
+    public AlibabaCloudSlsExternAlertService(AlarmCommonReduce alarmCommonReduce) {
+        this.alarmCommonReduce = alarmCommonReduce;
+    }
+
+    @Override
+    public void addExternAlert(String content) {
+        AlibabaCloudSlsExternAlert externAlert = JsonUtil.fromJson(content, AlibabaCloudSlsExternAlert.class);
+        if (externAlert == null) {
+            log.warn("Failure to parse external alert content. content: {}", content);
+            return;
+        }
+        SingleAlert singleAlert = new AlibabaCloudSlsConverter().convert(externAlert);
+        alarmCommonReduce.reduceAndSendAlarm(singleAlert);
+    }
+
+    @Override
+    public String supportSource() {
+        return "alibabacloud-sls";
+    }
+
+    /**
+     *
+     */
+    public static class AlibabaCloudSlsConverter {
+
+        /**
+         * convert
+         *
+         * @param externAlert alert content entity
+         * @return Single alert
+         */
+        public SingleAlert convert(AlibabaCloudSlsExternAlert externAlert) {
+            return SingleAlert.builder()
+                    .triggerTimes(1)
+                    .status(externAlert.getStatus())
+                    .startAt(Instant.ofEpochSecond(externAlert.getFireTime()).toEpochMilli())
+                    .activeAt(Instant.ofEpochSecond(externAlert.getAlertTime()).toEpochMilli())
+                    .endAt(convertResolveTime(externAlert.getStatus(), externAlert.getResolveTime()))
+                    .labels(buildLabels(externAlert))
+                    .annotations(buildAnnotations(externAlert))
+                    .content(formatContent(externAlert))
+                    .build();
+        }
+
+        /**
+         * todo i18n
+         *
+         * @param externAlert alert content entity
+         * @return content
+         */
+        private String formatContent(AlibabaCloudSlsExternAlert externAlert) {
+            // convet severity
+            Optional<AlibabaCloudSlsExternAlert.Severity> severity = AlibabaCloudSlsExternAlert.Severity.convert(externAlert.getSeverity());
+            // If the alarm state is resolved, the value is the specific recovery time.
+            Long resolveTimeMilli = convertResolveTime(externAlert.getStatus(), externAlert.getResolveTime());
+
+            return MessageFormat.format(
+            "AlibabaCloud-sls alert , {0} - [{1}], level: [{2}], desc: {3}, fire_time:{4}, resolve_time:{5}",
+                    externAlert.getAnnotation("title"),
+                    externAlert.getStatus(),
+                    severity.isPresent() ? severity.get().getAlias() : "N/A",
+                    externAlert.getAnnotation("desc"),
+                    timeSecondToDate(Instant.ofEpochSecond(externAlert.getFireTime()).toEpochMilli()),
+                    null != resolveTimeMilli ? timeSecondToDate(resolveTimeMilli) : "N/A"
+            );
+        }
+
+        /**
+         * Converts a timestamp (milliseconds) to a formatted date-time string.
+         *
+         * @param timestampMillis timestamp in milliseconds
+         * @return formatted date-time string in the pattern: yyyy-MM-dd HH:mm:ss
+         */
+        private String timeSecondToDate(long timestampMillis) {
+            LocalDateTime dateTime = LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(timestampMillis),
+                    ZoneId.systemDefault()
+            );
+            return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        }
+
+        /**
+         * Build basic annotations and fill annotations for alibaba cloud sls.
+         *
+         * @param externAlert alert content entity
+         * @return annotations
+         */
+        private Map<String, String> buildAnnotations(AlibabaCloudSlsExternAlert externAlert) {
+            Map<String, String> annotations = new HashMap<>(8);
+            Optional<AlibabaCloudSlsExternAlert.Severity> severity = AlibabaCloudSlsExternAlert.Severity.convert(externAlert.getSeverity());
+            severity.ifPresent(value -> annotations.put("severity", value.getAlias()));
+            // Notification templates for sls need to be configured.
+            if (StringUtils.isNotBlank(externAlert.getSigninUrl()) && IpDomainUtil.isHasSchema(externAlert.getSigninUrl())) {
+                annotations.put("signinUrl", "<a target=\"_blank\" href=\"" + externAlert.getSigninUrl() + "\">View Details</a>");
+            }
+            // Filling the annotations with the alibaba cloud sls.
+            if (null != externAlert.getAnnotations() && !externAlert.getAnnotations().isEmpty()) {
+                annotations.putAll(externAlert.getAnnotations());
+            }
+
+            return annotations;
+        }
+
+        /**
+         * Build basic labels and fill labels for alibaba cloud sls.
+         *
+         * @param externAlert alert content entity
+         * @return labels
+         */
+        private Map<String, String> buildLabels(AlibabaCloudSlsExternAlert externAlert) {
+            Map<String, String> labels = new HashMap<>(8);
+            labels.put("__source__", "alibabacloud-sls");
+            labels.put("alertname", externAlert.getAlertName());
+            labels.put("region", externAlert.getRegion());
+            // The project name is globally unique.
+            labels.put("project", externAlert.getProject());
+            // Filling the labels with the alibaba cloud sls.
+            if (null != externAlert.getLabels() && !externAlert.getLabels().isEmpty()){
+                labels.putAll(externAlert.getLabels());
+            }
+            return labels;
+        }
+
+        /**
+         * If the alarm status is firing, the value is 0.
+         * If the alarm state is resolved, the value is the specific recovery time.
+         *
+         * @param status alert status
+         * @param resolveTimeSecond recovery time
+         * @return milliseconds
+         */
+        private Long convertResolveTime(String status, int resolveTimeSecond) {
+            return CommonConstants.ALERT_STATUS_RESOLVED.equals(status) ? Instant.ofEpochSecond(resolveTimeSecond).toEpochMilli() : null;
+        }
+    }
+
+}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/DataSourceServiceImpl.java

@@ -87,12 +87,10 @@ public class DataSourceServiceImpl implements DataSourceService {
     }
 
     private List<Map<String, Object>> evaluate(String expr, QueryExecutor executor) {
-        ParseTree tree = expressionCache.get(expr, e -> {
-            CommonTokenStream tokens = tokenStreamCache.get(e, this::createTokenStream);
-            AlertExpressionParser parser = new AlertExpressionParser(tokens);
-            return parser.expr();
-        });
-        AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor);
+        CommonTokenStream tokens = tokenStreamCache.get(expr, this::createTokenStream);
+        AlertExpressionParser parser = new AlertExpressionParser(tokens);
+        ParseTree tree = expressionCache.get(expr, e -> parser.expr());
+        AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor, tokens);
         return visitor.visit(tree);
 
     }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/HuaweiCloudExternAlertService.java

@@ -0,0 +1,343 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.ExternAlertService;
+import org.apache.hertzbeat.alert.util.DateUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.support.exception.IgnoreException;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.Signature;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.text.MessageFormat;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.NOTIFICATION;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.SUBSCRIPTION;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.AlertType.UNSUBSCRIBE;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_MESSAGE;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_MESSAGE_ID;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_SUBJECT;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_SUBSCRIBE_URL;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TIMESTAMP;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TOPIC_URN;
+import static org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert.FIELD_TYPE;
+
+/**
+ * Huawei cloud external alarm service impl
+ */
+@Slf4j
+@Service
+public class HuaweiCloudExternAlertService implements ExternAlertService {
+
+    private static final String CERTIFICATE_TYPE = "X.509";
+
+    private static final String CHARSET_UTF8 = StandardCharsets.UTF_8.name();
+
+    private final AlarmCommonReduce alarmCommonReduce;
+
+    public HuaweiCloudExternAlertService(AlarmCommonReduce alarmCommonReduce) {
+        this.alarmCommonReduce = alarmCommonReduce;
+    }
+
+    @Override
+    public void addExternAlert(String content) {
+        HuaweiCloudExternAlert externAlert = JsonUtil.fromJson(content, HuaweiCloudExternAlert.class);
+        if (externAlert == null || StringUtils.isBlank(externAlert.getMessage())) {
+            log.warn("Failure to parse external alert content. content: {}", content);
+            return;
+        }
+        if (!isMessageValid(externAlert)) {
+            log.warn("Huawei cloud alert verify failed. content: {}", content);
+            return;
+        }
+        process(externAlert);
+    }
+
+    /**
+     * Process according to different types
+     *
+     * @param externAlert alert content entity
+     */
+    private void process(HuaweiCloudExternAlert externAlert) {
+        if (NOTIFICATION.getType().equals(externAlert.getType())) {
+            Optional.ofNullable(buildSendAlert(externAlert)).ifPresent(alarmCommonReduce::reduceAndSendAlarm);
+        } else if (SUBSCRIPTION.getType().equals(externAlert.getType())) {
+            autoSubscribeForUrl(externAlert.getSubscribeUrl());
+        } else if (UNSUBSCRIBE.getType().equals(externAlert.getType())) {
+            log.warn("Huawei cloud notifies the recipient of the notification to cancel the subscription.");
+        }
+    }
+
+    /**
+     * Build single alert.
+     *
+     * @param externAlert alert content entity
+     * @return single alert
+     */
+    private SingleAlert buildSendAlert(HuaweiCloudExternAlert externAlert) {
+        HuaweiCloudExternAlert.AlertMessage message = JsonUtil.fromJson(externAlert.getMessage(), HuaweiCloudExternAlert.AlertMessage.class);
+        if (null == message || null == message.getData()) {
+            log.warn("Failure to parse external alert message. message: {}", externAlert.getMessage());
+            return null;
+        }
+        // Note: Empty and false are both recovery notifications.
+        // Note: There are no recovery notifications for event types
+        boolean isAlarm = null != message.getData().getAlarm() && message.getData().getAlarm();
+        Long alarmTime = DateUtil.getZonedTimeStampFromFormat(message.getData().getAlarmTime(), "yyyy/MM/dd HH:mm:ss 'GMT'XXX");
+        return SingleAlert.builder()
+                .triggerTimes(1)
+                .status(isAlarm ? CommonConstants.ALERT_STATUS_FIRING : CommonConstants.ALERT_STATUS_RESOLVED)
+                .startAt(alarmTime)
+                .activeAt(Instant.now().toEpochMilli())
+                .endAt(isAlarm ? null : alarmTime)
+                .labels(buildLabels(message.getData()))
+                .annotations(buildAnnotations(message.getData()))
+                .content(formatContent(externAlert.getSubject(), message.getData()))
+                .build();
+    }
+
+    /**
+     * Build basic annotations and fill annotations for huawei cloud.
+     *
+     * @param alertData alert content entity
+     * @return annotations
+     */
+    private Map<String, String> buildAnnotations(HuaweiCloudExternAlert.AlertData alertData) {
+        Map<String, String> annotations = new HashMap<>(8);
+        if (null != alertData) {
+            putIfNotBlank(annotations, "region", alertData.getRegion());
+            putIfNotBlank(annotations, "dimensionName", alertData.getDimensionName());
+            putIfNotBlank(annotations, "resourceName", alertData.getResourceName());
+            putIfNotBlank(annotations, "alarmRecordId", alertData.getAlarmRecordId());
+        }
+        return annotations;
+    }
+
+    /**
+     * Build basic labels and fill labels for huawei cloud.
+     *
+     * @param alertData alert content entity
+     * @return labels
+     */
+    private Map<String, String> buildLabels(HuaweiCloudExternAlert.AlertData alertData) {
+        Map<String, String> labels = new HashMap<>(8);
+        labels.put("__source__", "huaweicloud-ces");
+        if (null != alertData) {
+            putIfNotBlank(labels, "namespace", alertData.getNamespace());
+            putIfNotBlank(labels, "metricName", alertData.getMetricName());
+            putIfNotBlank(labels, "resourceId", alertData.getResourceId());
+            putIfNotBlank(labels, "level", alertData.getAlarmLevel());
+        }
+        return labels;
+    }
+
+    /**
+     * todo i18n
+     *
+     * @param subject alert subject
+     * @param alertData alert content entity
+     * @return content
+     */
+    private String formatContent(String subject, HuaweiCloudExternAlert.AlertData alertData) {
+        if (null == alertData) {
+            return subject;
+        }
+        return MessageFormat.format(
+                "{0} threshold:{1}{2}, current：{3}",
+                subject,
+                alertData.getComparisonOperator(),
+                alertData.getValue(),
+                alertData.getCurrentData()
+        );
+    }
+
+    /**
+     * Automatic subscription url.
+     *
+     * @param subscribeUrl subscribeUrl
+     */
+    public void autoSubscribeForUrl(String subscribeUrl) {
+        if (StringUtils.isBlank(subscribeUrl)) {
+            return;
+        }
+        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
+            HttpGet httpGet = new HttpGet(subscribeUrl);
+            try (CloseableHttpResponse response = httpClient.execute(httpGet)) {
+                int statusCode = response.getStatusLine().getStatusCode();
+                String responseBody = EntityUtils.toString(response.getEntity());
+
+                if (statusCode != 200) {
+                    log.error("Subscribe url request failed with status code: " + statusCode + ", response: " + responseBody);
+                    return;
+                }
+                JsonNode jsonResponse = JsonUtil.fromJson(responseBody);
+                if (jsonResponse == null) {
+                    throw new IgnoreException("Subscribe url failed with status code: " + statusCode + ", response: " + responseBody);
+                }
+                JsonNode surnNode = jsonResponse.get("subscription_urn");
+                if (surnNode == null || StringUtils.isBlank(surnNode.asText())) {
+                    throw new IgnoreException("Subscribe url failed with status code: " + statusCode + ", response: " + responseBody);
+                }
+                log.info("Successfully subscribed to Huawei Cloud(SMN) url.");
+            }
+        } catch (Exception e) {
+            log.error("Failed to subscribe url request: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * Verifying the signature of huawei cloud alert message.
+     *
+     * @param externAlert alert content entity
+     * @return verification result
+     * @throws SecurityException thrown when validation fails
+     */
+    private boolean isMessageValid(HuaweiCloudExternAlert externAlert) {
+        try {
+            String signMessage = buildSignMessage(externAlert);
+            if (StringUtils.isBlank(signMessage)) {
+                throw new SecurityException("Verify sign message is null");
+            }
+            X509Certificate cert = getCertificate(externAlert.getSigningCertUrl());
+            return verifySignature(signMessage, cert, externAlert.getSignature());
+        } catch (Exception e) {
+            log.error("Failed to verify message signature: ", e);
+            return false;
+        }
+    }
+
+    /**
+     * Build sign message.
+     *
+     * @param externAlert alert content entity
+     * @return sign message
+     */
+    private String buildSignMessage(HuaweiCloudExternAlert externAlert) {
+        if (NOTIFICATION.getType().equals(externAlert.getType())) {
+            return buildNotificationMessage(externAlert);
+        } else if (SUBSCRIPTION.getType().equals(externAlert.getType()) || UNSUBSCRIBE.getType().equals(externAlert.getType())){
+            return buildSubscriptionMessage(externAlert);
+        }
+        return null;
+    }
+
+    /**
+     * Building sign message of 'Notification' type
+     *
+     * @param externAlert alert content entity
+     * @return sign message
+     */
+    private String buildNotificationMessage(HuaweiCloudExternAlert externAlert) {
+        StringBuilder message = new StringBuilder();
+        appendField(message, FIELD_MESSAGE, externAlert.getMessage());
+        appendField(message, FIELD_MESSAGE_ID, externAlert.getMessageId());
+        if (StringUtils.isNotBlank(externAlert.getSubject())) {
+            appendField(message, FIELD_SUBJECT, externAlert.getSubject());
+        }
+        appendField(message, FIELD_TIMESTAMP, externAlert.getTimestamp());
+        appendField(message, FIELD_TOPIC_URN, externAlert.getTopicUrn());
+        appendField(message, FIELD_TYPE, externAlert.getType());
+        return message.toString();
+    }
+
+    /**
+     * Building sign message of 'SubscriptionConfirmation' or 'UnsubscribeConfirmation' type
+     *
+     * @param externAlert alert content entity
+     * @return sign message
+     */
+    private String buildSubscriptionMessage(HuaweiCloudExternAlert externAlert) {
+        StringBuilder message = new StringBuilder();
+        appendField(message, FIELD_MESSAGE, externAlert.getMessage());
+        appendField(message, FIELD_MESSAGE_ID, externAlert.getMessageId());
+        appendField(message, FIELD_SUBSCRIBE_URL, externAlert.getSubscribeUrl());
+        appendField(message, FIELD_TIMESTAMP, externAlert.getTimestamp());
+        appendField(message, FIELD_TOPIC_URN, externAlert.getTopicUrn());
+        appendField(message, FIELD_TYPE, externAlert.getType());
+        return message.toString();
+    }
+
+    /**
+     * Obtain certificate
+     *
+     * @param signCertUrl sign cert url
+     * @return X509 certificate
+     * @throws Exception Thrown when certificate acquisition fails
+     */
+    private X509Certificate getCertificate(String signCertUrl) throws Exception {
+        URL url = new URL(signCertUrl);
+        try (InputStream in = url.openStream()) {
+            CertificateFactory cf = CertificateFactory.getInstance(CERTIFICATE_TYPE);
+            return (X509Certificate) cf.generateCertificate(in);
+        }
+    }
+
+    /**
+     * Verify signature
+     *
+     * @param message sign message
+     * @param cert cert
+     * @param signature signature
+     * @return verification result
+     * @throws Exception thrown when an error occurs in the validation process
+     */
+    private boolean verifySignature(String message, X509Certificate cert, String signature) throws Exception {
+        Signature sig = Signature.getInstance(cert.getSigAlgName());
+        sig.initVerify(cert.getPublicKey());
+        sig.update(message.getBytes(CHARSET_UTF8));
+        return sig.verify(Base64.getDecoder().decode(signature));
+    }
+
+    private void putIfNotBlank(Map<String, String> map, String key, String value) {
+        if (StringUtils.isNotBlank(value)){
+            map.put(key, value);
+        }
+    }
+
+    private void appendField(StringBuilder builder, String fieldName, String value) {
+        builder.append(fieldName).append("\n").append(value).append("\n");
+    }
+
+    @Override
+    public String supportSource() {
+        return "huaweicloud-ces";
+    }
+
+}

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/util/DateUtil.java

@@ -19,6 +19,7 @@ package org.apache.hertzbeat.alert.util;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.util.Optional;
@@ -80,4 +81,19 @@ public final class DateUtil {
         return Optional.empty();
     }
 
+    /**
+     * convert format data to timestamp
+     */
+    public static Long getZonedTimeStampFromFormat(String dateStr, String format) {
+        try {
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
+            // the parsed zoned date-time, not null
+            return ZonedDateTime.parse(dateStr, formatter).toInstant().toEpochMilli();
+        } catch (Exception e) {
+            log.error("Error parsing date '{}' with format '{}': {}",
+                    dateStr, format, e.getMessage());
+        }
+        return null;
+    }
+
 }

hertzbeat-alerter/src/main/resources/expr/AlertExpression.g4

@@ -22,36 +22,273 @@ expression
     ;
 
 expr
-    : '(' expr ')'                       # ParenExpr
-    | left=expr op=('>='|'<='|'>'|'<'|'=='|'!=') right=expr  # ComparisonExpr
-    | left=expr 'and' right=expr         # AndExpr
-    | left=expr 'unless' right=expr      # UnlessExpr
-    | left=expr 'or' right=expr          # OrExpr
-    | identifier                         # QueryExpr
-    | number                             # LiteralExpr
+    : LPAREN expr RPAREN                                          # ParenExpr
+    | left=expr op=(GE|LE|GT|LT|EQ|NE) right=expr                 # ComparisonExpr
+    | left=expr AND right=expr                                    # AndExpr
+    | left=expr UNLESS right=expr                                 # UnlessExpr
+    | left=expr OR right=expr                                     # OrExpr
+    | promql                                                      # PromqlExpr
+    | selectSql                                                   # SqlExpr
+    | number                                                      # LiteralExpr
+    | SQL_FUNCTION LPAREN string RPAREN                           # SqlCallExpr
+    | PROMQL_FUNCTION LPAREN string RPAREN                        # PromqlCallExpr
     ;
 
-// Lexer rules
-AND     : 'and' ;
-OR      : 'or' ;
-UNLESS  : 'unless' ;
-GT      : '>' ;
-GE      : '>=' ;
-LT      : '<' ;
-LE      : '<=' ;
-EQ      : '==' ;
-NE      : '!=' ;
-LPAREN  : '(' ;
-RPAREN  : ')' ;
+functionCall
+    : functionName LPAREN parameterList RPAREN
+    ;
 
-identifier
-    : IDENTIFIER
+parameterList
+    : parameter (COMMA parameter)*
+    ;
+
+parameter
+    : expr
+    | STAR
+    | string
+    | duration
     ;
 
 number
     : NUMBER
+    | FLOAT
+    | SCIENTIFIC_NUMBER
     ;
 
-IDENTIFIER : [a-zA-Z_] [a-zA-Z0-9_=～{}[\]".]*;
-NUMBER     : [0-9]+ ('.' [0-9]+)? ;
-WS         : [ \t\r\n]+ -> skip ;
+string
+    : STRING
+    ;
+
+duration
+    : DURATION
+    ;
+
+functionName
+    : COUNT
+    | AVG
+    | SUM
+    | MIN
+    | MAX
+    | RATE_FUNCTION
+    | INCREASE_FUNCTION
+    | HISTOGRAM_QUANTILE_FUNCTION
+    | BY_FUNCTION
+    | WITHOUT_FUNCTION
+    | GROUP_LEFT_FUNCTION
+    | GROUP_RIGHT_FUNCTION
+    | IGNORING_FUNCTION
+    | ON_FUNCTION
+    | IDENTIFIER
+    ;
+
+// SQL grammar for complex queries
+selectSql
+    : SELECT selectFieldList FROM relList (WHERE conditionList)?
+      (GROUP BY groupByList)? (HAVING conditionList)?
+      (ORDER BY orderByList)? (LIMIT limitClause)?
+    ;
+
+selectFieldList
+    : selectField (COMMA selectField)*
+    ;
+
+selectField
+    : functionCall (AS? IDENTIFIER)?
+    | IDENTIFIER (AS? IDENTIFIER)?
+    | STAR (AS? IDENTIFIER)?
+    | IDENTIFIER DOT IDENTIFIER (AS? IDENTIFIER)?
+    ;
+
+groupByList
+    : IDENTIFIER (COMMA IDENTIFIER)*
+    ;
+
+orderByList
+    : orderByField (COMMA orderByField)*
+    ;
+
+orderByField
+    : IDENTIFIER (ASC | DESC)?
+    | functionCall (ASC | DESC)?
+    ;
+
+limitClause
+    : NUMBER
+    ;
+
+relList
+    : relation (COMMA relation)*
+    ;
+
+relation
+    : IDENTIFIER (AS? IDENTIFIER)?
+    | LPAREN selectSql RPAREN AS IDENTIFIER
+    ;
+
+conditionList
+    : conditionList AND conditionList
+    | conditionList OR conditionList
+    | condition
+    | LPAREN conditionList RPAREN
+    ;
+
+compOp
+    : EQ | LT | GT | LE | GE | NE | LIKE | NOT LIKE | IN | NOT IN | IS | IS NOT
+    ;
+
+condition
+    : conditionUnit compOp conditionUnit
+    | LPAREN condition RPAREN
+    | IDENTIFIER BETWEEN number AND number
+    ;
+
+conditionUnit
+    : number
+    | string
+    | IDENTIFIER
+    | IDENTIFIER DOT IDENTIFIER
+    | NULL
+    | LPAREN selectSql RPAREN
+    | functionCall
+    ;
+
+// PromQL query expressions
+promql
+    : metricSelector instantVectorOp?
+    | aggregationOperator LPAREN promql (BY labelList)? RPAREN
+    | promql binaryOperator promql
+    | functionCall
+    | promql LBRACKET duration RBRACKET
+    | promql LBRACKET duration COLON duration RBRACKET
+    | promql OFFSET duration
+    | IDENTIFIER
+    ;
+
+metricSelector
+    : LBRACE labelMatcherList? RBRACE
+    ;
+
+labelMatcherList
+    : labelMatcherItem (COMMA labelMatcherItem)*
+    ;
+
+labelMatcherItem
+    : IDENTIFIER labelMatcherOp string
+    ;
+
+labelMatcherOp
+    : EQ | NE
+    ;
+
+labelList
+    : LPAREN IDENTIFIER (COMMA IDENTIFIER)* RPAREN
+    ;
+
+instantVectorOp
+    : LBRACKET duration RBRACKET
+    ;
+
+aggregationOperator
+    : SUM | AVG | COUNT | MIN | MAX | STDDEV | STDVAR | TOPK | BOTTOMK | QUANTILE
+    ;
+
+binaryOperator
+    : EQ | NE | GT | LT | GE | LE
+    | AND | OR | UNLESS
+    ;
+
+// Lexer rules
+
+// Boolean operators
+AND      : [Aa][Nn][Dd] ;
+OR       : [Oo][Rr] ;
+UNLESS   : [Uu][Nn][Ll][Ee][Ss][Ss] ;
+NOT      : [Nn][Oo][Tt] ;
+
+// SQL keywords
+SELECT  : [Ss][Ee][Ll][Ee][Cc][Tt] ;
+FROM    : [Ff][Rr][Oo][Mm] ;
+WHERE   : [Ww][Hh][Ee][Rr][Ee] ;
+GROUP   : [Gg][Rr][Oo][Uu][Pp] ;
+BY      : [Bb][Yy] ;
+HAVING  : [Hh][Aa][Vv][Ii][Nn][Gg] ;
+ORDER   : [Oo][Rr][Dd][Ee][Rr] ;
+LIMIT   : [Ll][Ii][Mm][Ii][Tt] ;
+OFFSET  : [Oo][Ff][Ff][Ss][Ee][Tt] ;
+AS      : [Aa][Ss] ;
+ASC     : [Aa][Ss][Cc] ;
+DESC    : [Dd][Ee][Ss][Cc] ;
+IN      : [Ii][Nn] ;
+IS      : [Ii][Ss] ;
+NULL    : [Nn][Uu][Ll][Ll] ;
+LIKE    : [Ll][Ii][Kk][Ee] ;
+BETWEEN : [Bb][Ee][Tt][Ww][Ee][Ee][Nn] ;
+STAR    : '*' ;
+
+// Aggregate functions
+COUNT   : [Cc][Oo][Uu][Nn][Tt] ;
+SUM     : [Ss][Uu][Mm] ;
+AVG     : [Aa][Vv][Gg] ;
+MIN     : [Mm][Ii][Nn] ;
+MAX     : [Mm][Aa][Xx] ;
+STDDEV  : [Ss][Tt][Dd][Dd][Ee][Vv] ;
+STDVAR  : [Ss][Tt][Dd][Vv][Aa][Rr] ;
+VARIANCE: [Vv][Aa][Rr][Ii][Aa][Nn][Cc][Ee] ;
+
+// PromQL specific functions
+RATE_FUNCTION    : [Rr][Aa][Tt][Ee] ;
+INCREASE_FUNCTION: [Ii][Nn][Cc][Rr][Ee][Aa][Ss][Ee] ;
+HISTOGRAM_QUANTILE_FUNCTION: [Hh][Ii][Ss][Tt][Oo][Gg][Rr][Aa][Mm] '_' [Qq][Uu][Aa][Nn][Tt][Ii][Ll][Ee] ;
+TOPK    : [Tt][Oo][Pp][Kk] ;
+BOTTOMK : [Bb][Oo][Tt][Tt][Oo][Mm][Kk] ;
+QUANTILE: [Qq][Uu][Aa][Nn][Tt][Ii][Ll][Ee] ;
+BY_FUNCTION: [Bb][Yy] ;
+WITHOUT_FUNCTION: [Ww][Ii][Tt][Hh][Oo][Uu][Tt] ;
+GROUP_LEFT_FUNCTION: [Gg][Rr][Oo][Uu][Pp] '_' [Ll][Ee][Ff][Tt] ;
+GROUP_RIGHT_FUNCTION: [Gg][Rr][Oo][Uu][Pp] '_' [Rr][Ii][Gg][Hh][Tt] ;
+IGNORING_FUNCTION: [Ii][Gg][Nn][Oo][Rr][Ii][Nn][Gg] ;
+ON_FUNCTION: [Oo][Nn] ;
+
+// Other functions
+SQL_FUNCTION: [Ss][Qq][Ll] ;
+PROMQL_FUNCTION: [Pp][Rr][Oo][Mm][Qq][Ll] ;
+
+// Comparison operators
+GT      : '>' ;
+GE      : '>=' ;
+LT      : '<' ;
+LE      : '<=' ;
+EQ      : '==' | '=' ;
+NE      : '!=' ;
+
+// Delimiters
+LPAREN  : '(' ;
+RPAREN  : ')' ;
+LBRACE  : '{' ;
+RBRACE  : '}' ;
+LBRACKET: '[' ;
+RBRACKET: ']' ;
+COMMA   : ',' ;
+DOT     : '.' ;
+COLON   : ':' ;
+SEMICOLON: ';' ;
+
+// number formats
+SCIENTIFIC_NUMBER: [0-9]+ ('.' [0-9]+)? [eE] [+-]? [0-9]+ ;
+FLOAT           : [0-9]+ '.' [0-9]+ ;
+NUMBER          : [0-9]+ ;
+
+// Duration literals for PromQL (e.g., 5m, 1h, 30s)
+DURATION        : [0-9]+ [a-zA-Z]+ ;
+
+// String literals
+STRING          : '"' (~["\r\n\\] | '\\' .)* '"'
+                | '\'' (~['\r\n\\] | '\\' .)* '\'' ;
+
+// Identifiers and metric names
+IDENTIFIER      : [a-zA-Z_] [a-zA-Z0-9_=～{}[\]".~-]* ;
+
+// Whitespace and comments
+WS              : [ \t\r\n]+ -> channel(HIDDEN) ;
+LINE_COMMENT    : '//' ~[\r\n]* -> skip ;
+BLOCK_COMMENT   : '/*' .*? '*/' -> skip ;

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculatorMatchTest.java

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

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitorTest.java

@@ -38,76 +38,130 @@ import static org.mockito.Mockito.when;
 class AlertExpressionEvalVisitorTest {
 
     private QueryExecutor mockExecutor;
-    private AlertExpressionEvalVisitor visitor;
 
     @BeforeEach
     void setUp() {
         mockExecutor = Mockito.mock(QueryExecutor.class);
-        visitor = new AlertExpressionEvalVisitor(mockExecutor);
     }
 
     @Test
     void testGreaterThan() {
         when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80.0))));
+        when(mockExecutor.execute("select cpu from cpu_table where id = 1")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 80.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("cpu > 70");
         assertEquals(1, result.size());
         assertEquals(80.0, result.get(0).get("__value__"));
+        //sql
+        result = evaluate("(select cpu from cpu_table where id = 1) > 70");
+        assertEquals(1, result.size());
+        assertEquals(80.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testGreaterThanWithInteger() {
         when(mockExecutor.execute("cpu")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80))));
+        when(mockExecutor.execute("select cpu_usage from system_metrics where host = 'server1'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 80))));
+        // promql
         List<Map<String, Object>> result = evaluate("cpu > 70");
         assertEquals(1, result.size());
         assertEquals(80, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select cpu_usage from system_metrics where host = 'server1') > 70");
+        assertEquals(1, result.size());
+        assertEquals(80, result.get(0).get("__value__"));
     }
 
     @Test
     void testLessThan() {
         when(mockExecutor.execute("memory")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 65.0))));
+        when(mockExecutor.execute("select memory_usage from memory_table where instance = 'web1'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 65.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("memory < 70");
         assertEquals(1, result.size());
         assertEquals(65.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select memory_usage from memory_table where instance = 'web1') < 70");
+        assertEquals(1, result.size());
+        assertEquals(65.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testEqualWithTolerance() {
         when(mockExecutor.execute("disk")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 99.999))));
+        when(mockExecutor.execute("select disk_usage from storage_metrics where partition = '/'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 99.999))));
+        // promql
         List<Map<String, Object>> result = evaluate("disk == 100");
         assertEquals(1, result.size());
         assertNull(result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select disk_usage from storage_metrics where partition = '/') == 100");
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
     }
 
     @Test
     void testNotEqual() {
         when(mockExecutor.execute("network")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
+        when(mockExecutor.execute("select bandwidth from network_stats where interface = 'eth0'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 50.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("network != 60");
         assertEquals(1, result.size());
         assertEquals(50.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select bandwidth from network_stats where interface = 'eth0') != 60");
+        assertEquals(1, result.size());
+        assertEquals(50.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testExactlyEqual() {
         when(mockExecutor.execute("threshold")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 100.0))));
+        when(mockExecutor.execute("select alert_threshold from alert_config where rule_id = 'cpu_high'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 100.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("threshold == 100");
         assertEquals(1, result.size());
         assertEquals(100.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select alert_threshold from alert_config where rule_id = 'cpu_high') == 100");
+        assertEquals(1, result.size());
+        assertEquals(100.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testMaxValueBoundary() {
         when(mockExecutor.execute("max_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MAX_VALUE))));
+        when(mockExecutor.execute("select max_value from boundary_test where test_case = 'extreme'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", Double.MAX_VALUE))));
+        // promql
         List<Map<String, Object>> result = evaluate("max_val > 100");
         assertEquals(1, result.size());
         assertEquals(Double.MAX_VALUE, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select max_value from boundary_test where test_case = 'extreme') > 100");
+        assertEquals(1, result.size());
+        assertEquals(Double.MAX_VALUE, result.get(0).get("__value__"));
     }
 
     @Test
     void testMinValueBoundary() {
         when(mockExecutor.execute("min_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", Double.MIN_VALUE))));
+        when(mockExecutor.execute("select min_value from boundary_test where test_case = 'minimal'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", Double.MIN_VALUE))));
+        // promql
         List<Map<String, Object>> result = evaluate("min_val > 0");
         assertEquals(1, result.size());
         assertEquals(Double.MIN_VALUE, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select min_value from boundary_test where test_case = 'minimal') > 0");
+        assertEquals(1, result.size());
+        assertEquals(Double.MIN_VALUE, result.get(0).get("__value__"));
     }
 
     @Test
@@ -121,25 +175,46 @@ class AlertExpressionEvalVisitorTest {
     @Test
     void testListValueWithMax() {
         when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
+        when(mockExecutor.execute("select values from multi_metrics where group_id = 'test_group'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
+        // promql
         List<Map<String, Object>> result = evaluate("multi_val > 25");
         assertEquals(1, result.size());
         assertEquals(30.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select values from multi_metrics where group_id = 'test_group') > 25");
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testListValueWithMin() {
         when(mockExecutor.execute("multi_val")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
+        when(mockExecutor.execute("select response_times from performance_data where service = 'api'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
+        // promql
         List<Map<String, Object>> result = evaluate("multi_val < 15");
         assertEquals(1, result.size());
         assertEquals(10.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select response_times from performance_data where service = 'api') < 15");
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
     }
 
     @Test
     void testEmptyListValue() {
         when(mockExecutor.execute("empty_list")).thenReturn(List.of(new HashMap<>(Map.of("__value__", List.of()))));
+        when(mockExecutor.execute("select error_codes from error_log where date = '2024-01-01'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", List.of()))));
+        // promql
         List<Map<String, Object>> result = evaluate("empty_list > 50");
         assertEquals(1, result.size());
         assertNull(result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select error_codes from error_log where date = '2024-01-01') > 50");
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
     }
 
     @Test
@@ -147,9 +222,22 @@ class AlertExpressionEvalVisitorTest {
         when(mockExecutor.execute("a")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 10.0))));
         when(mockExecutor.execute("b")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 20.0))));
         when(mockExecutor.execute("c")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 30.0))));
+        when(mockExecutor.execute("select cpu from server_a where region = 'us-east'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 10.0))));
+        when(mockExecutor.execute("select memory from server_b where region = 'us-west'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 20.0))));
+        when(mockExecutor.execute("select disk from server_c where region = 'eu-central'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 30.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("(a > 5) and (b > 15 or c < 25)");
         assertEquals(1, result.size());
         assertEquals(10.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("((select cpu from server_a where region = 'us-east') > 5)"
+                + " and ((select memory from server_b where region = 'us-west') > 15"
+                + " or (select disk from server_c where region = 'eu-central') < 25)");
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
     }
 
     @Test
@@ -157,9 +245,22 @@ class AlertExpressionEvalVisitorTest {
         when(mockExecutor.execute("metric1")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 40.0))));
         when(mockExecutor.execute("metric2")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 50.0))));
         when(mockExecutor.execute("metric3")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 60.0))));
+        when(mockExecutor.execute("select cpu_usage from metrics where service = 'web'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 40.0))));
+        when(mockExecutor.execute("select memory_usage from metrics where service = 'db'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 50.0))));
+        when(mockExecutor.execute("select disk_usage from metrics where service = 'cache'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 60.0))));
+        // promql
         List<Map<String, Object>> result = evaluate("metric1 > 30 unless metric2 > 45 unless metric3 < 70");
         assertEquals(1, result.size());
         assertNull(result.get(0).get("__value__"));
+        // sql
+        result = evaluate("(select cpu_usage from metrics where service = 'web') > 30"
+                + " unless (select memory_usage from metrics where service = 'db') > 45"
+                + " unless (select disk_usage from metrics where service = 'cache') < 70");
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
     }
 
     @Test
@@ -167,15 +268,215 @@ class AlertExpressionEvalVisitorTest {
         when(mockExecutor.execute("cpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 75.0))));
         when(mockExecutor.execute("gpu_temp")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 85.0))));
         when(mockExecutor.execute("fan_speed")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 2000.0))));
+        when(mockExecutor.execute("select cpu_temperature from hardware_metrics where component = 'cpu'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 75.0))));
+        when(mockExecutor.execute("select gpu_temperature from hardware_metrics where component = 'gpu'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 85.0))));
+        when(mockExecutor.execute("select fan_rpm from hardware_metrics where component = 'fan'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 2000.0))));
 
+        // promql
         List<Map<String, Object>> result = evaluate("(cpu_temp > 70 and gpu_temp < 90) or fan_speed > 1500");
         assertEquals(1, result.size());
         assertEquals(75.0, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("((select cpu_temperature from hardware_metrics where component = 'cpu') > 70"
+                + " and (select gpu_temperature from hardware_metrics where component = 'gpu') < 90)"
+                + " or (select fan_rpm from hardware_metrics where component = 'fan') > 1500");
+        assertEquals(1, result.size());
+        assertEquals(75.0, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlAggregateCount() {
+        when(mockExecutor.execute("select count(*) from cpu_metrics where host = 'server1'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 150))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from cpu_metrics where host = 'server1') > 100");
+        assertEquals(1, result.size());
+        assertEquals(150, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlAggregateAvg() {
+        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where region = 'us-east'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 75.5))));
+        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where region = 'us-east') > 70");
+        assertEquals(1, result.size());
+        assertEquals(75.5, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlAggregateSum() {
+        when(mockExecutor.execute("select sum(memory_used) from memory_stats where service = 'web'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 2048.0))));
+        List<Map<String, Object>> result = evaluate("(select sum(memory_used) from memory_stats where service = 'web') < 3000");
+        assertEquals(1, result.size());
+        assertEquals(2048.0, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlAggregateMaxMin() {
+        when(mockExecutor.execute("select max(response_time) from api_metrics where endpoint = '/api/users'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 250.0))));
+        when(mockExecutor.execute("select min(response_time) from api_metrics where endpoint = '/api/users'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 50.0))));
+        
+        List<Map<String, Object>> result = evaluate("(select max(response_time) from api_metrics where endpoint = '/api/users') > 200");
+        assertEquals(1, result.size());
+        assertEquals(250.0, result.get(0).get("__value__"));
+        
+        result = evaluate("(select min(response_time) from api_metrics where endpoint = '/api/users') < 100");
+        assertEquals(1, result.size());
+        assertEquals(50.0, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlGroupBy() {
+        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where timestamp > '2024-01-01' group by host")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 80.5))));
+        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where timestamp > '2024-01-01' group by host) > 75");
+        assertEquals(1, result.size());
+        assertEquals(80.5, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlGroupByHaving() {
+        when(mockExecutor.execute("select count(*) from error_logs where level = 'ERROR' group by service having count(*) > 10")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 25))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from error_logs where level = 'ERROR' group by service having count(*) > 10) > 20");
+        assertEquals(1, result.size());
+        assertEquals(25, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlOrderByLimit() {
+        when(mockExecutor.execute("select cpu_usage from system_metrics where host like 'web%' order by cpu_usage desc limit 1")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 95.2))));
+        List<Map<String, Object>> result = evaluate("(select cpu_usage from system_metrics where host like 'web%' order by cpu_usage desc limit 1) > 90");
+        assertEquals(1, result.size());
+        assertEquals(95.2, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlMultipleColumns() {
+        when(mockExecutor.execute("select avg(cpu_usage), max(memory_usage) from system_metrics where region = 'us-west'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 65.8))));
+        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage), max(memory_usage) from system_metrics where region = 'us-west') < 70");
+        assertEquals(1, result.size());
+        assertEquals(65.8, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlSubquery() {
+        when(mockExecutor.execute("select avg(cpu_usage) from system_metrics where host in (select host from active_servers where status = 'running')")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 72.3))));
+        List<Map<String, Object>> result = evaluate("(select avg(cpu_usage) from system_metrics where host in (select host from active_servers where status = 'running')) > 70");
+        assertEquals(1, result.size());
+        assertEquals(72.3, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlComplexSubquery() {
+        when(mockExecutor.execute("select count(*) from alerts where severity = 'HIGH' and service_id in (select id from services where category = 'critical')")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 8))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from alerts where severity = 'HIGH' and service_id in (select id from services where category = 'critical')) >= 5");
+        assertEquals(1, result.size());
+        assertEquals(8, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlWithJoins() {
+        when(mockExecutor.execute("select avg(m.cpu_usage) from metrics m, servers s where m.server_id = s.id and s.environment = 'production'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 78.9))));
+        List<Map<String, Object>> result = evaluate("(select avg(m.cpu_usage) from metrics m, servers s where m.server_id = s.id and s.environment = 'production') < 80");
+        assertEquals(1, result.size());
+        assertEquals(78.9, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlBetweenCondition() {
+        when(mockExecutor.execute("select count(*) from performance_logs where response_time between 100 and 500")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 1200))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from performance_logs where response_time between 100 and 500) > 1000");
+        assertEquals(1, result.size());
+        assertEquals(1200, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlComplexGroupByOrderBy() {
+        when(mockExecutor.execute("select service, avg(response_time) from api_metrics where timestamp > '2024-01-01'"
+                + " group by service order by avg(response_time) desc limit 5")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 180.5))));
+        List<Map<String, Object>> result = evaluate("(select service, avg(response_time) from api_metrics where timestamp > '2024-01-01'"
+                + " group by service order by avg(response_time) desc limit 5) > 150");
+        assertEquals(1, result.size());
+        assertEquals(180.5, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlVarianceStddev() {
+        when(mockExecutor.execute("select stddev(cpu_usage) from system_metrics where host = 'db-server' and timestamp > '2024-01-01'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 12.5))));
+        List<Map<String, Object>> result = evaluate("(select stddev(cpu_usage) from system_metrics where host = 'db-server' and timestamp > '2024-01-01') < 15");
+        assertEquals(1, result.size());
+        assertEquals(12.5, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlNestedAggregation() {
+        when(mockExecutor.execute("select max(daily_avg) from (select date, avg(cpu_usage) as daily_avg from system_metrics group by date) as daily_stats")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 88.7))));
+        List<Map<String, Object>> result = evaluate("(select max(daily_avg) from (select date, avg(cpu_usage) as daily_avg from system_metrics group by date) as daily_stats) > 85");
+        assertEquals(1, result.size());
+        assertEquals(88.7, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlComplexWhereConditions() {
+        when(mockExecutor.execute("select count(*) from alerts where (severity = 'HIGH' or severity = 'CRITICAL') and status = 'ACTIVE' and created_at > '2024-01-01'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 42))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from alerts where (severity = 'HIGH' or severity = 'CRITICAL') and status = 'ACTIVE' and created_at > '2024-01-01') != 50");
+        assertEquals(1, result.size());
+        assertEquals(42, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlWithNullChecks() {
+        when(mockExecutor.execute("select count(*) from system_metrics where cpu_usage is not null and memory_usage is not null")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 9876))));
+        List<Map<String, Object>> result = evaluate("(select count(*) from system_metrics where cpu_usage is not null and memory_usage is not null) > 9000");
+        assertEquals(1, result.size());
+        assertEquals(9876, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlMultipleAggregatesWithAlias() {
+        when(mockExecutor.execute("select max(cpu_usage) as max_cpu, min(cpu_usage) as min_cpu, avg(cpu_usage) as avg_cpu from system_metrics where region = 'asia'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 92.1))));
+        List<Map<String, Object>> result = evaluate("(select max(cpu_usage) as max_cpu, min(cpu_usage) as min_cpu, avg(cpu_usage) as avg_cpu from system_metrics where region = 'asia') > 90");
+        assertEquals(1, result.size());
+        assertEquals(92.1, result.get(0).get("__value__"));
+    }
+
+    @Test
+    void testSqlAndPromqlCallExpr() {
+        when(mockExecutor.execute("sum(rate(http_requests_total{job='your-service'}[1m]))")).thenReturn(List.of(new HashMap<>(Map.of("__value__", 80))));
+        when(mockExecutor.execute("select cpu_usage from system_metrics where host = 'server1'")).thenReturn(
+                List.of(new HashMap<>(Map.of("__value__", 80))));
+        // promql
+        List<Map<String, Object>> result = evaluate("promql(\"sum(rate(http_requests_total{job='your-service'}[1m]))\") > 70");
+        assertEquals(1, result.size());
+        assertEquals(80, result.get(0).get("__value__"));
+        // sql
+        result = evaluate("sql(\"select cpu_usage from system_metrics where host = 'server1'\") > 70");
+        assertEquals(1, result.size());
+        assertEquals(80, result.get(0).get("__value__"));
     }
 
     private List<Map<String, Object>> evaluate(String expression) {
         AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expression));
-        AlertExpressionParser parser = new AlertExpressionParser(new CommonTokenStream(lexer));
-        return visitor.visit(parser.expression());
+        CommonTokenStream tokens = new CommonTokenStream(lexer);
+        AlertExpressionParser parser = new AlertExpressionParser(tokens);
+        return new AlertExpressionEvalVisitor(mockExecutor, tokens).visit(parser.expression());
     }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlibabaCloudSlsExternAlertServiceTest.java

@@ -0,0 +1,152 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service;
+
+
+import org.apache.hertzbeat.alert.dto.AlibabaCloudSlsExternAlert;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.impl.AlibabaCloudSlsExternAlertService;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * unit test for {@link AlibabaCloudSlsExternAlertServiceTest }
+ */
+@Disabled
+@ExtendWith(MockitoExtension.class)
+public class AlibabaCloudSlsExternAlertServiceTest {
+
+    @Mock
+    private AlarmCommonReduce alarmCommonReduce;
+
+    @InjectMocks
+    private AlibabaCloudSlsExternAlertService externAlertService;
+
+    @Test
+    void testAddExternAlertWithInvalidContent() {
+        String invalidContent = "invalid json";
+        externAlertService.addExternAlert(invalidContent);
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlert() {
+        String source = externAlertService.supportSource();
+        assertEquals("alibabacloud-sls", source);
+
+        AlibabaCloudSlsExternAlert externAlert = new AlibabaCloudSlsExternAlert();
+        externAlert.setAlertName("Test SLS alert");
+        externAlert.setFireTime((int) Instant.now().getEpochSecond());
+        externAlert.setAlertTime((int) Instant.now().getEpochSecond());
+        externAlert.setRegion("cn-hangzhou");
+        externAlert.setProject("project");
+        externAlert.setStatus("firing");
+        externAlert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
+
+        Map<String, String> labels = new HashMap<>();
+        labels.put("labels-k", "labels-v");
+        externAlert.setLabels(labels);
+
+        Map<String, String> annotations = new HashMap<>();
+        annotations.put("annotations-k", "annotations-v");
+        externAlert.setAnnotations(annotations);
+
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlertWithSigninUrl() {
+        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
+        alert.setAlertName("Test Alert");
+        alert.setFireTime((int) Instant.now().getEpochSecond());
+        alert.setAlertTime((int) Instant.now().getEpochSecond());
+        alert.setRegion("cn-hangzhou");
+        alert.setProject("test-project");
+        alert.setStatus("firing");
+        alert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
+        alert.setSigninUrl("https://example.com");
+        externAlertService.addExternAlert(JsonUtil.toJson(alert));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlertWithDifferentSeverityLevels() {
+        for (AlibabaCloudSlsExternAlert.Severity severity : AlibabaCloudSlsExternAlert.Severity.values()) {
+            AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
+            alert.setAlertName("Test Alert");
+            alert.setFireTime((int) Instant.now().getEpochSecond());
+            alert.setAlertTime((int) Instant.now().getEpochSecond());
+            alert.setRegion("cn-hangzhou");
+            alert.setProject("test-project");
+            alert.setStatus("firing");
+            alert.setSeverity(severity.getStatus());
+            externAlertService.addExternAlert(JsonUtil.toJson(alert));
+        }
+        verify(alarmCommonReduce, times(AlibabaCloudSlsExternAlert.Severity.values().length))
+                .reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlertWithEmptyLabelsAndAnnotations() {
+        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
+        alert.setAlertName("Test Alert");
+        alert.setFireTime((int) Instant.now().getEpochSecond());
+        alert.setAlertTime((int) Instant.now().getEpochSecond());
+        alert.setRegion("cn-hangzhou");
+        alert.setProject("test-project");
+        alert.setStatus("firing");
+        alert.setSeverity(AlibabaCloudSlsExternAlert.Severity.HIGH.getStatus());
+        alert.setLabels(new HashMap<>());
+        alert.setAnnotations(new HashMap<>());
+        externAlertService.addExternAlert(JsonUtil.toJson(alert));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlertWithInvalidSeverity() {
+        AlibabaCloudSlsExternAlert alert = new AlibabaCloudSlsExternAlert();
+        alert.setAlertName("Test Alert");
+        alert.setFireTime((int) Instant.now().getEpochSecond());
+        alert.setAlertTime((int) Instant.now().getEpochSecond());
+        alert.setRegion("cn-hangzhou");
+        alert.setProject("test-project");
+        alert.setStatus("firing");
+        alert.setSeverity(-99);
+        externAlertService.addExternAlert(JsonUtil.toJson(alert));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/HuaweiCloudExternAlertServiceTest.java

@@ -0,0 +1,154 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service;
+
+import org.apache.hertzbeat.alert.dto.HuaweiCloudExternAlert;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.impl.HuaweiCloudExternAlertService;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * unit test for {@link AlibabaCloudSlsExternAlertServiceTest }
+ */
+@Disabled
+@ExtendWith(MockitoExtension.class)
+public class HuaweiCloudExternAlertServiceTest {
+
+    @Mock
+    private AlarmCommonReduce alarmCommonReduce;
+
+    @InjectMocks
+    private HuaweiCloudExternAlertService externAlertService;
+
+    @BeforeEach
+    void setUp() {
+        assertEquals("huaweicloud-ces", externAlertService.supportSource());
+    }
+
+    @Test
+    void testAddExternAlertWithInvalidContent() {
+        String invalidContent = "invalid json";
+        externAlertService.addExternAlert(invalidContent);
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testMessageValidFailed() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
+        externAlert.setType("failedType");
+        externAlert.setMessage("failedMessage");
+        externAlert.setTimestamp("2025-06-07T15:12:09Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testCertFailed() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSignature("TImrLoeb0tV1JZJSPyA0rpC9mNqH3MmhwQ4tgpuHHa+JztfGVZFvkU//OthKKhzpDAoYiXOYG9DbzXCLb"
+                + "vaGePIRITakoynYyYr9zZIpdx9jXhQNlgF8np1+t0JxNeoIq0DYWgH52tsodwqOm+OnmkcHwCRo/1rFv85KrKAaX2gy3sNwX"
+                + "w1hKnAwAw0mJlxHHSf/N3+7j6GoxCNV7fN9K4CpJiLMGNvUa7zVmG0U9mPvt/7Lac155kPPQ9lYyeL7vVI0e4sfRbuQruz3E"
+                + "0ZP40TKx0afoeR0/Bx/IoZzRP1La7pKlbEISvkcM7TqW/IOGQTkhVsQ32RFRxZWO2snw==");
+        externAlert.setSubject("[华为云][紧急告警恢复]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已恢复正常。");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
+        externAlert.setType("Notification");
+        externAlert.setMessage("{}");
+        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/failedUrl");
+        externAlert.setTimestamp("2025-06-07T15:12:09Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testAddExternAlert() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSignature("Igs0bBhzw0JGmlgBH+9ejw2xWfPTXjAatAEsKDkkWcC5bZ/jveckdRZdgp/S0JER9eiJfMF427YDABufIN0sv/vBRXaRQKfRBLTJYbSTl+AQpEbIW5yUfJSRLEG3HNEhUDjASolbrW7zdPCoGkkqjifE23FCvw"
+                + "+4tewMzqmHnfJHcFBq3W89CJzdPBjwO1UcY9C39moUZgqZk+qDVLpxb4bHSrEYAwPOSrOPR7TZpETJ30UOgFYajJydQk692edfs0NeVutHoQiOJ5/YC83ULHft0aXhichjtfZE4KF69nROAKez0ubk3l"
+                + "Ey/mBIM9Ylbxn5b84OIrzzZQrIWe8Syw==");
+        externAlert.setSubject("[华为云][紧急告警]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已触发告警。");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("1565df032a19494590d61e05f7b0dc0e");
+        externAlert.setType("Notification");
+        externAlert.setMessage("{\"version\":\"v1\",\"data\":{\"AccountName\":\"hid_hk6tij5o1v-95zn\",\"Namespace\":\"分布式缓存服务\",\"DimensionName\":\"DCS Redis实例\",\"ResourceName\""
+                + ":\"dcs-h4tv\",\"MetricName\":\"每秒并发操作数\",\"IsAlarm\":true,\"AlarmLevel\":\"紧急\",\"Region\":\"华东-上海一\",\"RegionId\":\"cn-east-3\",\"ResourceId\":\"3dc7b9ea"
+                + "-70b4-4c38-942d-e2636e6d844c\",\"PrivateIp\":\"192.168.0.54\",\"CurrentData\":\"6.00 count\",\"AlarmTime\":\"2025/06/02 22:56:15 GMT+08:00\","
+                + "\"AlarmRecordID\":\"ah1748876175242njvndyzMZ\","
+                + "\"AlarmRuleName\":\"alarm-c5jj\",\"IsOriginalValue\":true,\"Filter\":\"原始值\",\"ComparisonOperator\":\"\\u003e\",\"Value\":\"5 count\",\"Unit\":\"count\",\"Count\":2}}");
+        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
+        externAlert.setTimestamp("2025-06-02T14:56:17Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testSubscriptionUrl() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSubscribeUrl("https://console.huaweicloud.com/smn/subscription/confirm?token=477a784601d744e4ab9ab83986502d31c4b938"
+                + "0ec0b64392b134e517c3aa17eb7b3a12dc9f3b4ab495e61c4dee654b435d7223ea934345bf8ae8901cef912b1d&topic_urn=urn:smn:cn-north-4"
+                + ":477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX&region=cn-north-4");
+        externAlert.setSignature("ottf37C/2RdDgqimRQMIBU6i7XjUfPPMU760jJn71wwP3825YPoIT22uw2A9399rkm9Jrt1qUEFrDLuA5yHFLd5n/XoM4FghIgyFn7VIfgpuVM31a+co78s"
+                + "YBiZ1egOCE/AwFm2oygRhfIceUj9Kw9vmc06el9TXY6RtE5tAEF6qEmICtTh45KwtCO/WRs3DY72dQi5hm0w7/tktS4WFZ1iP4LHt5eCwFvnH0u29Y96cJNI0fLUQxI5MkhgjK"
+                + "77JkFK7UT6ZYJZhzgSp/B7OQGStOQx+3Duvx4T4CzccZQM3sca81Z0B0GFGWeVXuEHyCPLsayY/Iz+5Tco51elT8w==");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("242fac183d3a4936b5ead6c725a32ed0");
+        externAlert.setType("SubscriptionConfirmation");
+        externAlert.setMessage("You are invited to subscribe to topic: urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:"
+                + "CES_notification_group_bngJ2aMpX. To confirm this subscription, please visit the subscribe_url included in this message. The subscribe_url is valid only within 48 hours.");
+        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
+        externAlert.setTimestamp("2025-06-07T15:07:14Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+    @Test
+    void testUnsubscribe() {
+        HuaweiCloudExternAlert externAlert = new HuaweiCloudExternAlert();
+        externAlert.setSignature("TImrLoeb0tV1JZJSPyA0rpC9mNqH3MmhwQ4tgpuHHa+JztfGVZFvkU//OthKKhzpDAoYiXOYG9DbzXCLbvaGePIRITakoynYyYr9zZIpdx9jXhQNlgF8np"
+                + "1+t0JxNeoIq0DYWgH52tsodwqOm+OnmkcHwCRo/1rFv85KrKAaX2gy3sNwXw1hKnAwAw0mJlxHHSf/N3+7j6GoxCNV7fN9K4CpJiLMGNvUa7zVmG0U9mPvt/7Lac155kPPQ9l"
+                + "YyeL7vVI0e4sfRbuQruz3E0+ZP40TKx0afoeR0/Bx/IoZzRP1La7pKlbEISvkcM7TqW/IOGQTkhVsQ32RFRxZWO2snw==");
+        externAlert.setSubject("[华为云][紧急告警恢复]云监控通知：分布式缓存服务-DCS Redis实例 “dcs-h4tv” 的每秒并发操作数已恢复正常。");
+        externAlert.setTopicUrn("urn:smn:cn-north-4:477a784601d744e4ab9ab83986502d31:CES_notification_group_bngJ2aMpX");
+        externAlert.setMessageId("d3672d737bb742cf8c2aa3f0fd72d4d1");
+        externAlert.setType("UnsubscribeConfirmation");
+        externAlert.setMessage("{}");
+        externAlert.setSigningCertUrl("https://smn.cn-north-4.myhuaweicloud.com/smn/SMN_cn-north-4_b98100ca131b4116ab8ee7ccedbaae99.pem");
+        externAlert.setTimestamp("2025-06-07T15:12:09Z");
+        externAlertService.addExternAlert(JsonUtil.toJson(externAlert));
+        verify(alarmCommonReduce, never()).reduceAndSendAlarm(any(SingleAlert.class));
+    }
+
+
+
+
+}

hertzbeat-collector/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusAutoCollectImpl.java

@@ -72,12 +72,13 @@ import org.springframework.util.StringUtils;
  * prometheus auto collect
  */
 @Slf4j
-public class PrometheusAutoCollectImpl {
+public class PrometheusAutoCollectImpl implements PrometheusCollect {
     
     private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
             HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
             HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
     
+    @Override
     public List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder,
                                                 Metrics metrics) {
         try {
@@ -139,6 +140,7 @@ public class PrometheusAutoCollectImpl {
         return Collections.singletonList(builder.build());
     }
     
+    @Override
     public String supportProtocol() {
         return DispatchConstants.PROTOCOL_PROMETHEUS;
     }

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusCollect.java

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.prometheus;
+
+import org.apache.hertzbeat.common.entity.job.Metrics;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+
+import java.util.List;
+
+/**
+ * Prometheus metrics collector interface
+ */
+public interface PrometheusCollect {
+
+    /**
+     * Collect prometheus metrics data
+     * @param builder metrics data builder
+     * @param metrics metrics config
+     * @return list of metrics data
+     */
+    List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder, Metrics metrics);
+
+    /**
+     * Get the protocol name this collector supported
+     * @return protocol name
+     */
+    String supportProtocol();
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/prometheus/PrometheusProxyCollectImpl.java

@@ -0,0 +1,308 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.collector.collect.prometheus;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.collector.collect.common.http.CommonHttpClient;
+import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
+import org.apache.hertzbeat.collector.util.CollectUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.constants.NetworkConstants;
+import org.apache.hertzbeat.common.constants.SignConstants;
+import org.apache.hertzbeat.common.entity.job.Metrics;
+import org.apache.hertzbeat.common.entity.job.protocol.PrometheusProtocol;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.apache.hertzbeat.common.util.Base64Util;
+import org.apache.hertzbeat.common.util.CommonUtil;
+import org.apache.hertzbeat.common.util.IpDomainUtil;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpStatus;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.auth.DigestScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.protocol.HttpContext;
+import org.apache.http.util.EntityUtils;
+import org.springframework.http.MediaType;
+import org.springframework.util.StringUtils;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.net.ssl.SSLException;
+
+import static org.apache.hertzbeat.common.constants.SignConstants.RIGHT_DASH;
+
+
+@Slf4j
+public class PrometheusProxyCollectImpl implements PrometheusCollect {
+
+    private final Set<Integer> defaultSuccessStatusCodes = Stream.of(HttpStatus.SC_OK, HttpStatus.SC_CREATED,
+            HttpStatus.SC_ACCEPTED, HttpStatus.SC_MULTIPLE_CHOICES, HttpStatus.SC_MOVED_PERMANENTLY,
+            HttpStatus.SC_MOVED_TEMPORARILY).collect(Collectors.toSet());
+
+    public static final String RAW_TEXT_CONTENT_FIELD_NAME = "raw_text_content";
+
+    @Override
+    public List<CollectRep.MetricsData> collect(CollectRep.MetricsData.Builder builder, Metrics metrics) {
+        PrometheusProtocol prometheusProtocol = metrics.getPrometheus();
+        HttpUriRequest request;
+        try {
+            validateParams(metrics);
+        } catch (Exception e) {
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(e.getMessage());
+            return Collections.singletonList(builder.build());
+        }
+
+        HttpContext httpContext = createHttpContext(prometheusProtocol);
+        request = createHttpRequest(prometheusProtocol);
+
+        try (CloseableHttpResponse response = CommonHttpClient.getHttpClient().execute(request, httpContext)) {
+            int statusCode = response.getStatusLine().getStatusCode();
+            log.debug("Prometheus proxy collect, response status: {}", statusCode);
+
+            if (!defaultSuccessStatusCodes.contains(statusCode)) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
+                return Collections.singletonList(builder.build());
+            }
+
+            String rawTextContent = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+
+            builder.clearFields();
+            builder.clearValues();
+
+            CollectRep.Field rawDataField = CollectRep.Field.newBuilder()
+                    .setName(RAW_TEXT_CONTENT_FIELD_NAME)
+                    .setType(CommonConstants.TYPE_STRING)
+                    .build();
+            builder.addField(rawDataField);
+
+            CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
+            valueRowBuilder.addColumn(rawTextContent);
+            builder.addValueRow(valueRowBuilder.build());
+
+            builder.setCode(CollectRep.Code.SUCCESS);
+        } catch (ClientProtocolException e1) {
+            String errorMsg = CommonUtil.getMessageFromThrowable(e1);
+            log.error("Prometheus proxy collect error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e1);
+            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
+            builder.setMsg(errorMsg);
+        } catch (UnknownHostException e2) {
+            String errorMsg = CommonUtil.getMessageFromThrowable(e2);
+            log.info("Prometheus proxy collect unknown host: {}. Host: {}", errorMsg, prometheusProtocol.getHost(), e2);
+            builder.setCode(CollectRep.Code.UN_REACHABLE);
+            builder.setMsg("unknown host:" + errorMsg);
+        } catch (InterruptedIOException | ConnectException | SSLException e3) {
+            String errorMsg = CommonUtil.getMessageFromThrowable(e3);
+            log.info("Prometheus proxy collect connect error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e3);
+            builder.setCode(CollectRep.Code.UN_CONNECTABLE);
+            builder.setMsg(errorMsg);
+        } catch (IOException e4) {
+            String errorMsg = CommonUtil.getMessageFromThrowable(e4);
+            log.info("Prometheus proxy collect IO error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e4);
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(errorMsg);
+        } catch (Exception e) {
+            String errorMsg = CommonUtil.getMessageFromThrowable(e);
+            log.error("Prometheus proxy collect unknown error: {}. Host: {}, Port: {}", errorMsg, prometheusProtocol.getHost(), prometheusProtocol.getPort(), e);
+            builder.setCode(CollectRep.Code.FAIL);
+            builder.setMsg(errorMsg);
+        } finally {
+            if (request != null) {
+                request.abort();
+            }
+        }
+        return Collections.singletonList(builder.build());
+    }
+
+    @Override
+    public String supportProtocol() {
+        return DispatchConstants.PROTOCOL_PROMETHEUS;
+    }
+
+    private void validateParams(Metrics metrics) throws Exception {
+        if (metrics == null || metrics.getPrometheus() == null) {
+            throw new Exception("Prometheus collect must has prometheus params");
+        }
+        PrometheusProtocol protocol = metrics.getPrometheus();
+        if (!StringUtils.hasText(protocol.getHost())
+            || !StringUtils.hasText(protocol.getPort())) {
+            throw new Exception("Prometheus collect must has host and port params");
+        }
+        if (protocol.getPath() == null
+                || !StringUtils.hasText(protocol.getPath())
+                || !protocol.getPath().startsWith(RIGHT_DASH)) {
+            protocol.setPath(protocol.getPath() == null ? RIGHT_DASH : RIGHT_DASH + protocol.getPath().trim());
+        }
+    }
+    
+    /**
+     * create httpContext
+     * This method is adapted from PrometheusAutoCollectImpl
+     * @param protocol prometheus protocol
+     * @return context
+     */
+    public HttpContext createHttpContext(PrometheusProtocol protocol) {
+        PrometheusProtocol.Authorization auth = protocol.getAuthorization();
+        if (auth != null && DispatchConstants.DIGEST_AUTH.equals(auth.getType())) {
+            HttpClientContext clientContext = new HttpClientContext();
+            if (StringUtils.hasText(auth.getDigestAuthUsername())
+                        && StringUtils.hasText(auth.getDigestAuthPassword())) {
+                CredentialsProvider provider = new BasicCredentialsProvider();
+                UsernamePasswordCredentials credentials =
+                        new UsernamePasswordCredentials(auth.getDigestAuthUsername(), auth.getDigestAuthPassword());
+                provider.setCredentials(AuthScope.ANY, credentials);
+                AuthCache authCache = new BasicAuthCache();
+                HttpHost targetHost = new HttpHost(protocol.getHost(), Integer.parseInt(protocol.getPort()));
+                authCache.put(targetHost, new DigestScheme());
+                clientContext.setCredentialsProvider(provider);
+                clientContext.setAuthCache(authCache);
+                return clientContext;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * create http request
+     * This method is adapted from PrometheusAutoCollectImpl
+     * @param protocol http params
+     * @return http uri request
+     */
+    public HttpUriRequest createHttpRequest(PrometheusProtocol protocol) {
+        RequestBuilder requestBuilder = RequestBuilder.get();
+        // params
+        Map<String, String> params = protocol.getParams();
+        if (params != null && !params.isEmpty()) {
+            for (Map.Entry<String, String> param : params.entrySet()) {
+                if (StringUtils.hasText(param.getValue())) {
+                    requestBuilder.addParameter(param.getKey(), param.getValue());
+                }
+            }
+        }
+        requestBuilder.addHeader(HttpHeaders.CONNECTION, NetworkConstants.KEEP_ALIVE);
+        requestBuilder.addHeader(HttpHeaders.USER_AGENT, NetworkConstants.USER_AGENT);
+        // headers  The custom request header is overwritten here
+        Map<String, String> headers = protocol.getHeaders();
+        if (headers != null && !headers.isEmpty()) {
+            for (Map.Entry<String, String> header : headers.entrySet()) {
+                if (StringUtils.hasText(header.getValue())) {
+                    requestBuilder.addHeader(CollectUtil.replaceUriSpecialChar(header.getKey()),
+                            CollectUtil.replaceUriSpecialChar(header.getValue()));
+                }
+            }
+        }
+        if (headers == null || headers.keySet().stream().noneMatch(HttpHeaders.ACCEPT::equalsIgnoreCase)) {
+            requestBuilder.addHeader(HttpHeaders.ACCEPT, MediaType.TEXT_PLAIN_VALUE + ";version=0.0.4,*/*;q=0.1");
+        }
+        
+        if (protocol.getAuthorization() != null) {
+            PrometheusProtocol.Authorization authorization = protocol.getAuthorization();
+            if (DispatchConstants.BEARER_TOKEN.equalsIgnoreCase(authorization.getType())) {
+                if (StringUtils.hasText(authorization.getBearerTokenToken())) {
+                    String value = DispatchConstants.BEARER + " " + authorization.getBearerTokenToken();
+                    requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, value);
+                }
+            } else if (DispatchConstants.BASIC_AUTH.equals(authorization.getType())) {
+                if (StringUtils.hasText(authorization.getBasicAuthUsername())
+                            && StringUtils.hasText(authorization.getBasicAuthPassword())) {
+                    String authStr = authorization.getBasicAuthUsername() + ":" + authorization.getBasicAuthPassword();
+                    String encodedAuth = Base64Util.encode(authStr);
+                    requestBuilder.addHeader(HttpHeaders.AUTHORIZATION, DispatchConstants.BASIC + " " + encodedAuth);
+                }
+            }
+        }
+
+        if (StringUtils.hasLength(protocol.getPayload())) {
+            requestBuilder.setEntity(new StringEntity(protocol.getPayload(), StandardCharsets.UTF_8));
+            if (headers == null || headers.keySet().stream().noneMatch(HttpHeaders.CONTENT_TYPE::equalsIgnoreCase)) {
+                requestBuilder.setHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_PLAIN_VALUE);
+            }
+        }
+        
+        String uriPath = CollectUtil.replaceUriSpecialChar(protocol.getPath());
+        if (IpDomainUtil.isHasSchema(protocol.getHost())) {
+            requestBuilder.setUri(protocol.getHost() + SignConstants.DOUBLE_MARK + protocol.getPort() + uriPath);
+        } else {
+            String ipAddressType = IpDomainUtil.checkIpAddressType(protocol.getHost());
+            String baseUri = NetworkConstants.IPV6.equals(ipAddressType)
+                                     ? String.format("[%s]:%s%s", protocol.getHost(), protocol.getPort(), uriPath)
+                                     : String.format("%s:%s%s", protocol.getHost(), protocol.getPort(), uriPath);
+            boolean ssl = Boolean.parseBoolean(protocol.getSsl());
+            if (ssl) {
+                requestBuilder.setUri(NetworkConstants.HTTPS_HEADER + baseUri);
+            } else {
+                requestBuilder.setUri(NetworkConstants.HTTP_HEADER + baseUri);
+            }
+        }
+        
+        // custom timeout
+        int timeout = CollectUtil.getTimeout(protocol.getTimeout());
+        if (timeout > 0) {
+            RequestConfig requestConfig = RequestConfig.custom()
+                                                  .setConnectTimeout(timeout)
+                                                  .setSocketTimeout(timeout)
+                                                  .setConnectionRequestTimeout(timeout)
+                                                  .setRedirectsEnabled(true)
+                                                  .build();
+            requestBuilder.setConfig(requestConfig);
+        } else {
+            RequestConfig requestConfig = RequestConfig.custom()
+                                                  .setRedirectsEnabled(true)
+                                                  .build();
+            requestBuilder.setConfig(requestConfig);
+        }
+        return requestBuilder.build();
+    }
+
+    /**
+     * get collect instance
+     * @return instance
+     */
+    public static PrometheusProxyCollectImpl getInstance() {
+        return PrometheusProxyCollectImpl.SingleInstance.INSTANCE;
+    }
+
+    /**
+     * static instance
+     */
+    private static class SingleInstance {
+        private static final PrometheusProxyCollectImpl INSTANCE = new PrometheusProxyCollectImpl();
+    }
+}

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java

@@ -115,6 +115,10 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
      * Whether it is a service discovery job, true is yes, false is no
      */
     protected boolean isSd;
+    /**
+     * Whether to use the Prometheus proxy
+     */
+    protected boolean prometheusProxyMode;
 
     protected List<UnitConvert> unitConvertList;
 
@@ -137,6 +141,7 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
         this.collectDataDispatch = collectDataDispatch;
         this.isCyclic = job.isCyclic();
         this.isSd = job.isSd();
+        this.prometheusProxyMode = job.isPrometheusProxyMode();
         this.unitConvertList = unitConvertList;
         // Temporary one-time tasks are executed with high priority
         if (isCyclic) {
@@ -153,11 +158,31 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
         CollectRep.MetricsData.Builder response = CollectRep.MetricsData.newBuilder();
         response.setApp(app).setId(id).setTenantId(tenantId)
                 .setLabels(labels).setAnnotations(annotations).addMetadataAll(metadata);
-        // for prometheus auto
+        // for prometheus auto or proxy mode
         if (DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(metrics.getProtocol())) {
-            List<CollectRep.MetricsData> metricsData = PrometheusAutoCollectImpl
-                    .getInstance().collect(response, metrics);
-            validateResponse(metricsData.stream().findFirst().orElse(null));
+            List<CollectRep.MetricsData> metricsData;
+
+            // TODO: Refactor Prometheus metrics collection logic.
+            // The current implementation for proxy mode and auto mode needs review and potential simplification.
+            // Consider a more unified approach or clarify the conditions for each mode.
+            /*
+            // TODO USE PROXY MODE
+            if (prometheusProxyMode) {
+                List<CollectRep.MetricsData> proxyData = PrometheusProxyCollectImpl.getInstance().collect(response, metrics);
+                List<CollectRep.MetricsData> autoData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
+                metricsData = new LinkedList<>();
+                if (proxyData != null) {
+                    metricsData.addAll(proxyData);
+                }
+                if (autoData != null) {
+                    metricsData.addAll(autoData);
+                }
+            } else {
+                metricsData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
+            }
+            */
+            metricsData = PrometheusAutoCollectImpl.getInstance().collect(response, metrics);
+            validateResponse(metricsData == null ? null : metricsData.stream().findFirst().orElse(null));
             collectDataDispatch.dispatchCollectData(timeout, metrics, metricsData);
             return;
         }

hertzbeat-collector/mvnw

@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# 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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"

hertzbeat-collector/mvnw.cmd

@@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiConstants.java

@@ -142,5 +142,58 @@ public interface AiConstants {
         float TEMPERATURE = 0.7f;
 
     }
+  
+    /**
+     * Ollama constants
+     */
+    interface OllamaConstants {
+        /**
+         * request role param
+         */
+        String REQUEST_ROLE = "user";
+
+        /**
+         * The model outputs the maximum tokens, with a maximum output of 8192 and a default value of 3072
+         */
+        Integer MAX_TOKENS = 3072;
+
+        /**
+         * The sampling temperature, which controls the randomness of the output, must be positive
+         * The value ranges from 0.0 to 1.0, and cannot be equal to 0. The default value is 0.95. The larger the value,
+         * the more random and creative the output will be. The smaller the value, the more stable or certain the output will be
+         * You are advised to adjust top_p or temperature parameters based on application scenarios, but do not adjust the two parameters at the same time
+         */
+        float TEMPERATURE = 0.7f;
+
+    }
+  
+    /**
+     * OpenRouter constants
+     */
+    interface OpenRouterConstants {
+        /**
+         * OpenRouter Ai URL
+         */
+        String URL = "https://openrouter.ai/api/v1/chat/completions";
+      
+        /**
+         * request role param
+         */
+        String REQUEST_ROLE = "user";
+
+        /**
+         * The model outputs the maximum tokens, with a maximum output of 8192 and a default value of 3072
+         */
+        Integer MAX_TOKENS = 3072;
+
+        /**
+         * The sampling temperature, which controls the randomness of the output, must be positive
+         * The value ranges from 0.0 to 1.0, and cannot be equal to 0. The default value is 0.95. The larger the value,
+         * the more random and creative the output will be. The smaller the value, the more stable or certain the output will be
+         * You are advised to adjust top_p or temperature parameters based on application scenarios, but do not adjust the two parameters at the same time
+         */
+        float TEMPERATURE = 0.7f;
+
+    }
 
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/AiTypeEnum.java

@@ -42,8 +42,17 @@ public enum AiTypeEnum {
     /**
      * Moonshot AI
      */
-    kimiAi;
+    kimiAi,
 
+    /**
+     * Ollama AI
+     */
+    ollama,
+
+    /**
+     * OpenRouter
+     */
+    openRouter;
 
     /**
      * get type

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java

@@ -138,6 +138,11 @@ public class Job {
      */
     private boolean isSd = false;
 
+    /**
+     * Whether to use the Prometheus proxy
+     */
+    private boolean prometheusProxyMode = false;
+
     /**
      * the collect data response metrics as env configmap for other collect use. ^o^xxx^o^
      */

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/common/GrafanaConstants.java

@@ -18,6 +18,7 @@
 package org.apache.hertzbeat.grafana.common;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
+import java.net.URL;
 
 /**
  * Grafana Common Constants
@@ -31,32 +32,64 @@ public interface GrafanaConstants {
     String REFRESH = "&refresh=15s";
 
     String INSTANCE = "&var-instance=";
-    
+
     String CREATE_DASHBOARD_API = "/api/dashboards/db";
-    
+
     String DELETE_DASHBOARD_API = "/api/dashboards/uid/%s";
-    
-    String DATASOURCE_NAME = "hertzbeat-victoria-metrics";
-    
-    String USE_DATASOURCE = "&var-ds=" + DATASOURCE_NAME;
-    
+
+    String DATASOURCE_BASE_NAME = "hertzbeat";
+
     String DATASOURCE_TYPE = "prometheus";
-    
+
     String DATASOURCE_ACCESS = "proxy";
-    
+
     String CREATE_DATASOURCE_API = "/api/datasources";
-    
-    String QUERY_DATASOURCE_API = "/api/datasources/name/" + DATASOURCE_NAME;
-    
+
+    String QUERY_DATASOURCE_API = "/api/datasources/name/";
+
     String GET_SERVICE_ACCOUNTS_API = "%s/api/serviceaccounts/search";
 
     String ACCOUNT_NAME = ConfigConstants.SystemConstant.PROJECT_NAME;
-    
+
     String ACCOUNT_ROLE = "Admin";
-    
+
     String CREATE_SERVICE_ACCOUNT_API = "%s/api/serviceaccounts";
-    
+
     String CREATE_SERVICE_TOKEN_API = "%s/api/serviceaccounts/%d/tokens";
 
     String GRAFANA_CONFIG = "grafanaConfig";
-}
+
+    /**
+     * Generate data source name based on type and URL
+     * @param type Data source type (vm or greptime)
+     * @param url Data source URL
+     * @return Generated unique data source name
+     */
+    static String generateDatasourceName(String type, String url) {
+        try {
+            URL parsedUrl = new URL(url);
+            String host = parsedUrl.getHost();
+            int port = parsedUrl.getPort();
+
+            // Extract host without subdomain for cleaner names
+            String hostPart = host != null ? host.replaceAll("^www\\.", "") : "localhost";
+
+            // Include port if it's not default
+            String portPart = (port > 0 && port != 80 && port != 443) ? "-" + port : "";
+
+            return String.format("%s-%s-%s%s", DATASOURCE_BASE_NAME, type, hostPart, portPart);
+        } catch (Exception e) {
+            // Fallback to simple naming if URL parsing fails
+            return String.format("%s-%s-%s", DATASOURCE_BASE_NAME, type, url.hashCode());
+        }
+    }
+
+    /**
+     * Generate USE_DATASOURCE parameter with dynamic datasource name
+     * @param datasourceName The datasource name
+     * @return USE_DATASOURCE parameter string
+     */
+    static String generateUseDatasource(String datasourceName) {
+        return "&var-ds=" + datasourceName;
+    }
+}

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/config/GrafanaInit.java

@@ -45,10 +45,7 @@ public class GrafanaInit implements CommandLineRunner {
         if (grafanaProperties.enabled()) {
             log.info("grafana init start");
             try {
-                String token = serviceAccountService.getToken();
-                if (token == null) {
-                    token = serviceAccountService.applyForToken();
-                }
+                String token = serviceAccountService.applyForToken();
                 datasourceService.existOrCreateDatasource(token);   
             } catch (Exception e) {
                 log.error("grafana init error", e);

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java

@@ -22,7 +22,6 @@ import static org.apache.hertzbeat.grafana.common.GrafanaConstants.DELETE_DASHBO
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.INSTANCE;
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.KIOSK;
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.REFRESH;
-import static org.apache.hertzbeat.grafana.common.GrafanaConstants.USE_DATASOURCE;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -30,6 +29,7 @@ import java.util.Objects;
 
 import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
 import org.apache.hertzbeat.common.util.JsonUtil;
+import org.apache.hertzbeat.grafana.common.GrafanaConstants;
 import org.apache.hertzbeat.grafana.config.GrafanaProperties;
 import org.apache.hertzbeat.grafana.dao.DashboardDao;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,10 +63,15 @@ public class DashboardService {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private DatasourceService datasourceService;
+
     /**
-     * Creates a new dashboard in Grafana.
+     * Creates or updates a dashboard in Grafana.
+     * The "id" field will be removed from the dashboard JSON before sending
+     * to Grafana to ensure new dashboards are created correctly.
      *
-     * @param dashboardJson the JSON representation of the dashboard
+     * @param dashboardJson the JSON representation of the dashboard definition
      * @param monitorId the ID of the monitor associated with the dashboard
      * @return ResponseEntity containing the response from Grafana
      */
@@ -84,11 +89,31 @@ public class DashboardService {
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.setBearerAuth(token);
 
-        Map<String, Object> body = new HashMap<>();
-        body.put("dashboard", JsonUtil.fromJson(dashboardJson, Object.class));
-        body.put("overwrite", true);
+        Map<String, Object> dashboardObjectMap;
+        try {
+            dashboardObjectMap = JsonUtil.fromJson(dashboardJson, Map.class);
+        } catch (Exception e) {
+            log.error("Failed to parse dashboardJson. Monitor ID: {}. JSON: {}", monitorId, dashboardJson, e);
+            throw new RuntimeException("Invalid dashboard JSON structure", e);
+        }
 
-        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(body, headers);
+        if (dashboardObjectMap == null) {
+            log.error("Parsed dashboardJson is null. Monitor ID: {}. Original JSON: {}", monitorId, dashboardJson);
+            throw new RuntimeException("Parsed dashboard JSON is null");
+        }
+
+        if (dashboardObjectMap.containsKey("id")) {
+            dashboardObjectMap.remove("id");
+            log.debug("Removed 'id' field from dashboard JSON for monitorId: {}", monitorId);
+        }
+
+        // Construct the full request payload for Grafana API
+        Map<String, Object> requestPayload = new HashMap<>();
+        requestPayload.put("dashboard", dashboardObjectMap);
+        requestPayload.put("overwrite", true); // Overwrite if a dashboard with the same UID exists
+
+        String finalJsonPayload = JsonUtil.toJson(requestPayload);
+        HttpEntity<String> requestEntity = new HttpEntity<>(finalJsonPayload, headers);
 
         try {
             ResponseEntity<String> response = restTemplate.postForEntity(url, requestEntity, String.class);
@@ -97,30 +122,49 @@ public class DashboardService {
                 GrafanaDashboard grafanaDashboard = JsonUtil.fromJson(response.getBody(), GrafanaDashboard.class);
                 if (grafanaDashboard != null) {
                     grafanaDashboard.setEnabled(true);
-                    grafanaDashboard.setUrl(grafanaProperties.exposeUrl()
-                            + grafanaDashboard.getUrl().replace(grafanaProperties.getUrl(), "")
-                            + KIOSK + REFRESH + INSTANCE + monitorId + USE_DATASOURCE);
+
+                    String currentDatasourceName = datasourceService.getCurrentDatasourceName();
+                    String useDatasource = currentDatasourceName != null
+                            ? GrafanaConstants.generateUseDatasource(currentDatasourceName) : "";
+
+                    String relativeDashboardUrl = grafanaDashboard.getUrl();
+                    if (relativeDashboardUrl != null && grafanaProperties.getUrl() != null && relativeDashboardUrl.startsWith(grafanaProperties.getUrl())) {
+                        relativeDashboardUrl = relativeDashboardUrl.substring(grafanaProperties.getUrl().length());
+                    }
+                    String fullDashboardUrl = grafanaProperties.exposeUrl().replaceAll("/$", "")
+                            + (relativeDashboardUrl != null ? relativeDashboardUrl.replaceAll("^/", "") : "");
+
+                    grafanaDashboard.setUrl(fullDashboardUrl + KIOSK + REFRESH + INSTANCE + monitorId + useDatasource);
+
                     grafanaDashboard.setMonitorId(monitorId);
                     dashboardDao.save(grafanaDashboard);
-                    log.info("create dashboard success, token: {}", response.getBody());
+                    log.info("Successfully created/updated Grafana dashboard for monitorId: {}. Response: {}", monitorId, response.getBody());
+                } else {
+                    log.error("Failed to parse Grafana response into GrafanaDashboard object. MonitorId: {}. Response body: {}", monitorId, response.getBody());
                 }
                 return response;
             } else {
-                log.error("create dashboard error: {}", response.getStatusCode());
-                throw new RuntimeException("create dashboard error");
+                log.error("Failed to create/update Grafana dashboard for monitorId: {}. Status: {}, Response: {}",
+                        monitorId, response.getStatusCode(), response.getBody());
+                throw new RuntimeException("Failed to create/update Grafana dashboard: " + response.getStatusCode() + " - " + response.getBody());
             }
-        } 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 (HttpClientErrorException ex) {
+            String responseBody = ex.getResponseBodyAsString();
+            log.error("Grafana API request failed for monitorId: {}. Status: {}. URL: {}. Request: {}. Response: {}",
+                    monitorId, ex.getStatusCode(), url, finalJsonPayload, responseBody, ex);
+            if (ex instanceof HttpClientErrorException.Forbidden) {
+                throw new RuntimeException("Grafana Access Denied: " + responseBody, ex);
+            } else if (ex instanceof HttpClientErrorException.NotFound) {
+                throw new RuntimeException("Grafana API endpoint or resource not found: " + responseBody, ex);
+            }
+            throw new RuntimeException("Grafana API client error (" + ex.getStatusCode() + "): " + responseBody, ex);
         } catch (Exception ex) {
-            log.error("create dashboard error", ex);
-            throw new RuntimeException("create dashboard error", ex);
+            log.error("An unexpected error occurred while creating/updating Grafana dashboard for monitorId: {}. URL: {}. Request: {}",
+                    monitorId, url, finalJsonPayload, ex);
+            throw new RuntimeException("Error during Grafana dashboard operation: " + ex.getMessage(), ex);
         }
     }
-    
+
     /**
      * Deletes a dashboard in Grafana by monitor ID.
      *
@@ -130,6 +174,7 @@ public class DashboardService {
     public void deleteDashboard(Long monitorId) {
         GrafanaDashboard grafanaDashboard = dashboardDao.findByMonitorId(monitorId);
         if (Objects.isNull(grafanaDashboard)) {
+            log.info("No Grafana dashboard found for monitorId {} to delete.", monitorId);
             return;
         }
         String uid = grafanaDashboard.getUid();
@@ -137,6 +182,7 @@ public class DashboardService {
 
         if (grafanaDashboards.size() > 1) {
             dashboardDao.deleteByMonitorId(monitorId);
+            log.info("Deleted hertzbeat dashboard record for monitorId: {}, Grafana dashboard with UID: {} still used by other monitors.", monitorId, uid);
         } else {
             String token = serviceAccountService.getToken();
             String url = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + String.format(DELETE_DASHBOARD_API, uid);
@@ -146,19 +192,36 @@ public class DashboardService {
             headers.setBearerAuth(token);
 
             HttpEntity<Void> requestEntity = new HttpEntity<>(headers);
-            dashboardDao.deleteByMonitorId(monitorId);
 
-            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, String.class);
+            try {
+                ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, String.class);
 
-            if (response.getStatusCode().is2xxSuccessful()) {
-                log.info("delete dashboard success");
-            } else {
-                log.error("delete dashboard error: {}", response.getStatusCode());
-                throw new RuntimeException("delete dashboard error");
+                if (response.getStatusCode().is2xxSuccessful()) {
+                    // Delete from local DB only after successful Grafana deletion
+                    dashboardDao.deleteByMonitorId(monitorId);
+                    log.info("Successfully deleted Grafana dashboard with UID: {} and corresponding hertzbeat record for monitorId: {}", uid, monitorId);
+                } else {
+                    log.error("Failed to delete Grafana dashboard with UID: {}. Status: {}, Response: {}",
+                            uid, response.getStatusCode(), response.getBody());
+                    throw new RuntimeException("Failed to delete Grafana dashboard: " + response.getStatusCode() + " - " + response.getBody());
+                }
+            } catch (HttpClientErrorException ex) {
+                String responseBody = ex.getResponseBodyAsString();
+                log.error("Grafana API request failed during dashboard deletion for UID: {}. Status: {}. URL: {}. Response: {}",
+                        uid, ex.getStatusCode(), url, responseBody, ex);
+                if (ex.getStatusCode() == org.springframework.http.HttpStatus.NOT_FOUND) {
+                    log.warn("Grafana dashboard with UID: {} not found during deletion attempt. Assuming already deleted. Deleting local record for monitorId: {}", uid, monitorId);
+                    dashboardDao.deleteByMonitorId(monitorId);
+                } else {
+                    throw new RuntimeException("Grafana API client error during deletion (" + ex.getStatusCode() + "): " + responseBody, ex);
+                }
+            } catch (Exception ex) {
+                log.error("An unexpected error occurred while deleting Grafana dashboard with UID: {}. URL: {}", uid, url, ex);
+                throw new RuntimeException("Error during Grafana dashboard deletion: " + ex.getMessage(), ex);
             }
         }
     }
-    
+
     /**
      * Retrieves a dashboard by monitor ID.
      *
@@ -171,14 +234,22 @@ public class DashboardService {
 
     /**
      * Disables a Grafana dashboard by monitor ID.
+     * (This only updates the local HertzBeat database flag, does not interact with Grafana API)
      *
      * @param monitorId the ID of the monitor associated with the dashboard
      */
     public void closeGrafanaDashboard(Long monitorId) {
         GrafanaDashboard grafanaDashboard = dashboardDao.findByMonitorId(monitorId);
         if (grafanaDashboard != null) {
-            grafanaDashboard.setEnabled(false);
-            dashboardDao.save(grafanaDashboard);
+            if (grafanaDashboard.isEnabled()) { // Only save if there's a change
+                grafanaDashboard.setEnabled(false);
+                dashboardDao.save(grafanaDashboard);
+                log.info("Disabled Grafana dashboard link in HertzBeat for monitorId: {}", monitorId);
+            } else {
+                log.info("Grafana dashboard link for monitorId: {} was already disabled.", monitorId);
+            }
+        } else {
+            log.warn("No Grafana dashboard record found for monitorId {} to disable.", monitorId);
         }
     }
-}
+}

hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java

@@ -19,12 +19,18 @@ package org.apache.hertzbeat.grafana.service;
 
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.CREATE_DATASOURCE_API;
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.DATASOURCE_ACCESS;
-import static org.apache.hertzbeat.grafana.common.GrafanaConstants.DATASOURCE_NAME;
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.DATASOURCE_TYPE;
 import static org.apache.hertzbeat.grafana.common.GrafanaConstants.QUERY_DATASOURCE_API;
+import static org.apache.hertzbeat.grafana.common.GrafanaConstants.generateDatasourceName;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.grafana.config.GrafanaProperties;
-import org.apache.hertzbeat.warehouse.store.history.vm.VictoriaMetricsProperties;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.vm.VictoriaMetricsProperties;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.greptime.GreptimeProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -36,7 +42,8 @@ import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestTemplate;
 
 /**
- * Service for managing Grafana datasource.
+ * Service for managing Grafana datasources.
+ * This service checks if a datasource exists and creates it if not.
  */
 @Service
 @Slf4j
@@ -44,57 +51,163 @@ public class DatasourceService {
 
     private final GrafanaProperties grafanaProperties;
     private final VictoriaMetricsProperties warehouseProperties;
+    private final GreptimeProperties greptimeProperties;
     private final RestTemplate restTemplate;
 
     @Autowired
     public DatasourceService(
             GrafanaProperties grafanaProperties,
             VictoriaMetricsProperties warehouseProperties,
+            GreptimeProperties greptimeProperties,
             RestTemplate restTemplate
     ) {
         this.grafanaProperties = grafanaProperties;
         this.warehouseProperties = warehouseProperties;
+        this.greptimeProperties = greptimeProperties;
         this.restTemplate = restTemplate;
     }
 
-    /**
-     * Create a new datasource in Grafana.
-     */
     public void existOrCreateDatasource(String token) {
-        if (!warehouseProperties.enabled()) {
-            log.info("HertzBeat VictoriaMetrics config not enabled");
+        boolean vmEnabled = warehouseProperties.enabled();
+        boolean greptimeEnabled = greptimeProperties.enabled();
+
+        if (vmEnabled && greptimeEnabled) {
+            throw new IllegalStateException("Conflict: Both VictoriaMetrics and Greptime are enabled, only one can be used for Grafana datasource");
+        }
+
+        if (!vmEnabled && !greptimeEnabled) {
+            log.info("HertzBeat warehouse config not enabled");
             return;
         }
 
+        // Determine datasource type and URL
+        String datasourceType;
+        String datasourceUrl;
+
+        if (vmEnabled) {
+            datasourceType = "vm";
+            datasourceUrl = warehouseProperties.url();
+        } else {
+            datasourceType = "greptime";
+            datasourceUrl = greptimeProperties.httpEndpoint();
+        }
+
+        // Generate unique datasource name
+        String datasourceName = generateDatasourceName(datasourceType, datasourceUrl);
+
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         headers.setBearerAuth(token);
-        // query if exist this datasource
-        String queryUrl = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + QUERY_DATASOURCE_API;
+
+        String queryUrl = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + QUERY_DATASOURCE_API + datasourceName;
         HttpEntity<Void> entity = new HttpEntity<>(headers);
+
         try {
             ResponseEntity<String> response = restTemplate.exchange(queryUrl, HttpMethod.GET, entity, String.class);
             if (response.getStatusCode().is2xxSuccessful()) {
-                log.info("{} datasource exist", DATASOURCE_NAME);
+                log.info("{} datasource already exists", datasourceName);
+                return;
             }
         } catch (HttpClientErrorException.NotFound notFound) {
-            String createUrl = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + CREATE_DATASOURCE_API;
-            String body = String.format(
-                    "{\"name\":\"%s\",\"type\":\"%s\",\"access\":\"%s\",\"url\":\"%s\",\"basicAuth\":%s}",
-                    DATASOURCE_NAME, DATASOURCE_TYPE, DATASOURCE_ACCESS, warehouseProperties.url(), false
-            );
-            HttpEntity<String> createEntity = new HttpEntity<>(body, headers);
-            try {
-                ResponseEntity<String> createResponse = restTemplate.postForEntity(createUrl, createEntity, String.class);
-                if (createResponse.getStatusCode().is2xxSuccessful()) {
-                    log.info("Create datasource success");
-                }
-            } catch (Exception e) {
-                log.error("Create datasource error", e);
-            }
+            log.info("Datasource {} not found, creating new one", datasourceName);
         } catch (Exception e) {
             log.error("Query datasource error", e);
+            return;
         }
-        
+
+        // Create new datasource
+        createDatasource(token, datasourceName, datasourceUrl, datasourceType);
     }
-}
+
+    public void createDatasource(String token, String datasourceName, String datasourceUrl, String datasourceType) {
+        String createUrl = grafanaProperties.getPrefix() + grafanaProperties.getUrl() + CREATE_DATASOURCE_API;
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setBearerAuth(token);
+
+        DatasourceRequest datasourceRequest;
+        if ("greptime".equals(datasourceType)) {
+            datasourceUrl += "/v1/prometheus";
+            Map<String, Object> jsonData = new HashMap<>();
+            Map<String, Object> secureJsonData = new HashMap<>();
+            jsonData.put("httpHeaderName1", "x-greptime-db-name");
+            secureJsonData.put("httpHeaderValue1", greptimeProperties.database());
+            datasourceRequest = new DatasourceRequest(
+                    datasourceName,
+                    DATASOURCE_TYPE,
+                    DATASOURCE_ACCESS,
+                    datasourceUrl,
+                    false,
+                    jsonData,
+                    secureJsonData
+            );
+        } else {
+            datasourceRequest = new DatasourceRequest(
+                    datasourceName,
+                    DATASOURCE_TYPE,
+                    DATASOURCE_ACCESS,
+                    datasourceUrl,
+                    false,
+                    null,
+                    null
+            );
+        }
+
+        try {
+            String body = JsonUtil.toJson(datasourceRequest);
+            HttpEntity<String> createEntity = new HttpEntity<>(body, headers);
+
+            ResponseEntity<String> createResponse = restTemplate.postForEntity(createUrl, createEntity, String.class);
+            if (createResponse.getStatusCode().is2xxSuccessful()) {
+                log.info("Create datasource success");
+            }
+        } catch (HttpClientErrorException.Conflict conflict) {
+            log.info("Datasource already exists");
+        } catch (Exception e) {
+            log.error("Create datasource error", e);
+        }
+    }
+
+    /**
+     * Request object for creating a Grafana datasource.
+     * Fields are annotated with @JsonInclude to exclude null values from serialization.
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public static class DatasourceRequest {
+        public String name;
+        public String type;
+        public String access;
+        public String url;
+        public boolean basicAuth;
+        public Map<String, Object> jsonData;
+        public Map<String, Object> secureJsonData;
+
+        public DatasourceRequest(String name, String type, String access, String url, boolean basicAuth, Map<String, Object> jsonData, Map<String, Object> secureJsonData) {
+            this.name = name;
+            this.type = type;
+            this.access = access;
+            this.url = url;
+            this.basicAuth = basicAuth;
+            this.jsonData = jsonData;
+            this.secureJsonData = secureJsonData;
+        }
+    }
+
+    /**
+     * Get the current active datasource name
+     * @return Current datasource name or null if none active
+     */
+    public String getCurrentDatasourceName() {
+        boolean vmEnabled = warehouseProperties.enabled();
+        boolean greptimeEnabled = greptimeProperties.enabled();
+
+        if (vmEnabled) {
+            return generateDatasourceName("vm", warehouseProperties.url());
+        } else if (greptimeEnabled) {
+            return generateDatasourceName("greptime", greptimeProperties.httpEndpoint());
+        }
+
+        return null;
+    }
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AiProperties.java

@@ -52,4 +52,9 @@ public class AiProperties {
      */
     private String apiSecret;
 
+    /**
+     * API URL for the Ollama AI service.
+     */
+    private String apiUrl;
+
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/PrometheusProxyConfig.java

@@ -0,0 +1,81 @@
+/*
+ * 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.config;
+
+import jakarta.annotation.PostConstruct;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.greptime.GreptimeProperties;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.vm.VictoriaMetricsProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Configuration class for Prometheus Proxy.
+ * This class determines whether to use PrometheusProxyCollectImpl or PrometheusAutoCollectImpl
+ * based on the presence of GreptimeDB or VictoriaMetrics properties.
+ */
+@Component
+public class PrometheusProxyConfig {
+    private static GreptimeProperties staticGreptimeProperties;
+    private static VictoriaMetricsProperties staticVictoriaMetricsProperties;
+
+    private final GreptimeProperties greptimeProperties;
+    private final VictoriaMetricsProperties victoriaMetricsProperties;
+
+    /**
+     * Constructs the factory and injects warehouse properties.
+     * Uses @Autowired(required = false) to allow these properties to be optional,
+     * in case they are not configured or enabled in the warehouse module.
+     *
+     * @param greptimeProperties GreptimeDB configuration properties.
+     * @param victoriaMetricsProperties VictoriaMetrics configuration properties.
+     */
+    @Autowired
+    public PrometheusProxyConfig(
+            @Autowired(required = false) GreptimeProperties greptimeProperties,
+            @Autowired(required = false) VictoriaMetricsProperties victoriaMetricsProperties) {
+        this.greptimeProperties = greptimeProperties;
+        this.victoriaMetricsProperties = victoriaMetricsProperties;
+    }
+
+    /**
+     * Initializes static fields with the injected properties after construction.
+     * This allows the static getCollector method to access these configurations.
+     */
+    @PostConstruct
+    private void initStatic() {
+        staticGreptimeProperties = this.greptimeProperties;
+        staticVictoriaMetricsProperties = this.victoriaMetricsProperties;
+    }
+
+    /**
+     * Judges whether to use PrometheusProxyCollectImpl or PrometheusAutoCollectImpl
+     */
+    public boolean isPrometheusProxy() {
+        if (staticGreptimeProperties != null && staticGreptimeProperties.enabled()) {
+            return true;
+        }
+        if (staticVictoriaMetricsProperties != null && staticVictoriaMetricsProperties.enabled()) {
+            return true;
+        }
+        return false;
+    }
+
+
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/SchedulerInit.java

@@ -30,6 +30,7 @@ import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
 import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.ParamDefine;
+import org.apache.hertzbeat.manager.config.PrometheusProxyConfig;
 import org.apache.hertzbeat.manager.dao.CollectorDao;
 import org.apache.hertzbeat.manager.dao.CollectorMonitorBindDao;
 import org.apache.hertzbeat.manager.dao.MonitorDao;
@@ -73,6 +74,9 @@ public class SchedulerInit implements CommandLineRunner {
     
     @Autowired
     private CollectorMonitorBindDao collectorMonitorBindDao;
+
+    @Autowired
+    private PrometheusProxyConfig prometheusProxyConfig;
     
     @Override
     public void run(String... args) throws Exception {
@@ -99,6 +103,8 @@ public class SchedulerInit implements CommandLineRunner {
                 boolean isStatic = CommonConstants.SCRAPE_STATIC.equals(monitor.getScrape()) || !StringUtils.hasText(monitor.getScrape());
                 String app = isStatic ? monitor.getApp() : monitor.getScrape();
                 Job appDefine = appService.getAppDefine(app);
+                // set Prometheus proxy mode
+                appDefine.setPrometheusProxyMode(prometheusProxyConfig.isPrometheusProxy());
                 if (!isStatic) {
                     appDefine.setSd(true);
                 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/ai/OllamaAiService.java

@@ -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.manager.service.ai;
+
+import io.jsonwebtoken.lang.Assert;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.constants.AiConstants;
+import org.apache.hertzbeat.common.constants.AiTypeEnum;
+import org.apache.hertzbeat.manager.config.AiProperties;
+import org.apache.hertzbeat.manager.pojo.dto.AiMessage;
+import org.apache.hertzbeat.manager.pojo.dto.OpenAiRequestParamDTO;
+import org.apache.hertzbeat.manager.pojo.dto.OpenAiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.ServerSentEvent;
+import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+/**
+ * Ollama service
+ */
+@Service("OllamaServiceImpl")
+@ConditionalOnProperty(prefix = "ai", name = "type", havingValue = "ollama")
+@Slf4j
+public class OllamaAiService implements AiService{
+    @Autowired
+    private AiProperties aiProperties;
+
+    private WebClient webClient;
+
+    @PostConstruct
+    private void init() {
+        Assert.notNull(aiProperties.getApiUrl(), "Ollama API URL is null");
+        this.webClient = WebClient.builder()
+                .baseUrl(aiProperties.getApiUrl())
+                .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .exchangeStrategies(ExchangeStrategies.builder()
+                        .codecs(item -> item.defaultCodecs().maxInMemorySize(16 * 1024 * 1024))
+                        .build())
+                .build();
+    }
+
+    @Override
+    public AiTypeEnum getType() {
+        return AiTypeEnum.ollama;
+    }
+
+    @Override
+    public Flux<ServerSentEvent<String>> requestAi(String text) {
+        checkParam(text, aiProperties.getModel());
+        OpenAiRequestParamDTO ollamaParam = OpenAiRequestParamDTO.builder()
+                .model(aiProperties.getModel())
+                .stream(Boolean.TRUE)
+                .maxTokens(AiConstants.OllamaConstants.MAX_TOKENS)
+                .temperature(AiConstants.OllamaConstants.TEMPERATURE)
+                .messages(List.of(new AiMessage(AiConstants.OllamaConstants.REQUEST_ROLE, text)))
+                .build();
+
+        return webClient.post()
+                .body(BodyInserters.fromValue(ollamaParam))
+                .retrieve()
+                .bodyToFlux(String.class)
+                .filter(aiResponse -> !"[DONE]".equals(aiResponse))
+                .map(OpenAiResponse::convertToResponse)
+                .doOnError(error -> log.info("OllamaAiService.requestAi exception:{}", error.getMessage()));
+    }
+
+    private void checkParam(String param, String model) {
+        Assert.notNull(param, "text is null");
+        Assert.notNull(model, "model is null");
+    }
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/ai/OpenRouterServiceImpl.java

@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.service.ai;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.common.constants.AiConstants;
+import org.apache.hertzbeat.common.constants.AiTypeEnum;
+import org.apache.hertzbeat.manager.config.AiProperties;
+import org.apache.hertzbeat.manager.pojo.dto.AiMessage;
+import org.apache.hertzbeat.manager.pojo.dto.OpenAiRequestParamDTO;
+import org.apache.hertzbeat.manager.pojo.dto.OpenAiResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.ServerSentEvent;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Flux;
+
+import javax.annotation.PostConstruct;
+import java.util.List;
+
+/**
+ * OpenRouter service
+ */
+@Service("OpenRouterServiceImpl")
+@ConditionalOnProperty(prefix = "ai", name = "type", havingValue = "openRouter")
+@Slf4j
+public class OpenRouterServiceImpl implements AiService {
+
+    @Autowired
+    private AiProperties aiProperties;
+
+    private WebClient webClient;
+
+    @PostConstruct
+    private void init() {
+        this.webClient = WebClient.builder()
+                .baseUrl(AiConstants.OpenRouterConstants.URL)
+                .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .defaultHeader(HttpHeaders.AUTHORIZATION, "Bearer " + aiProperties.getApiKey())
+                .exchangeStrategies(ExchangeStrategies.builder()
+                        .codecs(item -> item.defaultCodecs().maxInMemorySize(16 * 1024 * 1024))
+                        .build())
+                .build();
+    }
+
+    @Override
+    public AiTypeEnum getType() {
+        return AiTypeEnum.openRouter;
+    }
+
+    @Override
+    public Flux<ServerSentEvent<String>> requestAi(String text) {
+        checkParam(text, aiProperties.getModel(), aiProperties.getApiKey());
+        OpenAiRequestParamDTO openRouterParam = OpenAiRequestParamDTO.builder()
+                .model(aiProperties.getModel())
+                .stream(Boolean.TRUE)
+                .maxTokens(AiConstants.OpenRouterConstants.MAX_TOKENS)
+                .temperature(AiConstants.OpenRouterConstants.TEMPERATURE)
+                .messages(List.of(new AiMessage(AiConstants.OpenRouterConstants.REQUEST_ROLE, text)))
+                .build();
+
+        return webClient.post()
+                .body(BodyInserters.fromValue(openRouterParam))
+                .retrieve()
+                .bodyToFlux(String.class)
+                .filter(aiResponse -> !"[DONE]".equals(aiResponse))
+                .map(OpenAiResponse::convertToResponse)
+                .doOnError(error -> log.info("OpenRouterAiServiceImpl.requestAi exception:{}", error.getMessage()));
+    }
+
+    private void checkParam(String param, String model, String apiKey) {
+        Assert.notNull(param, "text is null");
+        Assert.notNull(model, "model is null");
+        Assert.notNull(apiKey, "ai.api-key is null");
+    }
+}

hertzbeat-manager/src/main/resources/application.yml

@@ -62,6 +62,14 @@ sureness:
              8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5
              dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp'
 
+otel:
+  traces:
+    exporter: none
+  metrics:
+    exporter: none
+  logs:
+    exporter: none
+
 ---
 spring:
   config:
@@ -265,7 +273,7 @@ grafana:
 
 # See the documentation for details : https://hertzbeat.apache.org/zh-cn/docs/help/aiConfig
 ai:
-  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk
+  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk、ollama、openRouter
   type:
   # Model name：glm-4、qwen-turboo、moonshot-v1-8k、generalv3.5
   model:
@@ -273,3 +281,5 @@ ai:
   api-key:
   #At present, only IFLYTEK large model needs to be filled in
   api-secret:
+  # The URL of the ollama AI service
+  api-url:

hertzbeat-manager/src/main/resources/define/app-dahua.yml

@@ -208,7 +208,7 @@ metrics:
         i18n:
           zh-CN: 客户端地址
           en-US: ClientAddress
-          ja-JP: ユーザーのアドレス
+          ja-JP: クライアントのアドレス
       - field: Name
         type: 1
         i18n:
@@ -220,13 +220,13 @@ metrics:
         i18n:
           zh-CN: 客户端登录类型
           en-US: ClientType
-          ja-JP: ユーザータイプ
+          ja-JP: クライアントタイプ
       - field: LoginTime
         type: 1
         i18n:
           zh-CN: 客户端登录时间
           en-US: LoginTime
-          ja-JP: ユーザーのログイン時間
+          ja-JP: クライアントのログイン時間
   - name: ntp_info
     i18n:
       zh-CN: 校时信息

hertzbeat-manager/src/main/resources/define/app-darwin.yml

@@ -0,0 +1,857 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# The monitoring type category：service-application service monitoring db-database monitoring custom-custom monitoring os-operating system monitoring
+category: os
+# The monitoring type eg: linux windows tomcat mysql aws...
+app: darwin
+# The monitoring i18n name
+name:
+  zh-CN: Darwin操作系统
+  en-US: Darwin Linux
+  ja-JP: Darwin Linux
+  zh-TW: Darwin操作系統
+# The description and help of this monitoring type
+help:
+  zh-CN: HertzBeat 使用 <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 对 Darwin 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Darwin</i>”并配置HOST端口账户等相关参数进行添加，支持SSH账户密码或密钥认证。或者选择“<i>更多操作</i>”，导入已有配置。
+  en-US: HertzBeat uses <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSH protocol</a> to monitors Darwin operating system's general performance metrics such as cpu, memory, disk, basic, interface, disk_free, top_process etc. <br>You can click the "<i>New Darwin</i>" and config host port and other related params to add, auth support password or secretKey. Or import an existing setup through the "<i>More Actions</i>" menu.
+#  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 對 Darwin 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Darwin</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
+#  ja-JP: HertzBeat は <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Darwinシステムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Darwin Linux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+helpLink:
+  zh-CN: https://HertzBeat.apache.org/zh-cn/docs/help/Darwin/
+  en-US: https://HertzBeat.apache.org/docs/help/Darwin/
+# Input params define for monitoring(render web ui by the definition)
+params:
+  # field-param field key
+  - field: host
+    # name-param field display i18n name
+    name:
+      zh-CN: 目标Host
+      en-US: Target Host
+      ja-JP: 目標ホスト
+      zh-TW: 目標Host
+    # type-param field type(most mapping the html input type)
+    type: host
+    # required-true or false
+    required: true
+  # field-param field key
+  - field: port
+    # name-param field display i18n name
+    name:
+      zh-CN: 端口
+      en-US: Port
+      ja-JP: ポート
+      zh-TW: 端口
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[0,65535]'
+    # required-true or false
+    required: true
+    # default value
+    defaultValue: 22
+  # field-param field key
+  - field: timeout
+    # name-param field display i18n name
+    name:
+      zh-CN: 超时时间(ms)
+      en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
+      zh-TW: 超時時間（ｍｓ）
+    # type-param field type(most mapping the html input type)
+    type: number
+    # when type is number, range is required
+    range: '[400,200000]'
+    # required-true or false
+    required: false
+    # default value
+    # 默认值
+    defaultValue: 6000
+  # field-param field key
+  - field: reuseConnection
+    # name-param field display i18n name
+    name:
+      zh-CN: 复用连接
+      en-US: Reuse Connection
+      ja-JP: コネクション再利用
+      zh-TW: 復用連接
+    # type-param field type(most mapping the html input type)
+    type: boolean
+    # required-true or false
+    required: true
+    defaultValue: true
+  # field-param field key
+  - field: useProxy
+    # name-param field display i18n name
+    name:
+      zh-CN: 使用代理
+      en-US: Use Proxy Connection
+      ja-JP: プロキシコネクション利用
+      zh-TW: 使用代理
+    # 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:
+      zh-CN: 用户名
+      en-US: Username
+      ja-JP: ユーザー名
+      zh-TW: 用戶名
+    # 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: true
+  # field-param field key
+  - field: password
+    # name-param field display i18n name
+    name:
+      zh-CN: 密码
+      en-US: Password
+      ja-JP: パスワード
+      zh-TW: 密碼
+    # type-param field type(most mapping the html input tag)
+    type: password
+    # required-true or false
+    required: false
+  # field-param field key
+  - field: privateKey
+    # name-param field display i18n name
+    name:
+      zh-CN: 私钥
+      en-US: PrivateKey
+      ja-JP: 秘密鍵
+      zh-TW: 私鑰
+    # 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
+  # field-param field key
+  - field: privateKeyPassphrase
+    # name-param field display i18n name
+    name:
+      zh-CN: 密钥短语
+      en-US: PrivateKey PassPhrase
+      ja-JP: 秘密鍵フレーズ
+      zh-TW: 私鑰短語
+    # type-param field type(most mapping the html input type)
+    type: password
+    # required-true or false
+    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
+      ja-JP: プロキシホスト
+      zh-TW: 代理主機
+    # 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
+      ja-JP: プロキシポート
+      zh-TW: 代理端口
+    # 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
+      ja-JP: プロキシユーザー名
+      zh-TW: 代理用戶名
+    # 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
+      ja-JP: プロキシパスワード
+      zh-TW: 代理密碼
+    # 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
+      ja-JP: プロキシ秘密鍵
+      zh-TW: 代理主機私鑰
+    # 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)
+  - name: basic
+    i18n:
+      zh-CN: 系统基本信息
+      en-US: Basic Info
+      ja-JP: システム基礎情報
+      zh-TW: 系統基本信息
+    # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
+    # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
+    priority: 0
+    # collect metrics content
+    fields:
+      # field-metric name, type-metric type(0-number,1-string), unit-metric unit('%','ms','MB'), label-whether it is a metrics label field
+      - field: hostname
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 主机名称
+          en-US: Host Name
+          ja-JP: ホスト名
+          zh-TW: 主機名稱
+      - field: version
+        type: 1
+        i18n:
+          zh-CN: 操作系统版本
+          en-US: System Version
+          ja-JP: システムバージョン
+          zh-TW: 操作系統版本
+      - field: uptime
+        type: 1
+        i18n:
+          zh-CN: 启动时间
+          en-US: Uptime
+          ja-JP: アップタイム
+          zh-TW: 啟動時間
+    # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
+    protocol: ssh
+    # the config content when protocol is ssh
+    ssh:
+      # ssh host: ipv4 ipv6 domain
+      host: ^_^host^_^
+      # ssh port
+      port: ^_^port^_^
+      # ssh username
+      username: ^_^username^_^
+      # ssh password
+      password: ^_^password^_^
+      # ssh private key
+      privateKey: ^_^privateKey^_^
+      # ssh private key passphrase
+      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: |
+        (
+            hostname | awk -F "," '{printf "%s\n", $1}'
+            sw_vers | awk '/:/ {printf "%s ", $2} END {print ""}'
+            sysctl -n kern.boottime | awk '{for(i=9;i<=NF;i++) printf "%s ", $i; print ""}'
+        )
+      # ssh response data parse type: oneRow, multiRow
+      parseType: oneRow
+
+  - name: cpu
+    i18n:
+      zh-CN: CPU 信息
+      en-US: CPU Info
+      ja-JP: CPU情報
+      zh-TW: CPU 信息
+    priority: 1
+    fields:
+      - field: info
+        type: 1
+        i18n:
+          zh-CN: 型号
+          en-US: Info
+          ja-JP: バージョン
+          zh-TW: 型號
+      - field: cores
+        type: 1
+        i18n:
+          zh-CN: 核数
+          en-US: Cores
+          ja-JP: コア数
+          zh-TW: 核數
+      - field: interrupt
+        type: 0
+        i18n:
+          zh-CN: 中断数
+          en-US: Interrupt
+          ja-JP: 割り込み数
+          zh-TW: 中斷數
+      - field: load
+        type: 1
+        i18n:
+          zh-CN: 负载
+          en-US: Load
+          ja-JP: ロード
+          zh-TW: 負載
+      - field: context_switch
+        type: 0
+        i18n:
+          zh-CN: 上下文切换
+          en-US: Context Switch
+          ja-JP: コンテキストスイッチ
+          zh-TW: 上下文切換
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 使用率
+          en-US: Usage
+          ja-JP: 使用率
+          zh-TW: 使用率
+    # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
+    aliasFields:
+      - info
+      - cores
+      - load
+      - interrupt
+      - context_switch
+      - idle
+    # mapping and conversion expressions, use these and aliasField above to calculate metrics value
+    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
+    calculates:
+      - info=info
+      - cores=cores
+      - load=load
+      - interrupt=interrupt
+      - context_switch=context_switch
+      - usage=100 - idle
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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: sysctl -n machdep.cpu.brand_string; sysctl -n hw.logicalcpu; sysctl -n vm.loadavg | awk '{print $2, $3, $4}'; idle=$(top -l 1 | grep "CPU usage" | awk '{print $7}' | tr -d '%') ; free_pages=$(vm_stat | awk '/free/ {gsub(/\./,"",$3); print $3}'); active_pages=$(vm_stat | awk '/active/ {gsub(/\./,"",$3); print $3}'); first_swapins=$(vm_stat | awk '/swapins/ {gsub(/\./,"",$2); print $2}'); sleep 1; second_swapins=$(vm_stat | awk '/swapins/ {gsub(/\./,"",$2); print $2}'); echo "$free_pages"; echo "$active_pages";  echo "$idle";
+      parseType: oneRow
+
+  - name: memory
+    i18n:
+      zh-CN: 内存信息
+      en-US: Memory Info
+      ja-JP: メモリ情報
+      zh-TW: 內存信息
+    priority: 2
+    fields:
+      - field: total
+        type: 1
+        unit: Mb
+        i18n:
+          zh-CN: 总内存容量
+          en-US: Total Memory
+          ja-JP: メモリ容量
+          zh-TW: 總內存容量
+      - field: used
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 用户程序内存量
+          en-US: User Program Memory
+          ja-JP: ユーザープログラムメモリ
+          zh-TW: 用戶程序內存量
+      - field: free
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 空闲内存容量
+          zh-TW: 空閒內存容量
+          en-US: Free Memory
+          ja-JP: 空きメモリ
+      - field: buff_cache
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 缓存占用内存
+          zh-TW: 緩存佔用內存
+          en-US: Buff Cache Memory
+          ja-JP: バッファメモリ
+      - field: available
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 剩余可用内存
+          zh-TW: 剩餘可用內存
+          en-US: Available Memory
+          ja-JP: 使用可能なメモリ
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存使用率
+          zh-TW: 內存使用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+    aliasFields:
+      - total
+      - used
+      - free
+      - buff_cache
+      - available
+    calculates:
+      - total=total
+      - used=used
+      - free=free
+      - buff_cache=buff_cache
+      - available=available
+      - usage=(used / total) * 100
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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: |
+        sysctl -n hw.memsize | awk '{
+          t=$1/1048576;
+          cmd="vm_stat";
+          while (cmd | getline) {
+            if ($1=="Pages") {
+              if ($2=="free:") {f=$3}
+              else if ($2=="active:") {a=$3}
+              else if ($2=="inactive:") {i=$3}
+              else if ($2=="speculative:") {s=$3}
+              else if ($2~/wired/) {w=$NF}
+            };
+            gsub(/\.[ \t]*$/,"",f);
+            gsub(/\.[ \t]*$/,"",a);
+            gsub(/\.[ \t]*$/,"",i);
+            gsub(/\.[ \t]*$/,"",s);
+            gsub(/\.[ \t]*$/,"",w);
+          };
+          close(cmd);
+          fm=(f+s)/256;
+          um=(a+w)/256;
+          im=i/256;
+          bm=im;
+          am=fm+im;
+          print "total used free buff_cache available";
+          printf "%d %d %d %d %d\n", t, um, fm, bm, am
+        }'
+      parseType: multiRow
+
+#  - name: disk
+#    i18n:
+#      zh-CN: 磁盘信息
+#      zh-TW: 磁盤信息
+#      en-US: Disk Info
+#      ja-JP: ディスク情報
+#    priority: 3
+#    fields:
+#      - field: disk_num
+#        type: 1
+#        i18n:
+#          zh-CN: 磁盘总数
+#          zh-TW: 磁盤總數
+#          en-US: Disk Num
+#          ja-JP: ディスク番号
+#      - field: partition_num
+#        type: 1
+#        i18n:
+#          zh-CN: 分区总数
+#          zh-TW: 分區總數
+#          en-US: Partition Num
+#          ja-JP: パーティション
+#      - field: block_write
+#        type: 0
+#        i18n:
+#          zh-CN: 写磁盘块数
+#          zh-TW: 寫磁盤塊數
+#          en-US: Block Write
+#          ja-JP: 書き込みディスクブロック数
+#      - field: block_read
+#        type: 0
+#        i18n:
+#          zh-CN: 读磁盘块数
+#          zh-TW: 讀磁盤塊數
+#          en-US: Block Read
+#          ja-JP: 読み取りブロック数
+#      - field: write_rate
+#        type: 0
+#        unit: iops
+#        i18n:
+#          zh-CN: 磁盘写速率
+#          zh-TW: 磁盤寫速率
+#          en-US: Write Rate
+#          ja-JP: ディスク書き込み速度
+#    protocol: ssh
+#    ssh:
+#      host: ^_^host^_^
+#      port: ^_^port^_^
+#      username: ^_^username^_^
+#      password: ^_^password^_^
+#      privateKey: ^_^privateKey^_^
+#      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"} {gsub(":", "", $1); print $1,$2,$10}'
+#      parseType: oneRow
+
+  - name: interface
+    i18n:
+      zh-CN: 网卡信息
+      zh-TW: 網卡信息
+      en-US: Interface Info
+      ja-JP: ネットワークカード情報
+    priority: 4
+    fields:
+      - field: interface_name
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 网卡名称
+          zh-TW: 網卡名稱
+          en-US: Interface Name
+          ja-JP: ネットワークカード名
+      - field: receive_bytes
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 入站数据流量
+          zh-TW: 入站數據流量
+          en-US: Receive Bytes
+          ja-JP: 受信バイト数
+      - field: transmit_bytes
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 出站数据流量
+          zh-TW: 出站數據流量
+          en-US: Transmit Bytes
+          ja-JP: 送信バイト数
+    units:
+      - receive_bytes=B->MB
+      - transmit_bytes=B->MB
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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: netstat -i | grep -v "lo0" | awk 'BEGIN { print "interface_name receive_bytes transmit_bytes" } NR>1 && $1 !~ /^-/ { print $1, $5, $9 }'
+      parseType: multiRow
+
+  - name: disk_free
+    i18n:
+      zh-CN: 文件系统
+      zh-TW: 文件系統
+      en-US: Disk Free
+      ja-JP: ファイルシステム
+    priority: 5
+    fields:
+      - field: filesystem
+        type: 1
+        i18n:
+          zh-CN: 文件系统
+          zh-TW: 檔案系統
+          en-US: Filesystem
+          ja-JP: ファイルシステム
+      - field: used
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 已使用量
+          zh-TW: 已使用量
+          en-US: Used
+          ja-JP: 使用済み
+      - field: available
+        type: 0
+        unit: Mb
+        i18n:
+          zh-CN: 可用量
+          zh-TW: 可用量
+          en-US: Available
+          ja-JP: 使用可能
+      - field: usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 使用率
+          zh-TW: 使用率
+          en-US: Usage
+          ja-JP: 使用率
+      - field: mounted
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 挂载点
+          zh-TW: 掛載點
+          en-US: Mounted
+          ja-JP: マウント
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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
+
+  - name: top_cpu_process
+    i18n:
+      zh-CN: Top10 CPU 进程
+      zh-TW: Top10 CPU 進程
+      en-US: Top10 CPU Process
+      ja-JP: トップ10 CPUプロセス
+    priority: 6
+    fields:
+      - field: pid
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 进程ID
+          zh-TW: 進程ID
+          en-US: PID
+          ja-JP: プロセスID
+      - field: cpu_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: CPU占用率
+          zh-TW: CPU佔用率
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: mem_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存占用率
+          zh-TW: 內存佔用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: command
+        type: 1
+        i18n:
+          zh-CN: 执行命令
+          zh-TW: 執行指令
+          en-US: Command
+          ja-JP: 指令
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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
+
+  - name: top_mem_process
+    i18n:
+      zh-CN: Top10 内存进程
+      zh-TW: Top10 內存進程
+      en-US: Top10 Memory Process
+      ja-JP: トップ10 メモリプロセス
+    priority: 7
+    fields:
+      - field: pid
+        type: 1
+        label: true
+        i18n:
+          zh-CN: 进程ID
+          zh-TW: 進程ID
+          en-US: PID
+          ja-JP: プロセスID
+      - field: mem_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: 内存占用率
+          zh-TW: 內存佔用率
+          en-US: Memory Usage
+          ja-JP: メモリ使用率
+      - field: cpu_usage
+        type: 0
+        unit: '%'
+        i18n:
+          zh-CN: CPU占用率
+          zh-TW: CPU佔用率
+          en-US: CPU Usage
+          ja-JP: CPU使用率
+      - field: command
+        type: 1
+        i18n:
+          zh-CN: 执行命令
+          zh-TW: 執行指令
+          en-US: Command
+          ja-JP: 指令
+    protocol: ssh
+    ssh:
+      host: ^_^host^_^
+      port: ^_^port^_^
+      username: ^_^username^_^
+      password: ^_^password^_^
+      privateKey: ^_^privateKey^_^
+      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

hertzbeat-manager/src/main/resources/define/app-doris_fe.yml

@@ -20,11 +20,13 @@ app: doris_fe
 name:
   zh-CN: Apache Doris FE
   en-US: Apache Doris FE
+  ja-JP: Apache Doris FE
 # The description and help of this monitoring type
 help:
   zh-CN: Hertzbeat 对 Doris 数据库FE的通用指标（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）进行测量监控，支持版本为DORIS2.0.0。<br>您可以点击 “<i>新建 Doris DatabaseFE</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Doris DatabaseFE through general performance metric such as doris_fe connection total, doris_fe edit log clean, doris_fe image and doris_fe rps. The version we support is DORIS2.0.0. You could click the "<i>New Doris DatabaseFE Monitor</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 Doris 資料庫FE的通用名額（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）進行量測監控，支持版本為DORIS2.0.0。<br>您可以點擊“<i>新建Doris DatabaseFE</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: Hertzbeat は DORIS 2.0.0のデータベースFEの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Doris DatabaseFE</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/doris_fe/
   en-US: https://hertzbeat.apache.org/docs/help/doris_fe/
@@ -36,6 +38,7 @@ params:
     name:
       zh-CN: 目标 Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -44,6 +47,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -55,6 +59,7 @@ params:
     name:
       zh-CN: 查询超时时间
       en-US: Query Timeout
+      ja-JP: クエリタイムアウト
     type: number
     required: false
     # hide param-true or false
@@ -65,6 +70,7 @@ metrics:
     i18n:
       zh-CN: 连接总数
       en-US: Connection Total
+      ja-JP: コネクション数
     priority: 0
     fields:
       - field: value
@@ -87,6 +93,7 @@ metrics:
     i18n:
       zh-CN: 编辑日志清理
       en-US: Edit Log Clean
+      ja-JP: 編集ログのクリーン
     priority: 1
     fields:
       - field: type
@@ -111,6 +118,7 @@ metrics:
     i18n:
       zh-CN: 编辑日志
       en-US: Edit Log
+      ja-JP: 編集ログ
     priority: 2
     fields:
       - field: type
@@ -135,6 +143,7 @@ metrics:
     i18n:
       zh-CN: 图片清理
       en-US: Image Clean
+      ja-JP: イメージのクリーン
     priority: 3
     fields:
       - field: type
@@ -159,6 +168,7 @@ metrics:
     i18n:
       zh-CN: 图片写入
       en-US: Image Write
+      ja-JP: イメージを書き込む
     priority: 4
     fields:
       - field: type
@@ -183,6 +193,7 @@ metrics:
     i18n:
       zh-CN: 查询错误
       en-US: Query Error
+      ja-JP: クエリエラー
     priority: 5
     fields:
       - field: value
@@ -205,6 +216,7 @@ metrics:
     i18n:
       zh-CN: 最大日志ID
       en-US: Max Journal ID
+      ja-JP: マックスジャーナルID
     priority: 6
     fields:
       - field: value
@@ -227,6 +239,7 @@ metrics:
     i18n:
       zh-CN: 最大Tablet压缩分数
       en-US: Max Tablet Compaction Score
+      ja-JP: Tablet最大圧縮スコア
     priority: 7
     fields:
       - field: value
@@ -249,6 +262,7 @@ metrics:
     i18n:
       zh-CN: 每秒查询率
       en-US: QPS
+      ja-JP: QPS
     priority: 8
     fields:
       - field: value
@@ -271,6 +285,7 @@ metrics:
     i18n:
       zh-CN: 查询错误率
       en-US: Query Error Rate
+      ja-JP: クエリエラー率
     priority: 9
     fields:
       - field: value
@@ -295,6 +310,7 @@ metrics:
     i18n:
       zh-CN: 报告队列大小
       en-US: Report Queue Size
+      ja-JP: レポートのキューサイズ
     priority: 10
     fields:
       - field: value
@@ -317,6 +333,7 @@ metrics:
     i18n:
       zh-CN: 每秒转数
       en-US: RPS
+      ja-JP: RPS
     priority: 11
     fields:
       - field: value
@@ -339,6 +356,7 @@ metrics:
     i18n:
       zh-CN: 调度 Tablet 数量
       en-US: Scheduled Tablet Num
+      ja-JP: Tablet予定数
     priority: 12
     fields:
       - field: value
@@ -361,6 +379,7 @@ metrics:
     i18n:
       zh-CN: 事务状态
       en-US: Transaction Status
+      ja-JP: トランザクション状態
     priority: 13
     fields:
       - field: type

hertzbeat-manager/src/main/resources/define/app-dynamic_tp.yml

@@ -21,11 +21,13 @@ app: dynamic_tp
 name:
   zh-CN: DynamicTp 线程池
   en-US: DynamicTp Pool
+  ja-JP: DynamicTpスレッドプール
 # The description and help of this monitoring type
 help:
   zh-CN: HertzBeat 对 DynamicTp actuator 暴露的线程池性能指标（thread pool）进行采集监控。<br><span class='help_module_span'>注意⚠️：您需要集成使用 DynamicTp，<a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp'>点击查看集成步骤</a>。
   en-US: HertzBeat monitoring DynamicTp of the thread Pool Performance Metrics which exposed by DynamicTp actuator. <br><span class='help_module_span'>Note⚠️:You should integrate and use DynamicTp, <a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/dynamic_tp'>Click here to view the specific steps.</a>"
   zh-TW: HertzBeat 對 DynamicTp actuator暴露的執行緒池性能指標（thread pool）進行採集監控。<br><span class='help_ module_ span'>注意⚠️：您需要集成使用DynamicTp，<a class='help_ module_ content' href='https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp'>點擊查看集成步驟</a>。
+  ja-JP: HertzBeat は DynamicTpスレッドプールの一般的なパフォーマンスのメトリック監視します。<br><span class='help_module_span'>注意⚠️：DynamicTpの使用を統合する必要があり、<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/dynamic_tp'>クリックしてガイドを見ます</a>。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp/
   en-US: https://hertzbeat.apache.org/docs/help/dynamic_tp/
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 启动SSL
       en-US: SSL
+      ja-JP: SSL利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -71,6 +76,7 @@ params:
     name:
       zh-CN: Base Path
       en-US: Base Path
+      ja-JP: Base Path
     # type-param field type(most mapping the html input type)
     type: text
     # default value
@@ -86,6 +92,7 @@ metrics:
     i18n:
       zh-CN: 线程池
       en-US: thread pool
+      ja-JP: スレッドプール
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -96,37 +103,44 @@ metrics:
         i18n:
           zh-CN: 池名称
           en-US: pool name
+          ja-JP: プール名
         type: 1
         label: true
       - field: queue_type
         i18n:
           zh-CN: 队列类型
           en-US: queue type
+          ja-JP: キュータイプ
         type: 1
       - field: core_pool_size
         i18n:
           zh-CN: 核心线程数
           en-US: core pool size
+          ja-JP: コアのスレッド数
         type: 0
       - field: maximum_pool_size
         i18n:
           zh-CN: 最大线程数
           en-US: maximum pool size
+          ja-JP: 最大スレッド数
         type: 0
       - field: fair
         i18n:
           zh-CN: 公平
           en-US: fair
+          ja-JP: 目標ホスト
         type: 1
       - field: reject_handler_name
         type: 1
         i18n:
           zh-CN: 拒绝策略
           en-US: reject handler name
+          ja-JP: 拒否戦略
       - field: dynamic
         i18n:
           zh-CN: 动态
           en-US: dynamic
+          ja-JP: dynamic
         type: 1
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
@@ -170,75 +184,89 @@ metrics:
     i18n:
       zh-CN: 运行中的线程池
       en-US: thread pool running
+      ja-JP: 実行中のスレッドプール
     priority: 1
     fields:
       - field: pool_name
         i18n:
           zh-CN: 池名称
           en-US: pool name
+          ja-JP: プール名
         type: 1
         label: true
       - field: queue_capacity
         i18n:
           zh-CN: 队列容量
           en-US: queue capacity
+          ja-JP: キュー容量
         type: 0
         unit: MB
       - field: queue_size
         i18n:
           zh-CN: 队列大小
           en-US: queue size
+          ja-JP: キューサイズ
         type: 0
       - field: queue_remaining_capacity
         i18n:
           zh-CN: 队列剩余容量
           en-US: queue remaining capacity
+          ja-JP: 使用可能なキュー容量
         type: 0
         unit: MB
       - field: active_count
         i18n:
           zh-CN: 活动线程数
           en-US: active count
+          ja-JP: 活動中のスレッド数
         type: 0
       - field: task_count
         i18n:
           zh-CN: 任务数
           en-US: task count
+          ja-JP: タスク数
         type: 0
       - field: completed_task_count
         i18n:
           zh-CN: 完成的任务数
           en-US: completed task count
+          ja-JP: 完了したタスク数
         type: 0
       - field: largest_pool_size
         i18n:
           zh-CN: 最大线程数
           en-US: largest pool size
+          ja-JP: 最大スレッド数
         type: 0
       - field: pool_size
         i18n:
           zh-CN: 线程池大小
           en-US: pool size
+          ja-JP: プールサイズ
         type: 0
       - field: wait_task_count
         i18n:
           zh-CN: 等待任务数
           en-US: wait task count
+          ja-JP: 待機中のタスク数
         type: 0
       - field: reject_count
         i18n:
           zh-CN: 拒绝数
           en-US: reject count
+          ja-JP: 拒否数
         type: 0
       - field: run_timeout_count
         i18n:
           zh-CN: 运行超时数
           en-US: run timeout count
+          ja-JP: 実行タイムアウト数
         type: 0
       - field: queue_timeout_count
         i18n:
           zh-CN: 队列超时数
           en-US: queue timeout count
+          ja-JP: キュータイムアウト数
         type: 0
     aliasFields:
       - poolName

hertzbeat-manager/src/main/resources/define/app-elasticsearch.yml

@@ -21,11 +21,13 @@ app: elasticsearch
 name:
   zh-CN: ElasticSearch
   en-US: ElasticSearch
+  ja-JP: ElasticSearch
 # The description and help of this monitoring type
 help:
   zh-CN: Hertzbeat 对 ElasticSearch 数据库监控通用指标进行测量监控。<br>您可以点击 “<i>新建 ElasticSearch</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring ElasticSearch through general performance metrics. You could click the "<i>New ElasticSearch</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 ElasticSearch 資料庫監控通用名額進行量測監控。<br>您可以點擊“<i>新建ElasticSearch</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: HertzBeat は ElasticSearch データベースの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 ElasticSearch</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/elasticsearch
   en-US: https://hertzbeat.apache.org/docs/help/elasticsearch
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 查询超时时间
       en-US: Query Timeout
+      ja-JP: クエリタイムアウト
     # type-param field type(most mapping the html input type)
     type: number
     # required-true or false
@@ -75,6 +80,7 @@ params:
     name:
       zh-CN: 启用HTTPS
       en-US: SSL
+      ja-JP: SSL利用
     # type-param field type(boolean mapping the html h tag)
     type: boolean
     # required-true or false
@@ -85,6 +91,7 @@ params:
     name:
       zh-CN: 认证方式
       en-US: Auth Type
+      ja-JP: 認証方法
     # type-param field type(most mapping the html input tag)
     type: radio
     # required-true or false
@@ -101,6 +108,7 @@ params:
     name:
       zh-CN: 用户名
       en-US: Username
+      ja-JP: ユーザー名
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -113,6 +121,7 @@ params:
     name:
       zh-CN: 密码
       en-US: Password
+      ja-JP: パスワード
     # type-param field type(most mapping the html input tag)
     type: password
     # required-true or false
@@ -124,6 +133,7 @@ metrics:
     i18n:
       zh-CN: 集群健康状态
       en-US: Cluster Health Status
+      ja-JP: クラスタ健全状態
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -136,49 +146,57 @@ metrics:
         i18n:
           zh-CN: 集群名称
           en-US: Cluster Name
+          ja-JP: クラスタ名
       - field: status
         type: 1
         i18n:
           zh-CN: 集群状态
           en-US: status
+          ja-JP: 状態
       - field: nodes
         type: 0
         i18n:
           zh-CN: 集群节点数
           en-US: nodes
+          ja-JP: ノード数
       - field: data_nodes
         type: 0
         i18n:
           zh-CN: 数据节点数
           en-US: Data Nodes
+          ja-JP: データノード数
       - field: active_primary_shards
         type: 0
         i18n:
           zh-CN: 主节点活跃分片数
           en-US: Active Primary Shards
+          ja-JP: 主ノードの活動中シャーズ数
       - field: active_shards
         type: 0
         i18n:
           zh-CN: 活跃分片数
           en-US: Active Shards
+          ja-JP: 活動中シャーズ数
       - field: active_percentage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 分片健康度（%）
           en-US: Active Percentage
+          ja-JP: シャーズの健全率
       - field: initializing_shards
         type: 0
         i18n:
           zh-CN: 初始化分片数
           en-US: Initializing Shards
+          ja-JP: 初期化シャーズ数
       - field: unassigned_shards
         type: 0
         i18n:
           zh-CN: 未分配分片数
           en-US: Unassigned Shards
+          ja-JP: 未割り当てシャーズ数
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
-    # (可选)监控指标别名, 做为中间字段与采集数据字段和指标字段映射转换
     aliasFields:
       - cluster_name
       - status
@@ -230,6 +248,7 @@ metrics:
     i18n:
       zh-CN: 集群节点信息
       en-US: Cluster Nodes
+      ja-JP: クラスタノード情報
     priority: 1
     fields:
       - field: total
@@ -237,16 +256,19 @@ metrics:
         i18n:
           zh-CN: 节点数
           en-US: total
+          ja-JP: ノード数
       - field: successful
         type: 0
         i18n:
           zh-CN: 在线节点数
           en-US: successful
+          ja-JP: オンラインノード数
       - field: failed
         type: 0
         i18n:
           zh-CN: 离线节点数
           en-US: failed
+          ja-JP: オフラインノード数
     protocol: http
     http:
       host: ^_^host^_^
@@ -269,6 +291,7 @@ metrics:
     i18n:
       zh-CN: 节点详细信息
       en-US: Node Detail
+      ja-JP: ノード情報
     priority: 2
     fields:
       - field: node_name
@@ -277,65 +300,73 @@ metrics:
         i18n:
           zh-CN: 节点名称
           en-US: Node Name
+          ja-JP: ノード名
       - field: ip
         type: 1
         i18n:
           zh-CN: IP地址
           en-US: IP Address
+          ja-JP: IP アドレス
       - field: cpu_load_average
         type: 0
         i18n:
           zh-CN: CPU平均负载
           en-US: Cpu Load Average
+          ja-JP: CPUロードアベレージ
       - field: cpu_percent
         type: 0
         unit: '%'
         i18n:
           zh-CN: CPU占用率
           en-US: Cpu Percent
+          ja-JP: CPU使用率
       - field: heap_used
         type: 0
         unit: MB
         i18n:
           zh-CN: 内存使用量（MB）
           en-US: Heap Used
+          ja-JP: メモリ使用量（MB）
       - field: heap_used_percent
         type: 0
         unit: '%'
         i18n:
           zh-CN: 内存使用率
           en-US: Heap Used Percent
+          ja-JP: メモリ使用率
       - field: heap_total
         type: 1
         unit: 'MB'
         i18n:
           zh-CN: 总内存（MB）
           en-US: Heap Total
+          ja-JP: メモリ容量（MB）
       - field: disk_free
         type: 0
         unit: 'GB'
         i18n:
           zh-CN: 磁盘剩余容量（GB）
           en-US: Disk Free
+          ja-JP: 利用可能なディスク容量
       - field: disk_total
         type: 1
         unit: 'GB'
         i18n:
           zh-CN: 磁盘总容量
           en-US: Disk Total
+          ja-JP: ディスク容量
       - field: disk_used_percent
         type: 0
         unit: '%'
         i18n:
           zh-CN: 磁盘使用率
           en-US: Disk Used Percent
+          ja-JP: ディスク使用率
     aliasFields:
       - $.name
       - $.ip
-      # $.os.cpu.load_average.1m 支持 5.x 及以上版本；$.os.load_average 支持 2.x 及以上版本
       - $.os.cpu.load_average.1m
       - $.os.load_average
-      # $.os.cpu.percent 支持 5.x 及以上版本；$.os.cpu_percent 支持 2.x 及以上版本
       - $.os.cpu_percent
       - $.os.cpu.percent
       - $.jvm.mem.heap_used_in_bytes

hertzbeat-manager/src/main/resources/define/app-emqx.yml

@@ -21,11 +21,13 @@ app: emqx
 name:
   zh-CN: EMQX MQTT
   en-US: EMQX MQTT
+  ja-JP: EMQX MQTT
 # The description and help of this monitoring type
 help:
   zh-CN: EMQX 是一款开源的大规模分布式 MQTT 消息服务器。Hertzbeat对EMQX MQTT消息服务器 5.0+ 版本的通用指标进行测量监控，<br>您可以点击 “<i>新建 EMQX 消息服务器</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: EMQX is an open source large-scale distributed MQTT message server. Hertzbeat measures and monitors common metrics of the EMQX message server 5.0+ version.<br>You can click "<i>New EMQX message server</i>" and configure it, or select "<i>More operations</i>", Import existing configuration.
   zh-TW: EMQX 是一款開源的大規模分散式 MQTT 訊息伺服器。 Hertzbeat對EMQX MQTT訊息伺服器 5.0+ 版本的通用指標進行測量監控，<br>您可以點擊“<i>新建 EMQX 訊息伺服器</i>” 並進行配置，或者選擇“<i>更多操作</i>” ，導入已有配置。
+  ja-JP: EMQXは、オープンソースの大規模分散MQTTメッセージサーバーです。HertzbeatはEMQX MQTTメッセージサーバー（バージョン5.0+）の一般的なフォーマンスのメトリック監視します。<br>「<i>新規 EMQX</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/emqx
   en-US: https://hertzbeat.apache.org/docs/help/emqx
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -59,12 +63,14 @@ params:
     name:
       zh-CN: 启用HTTPS
       en-US: HTTPS
+      ja-JP: HTTPS
     type: boolean
     defaultValue: false
   - field: timeout
     name:
       zh-CN: 超时时间(ms)
       en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
     type: number
     required: false
     hide: true
@@ -72,6 +78,7 @@ params:
     name:
       zh-CN: 认证方式
       en-US: Auth Type
+      ja-JP: 認証方法
     type: radio
     required: true
     options:
@@ -82,12 +89,14 @@ params:
     name:
       zh-CN: API Key
       en-US: API Key
+      ja-JP: API キー
     type: text
     required: true
   - field: secretkey
     name:
       zh-CN: Secret Key
       en-US: Secret Key
+      ja-JP: 鍵
     type: text
     required: true
 metrics:
@@ -97,6 +106,7 @@ metrics:
     i18n:
       zh-CN: 概要
       en-US: Summary
+      ja-JP: 概要
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -108,21 +118,25 @@ metrics:
         i18n:
           zh-CN: 系统版本
           en-US: Version
+          ja-JP: バージョン
       - field: node_name
         type: 1
         i18n:
           zh-CN: 节点名称
           en-US: Node Name
+          ja-JP: ノード名
       - field: broker_status
         type: 1
         i18n:
           zh-CN: Broker 状态
           en-US: Broker Status
+          ja-JP: ブローカーステータス
       - field: app_status
         type: 1
         i18n:
           zh-CN: 应用状态
           en-US: App Status
+          ja-JP: Appステータス
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - rel_vsn
@@ -165,6 +179,7 @@ metrics:
     i18n:
       zh-CN: 指标
       en-US: Metrics
+      ja-JP: メトリック
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 1
@@ -176,66 +191,79 @@ metrics:
         i18n:
           zh-CN: 客户端连接
           en-US: Client Connected
+          ja-JP: クライアント接続済み
       - field: client_disconnected
         type: 0
         i18n:
           zh-CN: 客户端断开
           en-US: Client Disconnected
+          ja-JP: クライアント切断
       - field: packets_sent
         type: 0
         i18n:
           zh-CN: 发送数据包
           en-US: Packets Sent
+          ja-JP: 送信パケット
       - field: packets_received
         type: 0
         i18n:
           zh-CN: 接收数据包
           en-US: Packets Received
+          ja-JP: 受信パケット
       - field: bytes_sent
         type: 0
         i18n:
           zh-CN: 发送字节
           en-US: Bytes Sent
+          ja-JP: 送信バイト数
       - field: bytes_received
         type: 0
         i18n:
           zh-CN: 接收字节
           en-US: Bytes Received
+          ja-JP: 受信バイト数
       - field: messages_sent
         type: 0
         i18n:
           zh-CN: 发送消息
           en-US: Messages Sent
+          ja-JP: 送信メッセージ
       - field: messages_acked
         type: 0
         i18n:
           zh-CN: 消息确认
           en-US: Messages Acked
+          ja-JP: 確認メッセージ
       - field: messages_delayed
         type: 0
         i18n:
           zh-CN: 延迟消息
           en-US: Messages Delayed
+          ja-JP: 遅延メッセージ
       - field: authorization_deny
         type: 0
         i18n:
           zh-CN: 授权拒绝
           en-US: Authorization Deny
+          ja-JP: 認証拒否
       - field: client_authorize
         type: 0
         i18n:
           zh-CN: 客户端授权
           en-US: Client Authorize
+          ja-JP: クライアント認証
       - field: session_created
         type: 0
         i18n:
           zh-CN: 会话创建
           en-US: Session Created
+          ja-JP: 目標ホスト
       - field: session_discarded
         type: 0
         i18n:
           zh-CN: 会话丢弃
           en-US: Session Discarded
+          ja-JP: 目標ホスト
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - client.connected
@@ -296,6 +324,7 @@ metrics:
     i18n:
       zh-CN: 统计
       en-US: Stats
+      ja-JP: スタッツ
     priority: 2
     fields:
       # metrics content contains field-metric name, type-metric type:0-number,1-string, instance-if is metrics, unit-metric unit('%','ms','MB')
@@ -304,111 +333,133 @@ metrics:
         i18n:
           zh-CN: 通道数
           en-US: Channels Count
+          ja-JP: チャンネル数
       - field: channels_max
         type: 0
         i18n:
           zh-CN: 通道最大数
           en-US: Channels Max
+          ja-JP: 最大チャンネル数
       - field: connections_count
         type: 0
         i18n:
           zh-CN: 连接数
           en-US: Connections Count
+          ja-JP: 接続数
       - field: connections_max
         type: 0
         i18n:
           zh-CN: 最大连接数
           en-US: Connections Max
+          ja-JP: 最大接続数
       - field: delayed_count
         type: 0
         i18n:
           zh-CN: 延迟数
           en-US: Delayed Count
+          ja-JP: 遅延数
       - field: delayed_max
         type: 0
         i18n:
           zh-CN: 最大延迟数
           en-US: Delayed Max
+          ja-JP: 最大遅延数
       - field: live_connections_count
         type: 0
         i18n:
           zh-CN: 活动连接数
           en-US: Live Connections Count
+          ja-JP: ライブ接続数
       - field: live_connections_max
         type: 0
         i18n:
           zh-CN: 最大活动连接数
           en-US: Live Connections Max
+          ja-JP: 最大ライブ接続数
       - field: retained_count
         type: 0
         i18n:
           zh-CN: 保留数
           en-US: Retained Count
+          ja-JP: 保持数
       - field: retained_max
         type: 0
         i18n:
           zh-CN: 最大保留数
           en-US: Retained Max
+          ja-JP: 最大保持数
       - field: sessions_count
         type: 0
         i18n:
           zh-CN: 会话数
           en-US: Sessions Count
+          ja-JP: セッション数
       - field: sessions_max
         type: 0
         i18n:
           zh-CN: 最大会话数
           en-US: Sessions Max
+          ja-JP: 最大セッション数
       - field: suboptions_count
         type: 0
         i18n:
           zh-CN: 订阅选项数
           en-US: Suboptions Count
+          ja-JP: サブスクリプションのオプション数
       - field: suboptions_max
         type: 0
         i18n:
           zh-CN: 最大订阅选项数
           en-US: Suboptions Max
+          ja-JP: 最大サブスクリプションのオプション数
       - field: subscribers_count
         type: 0
         i18n:
           zh-CN: 订阅者数
           en-US: Subscribers Count
+          ja-JP: サブスクライバー数
       - field: subscribers_max
         type: 0
         i18n:
           zh-CN: 最大订阅者数
           en-US: Subscribers Max
+          ja-JP: 最大サブスクライバー数
       - field: subscriptions_count
         type: 0
         i18n:
           zh-CN: 订阅数
           en-US: Subscriptions Count
+          ja-JP: サブスクリプション数
       - field: subscriptions_max
         type: 0
         i18n:
           zh-CN: 最大订阅数
           en-US: Subscriptions Max
+          ja-JP: 最大サブスクリプション数
       - field: subscriptions_shared_count
         type: 0
         i18n:
           zh-CN: 共享订阅数
           en-US: Subscriptions Shared Count
+          ja-JP: 共有サブスクリプション数
       - field: subscriptions_shared_max
         type: 0
         i18n:
           zh-CN: 最大共享订阅数
           en-US: Subscriptions Shared Max
+          ja-JP: 最大共有サブスクリプション数
       - field: topics_count
         type: 0
         i18n:
           zh-CN: 主题数
           en-US: Topics Count
+          ja-JP: トピック数
       - field: topics_max
         type: 0
         i18n:
           zh-CN: 最大主题数
           en-US: Topics Max
+          ja-JP: 最大トピック数
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - channels.count

hertzbeat-manager/src/main/resources/define/app-euleros.yml

@@ -21,11 +21,13 @@ app: euleros
 name:
   zh-CN: EulerOS 操作系统
   en-US: EulerOS
+  ja-JP: EulerOS
 # The description and help of this monitoring type
 help:
   zh-CN: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 对 EulerOS 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 EulerOS</i>”并配置HOST端口账户等相关参数进行添加，支持SSH账户密码或密钥认证。或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH protocol</a> to monitors EulerOS operating system's general performance metrics such as cpu, memory, disk, basic, interface, disk_free, top_process etc. <br>You can click the "<i>New EulerOS</i>" and config host port and other related params to add, auth support password or secretKey. Or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 對 EulerOS 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 EulerOS</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> EulerOS システムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 EulerOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/euleros
   en-US: https://hertzbeat.apache.org/docs/help/euleros
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 超时时间(ms)
       en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -75,6 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -86,6 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -97,6 +104,7 @@ params:
     name:
       zh-CN: 用户名
       en-US: Username
+      ja-JP: ユーザー名
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -109,6 +117,7 @@ params:
     name:
       zh-CN: 密码
       en-US: Password
+      ja-JP: パスワード
     # type-param field type(most mapping the html input tag)
     type: password
     # required-true or false
@@ -119,6 +128,7 @@ params:
     name:
       zh-CN: 私钥
       en-US: PrivateKey
+      ja-JP: 秘密鍵
     # type-param field type(most mapping the html input type)
     type: textarea
     placeholder: -----BEGIN RSA PRIVATE KEY-----
@@ -132,6 +142,7 @@ params:
     name:
       zh-CN: 密钥短语
       en-US: PrivateKey PassPhrase
+      ja-JP: 秘密鍵フレーズ
     # type-param field type(most mapping the html input type)
     type: password
     # required-true or false
@@ -144,6 +155,7 @@ params:
     name:
       zh-CN: 代理主机
       en-US: Proxy Host
+      ja-JP: プロキシホスト
     # type-param field type(most mapping the html input type)
     type: text
     # required-true or false
@@ -155,6 +167,7 @@ params:
     name:
       zh-CN: 代理端口
       en-US: Proxy Port
+      ja-JP: プロキシポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -171,6 +184,7 @@ params:
     name:
       zh-CN: 代理用户名
       en-US: Proxy Username
+      ja-JP: プロキシユーザー名
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -185,6 +199,7 @@ params:
     name:
       zh-CN: 代理密码
       en-US: Proxy Password
+      ja-JP: プロキシパスワード
     # type-param field type(most mapping the html input tag)
     type: password
     # required-true or false
@@ -197,6 +212,7 @@ params:
     name:
       zh-CN: 代理主机私钥
       en-US: proxyPrivateKey
+      ja-JP: プロキシ秘密鍵
     # type-param field type(most mapping the html input type)
     type: textarea
     placeholder: -----BEGIN RSA PRIVATE KEY-----
@@ -211,6 +227,7 @@ metrics:
     i18n:
       zh-CN: 系统基本信息
       en-US: Basic Info
+      ja-JP: システム基礎情報
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -223,16 +240,19 @@ metrics:
         i18n:
           zh-CN: 主机名称
           en-US: Host Name
+          ja-JP: ホスト名
       - field: version
         type: 1
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
           zh-CN: 启动时间
           en-US: Uptime
+          ja-JP: アップタイム
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: ssh
     # the config content when protocol is ssh
@@ -272,6 +292,7 @@ metrics:
     i18n:
       zh-CN: CPU 信息
       en-US: CPU Info
+      ja-JP: CPU情報
     priority: 1
     fields:
       - field: info
@@ -279,32 +300,38 @@ metrics:
         i18n:
           zh-CN: 型号
           en-US: Info
+          ja-JP: バージョン
       - field: cores
         type: 1
         i18n:
           zh-CN: 核数
           en-US: Cores
+          ja-JP: コア数
       - field: interrupt
         type: 0
         i18n:
           zh-CN: 中断数
           en-US: Interrupt
+          ja-JP: 割り込み数
       - field: load
         type: 1
         i18n:
           zh-CN: 负载
           en-US: Load
+          ja-JP: ロード
       - field: context_switch
         type: 0
         i18n:
           zh-CN: 上下文切换
           en-US: Context Switch
+          ja-JP: コンテキストスイッチ
       - field: usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 使用率
           en-US: Usage
+          ja-JP: 使用率
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - info
@@ -351,6 +378,7 @@ metrics:
     i18n:
       zh-CN: 内存信息
       en-US: Memory Info
+      ja-JP: メモリ情報
     priority: 2
     fields:
       - field: total
@@ -359,36 +387,42 @@ metrics:
         i18n:
           zh-CN: 总内存容量
           en-US: Total Memory
+          ja-JP: メモリ容量
       - field: used
         type: 0
         unit: Mb
         i18n:
           zh-CN: 用户程序内存量
           en-US: User Program Memory
+          ja-JP: ユーザープログラムメモリ
       - field: free
         type: 0
         unit: Mb
         i18n:
           zh-CN: 空闲内存容量
           en-US: Free Memory
+          ja-JP: 空きメモリ
       - field: buff_cache
         type: 0
         unit: Mb
         i18n:
           zh-CN: 缓存占用内存
           en-US: Buff Cache Memory
+          ja-JP: バッファメモリ
       - field: available
         type: 0
         unit: Mb
         i18n:
           zh-CN: 剩余可用内存
           en-US: Available Memory
+          ja-JP: 使用可能なメモリ
       - field: usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 内存使用率
           en-US: Memory Usage
+          ja-JP: メモリ使用率
     aliasFields:
       - total
       - used
@@ -431,6 +465,7 @@ metrics:
     i18n:
       zh-CN: 磁盘信息
       en-US: Disk Info
+      ja-JP: ディスク情報
     priority: 3
     fields:
       - field: disk_num
@@ -438,27 +473,32 @@ metrics:
         i18n:
           zh-CN: 磁盘总数
           en-US: Disk Num
+          ja-JP: ディスク番号
       - field: partition_num
         type: 1
         i18n:
           zh-CN: 分区总数
           en-US: Partition Num
+          ja-JP: パーティション
       - field: block_write
         type: 0
         i18n:
           zh-CN: 写磁盘块数
           en-US: Block Write
+          ja-JP: 書き込みディスクブロック数
       - field: block_read
         type: 0
         i18n:
           zh-CN: 读磁盘块数
           en-US: Block Read
+          ja-JP: 読み取りブロック数
       - field: write_rate
         type: 0
         unit: iops
         i18n:
           zh-CN: 磁盘写速率
           en-US: Write Rate
+          ja-JP: ディスク書き込み速度
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -488,6 +528,7 @@ metrics:
     i18n:
       zh-CN: 网卡信息
       en-US: Interface Info
+      ja-JP: ネットワークカード情報
     priority: 4
     fields:
       - field: interface_name
@@ -496,18 +537,21 @@ metrics:
         i18n:
           zh-CN: 网卡名称
           en-US: Interface Name
+          ja-JP: ネットワークカード名
       - field: receive_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -540,6 +584,7 @@ metrics:
     i18n:
       zh-CN: 文件系统
       en-US: Disk Free
+      ja-JP: ファイルシステム
     priority: 5
     fields:
       - field: filesystem
@@ -547,30 +592,35 @@ metrics:
         i18n:
           zh-CN: 文件系统
           en-US: Filesystem
+          ja-JP: ファイルシステム
       - field: used
         type: 0
         unit: Mb
         i18n:
           zh-CN: 已使用量
           en-US: Used
+          ja-JP: 使用済み
       - field: available
         type: 0
         unit: Mb
         i18n:
           zh-CN: 可用量
           en-US: Available
+          ja-JP: 使用可能
       - field: usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 使用率
           en-US: Usage
+          ja-JP: 使用率
       - field: mounted
         type: 1
         label: true
         i18n:
           zh-CN: 挂载点
           en-US: Mounted
+          ja-JP: マウント
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -600,6 +650,7 @@ metrics:
     i18n:
       zh-CN: Top10 CPU 进程
       en-US: Top10 CPU Process
+      ja-JP: トップ10 CPUプロセス
     priority: 6
     fields:
       - field: pid
@@ -608,23 +659,27 @@ metrics:
         i18n:
           zh-CN: 进程ID
           en-US: PID
+          ja-JP: プロセスID
       - field: cpu_usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: CPU占用率
           en-US: CPU Usage
+          ja-JP: CPU使用率
       - field: mem_usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 内存占用率
           en-US: Memory Usage
+          ja-JP: メモリ使用率
       - field: command
         type: 1
         i18n:
           zh-CN: 执行命令
           en-US: Command
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -654,6 +709,7 @@ metrics:
     i18n:
       zh-CN: Top10 内存进程
       en-US: Top10 Memory Process
+      ja-JP: トップ10 メモリプロセス
     priority: 7
     fields:
       - field: pid
@@ -662,23 +718,27 @@ metrics:
         i18n:
           zh-CN: 进程ID
           en-US: PID
+          ja-JP: プロセスID
       - field: mem_usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: 内存占用率
           en-US: Memory Usage
+          ja-JP: メモリ使用率
       - field: cpu_usage
         type: 0
         unit: '%'
         i18n:
           zh-CN: CPU占用率
           en-US: CPU Usage
+          ja-JP: CPU使用率
       - field: command
         type: 1
         i18n:
           zh-CN: 执行命令
           en-US: Command
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

hertzbeat-manager/src/main/resources/define/app-eureka_sd.yml

@@ -21,6 +21,7 @@ app: eureka_sd
 name:
   zh-CN: Eureka Service Discovery
   en-US: Eureka Service Discovery
+  ja-JP: Eureka サービスディスカバリー
 # Input params define for app api(render web ui by the definition)
 params:
   # field-param field key
@@ -29,6 +30,7 @@ params:
     name:
       zh-CN: Eureka服务发现地址
       en-US: Eureka Service Discovery Url
+      ja-JP: Eureka サービスディスカバリーURL
     # type-param field type(most mapping the html input type)
     type: text
     # required-true or false
@@ -39,6 +41,7 @@ metrics:
     i18n:
       zh-CN: 监控目标
       en-US: Monitor Target
+      ja-JP: 監視対象
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -50,11 +53,13 @@ metrics:
         i18n:
           zh-CN: Host
           en-US: Host
+          ja-JP: ホスト
       - field: port
         type: 1
         i18n:
           zh-CN: Port
           en-US: Port
+          ja-JP: ポート
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: eureka_sd
     # the config content when protocol is http_sd

hertzbeat-manager/src/main/resources/define/app-flink.yml

@@ -21,11 +21,13 @@ app: flink
 name:
   zh-CN: Apache Flink
   en-US: Apache Flink
+  ja-JP: Apache Flink
 # The description and help of this monitoring type
 help:
   zh-CN: Hertzbeat 对 Flink流引擎的通用指标进行测量监控。<br>您可以点击 “<i>新建 Flink流引擎</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Flink Stream through general performance metric. You could click the "<i>New Flink Stream</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 Flink流引擎的通用名額進行量測監控。<br>您可以點擊“<i>新建Flink流引擎</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: HertzBeat は Flinkの一般的なメトリック監視します。<br>「<i>新規 Flink</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/flink
   en-US: https://hertzbeat.apache.org/docs/help/flink
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 启动SSL
       en-US: SSL
+      ja-JP: SSL利用
     # type-param field type(boolean mapping the html switch tag)
     type: boolean
     # required-true or false
@@ -70,6 +75,7 @@ params:
     name:
       zh-CN: 认证方式
       en-US: Auth Type
+      ja-JP: 認証方法
     # type-param field type(most mapping the html input type)
     type: radio
     required: false
@@ -84,6 +90,7 @@ params:
     name:
       zh-CN: 用户名
       en-US: Username
+      ja-JP: ユーザー名
     type: text
     limit: 50
     required: false
@@ -92,6 +99,7 @@ params:
     name:
       zh-CN: 密码
       en-US: Password
+      ja-JP: パスワード
     type: password
     required: false
     hide: true
@@ -110,6 +118,7 @@ metrics:
         i18n:
           zh-CN: 版本
           en-US: Version
+          ja-JP: バージョン
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
     # the config content when protocol is http
@@ -143,26 +152,31 @@ metrics:
         i18n:
           zh-CN: 插槽总数
           en-US: Slots Total
+          ja-JP: スロット数
       - field: slots_used        # slots used count
         type: 0
         i18n:
           zh-CN: 已用插槽数
           en-US: Slots Used
+          ja-JP: 使用済みスロット数
       - field: task_total        # task count
         type: 0
         i18n:
           zh-CN: 任务总数
           en-US: Task Total
+          ja-JP: タスク数
       - field: jobs_running        # Number of running tasks
         type: 0
         i18n:
           zh-CN: 正在运行的任务数
           en-US: Jobs Running
+          ja-JP: 実行中のタスク数
       - field: jobs_failed        # Number of failed tasks
         type: 0
         i18n:
           zh-CN: 已经失败的任务数
           en-US: Jobs Failed
+          ja-JP: 失敗したタスク数
     aliasFields:
       - slots-total
       - slots-available

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/ManagerTest.java

@@ -46,8 +46,8 @@ import org.apache.hertzbeat.common.support.SpringContextHolder;
 import org.apache.hertzbeat.alert.service.impl.TencentSmsClientImpl;
 import org.apache.hertzbeat.warehouse.WarehouseWorkerPool;
 import org.apache.hertzbeat.warehouse.controller.MetricsDataController;
-import org.apache.hertzbeat.warehouse.store.history.iotdb.IotDbDataStorage;
-import org.apache.hertzbeat.warehouse.store.history.tdengine.TdEngineDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.iotdb.IotDbDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine.TdEngineDataStorage;
 import org.apache.hertzbeat.warehouse.store.realtime.memory.MemoryDataStorage;
 import org.apache.hertzbeat.warehouse.store.realtime.redis.RedisDataStorage;
 import org.junit.jupiter.api.Test;

hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/LogAutoConfiguration.java

@@ -19,7 +19,7 @@ package org.apache.hertzbeat.otel.config;
 
 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.apache.hertzbeat.warehouse.store.history.tsdb.greptime.GreptimeProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 

hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.java

@@ -36,7 +36,7 @@ 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.apache.hertzbeat.warehouse.store.history.tsdb.greptime.GreptimeProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimePromqlQueryExecutor.java

@@ -19,7 +19,7 @@ package org.apache.hertzbeat.warehouse.db;
 
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.greptime.GreptimeProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/PromqlQueryExecutor.java

@@ -30,7 +30,7 @@ import org.apache.hertzbeat.common.util.TimePeriodUtil;
 import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.INSTANT;
 import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.PROMQL;
 import static org.apache.hertzbeat.warehouse.constants.WarehouseConstants.RANGE;
-import org.apache.hertzbeat.warehouse.store.history.vm.PromQlQueryContent;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.vm.PromQlQueryContent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.MediaType;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/VictoriaMetricsQueryExecutor.java

@@ -19,7 +19,7 @@ package org.apache.hertzbeat.warehouse.db;
 
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.warehouse.store.history.vm.VictoriaMetricsProperties;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.vm.VictoriaMetricsProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/listener/WareHouseApplicationReadyListener.java

@@ -19,7 +19,7 @@ package org.apache.hertzbeat.warehouse.listener;
 
 import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/service/impl/MetricsDataServiceImpl.java

@@ -34,7 +34,7 @@ import org.apache.hertzbeat.common.entity.dto.ValueRow;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.support.exception.CommonException;
 import org.apache.hertzbeat.warehouse.service.MetricsDataService;
-import org.apache.hertzbeat.warehouse.store.history.HistoryDataReader;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.HistoryDataReader;
 import org.apache.hertzbeat.warehouse.store.realtime.RealTimeDataReader;
 import org.springframework.stereotype.Service;
 

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/DataStorageDispatch.java

@@ -28,7 +28,7 @@ import org.apache.hertzbeat.common.queue.CommonDataQueue;
 import org.apache.hertzbeat.plugin.PostCollectPlugin;
 import org.apache.hertzbeat.plugin.runner.PluginRunner;
 import org.apache.hertzbeat.warehouse.WarehouseWorkerPool;
-import org.apache.hertzbeat.warehouse.store.history.HistoryDataWriter;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.HistoryDataWriter;
 import org.apache.hertzbeat.warehouse.store.realtime.RealTimeDataWriter;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/AbstractHistoryDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history;
+package org.apache.hertzbeat.warehouse.store.history.tsdb;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/HistoryDataReader.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history;
+package org.apache.hertzbeat.warehouse.store.history.tsdb;
 
 import java.util.List;
 import java.util.Map;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/HistoryDataWriter.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history;
+package org.apache.hertzbeat.warehouse.store.history.tsdb;
 
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeDbDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.greptime;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.greptime;
 
 import io.greptime.GreptimeDB;
 import io.greptime.models.AuthInfo;
@@ -55,8 +55,8 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.TimePeriodUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
-import org.apache.hertzbeat.warehouse.store.history.vm.PromQlQueryContent;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.vm.PromQlQueryContent;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -81,7 +81,6 @@ public class GreptimeDbDataStorage extends AbstractHistoryDataStorage {
     private static final String LABEL_KEY_NAME = "__name__";
     private static final String LABEL_KEY_FIELD = "__field__";
     private static final String LABEL_KEY_INSTANCE = "instance";
-    private static final String SPILT = "_";
 
     private GreptimeDB greptimeDb;
 
@@ -126,7 +125,7 @@ public class GreptimeDbDataStorage extends AbstractHistoryDataStorage {
             return;
         }
         String monitorId = String.valueOf(metricsData.getId());
-        String tableName = getTableName(metricsData.getId(), metricsData.getMetrics());
+        String tableName = getTableName(metricsData.getMetrics());
         TableSchema.Builder tableSchemaBuilder = TableSchema.newBuilder(tableName);
 
         tableSchemaBuilder.addTag("instance", DataType.String)
@@ -194,7 +193,7 @@ public class GreptimeDbDataStorage extends AbstractHistoryDataStorage {
     @Override
     public Map<String, List<Value>> getHistoryMetricData(Long monitorId, String app, String metrics, String metric,
                                                          String label, String history) {
-        String name = getTableName(monitorId, metrics);
+        String name = getTableName(metrics);
         String timeSeriesSelector = LABEL_KEY_NAME + "=\"" + name + "\""
                 + "," + LABEL_KEY_INSTANCE + "=\"" + monitorId + "\"";
         if (!CommonConstants.PROMETHEUS.equals(app)) {
@@ -242,12 +241,13 @@ public class GreptimeDbDataStorage extends AbstractHistoryDataStorage {
                     .queryParam("start", start)
                     .queryParam("end", end)
                     .queryParam("step", step)
+                    .queryParam("db", greptimeProperties.database())
                     .build(true).toUri();
 
             ResponseEntity<PromQlQueryContent> responseEntity = restTemplate.exchange(uri,
                     HttpMethod.GET, httpEntity, PromQlQueryContent.class);
             if (responseEntity.getStatusCode().is2xxSuccessful()) {
-                log.debug("query metrics data from victoria-metrics success. {}", uri);
+                log.debug("query metrics data from greptime success. {}", uri);
                 if (responseEntity.getBody() != null && responseEntity.getBody().getData() != null
                         && responseEntity.getBody().getData().getResult() != null) {
                     List<PromQlQueryContent.ContentData.Content> contents = responseEntity.getBody().getData().getResult();
@@ -275,8 +275,8 @@ public class GreptimeDbDataStorage extends AbstractHistoryDataStorage {
         return instanceValuesMap;
     }
 
-    private String getTableName(Long monitorId, String metrics) {
-        return "hzb" + SPILT + monitorId + SPILT + metrics;
+    private String getTableName(String metrics) {
+        return metrics;
     }
 
     @Override

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.greptime;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.greptime;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/influxdb/InfluxdbDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.influxdb;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.influxdb;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -46,7 +46,7 @@ import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
 import org.apache.hertzbeat.common.entity.dto.Value;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.apache.http.ssl.SSLContexts;
 import org.influxdb.InfluxDB;
 import org.influxdb.InfluxDBFactory;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/influxdb/InfluxdbProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.influxdb;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.influxdb;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/iotdb/IotDbDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.iotdb;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.iotdb;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -33,7 +33,7 @@ import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
 import org.apache.hertzbeat.common.entity.dto.Value;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.apache.iotdb.rpc.IoTDBConnectionException;
 import org.apache.iotdb.rpc.StatementExecutionException;
 import org.apache.iotdb.session.pool.SessionDataSetWrapper;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/iotdb/IotDbProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.iotdb;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.iotdb;
 
 import java.time.ZoneId;
 import java.util.List;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/jpa/JpaDatabaseDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.jpa;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.jpa;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -49,7 +49,7 @@ import org.apache.hertzbeat.common.entity.warehouse.History;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.TimePeriodUtil;
 import org.apache.hertzbeat.warehouse.dao.HistoryDao;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.Specification;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/jpa/JpaProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.jpa;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.jpa;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/tdengine/TdEngineDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.tdengine;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine;
 
 import com.google.common.collect.Maps;
 import com.taosdata.jdbc.TSDBDriver;
@@ -47,7 +47,7 @@ import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
 import org.apache.hertzbeat.common.entity.dto.Value;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/tdengine/TdEngineProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.tdengine;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/PromQlQueryContent.java

@@ -34,7 +34,7 @@
  * under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import java.util.List;
 import java.util.Map;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -63,7 +63,7 @@ import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.TimePeriodUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpEntity;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsDataStorage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -57,7 +57,7 @@ import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.TimePeriodUtil;
-import org.apache.hertzbeat.warehouse.store.history.AbstractHistoryDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Primary;
 import org.springframework.http.HttpEntity;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsInsertProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import org.springframework.boot.context.properties.bind.DefaultValue;
 

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsSelectProperties.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.warehouse.store.history.vm;
+package org.apache.hertzbeat.warehouse.store.history.tsdb.vm;
 
 /**
  * vmselect configuration information

hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/MetricsDataServiceTest.java

@@ -31,7 +31,7 @@ import java.util.Optional;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.support.exception.CommonException;
 import org.apache.hertzbeat.warehouse.service.impl.MetricsDataServiceImpl;
-import org.apache.hertzbeat.warehouse.store.history.HistoryDataReader;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.HistoryDataReader;
 import org.apache.hertzbeat.warehouse.store.realtime.RealTimeDataReader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/TdEngineDataStorageTest.java

@@ -17,7 +17,7 @@
 
 package org.apache.hertzbeat.warehouse.store;
 
-import org.apache.hertzbeat.warehouse.store.history.tdengine.TdEngineDataStorage;
+import org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine.TdEngineDataStorage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

home/blog/2024-08-18-new-committer.md

@@ -36,7 +36,7 @@ The first contribution in the Apache community should be to delete a `{@link}` c
 
 ### Get nominated and become a Committer
 
-This nomination was recommended by PMC Member [Logic](https://github.com/zqr10159) of Apache HertzbeatP(Incubating). Thanks to the Apache Hertzbeat Team. I was successfully nominated to become a Hertzbeat Committer and got my own Apache mailbox.
+This nomination was recommended by PPMC Member [Logic](https://github.com/zqr10159) of Apache HertzbeatP(Incubating). Thanks to the Apache Hertzbeat Team. I was successfully nominated to become a Hertzbeat Committer and got my own Apache mailbox.
 
 ![Apache ID Email](/img/blog/committer/yuluo-yx/3.jpg)
 
@@ -70,7 +70,7 @@ Before contributing to the community, it is important to understand the communit
 
 #### Project Committer Nomination Criteria
 
-The conditions for a Project PMC Team to nominate a Committer are different. Take Apache Hertzbeat for example:
+The conditions for a Project PPMC Team to nominate a Committer are different. Take Apache Hertzbeat for example:
 
 ! [Apache Hertzbeat becoming committer](/img/blog/committer/yuluo-yx/7.jpg)
 

home/blog/2025-04-06-new-pmc.md

@@ -24,7 +24,7 @@ During this period, I deeply realized that **the vitality of an open source proj
 
 ## Becoming a PMC: The Upgrade of Responsibilities and Challenges
 
-The responsibilities of the PMC go far beyond the code level. It requires members to have a deeper understanding and thinking about the project's **technical direction, community governance, and long-term development**. When I received the PMC invitation, I felt excited but also realized that I needed to face new challenges:
+The responsibilities of the PPMC go far beyond the code level. It requires members to have a deeper understanding and thinking about the project's **technical direction, community governance, and long-term development**. When I received the PPMC invitation, I felt excited but also realized that I needed to face new challenges:
 
 ### 1. Participation in Technical Strategy
 
@@ -37,7 +37,7 @@ These issues are no longer simple code implementations but involve in-depth disc
 
 ### 2. Community Governance and Health
 
-The PMC needs to pay attention to the long-term healthy development of the community, including:
+The PPMC needs to pay attention to the long-term healthy development of the community, including:
 
 - **Contributor experience**: How to optimize the documentation and lower the entry threshold for new members.
 - **Community culture**: Ensure a friendly discussion atmosphere and that conflicts can be properly resolved.

home/blog/2025-5-19-new-pmc.md

@@ -1,5 +1,5 @@
 ---
-title: "From User to PMC Member: Contributing to Open Source with Passion at Apache HertzBeat"
+title: "From User to PPMC Member: Contributing to Open Source with Passion at Apache HertzBeat"
 author: liutianyou
 author_title: liutianyou
 author_url: https://github.com/Liutianyou
@@ -16,7 +16,7 @@ As my contributions grew, I gradually evolved from an "occasional code submitter
 
 After becoming a Committer, my responsibilities expanded beyond coding to include community discussions, PR reviews, and helping new members onboard. This experience gave me a profound realization: **Open source isn't just about code - it's fundamentally about human collaboration**.
 
-This year, I was honored to be nominated as a PMC member. Just like when I first received the Committer invitation, I felt the same excitement. I understand this recognition carries not just acknowledgment of past contributions but also the community's trust and expectations. As PMC, my responsibilities now include ensuring project health through strategic planning, community event organization, and requirement coordination. This role enables deeper involvement in core decision-making, from technical direction to ecosystem development, driving HertzBeat's continuous evolution.
+This year, I was honored to be nominated as a PPMC member. Just like when I first received the Committer invitation, I felt the same excitement. I understand this recognition carries not just acknowledgment of past contributions but also the community's trust and expectations. As PMC, my responsibilities now include ensuring project health through strategic planning, community event organization, and requirement coordination. This role enables deeper involvement in core decision-making, from technical direction to ecosystem development, driving HertzBeat's continuous evolution.
 
 ### Personal Growth
 

home/docs/community/become_pmc_member.md

@@ -1,6 +1,6 @@
 ---
 id: 'become_pmc_member'
-title: 'Become A PMC member'
+title: 'Become A PPMC member'
 sidebar_position: 3
 ---
 
@@ -21,10 +21,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-## Become A PMC member of Apache HertzBeat
+## Become A PPMC member of Apache HertzBeat
 
 Anyone being supportive of the community and working in any of the
-CoPDoC areas can become an Apache HertzBeat PMC member. The CoPDoC is an
+CoPDoC areas can become an Apache HertzBeat PPMC member. The CoPDoC is an
 acronym from ASF to describe how we recognize your contributions not
 only by code.
 
@@ -38,16 +38,16 @@ only by code.
 
 Apache HertzBeat community strives to be meritocratic. Thus, once someone
 has contributed sufficiently to any area of CoPDoC they can be a
-candidate for PMC membership and at last voted in as a HertzBeat
-PMC member. Being an Apache HertzBeat PMC member does not necessarily mean
+candidate for PPMC membership and at last voted in as a HertzBeat
+PMC member. Being an Apache HertzBeat PPMC member does not necessarily mean
 you must commit code with your commit privilege to the codebase; it
 means you are committed to the HertzBeat project and are productively
 contributing to our community's success.
 
-## PMC member requirements
+## PPMC member requirements
 
 There are no strict rules for becoming a committer or PPMC member.
-Candidates for new PMC member are typically people that are active
+Candidates for new PPMC member are typically people that are active
 contributors and community members. Anyway, if the rules can be
 clarified a little bit, it can somehow clear the doubts in the minds
 of contributors and make the community more transparent, reasonable,

home/docs/community/how-to-release.md

@@ -449,7 +449,7 @@ Hello Incubator Community:
 
 This is a call for a vote to release Apache HertzBeat (incubating) version 1.6.0-RC1.
 The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat (incubating) version 1.6.0-RC1.
-We now kindly request the Incubator PMC members review and vote on this incubator release.
+We now kindly request the Incubator PPMC members review and vote on this incubator release.
 Apache HertzBeat, a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
 
 HertzBeat community vote thread:

home/docs/community/new_pmc_member_process.md

@@ -1,6 +1,6 @@
 ---
 id: 'new_pmc_ember_process'
-title: 'New PMC Member Process'
+title: 'New PPMC Member Process'
 sidebar_position: 5
 ---
 
@@ -23,7 +23,7 @@ limitations under the License.
 
 [Apache New Committer Guideline](https://community.apache.org/newcommitter.html#new-committer-process)
 
-## The process of new PMC member
+## The process of new PPMC member
 
 - Call a vote in mailing `private@hertzbeat.apache.org`
 
@@ -33,23 +33,23 @@ limitations under the License.
 
   see **Close Vote Template**
 
-- Board Approval of new PMC member
+- Board Approval of new PPMC member
 
-  see **Board Approval of new PMC member**
+  see **Board Approval of new PPMC member**
 
-- If the result is positive, invite the new PMC member
+- If the result is positive, invite the new PPMC member
 
   see **PMC member Invite Template**
 
-- If accept, then: Accept the PMC member
+- If accept, then: Accept the PPMC member
 
   see **PMC Member Accept Template**
 
-- Notify the PMC member of completion
+- Notify the PPMC member of completion
 
   see **PMC Member Done Template**
 
-- Announce the new PMC member
+- Announce the new PPMC member
 
   see **PMC Member Announce Template**
 
@@ -61,17 +61,17 @@ Note that, there are three placeholder in template should be replaced before usi
 - NEW_PMC_EMAIL
 - NEW_PMC_APACHE_NAME
 
-### PMC Member Vote Template
+### PPMC Member Vote Template
 
 ```text
 To: private@hertzbeat.apache.org
-Subject: [VOTE] New PMC member candidate: ${NEW_PMC_NAME}
+Subject: [VOTE] New PPMC member candidate: ${NEW_PMC_NAME}
 ```
 
 ```text
 Hi HertzBeat PPMC,
 
-This is a formal vote about inviting ${NEW_PMC_NAME} as our new PMC member.
+This is a formal vote about inviting ${NEW_PMC_NAME} as our new PPMC member.
 
 ${Work list}[1]
 
@@ -85,7 +85,7 @@ Note that, Voting ends one week from today, i.e. [midnight UTC on YYYY-MM-DD](ht
 
 ```text
 To: private@hertzbeat.apache.org
-Subject: [RESULT] [VOTE] New PMC member: ${NEW_PMC_NAME}
+Subject: [RESULT] [VOTE] New PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
@@ -102,12 +102,12 @@ Binding Votes:
 The vote is ***successful/not successful***
 ```
 
-### Board Approval of new PMC member Template
+### Board Approval of new PPMC member Template
 
 ```text
 To: board@apache.org
 Cc: private@<project>.apache.org
-Subject: [NOTICE] ${NEW_PMC_NAME} for HertzBeat PMC member
+Subject: [NOTICE] ${NEW_PMC_NAME} for HertzBeat PPMC member
 ```
 
 ```text
@@ -118,12 +118,12 @@ The vote result is available here: https://lists.apache.org/...
 
 [Apache New Pmc Guide](https://www.apache.org/dev/pmc.html#newpmc)
 
-### PMC Member Invite Template
+### PPMC Member Invite Template
 
 ```text
 To: ${NEW_PMC_EMAIL}
 Cc: private@hertzbeat.apache.org
-Subject: Invitation to become HertzBeat PMC member: ${NEW_PMC_NAME}
+Subject: Invitation to become HertzBeat PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
@@ -136,9 +136,9 @@ These privileges are offered on the understanding that
 you'll use them reasonably and with common sense.
 We like to work on trust rather than unnecessary constraints. 
 
-Being a PMC member enables you to guide the direction of the project.
+Being a PPMC member enables you to guide the direction of the project.
 
-Being a PMC member does not require you to 
+Being a PPMC member does not require you to 
 participate any more than you already do. It does 
 tend to make one even more committed.  You will 
 probably find that you spend more time here.
@@ -164,20 +164,20 @@ B. If you accept, the next step is to register an iCLA:
     unique Apache ID. Look to see if your preferred 
     ID is already taken at 
     https://people.apache.org/committer-index.html
-    This will allow the Secretary to notify the PMC 
+    This will allow the Secretary to notify the PPMC 
     when your iCLA has been recorded.
 
 When recording of your iCLA is noted, you will 
 receive a follow-up message with the next steps for 
-establishing you as a PMC member.
+establishing you as a PPMC member.
 ```
 
-### PMC Member Accept Template
+### PPMC Member Accept Template
 
 ```text
 To: ${NEW_PMC_EMAIL}
 Cc: private@hertzbeat.apache.org
-Subject: Re: invitation to become HertzBeat PMC member
+Subject: Re: invitation to become HertzBeat PPMC member
 ```
 
 ```text
@@ -214,7 +214,7 @@ in incubating projects:
   https://incubator.apache.org/guides/committer.html
   https://incubator.apache.org/guides/ppmc.html
 
-Just as before you became a PMC member, participation in any ASF community
+Just as before you became a PPMC member, participation in any ASF community
 requires adherence to the ASF Code of Conduct:
   https://www.apache.org/foundation/policies/conduct.html
 
@@ -222,7 +222,7 @@ Yours,
 The Apache HertzBeat PPMC
 ```
 
-### PMC Member Done Template
+### PPMC Member Done Template
 
 ```text
 To: private@hertzbeat.apache.org, ${NEW_PMC_EMAIL}
@@ -256,18 +256,18 @@ you can now help fix that.
 A PPMC member will announce your election to the dev list soon.
 ```
 
-### PMC Member Announce Template
+### PPMC Member Announce Template
 
 ```text
 To: dev@hertzbeat.apache.org
-[ANNONCE] New PMC member: ${NEW_PMC_NAME}
+[ANNONCE] New PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
 Hi HertzBeat Community,
 
 The Podling Project Management Committee (PPMC) for Apache HertzBeat
-has invited ${NEW_PMC_NAME} to become our PMC member and
+has invited ${NEW_PMC_NAME} to become our PPMC member and
 we are pleased to announce that he has accepted.
 
 ### add specific details here ###

home/docs/help/ai_config.md

@@ -59,3 +59,23 @@ QuickStart: <https://www.xfyun.cn/doc/platform/quickguide.html>
 | Spark Pro         | generalv3   |
 | Spark V2.0        | generalv2   |
 | Spark Lite(free)  | general     |
+
+#### Ollama AI
+
+QuickStart: <https://github.com/ollama/ollama/tree/main/docs>
+
+| Name of the parameter | Example                                         | Link                          |
+|-----------------------|-------------------------------------------------|-------------------------------|
+| type                  | ollama (must be exactly the same as example)    |                               |
+| model                 | deepseek-r1:latest、qwen3:latest、llama4:16x17b   | <https://ollama.com/search>   |
+| api-url               | <http://127.0.0.1:11434/v1/chat/completions>    |                               |
+
+#### OpenRouter
+
+QuickStart: <https://openrouter.ai/docs/quickstart>
+
+| Name of the parameter | Example                                        | Link                                    |
+|-----------------------|------------------------------------------------|-----------------------------------------|
+| type                  | openRouter (must be exactly the same as example) |                                       |
+| model                 | openai/gpt-4o, anthropic/claude-sonnet-4       | <https://openrouter.ai/models>          |
+| api-key               | xxxxxxxxxxx                                    | <https://openrouter.ai/settings/provisioning-keys> |

home/docs/help/darwin.md

@@ -0,0 +1,108 @@
+---
+id: darwin  
+title: darwin operating system monitoring      
+sidebar_label: darwin operating system       
+keywords: [open source monitoring tool, open source os monitoring tool, monitoring darwin operating system metrics]
+---
+
+> Collect and monitor the general performance Metrics of darwin operating system.
+
+### Configuration parameter
+
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
+
+### Data Collection Metrics
+
+#### Metric Set: Basic System Information
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
+
+#### Metric Set: CPU Information
+
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage  (to be fixed)          |
+
+#### Metric Set: Memory Information
+
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
+
+#### Metric Set: Disk Information  - to be finished
+
+- Disk information collection is not yet implemented, but will be added in future versions.
+
+#### Metric Set: Network Card Information
+
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
+
+#### Metric Set: File System
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
+
+#### Metric Set: Top 10 CPU Processes
+
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
+
+#### Metric Set: Top 10 Memory Processes
+
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/grafana_dashboard.md

@@ -17,21 +17,40 @@ keywords: [Grafana, Historical Dashboard]
 `Grafana` can only show historical data for `Prometheus` type of monitoring, currently it does not support monitoring data defined by `yml` in `HertzBeat`.
 :::
 
-### enable Grafana embedded url
+### Enable Grafana embedded features and configure anonymous authentication with role-based permissions
 
-ref: <https://grafana.com/blog/2023/10/10/how-to-embed-grafana-dashboards-into-web-applications/>
-In the `Grafana` configuration file `grafana.ini`, set the `allow_embedding = true`.
-In the `Grafana` configuration file `grafana.ini`, set the `[auth.anonymous]` option to `true`.
-Or run `Grafana` with the following command via `docker`:
+ref: <https://grafana.com/blog/2023/10/10/how-to-embed-grafana-dashboards-into-web-applications/>.
+In the `Grafana` configuration file `grafana.ini`, set the configuration parameters.
+Or run `Grafana` via `Docker`.
 
-```bash
-docker run -itd --name grafana -p 3000:3000 -e "GF_AUTH_PROXY_ENABLED=true" -e "GF_AUTH_ANONYMOUS_ENABLED=true" -e "GF_SECURITY_ALLOW_EMBEDDING=true" grafana/grafana:latest
+Modify the following configuration parameters in the `Grafana` configuration file `grafana.ini`:
 
 ```ini
-allow_embedding = true
-[auth.anonymous]
-# enable anonymous access
+[auth.proxy]
 enabled = true
+
+[auth.anonymous]
+enabled = true
+org_role = Admin
+
+[users]
+viewers_can_edit = true
+
+[security]
+allow_embedding = true
+```
+
+Or run `Grafana` via `Docker` using the following command:
+
+```bash
+docker run -d -p 3000:3000 --name=grafana \
+  -v "$PWD/data:/var/lib/grafana" \
+  -e "GF_AUTH_PROXY_ENABLED=true" \
+  -e "GF_AUTH_ANONYMOUS_ENABLED=true" \
+  -e "GF_AUTH_ANONYMOUS_ORG_ROLE=Admin" \
+  -e "GF_USERS_VIEWERS_CAN_EDIT=true" \
+  -e "GF_SECURITY_ALLOW_EMBEDDING=true" \
+  grafana/grafana:latest
 ```
 
 ### Configuring Grafana in HertzBeat

home/docs/help/security_model.md

@@ -30,6 +30,10 @@ Apache HertzBeat supports users to upload custom code plugins to run in the life
 
 Apache HertzBeat supports users to customize collectors to personalize the collection of monitoring indicators, and users need to ensure the security of the custom collectors themselves.
 
+## Custom URL and Other Parameter Security
+
+Apache HertzBeat provides the ability to configure custom parameters. All users authorized to configure URLs and other parameters are considered highly trusted and are expected to trigger certain behaviors.
+
 ## Security Constraints in Other Customizations
 
 Apache HertzBeat provides a variety of system extension methods and custom capabilities. Users need to pay attention to the security of customizations during use. Of course, all extension capabilities need to be within the scope of authenticated users.

home/docs/start/rainbond-deploy.md

@@ -6,11 +6,29 @@ sidebar_label: Install via Rainbond
 
 If you are unfamiliar with Kubernetes, and want to install Apache HertzBeat (incubating) in Kubernetes, you can use Rainbond to deploy. Rainbond is a cloud-native application management platform built on Kubernetes and simplifies the application deployment to Kubernetes.
 
-## Prerequisites
+## Rainbond Cloud deployment
+
+If you want to deploy "HertzBeat" on "Rainbond Cloud" in one click, you can follow the steps below to do so.
+
+- Open the details of the [HertzBeat application](https://hub.grapps.cn/marketplace/apps/753)
+
+![HertzBeat app desc](/img/docs/start/hertzbeat-desc.png)
+
+- Log in to your Rainbond Cloud account. If you don't have an account, register one in advance!
+
+![Rainbond Cloud](/img/docs/start/rainbond-cloud.png)
+
+- Select the version for installation
+
+![hertzbeat versions](/img/docs/start/hertzbeat-versions.png)
+
+## Open-source Rainbond deployment
+
+### Prerequisites
 
 To install Rainbond, please refer to [Rainbond Quick Install](https://www.rainbond.com/docs/quick-start/quick-install)。
 
-## Deploy HertzBeat
+### Deploy HertzBeat
 
 After logging in Rainbond, click Market in the left menu, switch to open source app store, and search HertzBeat in the search box, and click the Install button.
 
@@ -18,10 +36,10 @@ After logging in Rainbond, click Market in the left menu, switch to open source
 
 Fill in the following information, and click Confirm button to install.
 
-* Team: select a team or create a new team
-* Cluster: select a cluster
-* Application: select an application or create a new application
-* Version: select a version
+- Team: select a team or create a new team
+- Cluster: select a cluster
+- Application: select an application or create a new application
+- Version: select a version
 
 After installation, HertzBeat can be accessed via the Access button.
 

home/i18n/zh-cn/docusaurus-plugin-content-blog/2024-08-18-new-committer.md

@@ -34,7 +34,7 @@ Apache 软件基金会起初是由开发 [Apache HTTPd](https://httpd.apache.org
 
 ### 获得提名，成为 Committer
 
-此次提名是 Apache HertzbeatP(Incubating) 的 PMC Member [Logic](https://github.com/zqr10159) 举荐的，感谢 Apache Hertzbeat Team。顺利提名成为了 Hertzbeat Committer，有了自己的 Apache 邮箱。
+此次提名是 Apache HertzbeatP(Incubating) 的 PPMC Member [Logic](https://github.com/zqr10159) 举荐的，感谢 Apache Hertzbeat Team。顺利提名成为了 Hertzbeat Committer，有了自己的 Apache 邮箱。
 
 ![Apache ID Email](/img/blog/committer/yuluo-yx/3.jpg)
 
@@ -66,7 +66,7 @@ Apache Community 奉行的 [The Apache Way](https://www.apache.org/theapacheway/
 
 #### 项目 Committer 提名条件
 
-项目 PMC Team 提名 Committer 的条件是不一样的。以 Apache Hertzbeat 为例：
+项目 PPMC Team 提名 Committer 的条件是不一样的。以 Apache Hertzbeat 为例：
 
 ![Apache Hertzbeat becoming committer](/img/blog/committer/yuluo-yx/7.jpg)
 

home/i18n/zh-cn/docusaurus-plugin-content-blog/2025-04-06-new-pmc.md

@@ -24,7 +24,7 @@ keywords: [open source monitoring system, alerting system]
 
 ## 成为 PMC：责任与挑战的升级
 
-PMC 的职责远超代码层面，它要求成员对项目的**技术方向、社区治理、长期发展**有更深入的思考。当我收到 PMC 邀请时，既感到兴奋，也意识到需要迎接新的挑战：
+PMC 的职责远超代码层面，它要求成员对项目的**技术方向、社区治理、长期发展**有更深入的思考。当我收到 PPMC 邀请时，既感到兴奋，也意识到需要迎接新的挑战：
 
 ### 1. **技术战略的参与**
 

home/i18n/zh-cn/docusaurus-plugin-content-blog/2025-5-19-new-pmc.md

@@ -1,5 +1,5 @@
 ---
-title: 因热爱而贡献开源：如何从用户成长为 Apache Hertzbeat 的 PMC 成员
+title: 因热爱而贡献开源：如何从用户成长为 Apache Hertzbeat 的 PPMC 成员
 author: liutianyou
 author_title: liutianyou
 author_url: https://github.com/Liutianyou
@@ -16,7 +16,7 @@ keywords: [open source monitoring system, alerting system]
 
 成为 Committer 后，除了代码，还需要参与社区讨论、review其他贡献者的PR、帮助新成员融入。这段经历让我深刻体会到：**开源不仅仅是写代码，更是关于人与人的协作**。
 
-今年，我有幸被提名为 PMC 成员。和一年前收到成为 Committer 的邀请时一样，内心依旧无比激动。我深知这不仅是对我过往贡献的认可，更承载着社区的信任与期待。作为 PMC，我的职责是确保项目健康发展，包括制定战略规划、组织社区活动以及协调需求评审。这一身份让我得以更深度地参与项目的核心决策，从技术方向到生态建设，全方位推动 HertzBeat 的持续演进。
+今年，我有幸被提名为 PPMC 成员。和一年前收到成为 Committer 的邀请时一样，内心依旧无比激动。我深知这不仅是对我过往贡献的认可，更承载着社区的信任与期待。作为 PMC，我的职责是确保项目健康发展，包括制定战略规划、组织社区活动以及协调需求评审。这一身份让我得以更深度地参与项目的核心决策，从技术方向到生态建设，全方位推动 HertzBeat 的持续演进。
 
 ### 个人成长
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/become_pmc_member.md

@@ -21,7 +21,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-## 成为 Apache HertzBeat™ 的 PMC 成员
+## 成为 Apache HertzBeat™ 的 PPMC 成员
 
 任何支持社区并在 CoPDoC 领域中工作的人都可以成为 Apache HertzBeat 的PMC 成员。CoPDoC 是 ASF 的缩写，用来描述我们如何不仅仅通过代码来认识到您的贡献。
 
@@ -30,11 +30,11 @@ limitations under the License.
 - **Documentation** - 没有它，内容只会停留在作者的头脑中。
 - **Code** - 没有代码，讨论就毫无意义。
 
-Apache HertzBeat 社区努力追求基于功绩的原则。因此，一旦有人在 CoPDoC 的任何领域有了足够的贡献，他们就可以成为 PMC 成员资格的候选人，最终被投票选为 HertzBeat 的 PMC 成员。成为 Apache HertzBeat 的 PMC 成员并不一定意味着您必须使用您的提交权限向代码库提交代码；它意味着您致力于 HertzBeat 项目并为我们社区的成功做出了积极的贡献。
+Apache HertzBeat 社区努力追求基于功绩的原则。因此，一旦有人在 CoPDoC 的任何领域有了足够的贡献，他们就可以成为 PPMC 成员资格的候选人，最终被投票选为 HertzBeat 的 PPMC 成员。成为 Apache HertzBeat 的 PPMC 成员并不一定意味着您必须使用您的提交权限向代码库提交代码；它意味着您致力于 HertzBeat 项目并为我们社区的成功做出了积极的贡献。
 
-## PMC 成员的要求
+## PPMC 成员的要求
 
-没有成为 Committer 或 PPMC 成员的严格规则。新的 PMC 成员的候选人通常是积极的贡献者和社区成员。但是，如果能稍微明确一些规则，就可以在一定程度上消除贡献者的疑虑，使社区更加透明、合理和公平。
+没有成为 Committer 或 PPMC 成员的严格规则。新的 PPMC 成员的候选人通常是积极的贡献者和社区成员。但是，如果能稍微明确一些规则，就可以在一定程度上消除贡献者的疑虑，使社区更加透明、合理和公平。
 
 ### 持续的贡献
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md

@@ -449,7 +449,7 @@ Hello Incubator Community:
 
 This is a call for a vote to release Apache HertzBeat (incubating) version 1.6.0-RC1.
 The Apache HertzBeat community has voted on and approved a proposal to release Apache HertzBeat (incubating) version 1.6.0-RC1.
-We now kindly request the Incubator PMC members review and vote on this incubator release.
+We now kindly request the Incubator PPMC members review and vote on this incubator release.
 Apache HertzBeat, a real-time monitoring system with agentless, performance cluster, prometheus-compatible, custom monitoring and status page building capabilities.
 
 HertzBeat community vote thread:

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/new_pmc_member_process.md

@@ -65,13 +65,13 @@ limitations under the License.
 
 ```text
 To: private@hertzbeat.apache.org
-Subject: [VOTE] New PMC member candidate: ${NEW_PMC_NAME}
+Subject: [VOTE] New PPMC member candidate: ${NEW_PMC_NAME}
 ```
 
 ```text
 Hi HertzBeat PPMC,
 
-This is a formal vote about inviting ${NEW_PMC_NAME} as our new PMC member.
+This is a formal vote about inviting ${NEW_PMC_NAME} as our new PPMC member.
 
 ${Work list}[1]
 
@@ -86,7 +86,7 @@ ${Work list}[1]
 
 ```text
 To: private@hertzbeat.apache.org
-Subject: [RESULT] [VOTE] New PMC member: ${NEW_PMC_NAME}
+Subject: [RESULT] [VOTE] New PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
@@ -103,12 +103,12 @@ Binding Votes:
 The vote is ***successful/not successful***
 ```
 
-### Board Approval of new PMC member Template
+### Board Approval of new PPMC member Template
 
 ```text
 To: board@apache.org
 Cc: private@<project>.apache.org
-Subject: [NOTICE] ${NEW_PMC_NAME} for HertzBeat PMC member
+Subject: [NOTICE] ${NEW_PMC_NAME} for HertzBeat PPMC member
 ```
 
 ```text
@@ -124,7 +124,7 @@ The vote result is available here: https://lists.apache.org/...
 ```text
 To: ${NEW_PMC_EMAIL}
 Cc: private@hertzbeat.apache.org
-Subject: Invitation to become HertzBeat PMC member: ${NEW_PMC_NAME}
+Subject: Invitation to become HertzBeat PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
@@ -137,9 +137,9 @@ These privileges are offered on the understanding that
 you'll use them reasonably and with common sense.
 We like to work on trust rather than unnecessary constraints. 
 
-Being a PMC member enables you to guide the direction of the project.
+Being a PPMC member enables you to guide the direction of the project.
 
-Being a PMC member does not require you to 
+Being a PPMC member does not require you to 
 participate any more than you already do. It does 
 tend to make one even more committed.  You will 
 probably find that you spend more time here.
@@ -165,12 +165,12 @@ B. If you accept, the next step is to register an iCLA:
     unique Apache ID. Look to see if your preferred 
     ID is already taken at 
     https://people.apache.org/committer-index.html
-    This will allow the Secretary to notify the PMC 
+    This will allow the Secretary to notify the PPMC 
     when your iCLA has been recorded.
 
 When recording of your iCLA is noted, you will 
 receive a follow-up message with the next steps for 
-establishing you as a PMC member.
+establishing you as a PPMC member.
 ```
 
 ### PMC成员接受模板
@@ -178,7 +178,7 @@ establishing you as a PMC member.
 ```text
 To: ${NEW_PMC_EMAIL}
 Cc: private@hertzbeatv.apache.org
-Subject: Re: invitation to become HertzBeat PMC member
+Subject: Re: invitation to become HertzBeat PPMC member
 ```
 
 ```text
@@ -215,7 +215,7 @@ in incubating projects:
   https://incubator.apache.org/guides/committer.html
   https://incubator.apache.org/guides/ppmc.html
 
-Just as before you became a PMC member, participation in any ASF community
+Just as before you became a PPMC member, participation in any ASF community
 requires adherence to the ASF Code of Conduct:
   https://www.apache.org/foundation/policies/conduct.html
 
@@ -261,14 +261,14 @@ A PPMC member will announce your election to the dev list soon.
 
 ```text
 To: dev@hertzbeat.apache.org
-[ANNONCE] New PMC member: ${NEW_PMC_NAME}
+[ANNONCE] New PPMC member: ${NEW_PMC_NAME}
 ```
 
 ```text
 Hi HertzBeat Community,
 
 The Podling Project Management Committee (PPMC) for Apache HertzBeat
-has invited ${NEW_PMC_NAME} to become our PMC member and
+has invited ${NEW_PMC_NAME} to become our PPMC member and
 we are pleased to announce that he has accepted.
 
 ### add specific details here ###

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/ai_config.md

@@ -59,3 +59,23 @@ keywords: [人工智能 AI]
 | Spark Pro       | generalv3                     |
 | Spark V2.0      | generalv2                     |
 | Spark Lite(免费版) | general                       |
+
+#### Ollama AI
+
+快速入门: <https://github.com/ollama/ollama/tree/main/docs>
+
+| 参数名称 |                     示例                      |                 链接                  |
+|-----------------------|--------------------------------------------------|---------------------------------------|
+| type                  | ollama (必须和示例完全相同)  |                                       |
+| model                 | deepseek-r1:latest、qwen3:latest、llama4:16x17b | <https://ollama.com/search> |
+| api-url               | <http://127.0.0.1:11434/v1/chat/completions> |                                  |
+
+#### OpenRouter
+
+快速入门: <https://openrouter.ai/docs/quickstart>
+
+| 参数名称    | 示例                                       | 链接                                                 |
+|---------|------------------------------------------|----------------------------------------------------|
+| type    | openRouter (必须和示例完全相同)                   |                                                    |
+| model   | openai/gpt-4o, anthropic/claude-sonnet-4 | <https://openrouter.ai/models>                     |
+| api-key | xxxxxxxxxxx                              | <https://openrouter.ai/settings/provisioning-keys> |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/darwin.md

@@ -0,0 +1,110 @@
+---
+id: darwin  
+title: 监控：darwin操作系统监控      
+sidebar_label: darwin 操作系统      
+keywords: [开源监控系统, 开源操作系统监控, darwin操作系统监控]
+---
+
+> 对darwin操作系统的通用性能指标进行采集监控。
+
+### 配置参数
+
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
+
+### 采集指标
+
+#### 指标集合：系统基本信息
+
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
+
+#### 指标集合：CPU 信息
+
+| 指标名称           | 指标单位 | 指标帮助描述             |
+|----------------|------|--------------------|
+| info           | 无    | CPU型号              |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
+| load           | 无    | CPU最近1/5/15分钟的平均负载 |
+| context_switch | 无    | 当前上下文切换数量          |
+| usage          | %    | CPU使用率(待完善)        |
+
+#### 指标集合：内存信息
+
+|    指标名称    | 指标单位 |  指标帮助描述  |
+|------------|------|----------|
+| total      | Mb   | 总内存容量    |
+| used       | Mb   | 用户程序内存量  |
+| free       | Mb   | 空闲内存容量   |
+| buff_cache | Mb   | 缓存占用内存   |
+| available  | Mb   | 剩余可用内存容量 |
+| usage      | %    | 内存使用率    |
+
+#### 指标集合：磁盘信息 - 待完善
+
+- darwin操作系统的磁盘信息采集待完善，当前版本不支持。
+- 可以使用其他工具或脚本来获取磁盘信息。
+- 未来版本将支持磁盘信息采集。
+
+#### 指标集合：网卡信息
+
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
+
+#### 指标集合：文件系统
+
+|    指标名称    | 指标单位 | 指标帮助描述  |
+|------------|------|---------|
+| filesystem | 无    | 文件系统的名称 |
+| used       | Mb   | 已使用磁盘大小 |
+| available  | Mb   | 可用磁盘大小  |
+| usage      | %    | 使用率     |
+| mounted    | 无    | 挂载点目录   |
+
+#### 指标集合：Top10 CPU进程
+
+统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：Top10 内存进程
+
+统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/grafana_dashboard.md

@@ -17,21 +17,40 @@ keywords: [Grafana, 历史图表]
 `Grafana`只能展示`Prometheus`类型监控的历史数据,目前并不支持`HertzBeat`中`yml`定义的监控数据。
 :::
 
-### 启用Grafana 可嵌入功能, 并开启匿名访问
+### 启用Grafana可嵌入功能, 并配置匿名访问及权限角色
 
-参考: <https://grafana.com/blog/2023/10/10/how-to-embed-grafana-dashboards-into-web-applications/>
-修改配置文件`grafana.ini`中的`allow_embedding = true`
-修改配置文件`grafana.ini`中的`[auth.anonymous]` 为 `true`
-或者通过`docker`运行`Grafana`,使用以下命令:
+参考: <https://grafana.com/blog/2023/10/10/how-to-embed-grafana-dashboards-into-web-applications/>,
+修改配置文件`grafana.ini`中的配置项参数,
+或者通过`docker`运行`Grafana`。
 
-```bash
-docker run -itd --name grafana -p 3000:3000 -e "GF_AUTH_PROXY_ENABLED=true" -e "GF_AUTH_ANONYMOUS_ENABLED=true" -e "GF_SECURITY_ALLOW_EMBEDDING=true" grafana/grafana:latest
+修改配置文件`grafana.ini`中的以下配置项参数:
 
 ```ini
-allow_embedding = true
-[auth.anonymous]
-# enable anonymous access
+[auth.proxy]
 enabled = true
+
+[auth.anonymous]
+enabled = true
+org_role = Admin
+
+[users]
+viewers_can_edit = true
+
+[security]
+allow_embedding = true
+```
+
+或者通过`docker`启动`Grafana`，使用以下命令:
+
+```bash
+docker run -d -p 3000:3000 --name=grafana \
+  -v "$PWD/data:/var/lib/grafana" \
+  -e "GF_AUTH_PROXY_ENABLED=true" \
+  -e "GF_AUTH_ANONYMOUS_ENABLED=true" \
+  -e "GF_AUTH_ANONYMOUS_ORG_ROLE=Admin" \
+  -e "GF_USERS_VIEWERS_CAN_EDIT=true" \
+  -e "GF_SECURITY_ALLOW_EMBEDDING=true" \
+  grafana/grafana:latest
 ```
 
 ### 在HertzBeat中配置Grafana

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/security_model.md

@@ -30,6 +30,10 @@ Apache HertzBeat 支持用户上传自定义代码插件在多个系统的生命
 
 Apache HertzBeat 支持用户自定义采集器来个性化采集监控指标等，用户需要自行保证自定义采集器的安全性。
 
+## 自定义URL等参数安全
+
+Apache HertzBeat 提供自定义参数配置能力，所有被授权配置 URL 等参数的用户都被认为是高度信任的，并且期望他们可以触发某些行为。
+
 ## 其它自定义下的安全约束
 
 Apache HertzBeat 提供多种系统扩展方式和自定义能力，用户在使用过程中需注意自定义的安全性。当然所有扩展能力都是需在认证用户范围。

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/rainbond-deploy.md

@@ -6,11 +6,29 @@ sidebar_label: 基于Rainbond部署
 
 如果你不熟悉 Kubernetes，想在 Kubernetes 中安装 Apache HertzBeat (incubating)，可以使用 Rainbond 来部署。Rainbond 是一个基于 Kubernetes 构建的云原生应用管理平台，可以很简单的将你的应用部署到 Kubernetes中。
 
-## 前提
+## Rainbond Cloud 部署
+
+如果想在 “Rainbond Cloud” 上一键部署 “HertzBeat”，可以按照以下步骤进行操作
+
+- 打开 [HertzBeat 应用详情](https://hub.grapps.cn/marketplace/apps/753)
+
+![HertzBeat应用详情](/img/docs/start/hertzbeat-desc.png)
+
+- 登录 Rainbond Cloud 帐号，没有帐号，提前注册帐号！
+
+![Rainbond Cloud](/img/docs/start/rainbond-cloud.png)
+
+- 选择版本安装
+
+![hertzbeat 版本](/img/docs/start/hertzbeat-versions.png)
+
+## 开源 Rainbond 部署
+
+### 前提
 
 安装 Rainbond，请参阅 [Rainbond 快速安装](https://www.rainbond.com/docs/quick-start/quick-install)。
 
-## 部署 HertzBeat
+### 部署 HertzBeat
 
 登录 Rainbond 后，点击左侧菜单中的 `应用市场`，切换到开源应用商店，在搜索框中搜索 `HertzBeat`，点击安装按钮。
 
@@ -18,10 +36,10 @@ sidebar_label: 基于Rainbond部署
 
 填写以下信息，然后点击确认按钮进行安装。
 
-* 团队：选择现有团队或创建新的团队
-* 集群：选择对应的集群
-* 应用：选择现有应用或创建新的应用
-* 版本：选择要安装的 HertzBeat 版本
+- 团队：选择现有团队或创建新的团队
+- 集群：选择对应的集群
+- 应用：选择现有应用或创建新的应用
+- 版本：选择要安装的 HertzBeat 版本
 
 等待安装完成，即可访问 HertzBeat 应用。