(hertzbeat) 01/05: [bugfix] fix prometheus extern alert integrate error

[gongchao]

This is an automated email from the ASF dual-hosted git repository.

gongchao pushed a commit to branch fix-third-alarm
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit df8fa17da009306af0c9f3c7e694c53b1b574d01
Author: tomsun28 <tomsu...@outlook.com>
AuthorDate: Sun Jan 12 16:36:09 2025 +0800

    [bugfix] fix prometheus extern alert integrate error
    
    Signed-off-by: tomsun28 <tomsu...@outlook.com>
---
 .../org/apache/hertzbeat/alert/dto/PrometheusExternAlert.java     | 8 +++++---
 .../alert/service/impl/AlertManagerExternAlertService.java        | 6 +++---
 .../alert/service/impl/PrometheusExternAlertService.java          | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/PrometheusExternAlert.java
 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/PrometheusExternAlert.java
index 728f6939cf..0ccd1fef64 100644
--- 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/PrometheusExternAlert.java
+++ 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/dto/PrometheusExternAlert.java
@@ -17,6 +17,8 @@
 
 package org.apache.hertzbeat.alert.dto;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.Map;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -39,11 +41,11 @@ public class PrometheusExternAlert {
 
     private String status;
 
-    private Long startsAt;
+    private Instant startsAt;
 
-    private Long activeAt;
+    private Instant activeAt;
 
-    private Long endsAt;
+    private Instant endsAt;
     
     private String generatorURL;
 }
diff --git 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertManagerExternAlertService.java
 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertManagerExternAlertService.java
index 44e9ea6b36..ae8e5dc83a 100644
--- 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertManagerExternAlertService.java
+++ 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertManagerExternAlertService.java
@@ -74,9 +74,9 @@ public class AlertManagerExternAlertService implements 
ExternAlertService {
             SingleAlert singleAlert = SingleAlert.builder()
                     .content(description)
                     .status(prometheusAlert.getStatus())
-                    .activeAt(prometheusAlert.getActiveAt())
-                    .startAt(prometheusAlert.getStartsAt())
-                    .endAt(prometheusAlert.getEndsAt())
+                    .activeAt(prometheusAlert.getActiveAt() != null ? 
prometheusAlert.getActiveAt().getEpochSecond() : null)
+                    .startAt(prometheusAlert.getStartsAt() != null ? 
prometheusAlert.getStartsAt().getEpochSecond() : null)
+                    .endAt(prometheusAlert.getEndsAt() != null ? 
prometheusAlert.getEndsAt().getEpochSecond() : null)
                     .labels(prometheusAlert.getLabels())
                     .annotations(prometheusAlert.getAnnotations())
                     .build();
diff --git 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java
 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java
index 667053d665..f8ba25f966 100644
--- 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java
+++ 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java
@@ -66,9 +66,9 @@ public class PrometheusExternAlertService implements 
ExternAlertService {
         SingleAlert singleAlert = SingleAlert.builder()
                 .content(description)
                 .status(alert.getStatus())
-                .activeAt(alert.getActiveAt())
-                .startAt(alert.getStartsAt())
-                .endAt(alert.getEndsAt())
+                .activeAt(alert.getActiveAt() != null ? 
alert.getActiveAt().getEpochSecond() : null)
+                .startAt(alert.getStartsAt() != null ? 
alert.getStartsAt().getEpochSecond() : null)
+                .endAt(alert.getEndsAt() != null ? 
alert.getEndsAt().getEpochSecond() : null)
                 .labels(alert.getLabels())
                 .annotations(alert.getAnnotations())
                 .build();


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org