Merge branch 'master' into traces

Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: shown <yuluo08290126@gmail.com>

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

@@ -220,11 +220,11 @@ public class RealTimeAlertCalculator {
                 fingerPrints.putAll(commonFingerPrints);
                 for (int index = 0; index < valueRow.getColumnsList().size(); index++) {
                     String valueStr = valueRow.getColumns(index);
+                    final CollectRep.Field field = fields.get(index);
                     if (CommonConstants.NULL_VALUE.equals(valueStr)) {
+                        fieldValueMap.put(field.getName(), null);
                         continue;
                     }
-                    
-                    final CollectRep.Field field = fields.get(index);
                     final int fieldType = field.getType();
 
                     if (fieldType == CommonConstants.TYPE_NUMBER) {

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/DbAlertStoreHandlerImpl.java

@@ -52,86 +52,84 @@ final class DbAlertStoreHandlerImpl implements AlertStoreHandler {
             log.error("The Group Alerts is empty, ignore store");
             return groupAlert;
         }
-        // 1. Find existing alert group
-        GroupAlert existGroupAlert = groupAlertDao.findByGroupKey(groupAlert.getGroupKey());
-        
-        // 2. Process individual alerts
+        // Process individual alerts
         Set<String> alertFingerprints = new HashSet<>(8);
-
         List<SingleAlert> originalAlerts = groupAlert.getAlerts();
         List<SingleAlert> newAlerts = new ArrayList<>();
 
-
         for (SingleAlert singleAlert : originalAlerts) {
-            SingleAlert existAlert = singleAlertDao.findByFingerprint(singleAlert.getFingerprint());
-
-            if (existAlert != null) {
-                // Update the existing alert with the ID and creation time from the database
-                singleAlert.setId(existAlert.getId());
-                singleAlert.setGmtCreate(existAlert.getGmtCreate());
-
-                // Status transition logic
-                if (CommonConstants.ALERT_STATUS_FIRING.equals(singleAlert.getStatus())) {
-                    // If the alert is firing and the existing alert is not resolved, update the start time and trigger times
-                    if (!CommonConstants.ALERT_STATUS_RESOLVED.equals(existAlert.getStatus())) {
+            synchronized (singleAlert.getFingerprint().intern()) {
+                SingleAlert existAlert = singleAlertDao.findByFingerprint(singleAlert.getFingerprint());
+                if (existAlert != null) {
+                    // Update the existing alert with the ID and creation time from the database
+                    singleAlert.setId(existAlert.getId());
+                    singleAlert.setGmtCreate(existAlert.getGmtCreate());
+                    // Status transition logic
+                    if (CommonConstants.ALERT_STATUS_FIRING.equals(singleAlert.getStatus())) {
+                        // If the alert is firing and the existing alert is not resolved, update the start time and trigger times
+                        if (!CommonConstants.ALERT_STATUS_RESOLVED.equals(existAlert.getStatus())) {
+                            singleAlert.setStartAt(existAlert.getStartAt());
+                            int triggerTimes = Optional.ofNullable(existAlert.getTriggerTimes()).orElse(1)
+                                    + Optional.ofNullable(singleAlert.getTriggerTimes()).orElse(1);
+                            singleAlert.setTriggerTimes(triggerTimes);
+                        }
+                    } else if (CommonConstants.ALERT_STATUS_RESOLVED.equals(singleAlert.getStatus())) {
+                        // If the alert is resolved, set the end time (if not already set) and copy other fields from the existing alert
+                        if (singleAlert.getEndAt() == null) {
+                            singleAlert.setEndAt(System.currentTimeMillis());
+                        }
                         singleAlert.setStartAt(existAlert.getStartAt());
-                        int triggerTimes = Optional.ofNullable(existAlert.getTriggerTimes()).orElse(1)
-                                + Optional.ofNullable(singleAlert.getTriggerTimes()).orElse(1);
-                        singleAlert.setTriggerTimes(triggerTimes);
+                        singleAlert.setActiveAt(existAlert.getActiveAt());
+                        singleAlert.setTriggerTimes(existAlert.getTriggerTimes());
                     }
-                } else if (CommonConstants.ALERT_STATUS_RESOLVED.equals(singleAlert.getStatus())) {
-                    // If the alert is resolved, set the end time (if not already set) and copy other fields from the existing alert
-                    if (singleAlert.getEndAt() == null) {
-                        singleAlert.setEndAt(System.currentTimeMillis());
-                    }
-                    singleAlert.setStartAt(existAlert.getStartAt());
-                    singleAlert.setActiveAt(existAlert.getActiveAt());
-                    singleAlert.setTriggerTimes(existAlert.getTriggerTimes());
                 }
+                SingleAlert savedSingleAlert = singleAlertDao.save(singleAlert);
+                newAlerts.add(savedSingleAlert);
+                alertFingerprints.add(savedSingleAlert.getFingerprint());
             }
-            SingleAlert savedSingleAlert = singleAlertDao.save(singleAlert);
-            newAlerts.add(savedSingleAlert);
-            alertFingerprints.add(savedSingleAlert.getFingerprint());
         }
         groupAlert.setAlerts(newAlerts);
-        // 3. Process resolved alerts
-        if (existGroupAlert != null) {
-            List<String> existFingerprints = existGroupAlert.getAlertFingerprints();
-            if (existFingerprints != null) {
-                alertFingerprints.addAll(existFingerprints);
-            }
-            // Merge group information
-            groupAlert.setId(existGroupAlert.getId());
-            groupAlert.setGmtCreate(existGroupAlert.getGmtCreate());
-            // Merge other historical information to preserve
-            Map<String, String> existCommonLabels = existGroupAlert.getCommonLabels();
-            if (existCommonLabels != null) {
-                Map<String, String> commonLabels = groupAlert.getCommonLabels();
-                if (commonLabels != null) {
-                    // filter common label in commonLabels and existCommonLabels
-                    commonLabels = commonLabels.entrySet().stream()
-                            .filter(entry -> existCommonLabels.containsKey(entry.getKey()))
-                            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-                    groupAlert.setCommonLabels(commonLabels);
+        // Find existing alert group
+        synchronized (groupAlert.getGroupKey().intern()) {
+            GroupAlert existGroupAlert = groupAlertDao.findByGroupKey(groupAlert.getGroupKey());
+            // Process resolved alerts
+            if (existGroupAlert != null) {
+                List<String> existFingerprints = existGroupAlert.getAlertFingerprints();
+                if (existFingerprints != null) {
+                    alertFingerprints.addAll(existFingerprints);
                 }
-            }
-            Map<String, String> existCommonAnnotations = existGroupAlert.getCommonAnnotations();
-            if (existCommonAnnotations != null) {
-                Map<String, String> commonAnnotations = groupAlert.getCommonAnnotations();
-                if (commonAnnotations != null) {
-                    // filter common annotation in commonAnnotations and existCommonAnnotations
-                    commonAnnotations = commonAnnotations.entrySet().stream()
-                            .filter(entry -> existCommonAnnotations.containsKey(entry.getKey()))
-                            .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-                    groupAlert.setCommonAnnotations(commonAnnotations);
+                // Merge group information
+                groupAlert.setId(existGroupAlert.getId());
+                groupAlert.setGmtCreate(existGroupAlert.getGmtCreate());
+                // Merge other historical information to preserve
+                Map<String, String> existCommonLabels = existGroupAlert.getCommonLabels();
+                if (existCommonLabels != null) {
+                    Map<String, String> commonLabels = groupAlert.getCommonLabels();
+                    if (commonLabels != null) {
+                        // filter common label in commonLabels and existCommonLabels
+                        commonLabels = commonLabels.entrySet().stream()
+                                .filter(entry -> existCommonLabels.containsKey(entry.getKey()))
+                                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                        groupAlert.setCommonLabels(commonLabels);
+                    }
+                }
+                Map<String, String> existCommonAnnotations = existGroupAlert.getCommonAnnotations();
+                if (existCommonAnnotations != null) {
+                    Map<String, String> commonAnnotations = groupAlert.getCommonAnnotations();
+                    if (commonAnnotations != null) {
+                        // filter common annotation in commonAnnotations and existCommonAnnotations
+                        commonAnnotations = commonAnnotations.entrySet().stream()
+                                .filter(entry -> existCommonAnnotations.containsKey(entry.getKey()))
+                                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                        groupAlert.setCommonAnnotations(commonAnnotations);
+                    }
                 }
             }
+            // Save alert group
+            groupAlert.setAlertFingerprints(alertFingerprints.stream().toList());
+            GroupAlert savedGroupAlert = groupAlertDao.save(groupAlert);
+            savedGroupAlert.setAlerts(groupAlert.getAlerts());
+            return savedGroupAlert;
         }
-        
-        // 4. Save alert group
-        groupAlert.setAlertFingerprints(alertFingerprints.stream().toList());
-        GroupAlert savedGroupAlert = groupAlertDao.save(groupAlert);
-        savedGroupAlert.setAlerts(groupAlert.getAlerts());
-        return savedGroupAlert;
     }
 }

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

@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.alert.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.ExternAlertService;
+import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
+import org.apache.hertzbeat.common.util.JsonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * zabbix external alarm service impl
+ */
+@Slf4j
+@Service
+public class ZabbixExternAlertServiceImpl implements ExternAlertService {
+
+    @Autowired
+    private AlarmCommonReduce alarmCommonReduce;
+
+    @Override
+    public void addExternAlert(String content) {
+        SingleAlert alert = JsonUtil.fromJson(content, SingleAlert.class);
+        if (alert == null) {
+            log.warn("parse extern alert content failed! content: {}", content);
+            return;
+        }
+        alarmCommonReduce.reduceAndSendAlarm(alert);
+    }
+
+    @Override
+    public String supportSource() {
+        return "zabbix";
+    }
+}

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

@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
 
 /**
  * Alarm template keyword matching replacement engine tool
@@ -38,11 +39,11 @@ public final class AlertTemplateUtil {
     private static final Pattern PATTERN = Pattern.compile("\\$\\{(\\w+)\\}");
 
     public static String render(String template, Map<String, Object> replaceData) {
-        if (template == null) {
-            return null;  
+        if (!StringUtils.hasText(template)) {
+            return template;  
         }
         if (replaceData == null) {
-            log.warn("The replaceData is null.");
+            log.warn("The render replace data is null.");
             return template;
         }
         try {
@@ -50,7 +51,7 @@ public final class AlertTemplateUtil {
             StringBuilder builder = new StringBuilder();
             while (matcher.find()) {
                 Object objectValue = replaceData.getOrDefault(matcher.group(1), "NullValue");
-                String value = objectValue.toString();
+                String value = objectValue != null ? objectValue.toString() : "NullValue";
                 matcher.appendReplacement(builder, Matcher.quoteReplacement(value));
             }
             matcher.appendTail(builder);

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/DbAlertStoreHandlerImplTest.java

@@ -57,6 +57,7 @@ class DbAlertStoreHandlerImplTest {
     public void setUp() {
         groupAlert = new GroupAlert();
         singleAlert = new SingleAlert();
+        singleAlert.setFingerprint("test-fingerprint");
         List<SingleAlert> alerts = new ArrayList<>();
         alerts.add(singleAlert);
         groupAlert.setAlerts(alerts);
@@ -77,11 +78,13 @@ class DbAlertStoreHandlerImplTest {
         when(groupAlertDao.findByGroupKey(groupKey)).thenReturn(null);
 
         SingleAlert savedSingleAlert = new SingleAlert();
+        savedSingleAlert.setFingerprint("test-finger");
         when(singleAlertDao.save(any(SingleAlert.class))).thenReturn(savedSingleAlert);
 
         GroupAlert savedGroupAlert = new GroupAlert();
+        savedGroupAlert.setGroupKey(groupKey);
         when(groupAlertDao.save(any(GroupAlert.class))).thenReturn(savedGroupAlert);
-
+        
         dbAlertStoreHandler.store(groupAlert);
 
         verify(singleAlertDao).save(any(SingleAlert.class));

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/timer/TimerDispatcher.java

@@ -17,10 +17,10 @@
 
 package org.apache.hertzbeat.collector.dispatch.timer;
 
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import lombok.extern.slf4j.Slf4j;
@@ -87,7 +87,7 @@ public class TimerDispatcher implements TimerDispatch, DisposableBean {
             for (Metrics metric : addJob.getMetrics()) {
                 metric.setInterval(0L);
             }
-            addJob.setIntervals(new LinkedList<>(List.of(0L)));
+            addJob.setIntervals(new ConcurrentLinkedDeque<>(List.of(0L)));
             Timeout timeout = wheelTimer.newTimeout(timerJob, addJob.getInterval(), TimeUnit.SECONDS);
             currentTempTaskMap.put(addJob.getId(), timeout);
             eventListeners.put(addJob.getId(), eventListener);

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/alerter/GroupAlert.java

@@ -86,7 +86,7 @@ public class GroupAlert {
     
     @Schema(title = "Alert Fingerprints", example = "[\"dxsdfdsf\"]")
     @Convert(converter = JsonStringListAttributeConverter.class)
-    @Column(length = 2048)
+    @Column(length = 8192)
     private List<String> alertFingerprints;
 
     @Schema(title = "The creator of this record", example = "tom")

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

@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -114,7 +115,7 @@ public class Job {
     /**
      * Refresh time list for one cycle of the job
      */
-    private LinkedList<Long> intervals;
+    private ConcurrentLinkedDeque<Long> intervals;
     /**
      * Whether it is a recurring periodic task true is yes, false is no
      */
@@ -328,7 +329,7 @@ public class Job {
      * @param metricsIntervals A unique list composed of intervals for all metrics
      * Generate a list of refresh intervals for metric collection
      */
-    public void generateMetricsIntervals(List<Long> metricsIntervals) {
+    public synchronized void generateMetricsIntervals(List<Long> metricsIntervals) {
         // 1. To find the least common multiple (LCM) of all metric refresh intervals
         long lcm = lcm(metricsIntervals);
         List<Long> refreshTimes = new LinkedList<>();
@@ -348,14 +349,16 @@ public class Job {
         for (int i = 1; i < refreshTimes.size(); i++) {
             intervals.add(refreshTimes.get(i) - refreshTimes.get(i - 1));
         }
-        setIntervals(intervals);
+        setIntervals(new ConcurrentLinkedDeque<>(intervals));
     }
 
-    public long getInterval() {
-        if (!CollectionUtils.isEmpty(getIntervals())) {
-            long interval = getIntervals().remove();
-            getIntervals().add(interval);
-            return interval;
+    public synchronized long getInterval() {
+        if (!CollectionUtils.isEmpty(this.intervals)) {
+            Long interval = this.intervals.removeFirst();
+            if (interval != null) {
+                this.intervals.addLast(interval);
+                return interval;
+            }
         }
         return getDefaultInterval();
     }

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

@@ -1,117 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.hertzbeat.log.config;
-
-import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
-import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
-import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
-import io.opentelemetry.sdk.OpenTelemetrySdk;
-import io.opentelemetry.sdk.logs.SdkLoggerProvider;
-import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
-import io.opentelemetry.sdk.resources.Resource;
-
-import jakarta.annotation.PostConstruct;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * OpenTelemetryConfig is responsible for initializing OpenTelemetry with the specified service name and GrepTimeDB endpoint.
- * It ensures that the initialization is done in a thread-safe manner and includes authentication for GrepTimeDB.
- */
-@Configuration
-@Slf4j
-public class OpenTelemetryConfig {
-
-    @Autowired
-    private GreptimeProperties greptimeProperties;
-
-    /**
-     * Initializes OpenTelemetry with the given service name and GrepTimeDB endpoint.
-     * Includes authentication if configured in GreptimeProperties.
-     */
-    @PostConstruct
-    public void initializeOpenTelemetry() {
-        if (greptimeProperties == null || !greptimeProperties.enabled()) {
-            log.info("GrepTimeDB logging is disabled, skipping OpenTelemetry configuration.");
-            return;
-        }
-
-        try {
-            Resource resource = Resource.getDefault()
-                    .merge(Resource.builder()
-                            .put(SERVICE_NAME, "HertzBeat")
-                            .build());
-
-            Map<String, String> headers = new HashMap<>();
-
-            headers.put("X-Greptime-DB-Name", "public");
-            headers.put("X-Greptime-Log-Table-Name", "hzb_log");
-
-            addAuthenticationHeaders(headers);
-
-            OtlpHttpLogRecordExporter logExporter = OtlpHttpLogRecordExporter.builder()
-                    .setEndpoint(greptimeProperties.httpEndpoint() + "/v1/otlp/v1/logs")
-                    .setHeaders(()-> headers)
-                    .setTimeout(10, TimeUnit.SECONDS)
-                    .build();
-
-            SdkLoggerProvider loggerProvider = SdkLoggerProvider.builder()
-                    .setResource(resource)
-                    .addLogRecordProcessor(
-                            BatchLogRecordProcessor.builder(logExporter)
-                                    .setScheduleDelay(1000, TimeUnit.MILLISECONDS)
-                                    .setMaxExportBatchSize(512)
-                                    .build())
-                    .build();
-
-            OpenTelemetry openTelemetry = OpenTelemetrySdk.builder()
-                    .setLoggerProvider(loggerProvider)
-                    .build();
-
-            OpenTelemetryAppender.install(openTelemetry);
-            log.info("OpenTelemetry successfully configured with GrepTimeDB exporter.");
-        } catch (Exception e) {
-            log.error("Failed to initialize OpenTelemetry with GrepTimeDB", e);
-        }
-    }
-
-    /**
-     * Adds authentication headers to the provided map if username and password are configured.
-     *
-     * @param headers the map to which authentication headers will be added
-     */
-    private void addAuthenticationHeaders(Map<String, String> headers) {
-        if (StringUtils.isNotBlank(greptimeProperties.username())
-                && StringUtils.isNotBlank(greptimeProperties.password())) {
-            String credentials = greptimeProperties.username() + ":" + greptimeProperties.password();
-            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
-            headers.put("Authorization", "Basic " + encodedCredentials);
-        }
-
-    }
-}

hertzbeat-manager/pom.xml

@@ -92,7 +92,7 @@
         <!-- log -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-log</artifactId>
+            <artifactId>hertzbeat-otel</artifactId>
         </dependency>
         <!-- spring -->
         <dependency>

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

@@ -35,7 +35,7 @@ import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 public class JacksonConfig {
 
     @Bean
-    public Jackson2ObjectMapperBuilderCustomizer customizer() {
+    public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() {
         return builder -> {
             JavaTimeModule javaTimeModule = new JavaTimeModule();
             final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX");

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

@@ -207,12 +207,12 @@ metrics:
     # 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: Content-Type
+      - field: content_type
         type: 1
         i18n:
           zh-CN: Content Type
           en-US: Content Type
-      - field: Content-Length
+      - field: content_length
         type: 1
         i18n:
           zh-CN: 响应内容长度

hertzbeat-otel/pom.xml

@@ -24,7 +24,7 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>hertzbeat-log</artifactId>
+    <artifactId>hertzbeat-otel</artifactId>
     <name>${project.artifactId}</name>
     <properties>
         <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -43,25 +43,14 @@
             <artifactId>hertzbeat-warehouse</artifactId>
         </dependency>
         <!-- OpenTelemetry -->
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-sdk-logs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentelemetry</groupId>
-            <artifactId>opentelemetry-exporter-otlp</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-logback-appender-1.0</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 </project>

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

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.hertzbeat.log.config;
+package org.apache.hertzbeat.otel.config;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;

hertzbeat-otel/src/main/java/org/apache/hertzbeat/otel/config/OpenTelemetryConfig.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.otel.config;
+
+import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
+import static org.apache.http.HttpHeaders.CONTENT_TYPE;
+
+import io.opentelemetry.exporter.otlp.http.logs.OtlpHttpLogRecordExporter;
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
+import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporterBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
+import io.opentelemetry.sdk.resources.Resource;
+
+import java.util.Base64;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hertzbeat.warehouse.store.history.greptime.GreptimeProperties;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * OpenTelemetryConfig provides customizations for the auto-configured OpenTelemetry SDK,
+ * specifically for integrating with GrepTimeDB for logs and traces.
+ */
+@Configuration
+@Slf4j
+public class OpenTelemetryConfig {
+
+    private static final String HERTZBEAT_SERVICE_NAME = "HertzBeat";
+    private static final String DEFAULT_GREPTIME_DB_NAME = "public";
+    private static final String DEFAULT_LOGS_TABLE_NAME = "hzb_logs";
+    private static final String DEFAULT_TRACES_TABLE_NAME = "hzb_traces";
+    private static final String GREPTIME_DB_NAME_HEADER = "X-Greptime-DB-Name";
+    private static final String GREPTIME_LOG_TABLE_NAME_HEADER = "X-Greptime-Log-Table-Name";
+    private static final String GREPTIME_TRACE_TABLE_NAME_HEADER = "X-Greptime-Trace-Table-Name";
+    private static final String GREPTIME_PIPELINE_NAME_HEADER = "X-Greptime-Pipeline-Name";
+
+    /**
+     * Adds authentication headers if credentials are provided.
+     */
+    private void addAuthenticationHeaders(Map<String, String> headers, GreptimeProperties greptimeProps) {
+        if (greptimeProps != null && StringUtils.isNotBlank(greptimeProps.username())
+                && StringUtils.isNotBlank(greptimeProps.password())) {
+            String credentials = greptimeProps.username() + ":" + greptimeProps.password();
+            String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes());
+            headers.put("Authorization", "Basic " + encodedCredentials);
+            log.debug("Added Basic Authentication header for GreptimeDB.");
+        } else {
+            log.debug("GreptimeDB username/password not configured, skipping Authentication header.");
+        }
+    }
+
+    /**
+     * Builds HTTP Log headers for OTLP communication with GreptimeDB.
+     */
+    private Map<String, String> buildGreptimeOtlpLogHeaders(GreptimeProperties greptimeProps) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(GREPTIME_DB_NAME_HEADER, DEFAULT_GREPTIME_DB_NAME);
+        headers.put(GREPTIME_LOG_TABLE_NAME_HEADER, DEFAULT_LOGS_TABLE_NAME);
+        addAuthenticationHeaders(headers, greptimeProps);
+        return Collections.unmodifiableMap(headers);
+    }
+
+    /**
+     * Builds HTTP Trace headers for OTLP communication with GreptimeDB.
+     */
+    private Map<String, String> buildGreptimeOtlpTraceHeaders(GreptimeProperties greptimeProps) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put(GREPTIME_DB_NAME_HEADER, DEFAULT_GREPTIME_DB_NAME);
+        headers.put(GREPTIME_TRACE_TABLE_NAME_HEADER, DEFAULT_TRACES_TABLE_NAME);
+        headers.put(CONTENT_TYPE, "application/x-protobuf");
+        headers.put(GREPTIME_PIPELINE_NAME_HEADER, "greptime_trace_v1");
+        addAuthenticationHeaders(headers, greptimeProps);
+        return Collections.unmodifiableMap(headers);
+    }
+
+    /**
+     * Provides an AutoConfigurationCustomizerProvider to tailor the auto-configured OpenTelemetry SDK.
+     * This includes setting up GrepTimeDB exporters for logs and traces, and customizing the resource.
+     * Active only if 'greptime.enabled' is true.
+     *
+     * @param greptimeProperties Configuration for GrepTimeDB.
+     * @return AutoConfigurationCustomizerProvider instance.
+     */
+    @Bean
+    @ConditionalOnProperty(name = "warehouse.store.greptime.enabled", havingValue = "true")
+    public AutoConfigurationCustomizerProvider greptimeOtelCustomizer(GreptimeProperties greptimeProperties) {
+        log.info("GreptimeDB is enabled. Applying OpenTelemetry SDK customizations.");
+
+        return providerCustomizer -> providerCustomizer
+                .addPropertiesCustomizer(sdkConfigProperties -> {
+                    Map<String, String> newProperties = new HashMap<>();
+                    newProperties.put("otel.metrics.exporter", "none");
+                    newProperties.put("otel.traces.exporter", "otlp");
+                    newProperties.put("otel.logs.exporter", "none");
+                    return newProperties;
+                })
+                .addResourceCustomizer((resource, configProperties) -> {
+                    log.info("Customizing auto-configured OpenTelemetry Resource with service name: {}.", HERTZBEAT_SERVICE_NAME);
+                    return resource.merge(Resource.builder().put(SERVICE_NAME, HERTZBEAT_SERVICE_NAME).build());
+                })
+                .addSpanExporterCustomizer((originalSpanExporter, configProperties) -> {
+                    String traceEndpoint = greptimeProperties.httpEndpoint() + "/v1/otlp/v1/traces";
+                    log.info("Programmatically configuring OtlpHttpSpanExporter for GreptimeDB traces. Endpoint: {}", traceEndpoint);
+                    Map<String, String> traceHeaders = buildGreptimeOtlpTraceHeaders(greptimeProperties);
+                    log.info("Trace Headers for GreptimeDB (programmatic HTTP config): {}", traceHeaders);
+
+                    OtlpHttpSpanExporterBuilder httpExporterBuilder = OtlpHttpSpanExporter.builder()
+                            .setEndpoint(traceEndpoint)
+                            .setHeaders(() -> traceHeaders)
+                            .setTimeout(10000, TimeUnit.MILLISECONDS);
+                    return httpExporterBuilder.build();
+                })
+                .addLoggerProviderCustomizer((sdkLoggerProviderBuilder, configProperties) -> {
+                    log.info("Customizing auto-configured SdkLoggerProviderBuilder for GrepTimeDB logs.");
+
+                    OtlpHttpLogRecordExporter logExporter = OtlpHttpLogRecordExporter.builder()
+                            .setEndpoint(greptimeProperties.httpEndpoint() + "/v1/otlp/v1/logs")
+                            .setHeaders(() -> buildGreptimeOtlpLogHeaders(greptimeProperties))
+                            .setTimeout(10000, TimeUnit.MILLISECONDS)
+                            .build();
+
+                    BatchLogRecordProcessor batchLogProcessor = BatchLogRecordProcessor.builder(logExporter)
+                            .setScheduleDelay(1000, TimeUnit.MILLISECONDS)
+                            .setMaxExportBatchSize(512)
+                            .build();
+
+                    return sdkLoggerProviderBuilder.addLogRecordProcessor(batchLogProcessor);
+                });
+    }
+}

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

@@ -0,0 +1,58 @@
+/*
+ *   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.otel.config;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+
+/**
+ * Installs the OpenTelemetryAppender for Logback once the auto-configured
+ * OpenTelemetry SDK is available and GrepTimeDB integration is enabled.
+ */
+@Component
+@ConditionalOnProperty(name = "warehouse.store.greptime.enabled", havingValue = "true")
+@Slf4j
+public class OpenTelemetryLogbackAppenderInstaller implements InitializingBean {
+
+    private final OpenTelemetry openTelemetry;
+
+    @Autowired
+    public OpenTelemetryLogbackAppenderInstaller(OpenTelemetry openTelemetry) {
+        this.openTelemetry = openTelemetry;
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        if (this.openTelemetry instanceof OpenTelemetrySdk) {
+            log.info("Auto-configured OpenTelemetry SDK detected. Installing OpenTelemetryAppender for Logback.");
+            OpenTelemetryAppender.install(this.openTelemetry);
+        } else {
+            log.warn("OpenTelemetry SDK is not an instance of OpenTelemetrySdk (type: {}). "
+                            + "OpenTelemetryAppender for Logback will not be installed. "
+                            + "Ensure OpenTelemetry auto-configuration is active and correctly providing an SDK.",
+                    this.openTelemetry != null ? this.openTelemetry.getClass().getName() : "null");
+        }
+    }
+}

hertzbeat-otel/src/main/resources/META-INF/spring.factories

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.hertzbeat.log.config.LogAutoConfiguration
+org.apache.hertzbeat.otel.config.LogAutoConfiguration

home/blog/2025-04-23-hertzbeat-upgrade-guide-docker-mode.md

@@ -1,103 +1,94 @@
-# HertzBeat 升级指导-(Docker Mode)
+# HertzBeat Upgrade Guide (Docker Mode)
 
-## Docker 方式升级 - Mysql 数据库
+## Docker-based Upgrade
 
-1. 数据备份
+### 1. Data Backup
 
-    - 备份数据库，将 mysql 数据手动做备份，按需备份
+- **Back up the database**: Manually back up MySQL data as needed.
 
-      ```bash
-      mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" <库名> hertzbeat_backup-`date +%Y-%m-%d`.sql #单库备份
-      mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" > hertzbeat_backup-`date +%Y-%m-%d`.sql # 整库备份
-      ```
+  ```bash
+  mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" <DB_NAME> > hertzbeat_backup-`date +%Y-%m-%d`.sql  # Single database  
+  mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" --all-databases > hertzbeat_backup-`date +%Y-%m-%d`.sql  # Full database  
+  ```
 
-    - 备份配置文件及数据目录
+- **Back up configuration files and data directory**:
 
-      ```bash
-      mv application.yml application-bak.yml && mv sureness-bak.yml
-      cp -R data data-`date +%Y-%m-%d`. bak
-      ```
+  ```bash
+  mv application.yml application-bak.yml && mv sureness.yml sureness-bak.yml  
+  cp -R data data-`date +%Y-%m-%d`.bak  
+  ```
 
-2. 关闭 并移除 HertzBeat 容器
+### 2. Stop and Remove the HertzBeat Container
 
-    ```shell
-    docker stop hertzbeat && docker rm hertzbeat
-    ```
+```bash
+docker stop hertzbeat && docker rm hertzbeat  
+```
 
-3. 升级数据库脚本
+### 3. Upgrade Database Schema
 
-    打开[https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration)， 选择你使用的数据库的目录下相应的 `V160__update_column.sql`文件在 Mysql 执行升级 sql。
+Navigate to [HertzBeat GitHub Migration Scripts](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration), select the appropriate `V160__update_column.sql` file under your database type (e.g., MySQL), and execute it in MySQL.
 
-4. 更换镜像重新启动 HertzBeat 容器
+### 4. Restart HertzBeat with the New Image
 
-    ```bash
-    $ docker run -d -p 1157:1157 -p 1158:1158 \
-        -v $(pwd)/data:/opt/hertzbeat/data \
-        -v $(pwd)/logs:/opt/hertzbeat/logs \
-        -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \
-        -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \
-        --restart=always \
-        --name hertzbeat apache/hertzbeat:v1.7.0
-    ```
+```bash
+docker run -d -p 1157:1157 -p 1158:1158 \  
+    -v $(pwd)/data:/opt/hertzbeat/data \  
+    -v $(pwd)/logs:/opt/hertzbeat/logs \  
+    -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \  
+    -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \  
+    --restart=always \  
+    --name hertzbeat apache/hertzbeat:v1.7.0  
+```
 
-5. 升级配置文件
+### 5. Update Configuration Files
 
-    参考备份配置根据自己的需求基础上进行修改。
+Modify the backup configurations as needed:
 
-    - `application.yml`一般需要修改以下部分
+- **`application.yml`** (Typical modifications):
 
-      默认为：
+  ```yaml
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: root
+    url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    hikari:
+      max-lifetime: 120000
+  
+  jpa:
+    show-sql: false
+    database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
+    database: mysql
+    properties:
+      eclipselink:
+        logging:
+          level: SEVERE
+  ```
 
-      ```yaml
-      datasource:
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        username: root
-        password: root
-        url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-        hikari:
-          max-lifetime: 120000
+- **`sureness.yml`** (Optional, modify for account/password changes):
 
-      jpa:
-        show-sql: false
-        database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
-        database: mysql
-        properties:
-          eclipselink:
-            logging:
-              level: SEVERE
-      ```
+  ```yaml
+  account:
+    - appId: admin
+      credential: hertzbeat
+      role: [admin]
+    - appId: tom
+      credential: hertzbeat
+      role: [user]
+    - appId: guest
+      credential: hertzbeat
+      role: [guest]
+    - appId: lili
+      credential: 94C6B34E7A199A9F9D4E1F208093B489
+      salt: 123
+      role: [user]
+  ```
 
-    - `sureness.yml`修改是可选的，一般在你需要修改账号密码时
+### 6. Add Database Drivers
 
-      ```yaml
-      # account info config
-      # eg: admin has role [admin,user], password is hertzbeat
-      # eg: tom has role [user], password is hertzbeat
-      # eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289
-      account:
-        - appId: admin
-          credential: hertzbeat
-          role: [admin]
-        - appId: tom
-          credential: hertzbeat
-          role: [user]
-        - appId: guest
-          credential: hertzbeat
-          role: [guest]
-        - appId: lili
-          # credential = MD5(password + salt)
-          # plain password: hertzbeat
-          # attention: digest authentication does not support salted encrypted password accounts
-          credential: 94C6B34E7A199A9F9D4E1F208093B489
-          salt: 123
-          role: [user]
-      ```
+Due to Apache Foundation’s license compliance requirements, HertzBeat cannot include GPL-licensed dependencies (e.g., MySQL, Oracle). Users must manually download drivers and place them in the `ext-lib` directory, then mount it to `/opt/hertzbeat/ext-lib`:
 
-6. 添加相应的数据库驱动
-
-    由于 apache 基金会对于 license 合规的要求，HertzBeat 的安装包不能包含 mysql，oracle 等 gpl 许可的依赖，需要用户自行添加，用户可通过以下链接自行下载驱动 jar 放到本地 `ext-lib`目录下，然后启动时将`ext-lib`挂载到容器的 `/opt/hertzbeat/ext-lib`目录。
-
-    mysql：[https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.25.zip](https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.18.zip)
-    oracle（如果你要监控 oracle，这两个驱动是必须的）：
-    [https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar](https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar)
-    [https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar](https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar?utm_source=mavenlibs.com)
+- **MySQL Driver**: [Download MySQL Connector/J 8.0.25](https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.25.zip)
+- **Oracle Driver** (Required for Oracle monitoring):
+  - [ojdbc8.jar](https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar)
+  - [orai18n-21.5.0.0.jar](https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar)

home/blog/2025-04-23-hertzbeat-upgrade-guide-from-v1.6.1-to-v1.7.0-helm-mode.md

@@ -1,43 +1,41 @@
-# HertzBeat 从 1.6.1 版本升级到 1.7.0 版本指引-(Helm Mode)
+# HertzBeat Upgrade Guide from v1.6.1 to v1.7.0 (Helm Mode)
 
-## 1. 前置准备
-
-1. 确保已安装以下工具:
+## 1. Prerequisites
 
+1. Ensure the following tools are installed:
    - Helm 3.x
    - kubectl
-   - Git (可选)
+   - Git (optional)
 
-2. 确认当前部署信息:
+2. Verify current deployment information:
 
    ```bash
    helm list -n <your-namespace>
-   # 如果你老版本的chart包不见了，可以使用以下命令导出values.yaml文件
+   # If the old chart package is missing, export values.yaml with:
    helm get values hertzbeat -n <your-namespace> > hertzbeat-1.6.1-values.yaml
    ```
 
-3. 数据备份
+3. Data Backup:
 
-> 1. 若使用了自定义监控模版
+> **For custom monitoring templates:**
 >
->    - 需要备份 `kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define` 当前运行 pod里面的 `/opt/hertzbeat/define` 目录到当前主机下,如果做了持久化 请拷贝持久化目录
->    - `kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define`
+> - Backup `/opt/hertzbeat/define` from the running pod:
 >
-> 2. 若使用外置关系型数据库 Mysql, PostgreSQL数据
+>   ```bash
+>   kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define
+>   ```
 >
->    - 一般使用helm部署部署都做了持久化，可以选择拷贝持久化目录，也可以通过mysqldump、pgdump等工具完成备份
+> **For external databases (MySQL/PostgreSQL):**
 >
->    ```bash
->     kubectl get pvc -n hertzbeat
->    NAME                 STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS   AGE
->    hertzbeat-database   Bound    pvc-c63cf479-0033-423b-8466-eb00aa181657   4Gi        RWO            standard       68d
->    hertzbeat-ext-lib    Bound    pvc-31fee163-1211-424f-8966-e3e805c23ff5   1Gi        RWX            standard       68d
->    hertzbeat-tsdb       Bound    pvc-4f2ef614-0302-4a4c-8dd4-e68b34e9061c   4Gi        RWO            standard       68d
->    ```
+> - Use `mysqldump`/`pg_dump` or copy PVC directories:
+>
+>   ```bash
+>   kubectl get pvc -n hertzbeat
+>   ```
 
-## 2. 升级步骤
+## 2. Upgrade Steps
 
-### 1. 拉取最新Chart到本地
+### 1. Pull the latest Chart
 
 ```bash
 helm repo update
@@ -45,33 +43,32 @@ helm pull hertzbeat/hertzbeat --version 1.7.0 --untar
 cd hertzbeat
 ```
 
-或者从GitHub仓库获取(按需修改Chart):
+Or clone from GitHub:
 
 ```bash
 git clone https://github.com/hertzbeat/helm-charts.git
 cd helm-charts/charts/hertzbeat
 ```
 
-### 2. 修改values.yaml
+### 2. Update values.yaml
 
-比较并合并您的自定义配置到新版本values.yaml:
+Compare and merge configurations:
 
 ```bash
-# 使用diff工具比较新旧values文件
 diff -u ../hertzbeat-1.6.1-values.yaml values.yaml
-vimdiff 对着修改，改完继续diff，无输出则正常
+# Use vimdiff to compare and merge changes
 ```
 
-常见需要关注的配置项:
+Key configurations to check:
 
-- 镜像版本: `image.tag`
-- 资源限制: `resources`
-- 持久化配置: `persistence`
-- 服务类型: `service.type`
-- Ingress配置
-- 数据库配置(如果使用外部数据库)
+- `image.tag`
+- `resources`
+- `persistence`
+- `service.type`
+- Ingress settings
+- External database configurations
 
-### 3. 测试升级(干运行)
+### 3. Dry-run Upgrade
 
 ```bash
 helm upgrade hertzbeat . -n <your-namespace> \
@@ -80,24 +77,19 @@ helm upgrade hertzbeat . -n <your-namespace> \
   --debug
 ```
 
-### 4. 执行升级
+### 4. Execute Upgrade
 
 ```bash
 helm upgrade hertzbeat . -n <your-namespace> \
   --values values.yaml \
-  --atomic \          # 升级失败自动回滚
-  --timeout 10m       # 设置超时时间
+  --atomic \          # Auto-rollback on failure
+  --timeout 10m       # Set timeout
 ```
 
-### 5. 验证升级
+### 5. Verify Upgrade
 
 ```bash
-# 检查发布状态
 helm status hertzbeat -n <your-namespace>
-
-# 检查Pod状态
 kubectl get pods -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat
-
-# 检查日志
 kubectl logs -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat --tail=100
 ```

home/blog/hertzbeat-upgrade-guide-docker-mode-en.md

@@ -1,94 +0,0 @@
-# HertzBeat Upgrade Guide (Docker Mode)
-
-## Docker-based Upgrade
-
-### 1. Data Backup
-
-- **Back up the database**: Manually back up MySQL data as needed.
-
-  ```bash
-  mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" <DB_NAME> > hertzbeat_backup-`date +%Y-%m-%d`.sql  # Single database  
-  mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" --all-databases > hertzbeat_backup-`date +%Y-%m-%d`.sql  # Full database  
-  ```
-
-- **Back up configuration files and data directory**:
-
-  ```bash
-  mv application.yml application-bak.yml && mv sureness.yml sureness-bak.yml  
-  cp -R data data-`date +%Y-%m-%d`.bak  
-  ```
-
-### 2. Stop and Remove the HertzBeat Container
-
-```bash
-docker stop hertzbeat && docker rm hertzbeat  
-```
-
-### 3. Upgrade Database Schema
-
-Navigate to [HertzBeat GitHub Migration Scripts](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration), select the appropriate `V160__update_column.sql` file under your database type (e.g., MySQL), and execute it in MySQL.
-
-### 4. Restart HertzBeat with the New Image
-
-```bash
-docker run -d -p 1157:1157 -p 1158:1158 \  
-    -v $(pwd)/data:/opt/hertzbeat/data \  
-    -v $(pwd)/logs:/opt/hertzbeat/logs \  
-    -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \  
-    -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \  
-    --restart=always \  
-    --name hertzbeat apache/hertzbeat:v1.7.0  
-```
-
-### 5. Update Configuration Files
-
-Modify the backup configurations as needed:
-
-- **`application.yml`** (Typical modifications):
-
-  ```yaml
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: root
-    url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-    hikari:
-      max-lifetime: 120000
-  
-  jpa:
-    show-sql: false
-    database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
-    database: mysql
-    properties:
-      eclipselink:
-        logging:
-          level: SEVERE
-  ```
-
-- **`sureness.yml`** (Optional, modify for account/password changes):
-
-  ```yaml
-  account:
-    - appId: admin
-      credential: hertzbeat
-      role: [admin]
-    - appId: tom
-      credential: hertzbeat
-      role: [user]
-    - appId: guest
-      credential: hertzbeat
-      role: [guest]
-    - appId: lili
-      credential: 94C6B34E7A199A9F9D4E1F208093B489
-      salt: 123
-      role: [user]
-  ```
-
-### 6. Add Database Drivers
-
-Due to Apache Foundation’s license compliance requirements, HertzBeat cannot include GPL-licensed dependencies (e.g., MySQL, Oracle). Users must manually download drivers and place them in the `ext-lib` directory, then mount it to `/opt/hertzbeat/ext-lib`:
-
-- **MySQL Driver**: [Download MySQL Connector/J 8.0.25](https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.25.zip)
-- **Oracle Driver** (Required for Oracle monitoring):
-  - [ojdbc8.jar](https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar)
-  - [orai18n-21.5.0.0.jar](https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar)

home/blog/hertzbeat-upgrade-guide-from-v1.6.1-to-v1.7.0-helm-mode-en.md

@@ -1,95 +0,0 @@
-# HertzBeat Upgrade Guide from v1.6.1 to v1.7.0 (Helm Mode)
-
-## 1. Prerequisites
-
-1. Ensure the following tools are installed:
-   - Helm 3.x
-   - kubectl
-   - Git (optional)
-
-2. Verify current deployment information:
-
-   ```bash
-   helm list -n <your-namespace>
-   # If the old chart package is missing, export values.yaml with:
-   helm get values hertzbeat -n <your-namespace> > hertzbeat-1.6.1-values.yaml
-   ```
-
-3. Data Backup:
-
-> **For custom monitoring templates:**
->
-> - Backup `/opt/hertzbeat/define` from the running pod:
->
->   ```bash
->   kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define
->   ```
->
-> **For external databases (MySQL/PostgreSQL):**
->
-> - Use `mysqldump`/`pg_dump` or copy PVC directories:
->
->   ```bash
->   kubectl get pvc -n hertzbeat
->   ```
-
-## 2. Upgrade Steps
-
-### 1. Pull the latest Chart
-
-```bash
-helm repo update
-helm pull hertzbeat/hertzbeat --version 1.7.0 --untar
-cd hertzbeat
-```
-
-Or clone from GitHub:
-
-```bash
-git clone https://github.com/hertzbeat/helm-charts.git
-cd helm-charts/charts/hertzbeat
-```
-
-### 2. Update values.yaml
-
-Compare and merge configurations:
-
-```bash
-diff -u ../hertzbeat-1.6.1-values.yaml values.yaml
-# Use vimdiff to compare and merge changes
-```
-
-Key configurations to check:
-
-- `image.tag`
-- `resources`
-- `persistence`
-- `service.type`
-- Ingress settings
-- External database configurations
-
-### 3. Dry-run Upgrade
-
-```bash
-helm upgrade hertzbeat . -n <your-namespace> \
-  --values values.yaml \
-  --dry-run \
-  --debug
-```
-
-### 4. Execute Upgrade
-
-```bash
-helm upgrade hertzbeat . -n <your-namespace> \
-  --values values.yaml \
-  --atomic \          # Auto-rollback on failure
-  --timeout 10m       # Set timeout
-```
-
-### 5. Verify Upgrade
-
-```bash
-helm status hertzbeat -n <your-namespace>
-kubectl get pods -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat
-kubectl logs -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat --tail=100
-```

home/i18n/zh-cn/docusaurus-plugin-content-blog/2025-04-23-hertzbeat-upgrade-guide-docker-mode.md

@@ -0,0 +1,103 @@
+# HertzBeat 升级指导-(Docker Mode)
+
+## Docker 方式升级 - Mysql 数据库
+
+1. 数据备份
+
+    - 备份数据库，将 mysql 数据手动做备份，按需备份
+
+      ```bash
+      mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" <库名> hertzbeat_backup-`date +%Y-%m-%d`.sql #单库备份
+      mysqldump -h<HOST-IP> -P<PORT> -uroot -p"PASSWORD" > hertzbeat_backup-`date +%Y-%m-%d`.sql # 整库备份
+      ```
+
+    - 备份配置文件及数据目录
+
+      ```bash
+      mv application.yml application-bak.yml && mv sureness-bak.yml
+      cp -R data data-`date +%Y-%m-%d`. bak
+      ```
+
+2. 关闭 并移除 HertzBeat 容器
+
+    ```shell
+    docker stop hertzbeat && docker rm hertzbeat
+    ```
+
+3. 升级数据库脚本
+
+    打开[https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration](https://github.com/apache/hertzbeat/tree/master/hertzbeat-manager/src/main/resources/db/migration)， 选择你使用的数据库的目录下相应的 `V160__update_column.sql`文件在 Mysql 执行升级 sql。
+
+4. 更换镜像重新启动 HertzBeat 容器
+
+    ```bash
+    $ docker run -d -p 1157:1157 -p 1158:1158 \
+        -v $(pwd)/data:/opt/hertzbeat/data \
+        -v $(pwd)/logs:/opt/hertzbeat/logs \
+        -v $(pwd)/application.yml:/opt/hertzbeat/config/application.yml \
+        -v $(pwd)/sureness.yml:/opt/hertzbeat/config/sureness.yml \
+        --restart=always \
+        --name hertzbeat apache/hertzbeat:v1.7.0
+    ```
+
+5. 升级配置文件
+
+    参考备份配置根据自己的需求基础上进行修改。
+
+    - `application.yml`一般需要修改以下部分
+
+      默认为：
+
+      ```yaml
+      datasource:
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        username: root
+        password: root
+        url: jdbc:mysql://localhost:3306/hertzbeat?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        hikari:
+          max-lifetime: 120000
+
+      jpa:
+        show-sql: false
+        database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
+        database: mysql
+        properties:
+          eclipselink:
+            logging:
+              level: SEVERE
+      ```
+
+    - `sureness.yml`修改是可选的，一般在你需要修改账号密码时
+
+      ```yaml
+      # account info config
+      # eg: admin has role [admin,user], password is hertzbeat
+      # eg: tom has role [user], password is hertzbeat
+      # eg: lili has role [guest], plain password is lili, salt is 123, salted password is 1A676730B0C7F54654B0E09184448289
+      account:
+        - appId: admin
+          credential: hertzbeat
+          role: [admin]
+        - appId: tom
+          credential: hertzbeat
+          role: [user]
+        - appId: guest
+          credential: hertzbeat
+          role: [guest]
+        - appId: lili
+          # credential = MD5(password + salt)
+          # plain password: hertzbeat
+          # attention: digest authentication does not support salted encrypted password accounts
+          credential: 94C6B34E7A199A9F9D4E1F208093B489
+          salt: 123
+          role: [user]
+      ```
+
+6. 添加相应的数据库驱动
+
+    由于 apache 基金会对于 license 合规的要求，HertzBeat 的安装包不能包含 mysql，oracle 等 gpl 许可的依赖，需要用户自行添加，用户可通过以下链接自行下载驱动 jar 放到本地 `ext-lib`目录下，然后启动时将`ext-lib`挂载到容器的 `/opt/hertzbeat/ext-lib`目录。
+
+    mysql：[https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.25.zip](https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.18.zip)
+    oracle（如果你要监控 oracle，这两个驱动是必须的）：
+    [https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar](https://download.oracle.com/otn-pub/otn_software/jdbc/234/ojdbc8.jar)
+    [https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar](https://repo.mavenlibs.com/maven/com/oracle/database/nls/orai18n/21.5.0.0/orai18n-21.5.0.0.jar?utm_source=mavenlibs.com)

home/i18n/zh-cn/docusaurus-plugin-content-blog/2025-04-23-hertzbeat-upgrade-guide-from-v1.6.1-to-v1.7.0-helm-mode.md

@@ -0,0 +1,103 @@
+# HertzBeat 从 1.6.1 版本升级到 1.7.0 版本指引-(Helm Mode)
+
+## 1. 前置准备
+
+1. 确保已安装以下工具:
+
+   - Helm 3.x
+   - kubectl
+   - Git (可选)
+
+2. 确认当前部署信息:
+
+   ```bash
+   helm list -n <your-namespace>
+   # 如果你老版本的chart包不见了，可以使用以下命令导出values.yaml文件
+   helm get values hertzbeat -n <your-namespace> > hertzbeat-1.6.1-values.yaml
+   ```
+
+3. 数据备份
+
+> 1. 若使用了自定义监控模版
+>
+>    - 需要备份 `kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define` 当前运行 pod里面的 `/opt/hertzbeat/define` 目录到当前主机下,如果做了持久化 请拷贝持久化目录
+>    - `kubectl cp hertzbeat/hertzbeat-978477f84-fr894:/opt/hertzbeat/define ./define`
+>
+> 2. 若使用外置关系型数据库 Mysql, PostgreSQL数据
+>
+>    - 一般使用helm部署部署都做了持久化，可以选择拷贝持久化目录，也可以通过mysqldump、pgdump等工具完成备份
+>
+>    ```bash
+>     kubectl get pvc -n hertzbeat
+>    NAME                 STATUS   VOLUME                                     CAPACITY   ACCESS MODES   STORAGECLASS   AGE
+>    hertzbeat-database   Bound    pvc-c63cf479-0033-423b-8466-eb00aa181657   4Gi        RWO            standard       68d
+>    hertzbeat-ext-lib    Bound    pvc-31fee163-1211-424f-8966-e3e805c23ff5   1Gi        RWX            standard       68d
+>    hertzbeat-tsdb       Bound    pvc-4f2ef614-0302-4a4c-8dd4-e68b34e9061c   4Gi        RWO            standard       68d
+>    ```
+
+## 2. 升级步骤
+
+### 1. 拉取最新Chart到本地
+
+```bash
+helm repo update
+helm pull hertzbeat/hertzbeat --version 1.7.0 --untar
+cd hertzbeat
+```
+
+或者从GitHub仓库获取(按需修改Chart):
+
+```bash
+git clone https://github.com/hertzbeat/helm-charts.git
+cd helm-charts/charts/hertzbeat
+```
+
+### 2. 修改values.yaml
+
+比较并合并您的自定义配置到新版本values.yaml:
+
+```bash
+# 使用diff工具比较新旧values文件
+diff -u ../hertzbeat-1.6.1-values.yaml values.yaml
+vimdiff 对着修改，改完继续diff，无输出则正常
+```
+
+常见需要关注的配置项:
+
+- 镜像版本: `image.tag`
+- 资源限制: `resources`
+- 持久化配置: `persistence`
+- 服务类型: `service.type`
+- Ingress配置
+- 数据库配置(如果使用外部数据库)
+
+### 3. 测试升级(干运行)
+
+```bash
+helm upgrade hertzbeat . -n <your-namespace> \
+  --values values.yaml \
+  --dry-run \
+  --debug
+```
+
+### 4. 执行升级
+
+```bash
+helm upgrade hertzbeat . -n <your-namespace> \
+  --values values.yaml \
+  --atomic \          # 升级失败自动回滚
+  --timeout 10m       # 设置超时时间
+```
+
+### 5. 验证升级
+
+```bash
+# 检查发布状态
+helm status hertzbeat -n <your-namespace>
+
+# 检查Pod状态
+kubectl get pods -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat
+
+# 检查日志
+kubectl logs -n <your-namespace> -l app.kubernetes.io/instance=hertzbeat --tail=100
+```

material/licenses/LICENSE

@@ -358,6 +358,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans/3.1.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-api/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-modbus/0.12.0 Apache-2.0
+    https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-s7/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.attoparser/attoparser/2.0.7.RELEASE Apache-2.0
     https://mvnrepository.com/artifact/org.freemarker/freemarker/2.3.32 Apache-2.0
     https://mvnrepository.com/artifact/org.flywaydb/flyway-core/10.11.1
@@ -434,10 +435,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.webjars/swagger-ui/5.10.3 Apache-2.0
     https://mvnrepository.com/artifact/com.google.flatbuffers/flatbuffers-java/1.12.0 Apache-2.0
     https://mvnrepository.com/artifact/com.vesoft/client/3.6.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-api/1.49.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-sdk/1.49.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-sdk-logs/1.49.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-exporter-otlp/1.49.0 Apache-2.0
+    https://mvnrepository.com/artifact/io.opentelemetry.instrumentation/opentelemetry-spring-boot-starter-2.15.0 Apache-2.0
     https://mvnrepository.com/artifact/io.opentelemetry.instrumentation/opentelemetry-logback-appender-1.0 Apache-2.0
 
 ========================================================================

material/licenses/backend/LICENSE

@@ -358,6 +358,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans/3.1.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-api/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-modbus/0.12.0 Apache-2.0
+    https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-s7/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.attoparser/attoparser/2.0.7.RELEASE Apache-2.0
     https://mvnrepository.com/artifact/org.freemarker/freemarker/2.3.32 Apache-2.0
     https://mvnrepository.com/artifact/org.flywaydb/flyway-core/10.11.1

material/licenses/collector/LICENSE

@@ -291,6 +291,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/org.apache.tomcat.embed/tomcat-embed-websocket/10.1.19 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-api/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-modbus/0.12.0 Apache-2.0
+    https://mvnrepository.com/artifact/org.apache.plc4x/plc4j-driver-s7/0.12.0 Apache-2.0
     https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator/8.0.1.Final Apache-2.0
     https://mvnrepository.com/artifact/org.lz4/lz4-java/1.8.0 Apache-2.0
     https://mvnrepository.com/artifact/org.mongodb/mongodb-driver-core/4.6.1 Apache-2.0

pom.xml

@@ -88,7 +88,7 @@
         <module>hertzbeat-push</module>
         <module>hertzbeat-plugin</module>
         <module>hertzbeat-grafana</module>
-        <module>hertzbeat-log</module>
+        <module>hertzbeat-otel</module>
         <module>hertzbeat-e2e</module>
         <module>hertzbeat-base</module>
         <module>hertzbeat-mcp</module>
@@ -175,7 +175,7 @@
         <arrow.version>18.1.0</arrow.version>
         <snappy-java.version>1.1.10.7</snappy-java.version>
         <sshd-sftp.version>2.13.1</sshd-sftp.version>
-        <opentelemetry-api.version>1.43.0</opentelemetry-api.version>
+        <opentelemetry-starter.version>2.15.0</opentelemetry-starter.version>
         <opentelemetry-logback.version>2.14.0-alpha</opentelemetry-logback.version>
     </properties>
 
@@ -238,7 +238,7 @@
             <!-- log -->
             <dependency>
                 <groupId>org.apache.hertzbeat</groupId>
-                <artifactId>hertzbeat-log</artifactId>
+                <artifactId>hertzbeat-otel</artifactId>
                 <version>${hertzbeat.version}</version>
             </dependency>
             <!-- collector-basic -->
@@ -477,33 +477,18 @@
                 <version>${sshd-sftp.version}</version>
             </dependency>
             <!-- OpenTelemetry -->
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-api</artifactId>
-                <version>${opentelemetry-api.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-sdk</artifactId>
-                <version>${opentelemetry-api.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-sdk-logs</artifactId>
-                <version>${opentelemetry-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.opentelemetry</groupId>
-                <artifactId>opentelemetry-exporter-otlp</artifactId>
-                <version>${opentelemetry-api.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.opentelemetry.instrumentation</groupId>
                 <artifactId>opentelemetry-logback-appender-1.0</artifactId>
                 <version>${opentelemetry-logback.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.opentelemetry.instrumentation</groupId>
+                <artifactId>opentelemetry-instrumentation-bom</artifactId>
+                <version>${opentelemetry-starter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

script/assembly/collector/bin/entrypoint.sh

@@ -44,7 +44,7 @@ if [ ! -d $LOGS_DIR ]; then
 fi
 
 # JVM Configuration
-JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
+JAVA_OPTS=" -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
 
 # JVM Configuration
 JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"

script/assembly/collector/bin/startup.bat

@@ -51,7 +51,7 @@ if not exist %LOGS_DIR% (
 )
 
 rem JVM Configuration
-set JAVA_OPTS= -Duser.timezone=Asia/Shanghai -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
+set JAVA_OPTS= -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
 
 set JAVA_MEM_OPTS= -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%LOGS_DIR%
 

script/assembly/collector/bin/startup.sh

@@ -82,7 +82,7 @@ if [ ! -d $LOGS_DIR ]; then
 fi
 
 # JVM Configuration
-JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
+JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
 
 JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"
 

script/assembly/server/bin/entrypoint.sh

@@ -47,9 +47,9 @@ fi
 
 # JVM Configuration
 if [ -z "$JAVA_OPTS" ]; then
-  JAVA_OPTS=" -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
+  JAVA_OPTS=" -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
 else
-  JAVA_OPTS="${JAVA_OPTS} -Doracle.jdbc.timezoneAsRegion=false"
+  JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false"
 fi
 
 # JVM Configuration

script/assembly/server/bin/startup.bat

@@ -52,7 +52,7 @@ if not exist %LOGS_DIR% (
 
 rem JVM Configuration
 
-set JAVA_OPTS= -Duser.timezone=Asia/Shanghai -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
+set JAVA_OPTS= -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED
 
 set JAVA_MEM_OPTS= -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=%LOGS_DIR%
 

script/assembly/server/bin/startup.sh

@@ -86,7 +86,7 @@ fi
 
 
 # JVM Configuration
-JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
+JAVA_OPTS=" -Duser.timezone=Asia/Shanghai -Dfile.encoding=UTF-8 -Doracle.jdbc.timezoneAsRegion=false --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED"
 
 JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOGS_DIR"
 

web-app/src/app/routes/alert/alert-integration/alert-integration.component.ts

@@ -68,15 +68,20 @@ export class AlertIntegrationComponent implements OnInit {
       name: this.i18nSvc.fanyi('alert.integration.source.skywalking'),
       icon: 'assets/img/integration/skywalking.svg'
     },
-    {
-      id: 'tencent',
-      name: this.i18nSvc.fanyi('alert.integration.source.tencent'),
-      icon: 'assets/img/integration/tencent.svg'
-    },
     {
       id: 'uptime-kuma',
       name: this.i18nSvc.fanyi('alert.integration.source.uptime-kuma'),
       icon: 'assets/img/integration/uptime-kuma.svg'
+    },
+    {
+      id: 'zabbix',
+      name: this.i18nSvc.fanyi('alert.integration.source.zabbix'),
+      icon: 'assets/img/integration/zabbix.svg'
+    },
+    {
+      id: 'tencent',
+      name: this.i18nSvc.fanyi('alert.integration.source.tencent'),
+      icon: 'assets/img/integration/tencent.svg'
     }
   ];
 

web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts

@@ -85,6 +85,9 @@ export class MonitorEditComponent implements OnInit {
           if (message.code === 0) {
             let paramValueMap = new Map<String, Param>();
             this.monitor = message.data.monitor;
+            if (this.monitor.scrape == null || this.monitor.scrape == undefined) {
+              this.monitor.scrape = 'static';
+            }
             this.grafanaDashboard = message.data.grafanaDashboard != undefined ? message.data.grafanaDashboard : new GrafanaDashboard();
             this.collector = message.data.collector == null ? '' : message.data.collector;
             this.titleSvc.setTitleByI18n(`monitor.app.${this.monitor.app}`);

web-app/src/assets/doc/alert-integration/zabbix.en-US.md

@@ -0,0 +1,201 @@
+Send Zabbix alerts to the HertzBeat alert platform via Webhook.
+
+### Step 1: Create Custom Webhook Media Type in Zabbix
+1. Log in to Zabbix Web interface
+2. Go to **Administration** > **Media types** > **Create media type**
+3. Configure basic information
+  - Name: HertzBeat Webhook
+  - Type: Webhook
+4. Add the following fields in the **Parameters** section
+
+   | Name | Value |
+      |-----|-----|
+   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | AlertName | {TRIGGER.NAME} |
+   | AlertId | {EVENT.ID} |
+   | HostName | {HOST.NAME} |
+   | HostIp | {HOST.IP} |
+   | TriggerDescription | {TRIGGER.DESCRIPTION} |
+   | TriggerSeverity | {TRIGGER.SEVERITY} |
+   | TriggerStatus | {EVENT.STATUS} |
+   | ItemName | {ITEM.NAME} |
+   | ItemValue | {ITEM.VALUE} |
+   | ItemLastValue | {ITEM.LASTVALUE} |
+   | EventDate | {EVENT.DATE} |
+   | EventTime | {EVENT.TIME} |
+   | EventTags | {EVENT.TAGS} |
+   | EventRecoveryDate | {EVENT.RECOVERY.DATE} |
+   | EventRecoveryTime | {EVENT.RECOVERY.TIME} |
+
+5. Add the following JavaScript code in the **Script** section
+```javascript
+var Hertzbeat = {
+  sendMessage: function(url, alert) {
+    request = new HttpRequest();
+    request.addHeader('Content-Type: application/json');
+    data = JSON.stringify(alert);
+
+    Zabbix.Log(4, '[Hertzbeat Webhook] params: ' + data);
+    // Push alert message
+    response = request.post(url, data);
+    Zabbix.Log(4, '[Hertzbeat Webhook] HTTP code: ' + request.Status());
+    Zabbix.Log(4, '[Hertzbeat Webhook] response: ' + response);
+
+    // Format the returned result and make a judgment, throw an exception if there is an exception.
+    try {
+      response = JSON.parse(response);
+    } catch (error) {
+      response = null;
+      Zabbix.Log(4, '[Hertzbeat Webhook] response parse error');
+    }
+
+    if (request.Status() !== 200 ||  response.errcode !== 0 || response.errmsg !== 'ok') {
+      if (typeof response.errmsg === 'string') {
+        throw response.errmsg;
+      }
+      else {
+        throw 'Unknown error. Check debug log for more information.'
+      }
+    }
+  }
+}
+
+try {
+  var params = JSON.parse(value);
+  // Check if Webhook_url parameter is defined, throw an error if not defined.
+  if (typeof params.URL === 'undefined') {
+    throw 'Incorrect value is given for parameter "Webhook_url": parameter is missing';
+  }
+
+  var currentTimestamp = Date.now();
+
+  // Convert Zabbix severity to HertzBeat priority
+  function convertSeverity(severity) {
+    var severityMap = {
+      "信息": "info",
+      "Information": "info",
+      "警告": "warning",
+      "Warning": "warning",
+      "一般严重": "error",
+      "Average": "error",
+      "严重": "critical",
+      "High": "critical",
+      "灾难": "emergency",
+      "Disaster": "emergency"
+    };
+    return severityMap[severity] || "error";
+  }
+  // Build fingerprint unique identifier
+  var fingerprint = "zabbix-event:" + params.AlertId + "-" + params.HostName;
+
+  // Build labels
+  var labels = {
+    "alertname": params.AlertName,
+    "source": "zabbix",
+    "severity": convertSeverity(params.TriggerSeverity),
+    "host": params.HostName,
+    "hostip": params.HostIp,
+    "itemname": params.ItemName
+  };
+
+  // Parse event tags
+  if (params.EventTags) {
+    var tags = params.EventTags.split(',');
+    for (var i = 0; i < tags.length; i++) {
+      var tagParts = tags[i].split(':');
+      if (tagParts.length == 2) {
+        var key = tagParts[0].trim();
+        var value = tagParts[1].trim();
+        labels[key] = value;
+      }
+    }
+  }
+
+  // Build annotations
+  var annotations = {
+    "summary": params.AlertName,
+    "description": params.TriggerDescription,
+    "value": params.ItemValue,
+    "lastValue": params.ItemLastValue
+  };
+
+  // Build alert content
+  var content = "Host: " + params.HostName +
+    "\nIP: " + params.HostIp +
+    "\nAlert: " + params.AlertName +
+    "\nLevel: " + params.TriggerSeverity +
+    "\nDescription: " + params.TriggerDescription +
+    "\nItem: " + params.ItemName +
+    "\nCurrent Value: " + params.ItemValue +
+    "\nLast Value: " + params.ItemLastValue +
+    "\nTime: " + params.EventDate + " " + params.EventTime;
+
+  // Determine status
+  var status = params.TriggerStatus === "RESOLVED" ? "resolved" : "firing";
+
+  // Calculate timestamp
+  var startAt = currentTimestamp;
+  var endAt = null;
+
+  // If it's a recovery event, calculate end time
+  if (status === "resolved" && params.EventRecoveryDate && params.EventRecoveryTime) {
+    endAt = currentTimestamp;
+  }
+
+  // Build payload to send to HertzBeat
+  var hertzbeatAlert = {
+    "fingerprint": fingerprint,
+    "labels": labels,
+    "annotations": annotations,
+    "content": content,
+    "status": status,
+    "triggerTimes": 1,
+    "startAt": startAt,
+    "activeAt": startAt,
+    "endAt": endAt
+  };
+
+  // Log
+  Zabbix.Log(4, "HertzBeat webhook payload: " + JSON.stringify(hertzbeatAlert));
+
+  // Execute message push function
+  Hertzbeat.sendMessage(params.URL, hertzbeatAlert);
+  // Return to Zabbix, 'OK' will be used to identify successful execution in Zabbix actions.
+  return 'OK';
+} catch (error) {
+  Zabbix.Log(4, '[Hertzbeat Webhook] notification failed: ' + error);
+  throw 'Sending failed: ' + error + '.';
+}
+```
+7. Click the **Add** button to save the media type
+
+### Step 2: Configure Media for Users
+1. Go to **Administration** > **Users** > **Select the user who will receive alerts** (you can create a dedicated user for alerts)
+2. Select the **Media** tab > **Add**
+3. Select **HertzBeat Webhook** type
+4. Choose the time period and alert severity as needed, ensure the status is enabled
+5. Click the **Add** button to save the media
+
+### Step 3: Configure Alert Actions
+1. Go to **Configuration** > **Actions** > **Trigger actions** > **Create action**
+2. Configure the Action tab information
+  - Name: HertzBeat Webhook
+  - Conditions: Configure trigger conditions as needed
+3. Configure Operations tab information
+  - Operation step duration: Set as needed
+  - In the **Operations** section, add and configure users or user groups, select the user configured with HertzBeat Webhook media, select **HertzBeat Webhook** as the media type, check custom message content, ensure all macros are correctly passed
+  - **Recovery operations** and **Update operations** can be configured similarly
+4. Click the **Add** button to save the alert action
+
+
+### Common Issues
+
+#### Alerts Not Received
+- Ensure the Webhook URL is accessible by the Zabbix server
+- Check server logs for request records
+
+#### Alerts Not Triggered
+- Ensure alert policy conditions are correct and notifications are bound
+
+For more information, refer to [Zabbix Webhook](https://www.zabbix.com/documentation/current/manual/config/notifications/webhook) and [Zabbix Macros](https://www.zabbix.com/documentation/current/en/manual/appendix/macros)
+```

web-app/src/assets/doc/alert-integration/zabbix.zh-CN.md

@@ -0,0 +1,201 @@
+>将 Zabbix 的告警通过 Webhook 方式发送到 HertzBeat 告警平台。
+
+### 步骤一: 在 Zabbix 创建自定义 Webhook 媒介类型
+1. 登录 Zabbix Web 界面
+2. 进入 **告警** > **媒介类型** > **创建媒介类型**
+3. 配置基本信息
+    - 名称: HertzBeat Webhook
+    - 类型: Webhook
+4. 在 **参数** 部分添加以下字段
+
+   | 名称 | 值 |
+   |-----|-----|
+   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | AlertName | {TRIGGER.NAME} |
+   | AlertId | {EVENT.ID} |
+   | HostName | {HOST.NAME} |
+   | HostIp | {HOST.IP} |
+   | TriggerDescription | {TRIGGER.DESCRIPTION} |
+   | TriggerSeverity | {TRIGGER.SEVERITY} |
+   | TriggerStatus | {EVENT.STATUS} |
+   | ItemName | {ITEM.NAME} |
+   | ItemValue | {ITEM.VALUE} |
+   | ItemLastValue | {ITEM.LASTVALUE} |
+   | EventDate | {EVENT.DATE} |
+   | EventTime | {EVENT.TIME} |
+   | EventTags | {EVENT.TAGS} |
+   | EventRecoveryDate | {EVENT.RECOVERY.DATE} |
+   | EventRecoveryTime | {EVENT.RECOVERY.TIME} |
+
+5. 在 **脚本** 部分添加以下 JavaScript 代码
+```javascript
+var Hertzbeat = {
+
+  sendMessage: function(url, alert) {
+    request = new HttpRequest();
+    request.addHeader('Content-Type: application/json');
+    data = JSON.stringify(alert);
+
+    Zabbix.Log(4, '[Hertzbeat Webhook] params: ' + data);
+    // 推送告警消息
+    response = request.post(url, data);
+    Zabbix.Log(4, '[Hertzbeat Webhook] HTTP code: ' + request.Status());
+    Zabbix.Log(4, '[Hertzbeat Webhook] response: ' + response);
+
+    // 格式化返回的结果并做出判断，有异常则抛出异常。
+    try {
+      response = JSON.parse(response);
+    } catch (error) {
+      response = null;
+      Zabbix.Log(4, '[Hertzbeat Webhook] response parse error');
+    }
+
+    if (request.Status() !== 200 ||  response.errcode !== 0 || response.errmsg !== 'ok') {
+      if (typeof response.errmsg === 'string') {
+        throw response.errmsg;
+      }
+      else {
+        throw 'Unknown error. Check debug log for more information.'
+      }
+    }
+  }
+}
+
+try {
+  var params = JSON.parse(value);
+  // 判断Webhook_url参数是否定义，未定义抛出错误。
+  if (typeof params.URL === 'undefined') {
+    throw 'Incorrect value is given for parameter "Webhook_url": parameter is missing';
+  }
+
+  var currentTimestamp = Date.now();
+
+  // 转换 zabbix 严重性到 HertzBeat 优先级
+  function convertSeverity(severity) {
+    var severityMap = {
+      "信息": "info",
+      "Information": "info",
+      "警告": "warning",
+      "Warning": "warning",
+      "一般严重": "error",
+      "Average": "error",
+      "严重": "critical",
+      "High": "critical",
+      "灾难": "emergency",
+      "Disaster": "emergency"
+    };
+    return severityMap[severity] || "error";
+  }
+  // 构建指纹唯一标识
+  var fingerprint = "zabbix-event:" + params.AlertId + "-" + params.HostName;
+
+  // 构建 labels
+  var labels = {
+    "alertname": params.AlertName,
+    "source": "zabbix",
+    "severity": convertSeverity(params.TriggerSeverity),
+    "host": params.HostName,
+    "hostip": params.HostIp,
+    "itemname": params.ItemName
+  };
+
+  // 解析事件标签
+  if (params.EventTags) {
+    var tags = params.EventTags.split(',');
+    for (var i = 0; i < tags.length; i++) {
+      var tagParts = tags[i].split(':');
+      if (tagParts.length == 2) {
+        var key = tagParts[0].trim();
+        var value = tagParts[1].trim();
+        labels[key] = value;
+      }
+    }
+  }
+
+  // 构建注解信息
+  var annotations = {
+    "summary": params.AlertName,
+    "description": params.TriggerDescription,
+    "value": params.ItemValue,
+    "lastValue": params.ItemLastValue
+  };
+
+  // 构建告警内容
+  var content = "主机: " + params.HostName +
+    "\nIP: " + params.HostIp +
+    "\n告警: " + params.AlertName +
+    "\n级别: " + params.TriggerSeverity +
+    "\n描述: " + params.TriggerDescription +
+    "\n监控项: " + params.ItemName +
+    "\n当前值: " + params.ItemValue +
+    "\n上次值: " + params.ItemLastValue +
+    "\n时间: " + params.EventDate + " " + params.EventTime;
+
+  // 确定状态
+  var status = params.TriggerStatus === "RESOLVED" ? "resolved" : "firing";
+
+  // 计算时间戳
+  var startAt = currentTimestamp;
+  var endAt = null;
+
+  // 如果是恢复事件，计算结束时间
+  if (status === "resolved" && params.EventRecoveryDate && params.EventRecoveryTime) {
+    endAt = currentTimestamp;
+  }
+
+  // 构建发送到 HertzBeat 的 payload
+  var hertzbeatAlert = {
+    "fingerprint": fingerprint,
+    "labels": labels,
+    "annotations": annotations,
+    "content": content,
+    "status": status,
+    "triggerTimes": 1,
+    "startAt": startAt,
+    "activeAt": startAt,
+    "endAt": endAt
+  };
+
+  // 记录日志
+  Zabbix.Log(4, "HertzBeat webhook payload: " + JSON.stringify(hertzbeatAlert));
+
+  // 执行消息推送函数
+  Hertzbeat.sendMessage(params.URL, hertzbeatAlert);
+  // 返回给zabbix，ok 在 Zabbix 动作中会被用来标识成功执行。
+  return 'OK';
+} catch (error) {
+  Zabbix.Log(4, '[Hertzbeat Webhook] notification failed: ' + error);
+  throw 'Sending failed: ' + error + '.';
+}  
+```
+7. 点击 **添加** 按钮保存媒介类型
+
+### 步骤二: 为用户配置媒介
+1. 进入 **用户** > **用户** > **选择要接收告警的用户** (可以创建一个专门用于告警的用户)
+2. 选择 **报警媒介** 选项卡 > **添加**
+3. 选择 **HertzBeat Webhook** 类型 
+4. 启用时间段按需选择，报警严重性按需选择，确保状态为启用
+5. 点击 **添加** 按钮保存媒介
+
+### 步骤三: 配置告警动作
+1. 进入 **告警** > **动作** > **触发器动作** > **创建动作**
+2. 配置动作选项卡信息
+    - 名称: HertzBeat Webhook
+    - 条件: 根据需要配置触发条件
+3. 配置操作选项卡信息
+    - 操作步骤持续时间: 根据需要进行设置
+    - 在**操作**部分添加，配置用户或用户组，选择之前配置 HertzBeat Webhook 媒介的用户，发送至媒体类型选择 **HertzBeat Webhook**，选中自定义消息内容，确保所有宏都被正确传递
+    - **恢复操作**以及**更新操作**可以根据上述进行类似配置
+4. 点击 **添加** 按钮保存告警动作
+
+
+### 常见问题
+
+#### 未收到告警
+- 确保 Webhook URL 可以被 zabbix 服务访问
+- 检查服务器日志是否有请求记录
+
+#### 告警未触发
+- 确保告警策略的条件正确，并已绑定通知
+
+更多信息请参考 [Zabbix Webhook](https://www.zabbix.com/documentation/current/manual/config/notifications/webhook) 以及 [Zabbix 宏](https://www.zabbix.com/documentation/current/zh/manual/appendix/macros)

web-app/src/assets/doc/alert-integration/zabbix.zh-TW.md

@@ -0,0 +1,201 @@
+將 Zabbix 的告警通過 Webhook 方式發送到 HertzBeat 告警平臺。
+
+### 步驟一: 在 Zabbix 創建自定義 Webhook 媒介類型
+1. 登錄 Zabbix Web 界面
+2. 進入 **告警** > **媒介類型** > **創建媒介類型**
+3. 配置基本信息
+  - 名稱: HertzBeat Webhook
+  - 類型: Webhook
+4. 在 **參數** 部分添加以下字段
+
+   | 名稱 | 值 |
+      |-----|-----|
+   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | AlertName | {TRIGGER.NAME} |
+   | AlertId | {EVENT.ID} |
+   | HostName | {HOST.NAME} |
+   | HostIp | {HOST.IP} |
+   | TriggerDescription | {TRIGGER.DESCRIPTION} |
+   | TriggerSeverity | {TRIGGER.SEVERITY} |
+   | TriggerStatus | {EVENT.STATUS} |
+   | ItemName | {ITEM.NAME} |
+   | ItemValue | {ITEM.VALUE} |
+   | ItemLastValue | {ITEM.LASTVALUE} |
+   | EventDate | {EVENT.DATE} |
+   | EventTime | {EVENT.TIME} |
+   | EventTags | {EVENT.TAGS} |
+   | EventRecoveryDate | {EVENT.RECOVERY.DATE} |
+   | EventRecoveryTime | {EVENT.RECOVERY.TIME} |
+
+5. 在 **腳本** 部分添加以下 JavaScript 代碼
+```javascript
+var Hertzbeat = {
+  sendMessage: function(url, alert) {
+    request = new HttpRequest();
+    request.addHeader('Content-Type: application/json');
+    data = JSON.stringify(alert);
+
+    Zabbix.Log(4, '[Hertzbeat Webhook] params: ' + data);
+    // 推送告警消息
+    response = request.post(url, data);
+    Zabbix.Log(4, '[Hertzbeat Webhook] HTTP code: ' + request.Status());
+    Zabbix.Log(4, '[Hertzbeat Webhook] response: ' + response);
+
+    // 格式化返回的結果並做出判斷，有異常則拋出異常。
+    try {
+      response = JSON.parse(response);
+    } catch (error) {
+      response = null;
+      Zabbix.Log(4, '[Hertzbeat Webhook] response parse error');
+    }
+
+    if (request.Status() !== 200 ||  response.errcode !== 0 || response.errmsg !== 'ok') {
+      if (typeof response.errmsg === 'string') {
+        throw response.errmsg;
+      }
+      else {
+        throw 'Unknown error. Check debug log for more information.'
+      }
+    }
+  }
+}
+
+try {
+  var params = JSON.parse(value);
+  // 判斷Webhook_url參數是否定義，未定義拋出錯誤。
+  if (typeof params.URL === 'undefined') {
+    throw 'Incorrect value is given for parameter "Webhook_url": parameter is missing';
+  }
+
+  var currentTimestamp = Date.now();
+
+  // 轉換 zabbix 嚴重性到 HertzBeat 優先級
+  function convertSeverity(severity) {
+    var severityMap = {
+      "信息": "info",
+      "Information": "info",
+      "警告": "warning",
+      "Warning": "warning",
+      "一般嚴重": "error",
+      "Average": "error",
+      "嚴重": "critical",
+      "High": "critical",
+      "災難": "emergency",
+      "Disaster": "emergency"
+    };
+    return severityMap[severity] || "error";
+  }
+  // 構建指紋唯一標識
+  var fingerprint = "zabbix-event:" + params.AlertId + "-" + params.HostName;
+
+  // 構建 labels
+  var labels = {
+    "alertname": params.AlertName,
+    "source": "zabbix",
+    "severity": convertSeverity(params.TriggerSeverity),
+    "host": params.HostName,
+    "hostip": params.HostIp,
+    "itemname": params.ItemName
+  };
+
+  // 解析事件標籤
+  if (params.EventTags) {
+    var tags = params.EventTags.split(',');
+    for (var i = 0; i < tags.length; i++) {
+      var tagParts = tags[i].split(':');
+      if (tagParts.length == 2) {
+        var key = tagParts[0].trim();
+        var value = tagParts[1].trim();
+        labels[key] = value;
+      }
+    }
+  }
+
+  // 構建註解信息
+  var annotations = {
+    "summary": params.AlertName,
+    "description": params.TriggerDescription,
+    "value": params.ItemValue,
+    "lastValue": params.ItemLastValue
+  };
+
+  // 構建告警內容
+  var content = "主機: " + params.HostName +
+    "\nIP: " + params.HostIp +
+    "\n告警: " + params.AlertName +
+    "\n級別: " + params.TriggerSeverity +
+    "\n描述: " + params.TriggerDescription +
+    "\n監控項: " + params.ItemName +
+    "\n當前值: " + params.ItemValue +
+    "\n上次值: " + params.ItemLastValue +
+    "\n時間: " + params.EventDate + " " + params.EventTime;
+
+  // 確定狀態
+  var status = params.TriggerStatus === "RESOLVED" ? "resolved" : "firing";
+
+  // 計算時間戳
+  var startAt = currentTimestamp;
+  var endAt = null;
+
+  // 如果是恢復事件，計算結束時間
+  if (status === "resolved" && params.EventRecoveryDate && params.EventRecoveryTime) {
+    endAt = currentTimestamp;
+  }
+
+  // 構建發送到 HertzBeat 的 payload
+  var hertzbeatAlert = {
+    "fingerprint": fingerprint,
+    "labels": labels,
+    "annotations": annotations,
+    "content": content,
+    "status": status,
+    "triggerTimes": 1,
+    "startAt": startAt,
+    "activeAt": startAt,
+    "endAt": endAt
+  };
+
+  // 記錄日誌
+  Zabbix.Log(4, "HertzBeat webhook payload: " + JSON.stringify(hertzbeatAlert));
+
+  // 執行消息推送函數
+  Hertzbeat.sendMessage(params.URL, hertzbeatAlert);
+  // 返回給zabbix，ok 在 Zabbix 動作中會被用來標識成功執行。
+  return 'OK';
+} catch (error) {
+  Zabbix.Log(4, '[Hertzbeat Webhook] notification failed: ' + error);
+  throw 'Sending failed: ' + error + '.';
+}  
+```
+7. 點擊 **添加** 按鈕保存媒介類型
+
+### 步驟二: 為用戶配置媒介
+1. 進入 **用戶** > **用戶** > **選擇要接收告警的用戶** (可以創建一個專門用於告警的用戶)
+2. 選擇 **報警媒介** 選項卡 > **添加**
+3. 選擇 **HertzBeat Webhook** 類型
+4. 啟用時間段按需選擇，報警嚴重性按需選擇，確保狀態為啟用
+5. 點擊 **添加** 按鈕保存媒介
+
+### 步驟三: 配置告警動作
+1. 進入 **告警** > **動作** > **觸發器動作** > **創建動作**
+2. 配置動作選項卡信息
+  - 名稱: HertzBeat Webhook
+  - 條件: 根據需要配置觸發條件
+3. 配置操作選項卡信息
+  - 操作步驟持續時間: 根據需要進行設置
+  - 在**操作**部分添加，配置用戶或用戶組，選擇之前配置 HertzBeat Webhook 媒介的用戶，發送至媒體類型選擇 **HertzBeat Webhook**，選中自定義消息內容，確保所有宏都被正確傳遞
+  - **恢復操作**以及**更新操作**可以根據上述進行類似配置
+4. 點擊 **添加** 按鈕保存告警動作
+
+
+### 常見問題
+
+#### 未收到告警
+- 確保 Webhook URL 可以被 zabbix 服務訪問
+- 檢查服務器日誌是否有請求記錄
+
+#### 告警未觸發
+- 確保告警策略的條件正確，並已綁定通知
+
+更多信息請參考 [Zabbix Webhook](https://www.zabbix.com/documentation/current/manual/config/notifications/webhook) 以及 [Zabbix 宏](https://www.zabbix.com/documentation/current/zh/manual/appendix/macros)
+```

web-app/src/assets/i18n/en-US.json

@@ -99,6 +99,7 @@
   "alert.integration.source.webhook": "Default Webhook",
   "alert.integration.source.skywalking": "SkyWalking",
   "alert.integration.source.uptime-kuma": "Uptime Kuma",
+  "alert.integration.source.zabbix": "Zabbix",
   "alert.integration.token.desc": "Token you generated that can be used to access the HertzBeat API.",
   "alert.integration.token.new": "Click to Generate Token",
   "alert.integration.token.notice": "Token only be displayed once. Please keep your token secure. Do not share it with others.",

web-app/src/assets/i18n/ja-JP.json

@@ -99,6 +99,7 @@
   "alert.integration.source.webhook": "デフォルトWebhook",
   "alert.integration.source.skywalking": "SkyWalking",
   "alert.integration.source.uptime-kuma": "Uptime Kuma",
+  "alert.integration.source.zabbix": "Zabbix",
   "alert.integration.token.desc": "HertzBeat APIにアクセスするために生成したトークン。",
   "alert.integration.token.new": "トークンを生成するにはクリック",
   "alert.integration.token.notice": "トークンは一度だけ表示されます。トークンを安全に保管し、他人と共有しないでください。",

web-app/src/assets/i18n/pt-BR.json

@@ -1126,6 +1126,7 @@
   "alert.export.use-type": "Exportar regras no formato de arquivo {{type}}",
   "alert.integration.source.skywalking": "SkyWalking",
   "alert.integration.source.uptime-kuma": "Uptime Kuma",
+  "alert.integration.source.zabbix": "Zabbix",
   "dashboard.alerts.title": "Lista de Alarmes Recentes",
   "dashboard.alerts.title-no": "Alarmes Pendentes Recentes",
   "dashboard.alerts.no": "Nenhum Alarme Pendente",

web-app/src/assets/i18n/zh-CN.json

@@ -99,6 +99,7 @@
   "alert.integration.source.webhook": "默认Webhook",
   "alert.integration.source.skywalking": "SkyWalking",
   "alert.integration.source.uptime-kuma": "Uptime Kuma",
+  "alert.integration.source.zabbix": "Zabbix",
   "alert.integration.token.desc": "生成的 Token 可用于访问 HertzBeat API",
   "alert.integration.token.new": "点击生成 Token",
   "alert.integration.token.notice": "此内容只会展示一次，请妥善保管您的 Token，不要泄露给他人",

web-app/src/assets/i18n/zh-TW.json

@@ -99,6 +99,7 @@
   "alert.integration.source.webhook": "默认Webhook",
   "alert.integration.source.skywalking": "SkyWalking",
   "alert.integration.source.uptime-kuma": "Uptime Kuma",
+  "alert.integration.source.zabbix": "Zabbix",
   "alert.integration.token.desc": "生成的 Token 可用于访问 HertzBeat API",
   "alert.integration.token.new": "点击生成 Token",
   "alert.integration.token.notice": "此内容只会展示一次，请妥善保管您的 Token，不要泄露给他人",

web-app/src/assets/img/integration/zabbix.svg

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="600px"
+	 viewBox="0 0 168 44" style="enable-background:new 0 0 168 44;" xml:space="preserve">
+<style type="text/css">
+	.st0{clip-path:url(#SVGID_2_);fill:#D40000;}
+	.st1{clip-path:url(#SVGID_2_);fill:#FFFFFF;}
+</style>
+<g>
+	<g>
+		<defs>
+			<rect id="SVGID_1_" y="0" width="168" height="44"/>
+		</defs>
+		<clipPath id="SVGID_2_">
+			<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+		</clipPath>
+		<rect x="0" y="0" class="st0" width="168" height="44"/>
+		<polygon class="st1" points="7.2,6.7 31.5,6.7 31.5,9.9 11.9,33.8 32,33.8 32,37.3 6.7,37.3 6.7,34.1 26.3,10.2 7.2,10.2 		"/>
+		<path class="st1" d="M48.4,10.8L42.7,26h11.4L48.4,10.8z M46,6.7h4.7l11.8,30.6h-4.3l-2.8-7.8H41.4l-2.8,7.8h-4.4L46,6.7z"/>
+		<path class="st1" d="M71.2,22.7v11.2h6.7c2.3,0,3.9-0.5,5-1.4c1.1-0.9,1.6-2.3,1.6-4.2c0-1.9-0.5-3.3-1.6-4.2
+			c-1.1-0.9-2.8-1.4-5-1.4H71.2z M71.2,10.1v9.2h6.2c2,0,3.6-0.4,4.6-1.1c1-0.8,1.5-1.9,1.5-3.5c0-1.5-0.5-2.7-1.5-3.5
+			c-1-0.8-2.5-1.1-4.6-1.1H71.2z M67,6.7h10.7c3.2,0,5.6,0.7,7.4,2c1.7,1.3,2.6,3.2,2.6,5.6c0,1.9-0.4,3.4-1.3,4.5
+			c-0.9,1.1-2.2,1.8-3.9,2.1c2.1,0.4,3.7,1.3,4.8,2.7c1.1,1.4,1.7,3.1,1.7,5.2c0,2.7-0.9,4.8-2.8,6.3c-1.9,1.5-4.5,2.2-8,2.2H67V6.7
+			z"/>
+		<path class="st1" d="M99.9,22.7v11.2h6.7c2.2,0,3.9-0.5,5-1.4c1.1-0.9,1.6-2.3,1.6-4.2c0-1.9-0.5-3.3-1.6-4.2
+			c-1.1-0.9-2.8-1.4-5-1.4H99.9z M99.9,10.1v9.2h6.2c2,0,3.6-0.4,4.6-1.1c1-0.8,1.5-1.9,1.5-3.5c0-1.5-0.5-2.7-1.5-3.5
+			c-1-0.8-2.5-1.1-4.6-1.1H99.9z M95.7,6.7h10.7c3.2,0,5.6,0.7,7.4,2c1.7,1.3,2.6,3.2,2.6,5.6c0,1.9-0.4,3.4-1.3,4.5
+			c-0.9,1.1-2.2,1.8-3.9,2.1c2.1,0.4,3.7,1.3,4.8,2.7c1.1,1.4,1.7,3.1,1.7,5.2c0,2.7-0.9,4.8-2.8,6.3c-1.9,1.5-4.5,2.2-8,2.2H95.7
+			V6.7z"/>
+		<polygon class="st1" points="136.4,6.7 141,6.7 148.3,17.7 155.7,6.7 160.1,6.7 150.5,21 161.3,37.3 156.7,37.3 148.2,24.5 
+			139.7,37.3 135.2,37.3 146,21.1 		"/>
+		<rect x="124.3" y="6.7" class="st1" width="4.2" height="30.6"/>
+	</g>
+</g>
+</svg>