[alarm] refactor new alarm (#2902)

Signed-off-by: tomsun28 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Calvin <[email protected]> Co-authored-by: a-little-fool <[email protected]> Co-authored-by: Logic <[email protected]>
apache · Jan 4, 2025 · 4cd3c3c · 4cd3c3c
1 parent 69a21ff
commit 4cd3c3c
Show file tree

Hide file tree

Showing 287 changed files with 9,528 additions and 9,045 deletions.
diff --git a/e2e/testsuite.yaml b/e2e/testsuite.yaml
@@ -302,23 +302,23 @@ items:
       Authorization: Bearer {{.login.data.token}}
 - name: deleteAlertDefine
   request:
-    api: /api/alert/defines?ids={{(index .listAlertDefines.data.content 0).id | int64}}
+    api: /api/alert/defines?ids=1
     method: DELETE
     header:
       Authorization: Bearer {{.login.data.token}}
-- name: listAlertConverges
+- name: listAlertGroupConverges
   request:
-    api: /api/alert/converges
+    api: /api/alert/groups
     header:
       Authorization: Bearer {{.login.data.token}}
 - name: listAlertSilences
   request:
     api: /api/alert/silences
     header:
       Authorization: Bearer {{.login.data.token}}
-- name: listAlerts
+- name: listGroupAlerts
   request:
-    api: /api/alerts
+    api: /api/alerts/group
     header:
       Authorization: Bearer {{.login.data.token}}
 - name: listReceivers

diff --git a/hertzbeat-alerter/pom.xml b/hertzbeat-alerter/pom.xml
@@ -32,9 +32,14 @@
         <!-- common -->
         <dependency>
             <groupId>org.apache.hertzbeat</groupId>
-            <artifactId>hertzbeat-common</artifactId>
+            <artifactId>hertzbeat-base</artifactId>
             <scope>provided</scope>
         </dependency>
+        <!-- plugin -->
+        <dependency>
+            <groupId>org.apache.hertzbeat</groupId>
+            <artifactId>hertzbeat-plugin</artifactId>
+        </dependency>
         <!-- spring -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -50,6 +55,21 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- email -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <!--   freemarker     -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>${nekohtml.version}</version>
+        </dependency>
         <!-- kafka -->
         <dependency>
             <groupId>org.apache.kafka</groupId>
@@ -73,6 +93,36 @@
             <version>${easy-poi.version}</version>
             <scope>compile</scope>
         </dependency>
+        <!-- sms -->
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java-sms</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>logging-interceptor</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okhttp</groupId>
+                    <artifactId>okhttp</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.squareup.okio</groupId>
+                    <artifactId>okio</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.huaweicloud.sdk</groupId>
+            <artifactId>huaweicloud-sdk-smn</artifactId>
+            <version>${huawei.sdk.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.openeuler</groupId>
+                    <artifactId>bgmprovider</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-vector</artifactId>

diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/AlerterWorkerPool.java
@@ -44,7 +44,7 @@ public AlerterWorkerPool() {
     private void initWorkExecutor() {
         ThreadFactory threadFactory = new ThreadFactoryBuilder()
                 .setUncaughtExceptionHandler((thread, throwable) -> {
-                    log.error("workerExecutor has uncaughtException.");
+                    log.error("Alerter workerExecutor has uncaughtException.");
                     log.error(throwable.getMessage(), throwable);
                 })
                 .setDaemon(true)
@@ -62,7 +62,7 @@ private void initWorkExecutor() {
     private void initNotifyExecutor() {
         ThreadFactory threadFactory = new ThreadFactoryBuilder()
                 .setUncaughtExceptionHandler((thread, throwable) -> {
-                    log.error("notifyExecutor has uncaughtException.");
+                    log.error("Alerter notifyExecutor has uncaughtException.");
                     log.error(throwable.getMessage(), throwable);
                 })
                 .setDaemon(true)