apache · leo-934 · Apr 9, 2024 · Apr 9, 2024 · Apr 9, 2024 · Apr 9, 2024
diff --git a/alerter/pom.xml b/alerter/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>hertzbeat</artifactId>
-        <groupId>org.dromara.hertzbeat</groupId>
+        <groupId>org.apache.hertzbeat</groupId>
         <version>2.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
     <dependencies>
         <!-- common -->
         <dependency>
-            <groupId>org.dromara.hertzbeat</groupId>
+            <groupId>org.apache.hertzbeat</groupId>
             <artifactId>hertzbeat-common</artifactId>
             <scope>provided</scope>
         </dependency>

diff --git a/...ra/hertzbeat/alert/AlerterProperties.java → ...he/hertzbeat/alert/AlerterProperties.java b/...ra/hertzbeat/alert/AlerterProperties.java → ...he/hertzbeat/alert/AlerterProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert;
+package org.apache.hertzbeat.alert;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -24,7 +24,6 @@
 
 /**
  * alerter prop config
- *
  */
 @Component
 @ConfigurationProperties(prefix = "alerter")

diff --git a/...ra/hertzbeat/alert/AlerterWorkerPool.java → ...he/hertzbeat/alert/AlerterWorkerPool.java b/...ra/hertzbeat/alert/AlerterWorkerPool.java → ...he/hertzbeat/alert/AlerterWorkerPool.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert;
+package org.apache.hertzbeat.alert;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,6 @@
 
 /**
  * alarm module thread pool
- *
  */
 @Component
 @Slf4j

diff --git a/...zbeat/alert/calculate/CalculateAlarm.java → ...zbeat/alert/calculate/CalculateAlarm.java b/...zbeat/alert/calculate/CalculateAlarm.java → ...zbeat/alert/calculate/CalculateAlarm.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.calculate;
+package org.apache.hertzbeat.alert.calculate;
 
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.Expression;
@@ -24,23 +24,23 @@
 import com.googlecode.aviator.exception.ExpressionSyntaxErrorException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.hertzbeat.alert.AlerterWorkerPool;
-import org.dromara.hertzbeat.alert.dao.AlertMonitorDao;
-import org.dromara.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.dromara.hertzbeat.alert.service.AlertDefineService;
-import org.dromara.hertzbeat.alert.service.AlertService;
-import org.dromara.hertzbeat.alert.util.AlertTemplateUtil;
-import org.dromara.hertzbeat.common.constants.CommonConstants;
-import org.dromara.hertzbeat.common.entity.alerter.Alert;
-import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
-import org.dromara.hertzbeat.common.entity.manager.Monitor;
-import org.dromara.hertzbeat.common.entity.manager.TagItem;
-import org.dromara.hertzbeat.common.entity.message.CollectRep;
-import org.dromara.hertzbeat.common.queue.CommonDataQueue;
-import org.dromara.hertzbeat.common.support.event.MonitorDeletedEvent;
-import org.dromara.hertzbeat.common.support.event.SystemConfigChangeEvent;
-import org.dromara.hertzbeat.common.util.CommonUtil;
-import org.dromara.hertzbeat.common.util.ResourceBundleUtil;
+import org.apache.hertzbeat.alert.AlerterWorkerPool;
+import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.alert.dao.AlertMonitorDao;
+import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
+import org.apache.hertzbeat.alert.service.AlertService;
+import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
+import org.apache.hertzbeat.common.constants.CommonConstants;
+import org.apache.hertzbeat.common.entity.alerter.Alert;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.TagItem;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.apache.hertzbeat.common.queue.CommonDataQueue;
+import org.apache.hertzbeat.common.support.event.MonitorDeletedEvent;
+import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent;
+import org.apache.hertzbeat.common.util.CommonUtil;
+import org.apache.hertzbeat.common.util.ResourceBundleUtil;
 import org.springframework.context.event.EventListener;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Component;
@@ -51,11 +51,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import static org.dromara.hertzbeat.common.constants.CommonConstants.*;
+import static org.apache.hertzbeat.common.constants.CommonConstants.*;
 
 /**
  * Calculate alarms based on the alarm definition rules and collected data
- *
  */
 @Component
 @Slf4j
@@ -283,8 +282,8 @@ private void afterThresholdRuleMatch(long currentTimeMilli, long monitorId, Stri
             fieldValueMap.put(TAG_METRICS, metrics);
             fieldValueMap.put(TAG_METRIC, define.getField());
             Map<String, String> tags = new HashMap<>(8);
-            tags.put(CommonConstants.TAG_MONITOR_ID, String.valueOf(monitorId));
-            tags.put(CommonConstants.TAG_MONITOR_APP, app);
+            tags.put(TAG_MONITOR_ID, String.valueOf(monitorId));
+            tags.put(TAG_MONITOR_APP, app);
             tags.put(CommonConstants.TAG_THRESHOLD_ID, String.valueOf(define.getId()));
             if (!CollectionUtils.isEmpty(define.getTags())) {
                 for (TagItem tagItem : define.getTags()) {
@@ -351,8 +350,8 @@ private void handlerAvailableMetrics(long monitorId, String app, CollectRep.Metr
         if (metricsData.getCode() != CollectRep.Code.SUCCESS) {
             Alert preAlert = triggeredAlertMap.get(String.valueOf(monitorId));
             Map<String, String> tags = new HashMap<>(6);
-            tags.put(CommonConstants.TAG_MONITOR_ID, String.valueOf(monitorId));
-            tags.put(CommonConstants.TAG_MONITOR_APP, app);
+            tags.put(TAG_MONITOR_ID, String.valueOf(monitorId));
+            tags.put(TAG_MONITOR_APP, app);
             tags.put(CommonConstants.TAG_THRESHOLD_ID, String.valueOf(avaAlertDefine.getId()));
             tags.put(TAG_METRICS, CommonConstants.AVAILABILITY);
             tags.put(TAG_CODE, metricsData.getCode().name());

diff --git a/...lert/config/AlerterAutoConfiguration.java → ...lert/config/AlerterAutoConfiguration.java b/...lert/config/AlerterAutoConfiguration.java → ...lert/config/AlerterAutoConfiguration.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.config;
+package org.apache.hertzbeat.alert.config;
 
 import org.springframework.context.annotation.ComponentScan;
 
 /**
  * Alert auto configuration.
  * @version 2.1
  */
-@ComponentScan(basePackages = "org.dromara.hertzbeat.alert")
+@ComponentScan(basePackages = "org.apache.hertzbeat.alert")
 public class AlerterAutoConfiguration {
 }
diff --git a/...t/controller/AlertConvergeController.java → ...t/controller/AlertConvergeController.java b/...t/controller/AlertConvergeController.java → ...t/controller/AlertConvergeController.java
@@ -15,26 +15,25 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.dromara.hertzbeat.alert.service.AlertConvergeService;
-import org.dromara.hertzbeat.common.entity.alerter.AlertConverge;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.alert.service.AlertConvergeService;
+import org.apache.hertzbeat.common.entity.alerter.AlertConverge;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.validation.Valid;
 
-import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
+import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
  * Alarm Converge management API
- *
  */
 @Tag(name = "Alert Converge API | 告警收敛管理API")
 @RestController

diff --git a/.../controller/AlertConvergesController.java → .../controller/AlertConvergesController.java b/.../controller/AlertConvergesController.java → .../controller/AlertConvergesController.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.dromara.hertzbeat.alert.service.AlertConvergeService;
-import org.dromara.hertzbeat.common.entity.alerter.AlertConverge;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.alert.service.AlertConvergeService;
+import org.apache.hertzbeat.common.entity.alerter.AlertConverge;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -42,7 +42,6 @@
 
 /**
  * Converge the batch API for alarms
- *
  */
 @Tag(name = "Alert Converge Batch API | 告警收敛管理API")
 @RestController

diff --git a/...ert/controller/AlertDefineController.java → ...ert/controller/AlertDefineController.java b/...ert/controller/AlertDefineController.java → ...ert/controller/AlertDefineController.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
-import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
-import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
-import org.dromara.hertzbeat.alert.service.AlertDefineService;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
+import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,12 +40,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
+import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
  * Alarm definition management API
- *
  */
 @Tag(name = "Alert Define API | 告警定义管理API")
 @RestController

diff --git a/...rt/controller/AlertDefinesController.java → ...rt/controller/AlertDefinesController.java b/...rt/controller/AlertDefinesController.java → ...rt/controller/AlertDefinesController.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
-import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
-import org.dromara.hertzbeat.alert.service.AlertDefineService;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
+import org.apache.hertzbeat.alert.service.AlertDefineService;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -44,7 +44,6 @@
 
 /**
  * Define the batch API for alarms
- *
  */
 @Tag(name = "Alert Define Batch API | 告警定义管理API")
 @RestController

diff --git a/...ert/controller/AlertReportController.java → ...ert/controller/AlertReportController.java b/...ert/controller/AlertReportController.java → ...ert/controller/AlertReportController.java
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.hertzbeat.alert.dto.CloudAlertReportAbstract;
-import org.dromara.hertzbeat.alert.dto.GeneralCloudAlertReport;
-import org.dromara.hertzbeat.alert.enums.CloudServiceAlarmInformationEnum;
-import org.dromara.hertzbeat.alert.service.AlertService;
-import org.dromara.hertzbeat.common.entity.dto.AlertReport;
-import org.dromara.hertzbeat.common.entity.dto.Message;
-import org.dromara.hertzbeat.common.util.JsonUtil;
+import org.apache.hertzbeat.alert.dto.CloudAlertReportAbstract;
+import org.apache.hertzbeat.alert.dto.GeneralCloudAlertReport;
+import org.apache.hertzbeat.alert.enums.CloudServiceAlarmInformationEnum;
+import org.apache.hertzbeat.alert.service.AlertService;
+import org.apache.hertzbeat.common.entity.dto.AlertReport;
+import org.apache.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.common.util.JsonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -38,7 +38,6 @@
 
 /**
  * Extern Alarm Manage API
- *
  */
 @Tag(name = "Extern Alarm Manage API | 第三方告警管理API")
 @RestController

diff --git a/...rt/controller/AlertSilenceController.java → ...rt/controller/AlertSilenceController.java b/...rt/controller/AlertSilenceController.java → ...rt/controller/AlertSilenceController.java
@@ -15,27 +15,26 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.dromara.hertzbeat.alert.service.AlertSilenceService;
-import org.dromara.hertzbeat.common.entity.alerter.AlertSilence;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.alert.service.AlertSilenceService;
+import org.apache.hertzbeat.common.entity.alerter.AlertSilence;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.validation.Valid;
 
 
-import static org.dromara.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
+import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
  * Alarm Silence management API
- *
  */
 @Tag(name = "Alert Silence API | 告警静默管理API")
 @RestController

diff --git a/...t/controller/AlertSilencesController.java → ...t/controller/AlertSilencesController.java b/...t/controller/AlertSilencesController.java → ...t/controller/AlertSilencesController.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.dromara.hertzbeat.alert.service.AlertSilenceService;
-import org.dromara.hertzbeat.common.entity.alerter.AlertSilence;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.alert.service.AlertSilenceService;
+import org.apache.hertzbeat.common.entity.alerter.AlertSilence;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -42,7 +42,6 @@
 
 /**
  * Silence the batch API for alarms
- *
  */
 @Tag(name = "Alert Silence Batch API | 告警静默管理API")
 @RestController

diff --git a/...at/alert/controller/AlertsController.java → ...at/alert/controller/AlertsController.java b/...at/alert/controller/AlertsController.java → ...at/alert/controller/AlertsController.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.dromara.hertzbeat.alert.controller;
+package org.apache.hertzbeat.alert.controller;
 
-import org.dromara.hertzbeat.alert.dto.AlertSummary;
-import org.dromara.hertzbeat.common.entity.alerter.Alert;
-import org.dromara.hertzbeat.alert.service.AlertService;
-import org.dromara.hertzbeat.common.entity.dto.Message;
+import org.apache.hertzbeat.alert.dto.AlertSummary;
+import org.apache.hertzbeat.common.entity.alerter.Alert;
+import org.apache.hertzbeat.alert.service.AlertService;
+import org.apache.hertzbeat.common.entity.dto.Message;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -42,8 +42,6 @@
 
 /**
  * Alarm Management API
- *
- *
  */
 @Tag(name = "Alarm Manage Batch API | 告警批量管理API")
 @RestController