Merge branch 'master' into fix-dispatch-error

Signed-off-by: tomsun28 <tomsun28@outlook.com>

.github/workflows/nightly-build.yml

@@ -42,7 +42,7 @@ jobs:
       run: |
         mvn clean install
         mvn clean package -Prelease -DskipTests
-        cd hertzbeat-collector
+        cd collector
         mvn clean package -Pcluster -DskipTests
 
     - uses: docker/setup-qemu-action@v3

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/AlibabaSmsProperties.java

@@ -17,39 +17,30 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Alibaba Cloud SMS configuration properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class AlibabaSmsProperties {
     /**
      * Alibaba Cloud access key id
      */
-    @NotBlank(message = "AccessKeyId cannot be empty")
     private String accessKeyId;
     
     /**
      * Alibaba Cloud access key secret
      */
-    @NotBlank(message = "AccessKeySecret cannot be empty")
     private String accessKeySecret;
     
     /**
      * SMS signature
      */
-    @NotBlank(message = "SignName cannot be empty")
     private String signName;
     
     /**
      * SMS template Code
      */
-    @NotBlank(message = "TemplateCode cannot be null")
     private String templateCode;
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/AwsSmsProperties.java

@@ -17,7 +17,6 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 /**
@@ -28,19 +27,16 @@ public class AwsSmsProperties {
     /**
      * AWS Cloud access key id
      */
-    @NotBlank(message = "AccessKeyId cannot be empty")
     private String accessKeyId;
 
     /**
      * AWS Cloud access key secret
      */
-    @NotBlank(message = "AccessKeySecret cannot be empty")
     private String accessKeySecret;
 
     /**
      * AWS Cloud region
      */
-    @NotBlank(message = "region cannot be empty")
     private String region;
 
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/SmsConfig.java

@@ -17,10 +17,7 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
@@ -28,8 +25,6 @@ import org.springframework.stereotype.Component;
  * SMS configuration
  */
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Component
 @ConfigurationProperties(prefix = "alerter.sms")
 public class SmsConfig {
@@ -42,7 +37,6 @@ public class SmsConfig {
     /**
      * sms service provider
      */
-    @NotBlank(message = "Type cannot be empty")
     private String type;
 
     /**

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/SmslocalSmsProperties.java

@@ -18,16 +18,12 @@
 package org.apache.hertzbeat.alert.config;
 
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Smslocal SMS Properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class SmslocalSmsProperties {
     /**
      * SmsLocal account api key

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/TencentSmsProperties.java

@@ -17,45 +17,35 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * Tencent Cloud SMS properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class TencentSmsProperties {
     /**
      * Tencent cloud account secret id
      */
-    @NotBlank(message = "SecretId cannot be empty")
     private String secretId;
 
     /**
      * Tencent cloud account secret key
      */
-    @NotBlank(message = "SecretKey cannot be empty")
     private String secretKey;
 
     /**
      * SMS app id
      */
-    @NotBlank(message = "AppId cannot be null")
     private String appId;
 
     /**
      * SMS signature
      */
-    @NotBlank(message = "SignName cannot be empty")
     private String signName;
 
     /**
      * SMS template ID
      */
-    @NotBlank(message = "templateId cannot be null")
     private String templateId;
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/config/UniSmsProperties.java

@@ -17,22 +17,16 @@
 
 package org.apache.hertzbeat.alert.config;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 /**
  * UniSMS properties
  */
 @Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class UniSmsProperties {
     /**
      * UniSMS access key id
      */
-    @NotBlank(message = "accessKeyId cannot be empty")
     private String accessKeyId;
     
     /**
@@ -43,18 +37,15 @@ public class UniSmsProperties {
     /**
      * SMS signature
      */
-    @NotBlank(message = "signature cannot be null")
     private String signature;
     
     /**
      * SMS template ID
      */
-    @NotBlank(message = "templateId cannot be null")
     private String templateId;
     
     /**
      * Authentication mode: simple or hmac, default is simple
      */
-    @NotBlank(message = "authMode cannot be null")
     private String authMode = "simple";
 } 

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmsAlibabaConfig.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * Alibaba Sms Sender configuration dto
+ */
+@Data
+public class SmsAlibabaConfig {
+    
+    @NotBlank(message = "AccessKeyId cannot be empty")
+    private String accessKeyId;
+    
+    @NotBlank(message = "AccessKeySecret cannot be empty")
+    private String accessKeySecret;
+
+    @NotBlank(message = "SignName cannot be empty")
+    private String signName;
+
+    @NotBlank(message = "TemplateCode cannot be null")
+    private String templateCode;
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmsAwsConfig.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * AWS Sms Sender configuration dto
+ */
+@Data
+public class SmsAwsConfig {
+
+    @NotBlank(message = "AccessKeyId cannot be empty")
+    private String accessKeyId;
+
+    @NotBlank(message = "AccessKeySecret cannot be empty")
+    private String accessKeySecret;
+
+    @NotBlank(message = "region cannot be empty")
+    private String region;
+
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmsNoticeSender.java

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Sms Sender configuration dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsNoticeSender {
+    
+    @NotBlank(message = "Type cannot be empty")
+    private String type;
+    
+    private SmsTencentConfig tencent;
+    
+    private SmsAlibabaConfig alibaba;
+
+    private SmsUniSmsConfig unisms;
+
+    private SmslocalConfig smslocal;
+
+    private SmsAwsConfig aws;
+
+    private boolean enable = true;
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmsTencentConfig.java

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * Tencent Sms Sender configuration dto
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsTencentConfig {
+    
+    @NotBlank(message = "SecretId cannot be empty")
+    private String secretId;
+
+    @NotBlank(message = "SecretKey cannot be empty")
+    private String secretKey;
+
+    @NotBlank(message = "SignName cannot be empty")
+    private String signName;
+
+    @NotBlank(message = "AppId cannot be null")
+    private String appId;
+
+    @NotBlank(message = "templateId cannot be null")
+    private String templateId;
+
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmsUniSmsConfig.java

@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.NotBlank;
+
+/**
+ * UniSMS configuration
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmsUniSmsConfig {
+    /**
+     * UniSMS access key id
+     */
+    @NotBlank(message = "accessKeyId cannot be empty")
+    private String accessKeyId;
+
+    /**
+     * UniSMS access key secret, required for HMAC mode
+     */
+    private String accessKeySecret;
+
+    /**
+     * SMS signature
+     */
+    @NotBlank(message = "signature cannot be null")
+    private String signature;
+
+    /**
+     * SMS template ID
+     */
+    @NotBlank(message = "templateId cannot be null")
+    private String templateId;
+
+    /**
+     * Authentication mode: simple or hmac, default is simple
+     */
+    @NotBlank(message = "authMode cannot be null")
+    private String authMode = "simple";
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SmslocalConfig.java

@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hertzbeat.manager.pojo.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+/**
+ * Smslocal SMS configuration
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SmslocalConfig {
+    /**
+     * Smslocal api key
+     */
+    private String apiKey;
+}

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SmsGeneralConfigServiceImpl.java

@@ -22,10 +22,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import java.lang.reflect.Type;
 
 import jakarta.annotation.Resource;
-import org.apache.hertzbeat.alert.config.SmsConfig;
 import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.common.support.event.SmsConfigChangeEvent;
+import org.apache.hertzbeat.manager.pojo.dto.SmsNoticeSender;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Service;
  */
 
 @Service
-public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl<SmsConfig> {
+public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl<SmsNoticeSender> {
     @Resource
     private ApplicationContext applicationContext;
 
@@ -55,7 +55,7 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp
      * This method is used to handle the sms configuration change event.
      */
     @Override
-    public void handler(SmsConfig smsConfig) {
+    public void handler(SmsNoticeSender smsNoticeSender) {
         applicationContext.publishEvent(new SmsConfigChangeEvent(applicationContext));
     }
     
@@ -69,11 +69,11 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp
      * a TypeReference of NoticeSender type
      */
     @Override
-    public TypeReference<SmsConfig> getTypeReference() {
+    public TypeReference<SmsNoticeSender> getTypeReference() {
         return new TypeReference<>() {
             @Override
             public Type getType() {
-                return SmsConfig.class;
+                return SmsNoticeSender.class;
             }
         };
     }

hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SmsGeneralConfigServiceTest.java

@@ -21,9 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.hertzbeat.alert.config.SmsConfig;
 import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
+import org.apache.hertzbeat.manager.pojo.dto.SmsNoticeSender;
 import org.apache.hertzbeat.manager.service.impl.SmsGeneralConfigServiceImpl;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -66,9 +66,9 @@ class SmsGeneralConfigServiceTest {
     @Test
     void testGetTypeReference() {
 
-        TypeReference<SmsConfig> typeReference = service.getTypeReference();
+        TypeReference<SmsNoticeSender> typeReference = service.getTypeReference();
         assertNotNull(typeReference);
-        assertEquals(SmsConfig.class, typeReference.getType());
+        assertEquals(SmsNoticeSender.class, typeReference.getType());
     }
 
 }

web-app/angular.json

@@ -86,8 +86,8 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "50kb",
-                  "maximumError": "100kb"
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
                 }
               ]
             },

web-app/src/index.html

@@ -6,7 +6,7 @@
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <style type="text/css">.preloader{position:fixed;top:0;left:0;width:100%;height:100%;overflow:hidden;background:#c192c7;z-index:9999;transition:opacity .65s}.preloader-hidden-add{opacity:1;display:none}.preloader-hidden-add-active{opacity:0}.preloader-hidden{display:none}.cs-loader{position:absolute;top:0;left:0;height:100%;width:100%}.cs-loader-inner{transform:translateY(-50%);top:50%;position:absolute;width:100%;color:#fff;text-align:center}.cs-loader-inner label{font-size:20px;opacity:0;display:inline-block}@keyframes lol{0%{opacity:0;transform:translateX(-300px)}33%{opacity:1;transform:translateX(0)}66%{opacity:1;transform:translateX(0)}100%{opacity:0;transform:translateX(300px)}}.cs-loader-inner label:nth-child(6){animation:lol 3s infinite ease-in-out}.cs-loader-inner label:nth-child(5){animation:lol 3s .1s infinite ease-in-out}.cs-loader-inner label:nth-child(4){animation:lol 3s .2s infinite ease-in-out}.cs-loader-inner label:nth-child(3){animation:lol 3s .3s infinite ease-in-out}.cs-loader-inner label:nth-child(2){animation:lol 3s .4s infinite ease-in-out}.cs-loader-inner label:nth-child(1){animation:lol 3s .5s infinite ease-in-out}</style>
+  <style type="text/css">.preloader{position:fixed;top:0;left:0;width:100%;height:100%;overflow:hidden;background:#c192c7;z-index:9999;transition:opacity .65s}.preloader-hidden-add{opacity:1;display:block}.preloader-hidden-add-active{opacity:0}.preloader-hidden{display:none}.cs-loader{position:absolute;top:0;left:0;height:100%;width:100%}.cs-loader-inner{transform:translateY(-50%);top:50%;position:absolute;width:100%;color:#fff;text-align:center}.cs-loader-inner label{font-size:20px;opacity:0;display:inline-block}@keyframes lol{0%{opacity:0;transform:translateX(-300px)}33%{opacity:1;transform:translateX(0)}66%{opacity:1;transform:translateX(0)}100%{opacity:0;transform:translateX(300px)}}.cs-loader-inner label:nth-child(6){animation:lol 3s infinite ease-in-out}.cs-loader-inner label:nth-child(5){animation:lol 3s .1s infinite ease-in-out}.cs-loader-inner label:nth-child(4){animation:lol 3s .2s infinite ease-in-out}.cs-loader-inner label:nth-child(3){animation:lol 3s .3s infinite ease-in-out}.cs-loader-inner label:nth-child(2){animation:lol 3s .4s infinite ease-in-out}.cs-loader-inner label:nth-child(1){animation:lol 3s .5s infinite ease-in-out}</style>
   <!-- Matomo -->
   <script>
     var _paq = window._paq = window._paq || [];