[feature]change the package name (#825)

* change the package name to org.dromara.hertzbeat from com.usthe * [doc] update domain * change the package name to org.dromara.hertzbeat from com.usthe * change the package name to org.dromara.hertzbeat from com.usthe * change the package name to org.dromara.hertzbeat from com.usthe * change the package name to org.dromara.hertzbeat from com.usthe * catch aviator CompileExpressionErrorException ExpressionRuntimeException * update favicon * [script] update github workflow, add pr template (#819) * [script]update github workflow, add pr template * [script]update github workflow * [script]update github workflow * update * update --------- Co-authored-by: hudongdong <hudongdong9406@zto.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>
apache · Mar 31, 2023 · d003b61 · d003b61
1 parent a866a89
commit d003b61
Show file tree

Hide file tree

Showing 350 changed files with 1,399 additions and 1,518 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ Even small corrections to typos are very welcome :)
 1. Deploy and start dependent services `MYSQL` and `TDengine` database   
 2. Requires `maven3+`, `java8+` and `lombok` environments    
 3. Modify the dependent service address and other information of the configuration file-`manager/src/main/resources/application.yml`
-4. Start `springboot manager` service `manager/src/main/java/com/usthe/manager/Manager.java`   
+4. Start `springboot manager` service `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java`   
 
 - Front-web start   
 
@@ -113,13 +113,13 @@ With the above steps, you are a contributor to HertzBeat. Repeat the previous st
 
 [Gitter Channel](https://gitter.im/hertzbeat/community)
 
-[Github Discussion](https://github.com/usthe/hertzbeat/discussions)
+[Github Discussion](https://github.com/dromara/hertzbeat/discussions)
 
 [User Club](https://support.qq.com/products/379369)  
 
 Add WeChat account `tan-cloud` to pull you into the WeChat group.     
 
-QQ group number `718618151`, verify code: `tancloud`      
+QQ group number `236915833`, verify code: `tancloud`      
 
 Public WeChat: `tancloudtech`  
 
@@ -180,7 +180,7 @@ Public WeChat: `tancloudtech`
 1. 部署启动依赖服务`MYSQL`和`TDengine`数据库  
 2. 需要`maven3+`, `java8+`和`lombok`环境  
 3. 修改配置文件的依赖服务地址等信息-`manager/src/main/resources/application.yml`
-4. 启动`springboot manager`服务 `manager/src/main/java/com/usthe/manager/Manager.java`  
+4. 启动`springboot manager`服务 `manager/src/main/java/org/dromara/hertzbeat/manager/Manager.java`  
 
 - 前端启动
 
@@ -258,13 +258,13 @@ git pull upstream master
 
 [Gitter Channel](https://gitter.im/hertzbeat/community)
 
-[Github Discussion](https://github.com/usthe/hertzbeat/discussions)
+[Github Discussion](https://github.com/dromara/hertzbeat/discussions)
 
 [HertzBeat答疑网站](https://support.qq.com/products/379369)
 
 加微信号 `tan-cloud` 拉您进微信交流群   
 
-加QQ群号 `718618151` 进QQ交流群, 验证信息: `tancloud`     
+加QQ群号 `236915833` 进QQ交流群, 验证信息: `tancloud`     
 
 微信公众号: `tancloudtech`  
 

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@
 ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/custom-monitor.svg)
 ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/alert.svg)
 
-**Home: [hertzbeat.com](https://hertzbeat.com)**
+**Home: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)**
 
 **Cloud: [tancloud.cn](https://tancloud.cn)**
 
@@ -287,7 +287,7 @@ HertzBeat is a project under the [Dromara Open Source Community](https://dromara
 
 [Gitter Channel](https://gitter.im/hertzbeat/community)
 
-[Github Discussion](https://github.com/usthe/hertzbeat/discussions)
+[Github Discussion](https://github.com/dromara/hertzbeat/discussions)
 
 [User Club](https://support.qq.com/products/379369)   
 

diff --git a/README_CN.md b/README_CN.md
@@ -24,7 +24,7 @@
 ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/custom-monitor.svg)
 ![hertzbeat](https://cdn.jsdelivr.net/gh/dromara/hertzbeat@gh-pages/img/badge/alert.svg)
 
-**官网: [hertzbeat.com](https://hertzbeat.com)**
+**官网: [hertzbeat.dromara.org](https://hertzbeat.dromara.org) | [hertzbeat.com](https://hertzbeat.com)**
 
 **云服务: [tancloud.cn](https://tancloud.cn)**
 
@@ -292,7 +292,7 @@ HertzBeat 赫兹跳动是 [Dromara开源社区](https://dromara.org/) 下项目
 
 [Gitter Channel](https://gitter.im/hertzbeat/community)   
 
-[Github Discussion](https://github.com/usthe/hertzbeat/discussions)
+[Github Discussion](https://github.com/dromara/hertzbeat/discussions)
 
 [User Club](https://support.qq.com/products/379369)    
 

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>com.usthe.tancloud</groupId>
+        <groupId>org.dromara.hertzbeat</groupId>
         <version>1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -34,7 +34,7 @@
     <dependencies>
         <!-- common -->
         <dependency>
-            <groupId>com.usthe.tancloud</groupId>
+            <groupId>org.dromara.hertzbeat</groupId>
             <artifactId>common</artifactId>
             <version>${common.version}</version>
             <scope>provided</scope>

diff --git a/...va/com/usthe/alert/AlerterProperties.java → ...ra/hertzbeat/alert/AlerterProperties.java b/...va/com/usthe/alert/AlerterProperties.java → ...ra/hertzbeat/alert/AlerterProperties.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert;
+package org.dromara.hertzbeat.alert;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...va/com/usthe/alert/AlerterWorkerPool.java → ...ra/hertzbeat/alert/AlerterWorkerPool.java b/...va/com/usthe/alert/AlerterWorkerPool.java → ...ra/hertzbeat/alert/AlerterWorkerPool.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert;
+package org.dromara.hertzbeat.alert;
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import lombok.extern.slf4j.Slf4j;

diff --git a/...usthe/alert/calculate/CalculateAlarm.java → ...zbeat/alert/calculate/CalculateAlarm.java b/...usthe/alert/calculate/CalculateAlarm.java → ...zbeat/alert/calculate/CalculateAlarm.java
@@ -15,23 +15,25 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.calculate;
+package org.dromara.hertzbeat.alert.calculate;
 
 import com.googlecode.aviator.AviatorEvaluator;
 import com.googlecode.aviator.Expression;
-import com.usthe.alert.AlerterProperties;
-import com.usthe.alert.AlerterWorkerPool;
-import com.usthe.common.queue.CommonDataQueue;
-import com.usthe.alert.dao.AlertMonitorDao;
-import com.usthe.common.entity.alerter.Alert;
-import com.usthe.common.entity.alerter.AlertDefine;
-import com.usthe.alert.service.AlertDefineService;
-import com.usthe.alert.util.AlertTemplateUtil;
-import com.usthe.common.entity.manager.Monitor;
-import com.usthe.common.entity.message.CollectRep;
-import com.usthe.common.util.CommonConstants;
-import com.usthe.common.util.CommonUtil;
-import com.usthe.common.util.ResourceBundleUtil;
+import com.googlecode.aviator.exception.CompileExpressionErrorException;
+import com.googlecode.aviator.exception.ExpressionRuntimeException;
+import org.dromara.hertzbeat.alert.AlerterProperties;
+import org.dromara.hertzbeat.alert.AlerterWorkerPool;
+import org.dromara.hertzbeat.common.queue.CommonDataQueue;
+import org.dromara.hertzbeat.alert.dao.AlertMonitorDao;
+import org.dromara.hertzbeat.common.entity.alerter.Alert;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
+import org.dromara.hertzbeat.alert.service.AlertDefineService;
+import org.dromara.hertzbeat.alert.util.AlertTemplateUtil;
+import org.dromara.hertzbeat.common.entity.manager.Monitor;
+import org.dromara.hertzbeat.common.entity.message.CollectRep;
+import org.dromara.hertzbeat.common.util.CommonConstants;
+import org.dromara.hertzbeat.common.util.CommonUtil;
+import org.dromara.hertzbeat.common.util.ResourceBundleUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 
@@ -212,8 +214,16 @@ private void calculate(CollectRep.MetricsData metricsData) {
                     for (AlertDefine define : defines) {
                         String expr = define.getExpr();
                         try {
-                            Expression expression = AviatorEvaluator.compile(expr, true);
-                            Boolean match = (Boolean) expression.execute(fieldValueMap);
+                            Boolean match = false;
+                            try {
+                                Expression expression = AviatorEvaluator.compile(expr, true);
+                                match = (Boolean) expression.execute(fieldValueMap);
+                            } catch (CompileExpressionErrorException compileException) {
+                                log.error("Alert Define Rule: {} Compile Error: {}.", expr, compileException.getMessage());
+                            } catch (ExpressionRuntimeException expressionRuntimeException) {
+                                log.error("Alert Define Rule: {} Run Error: {}.", expr, expressionRuntimeException.getMessage());
+                            }
+
                             if (match != null && match) {
                                 // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
                                 // 阈值规则匹配，判断已触发阈值次数，触发告警
@@ -261,7 +271,7 @@ private void calculate(CollectRep.MetricsData metricsData) {
                                 break;
                             }
                         } catch (Exception e) {
-                            log.warn(e.getMessage());
+                            log.warn(e.getMessage(), e);
                         }
                     }
                 }

diff --git a/...lert/config/AlerterAutoConfiguration.java → ...lert/config/AlerterAutoConfiguration.java b/...lert/config/AlerterAutoConfiguration.java → ...lert/config/AlerterAutoConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.config;
+package org.dromara.hertzbeat.alert.config;
 
 import org.springframework.context.annotation.ComponentScan;
 
@@ -24,6 +24,6 @@
  * @version 2.1
  * Created by Musk.Chen on 2023/1/14
  */
-@ComponentScan(basePackages = "com.usthe.alert")
+@ComponentScan(basePackages = "org.dromara.hertzbeat.alert")
 public class AlerterAutoConfiguration {
 }
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 com.usthe.alert.controller;
+package org.dromara.hertzbeat.alert.controller;
 
-import com.usthe.common.entity.alerter.AlertDefine;
-import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
-import com.usthe.alert.service.AlertDefineService;
-import com.usthe.common.entity.dto.Message;
+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 io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,7 +40,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static com.usthe.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE;
+import static org.dromara.hertzbeat.common.util.CommonConstants.MONITOR_NOT_EXIST_CODE;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**

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 com.usthe.alert.controller;
+package org.dromara.hertzbeat.alert.controller;
 
-import com.usthe.common.entity.alerter.AlertDefine;
-import com.usthe.alert.service.AlertDefineService;
-import com.usthe.common.entity.dto.Message;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
+import org.dromara.hertzbeat.alert.service.AlertDefineService;
+import org.dromara.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;

diff --git a/...he/alert/controller/AlertsController.java → ...at/alert/controller/AlertsController.java b/...he/alert/controller/AlertsController.java → ...at/alert/controller/AlertsController.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.controller;
+package org.dromara.hertzbeat.alert.controller;
 
-import com.usthe.alert.dto.AlertSummary;
-import com.usthe.common.entity.alerter.Alert;
-import com.usthe.alert.service.AlertService;
-import com.usthe.common.entity.dto.AlertReport;
-import com.usthe.common.entity.dto.Message;
+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.AlertReport;
+import org.dromara.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;

diff --git a/...in/java/com/usthe/alert/dao/AlertDao.java → ...dromara/hertzbeat/alert/dao/AlertDao.java b/...in/java/com/usthe/alert/dao/AlertDao.java → ...dromara/hertzbeat/alert/dao/AlertDao.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dao;
+package org.dromara.hertzbeat.alert.dao;
 
-import com.usthe.alert.dto.AlertPriorityNum;
-import com.usthe.common.entity.alerter.Alert;
+import org.dromara.hertzbeat.alert.dto.AlertPriorityNum;
+import org.dromara.hertzbeat.common.entity.alerter.Alert;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
@@ -60,6 +60,6 @@ public interface AlertDao extends JpaRepository<Alert, Long>, JpaSpecificationEx
      *
      * @return Number of alerts 告警数量
      */
-    @Query("select new com.usthe.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority")
+    @Query("select new org.dromara.hertzbeat.alert.dto.AlertPriorityNum(mo.priority, count(mo.id)) from Alert mo where mo.status = 0 group by mo.priority")
     List<AlertPriorityNum> findAlertPriorityNum();
 }
diff --git a/...m/usthe/alert/dao/AlertDefineBindDao.java → ...rtzbeat/alert/dao/AlertDefineBindDao.java b/...m/usthe/alert/dao/AlertDefineBindDao.java → ...rtzbeat/alert/dao/AlertDefineBindDao.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dao;
+package org.dromara.hertzbeat.alert.dao;
 
-import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

diff --git a/...a/com/usthe/alert/dao/AlertDefineDao.java → ...a/hertzbeat/alert/dao/AlertDefineDao.java b/...a/com/usthe/alert/dao/AlertDefineDao.java → ...a/hertzbeat/alert/dao/AlertDefineDao.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dao;
+package org.dromara.hertzbeat.alert.dao;
 
-import com.usthe.common.entity.alerter.AlertDefine;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;

diff --git a/.../com/usthe/alert/dao/AlertMonitorDao.java → .../hertzbeat/alert/dao/AlertMonitorDao.java b/.../com/usthe/alert/dao/AlertMonitorDao.java → .../hertzbeat/alert/dao/AlertMonitorDao.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dao;
+package org.dromara.hertzbeat.alert.dao;
 
-import com.usthe.common.entity.manager.Monitor;
+import org.dromara.hertzbeat.common.entity.manager.Monitor;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

diff --git a/...com/usthe/alert/dto/AlertPriorityNum.java → ...hertzbeat/alert/dto/AlertPriorityNum.java b/...com/usthe/alert/dto/AlertPriorityNum.java → ...hertzbeat/alert/dto/AlertPriorityNum.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dto;
+package org.dromara.hertzbeat.alert.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...ava/com/usthe/alert/dto/AlertSummary.java → ...ara/hertzbeat/alert/dto/AlertSummary.java b/...ava/com/usthe/alert/dto/AlertSummary.java → ...ara/hertzbeat/alert/dto/AlertSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.dto;
+package org.dromara.hertzbeat.alert.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

diff --git a/...the/alert/service/AlertDefineService.java → ...eat/alert/service/AlertDefineService.java b/...the/alert/service/AlertDefineService.java → ...eat/alert/service/AlertDefineService.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.service;
+package org.dromara.hertzbeat.alert.service;
 
-import com.usthe.common.entity.alerter.AlertDefine;
-import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

diff --git a/...com/usthe/alert/service/AlertService.java → ...hertzbeat/alert/service/AlertService.java b/...com/usthe/alert/service/AlertService.java → ...hertzbeat/alert/service/AlertService.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.service;
+package org.dromara.hertzbeat.alert.service;
 
-import com.usthe.alert.dto.AlertSummary;
-import com.usthe.common.entity.alerter.Alert;
-import com.usthe.common.entity.dto.AlertReport;
+import org.dromara.hertzbeat.alert.dto.AlertSummary;
+import org.dromara.hertzbeat.common.entity.alerter.Alert;
+import org.dromara.hertzbeat.common.entity.dto.AlertReport;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;

diff --git a/.../service/impl/AlertDefineServiceImpl.java → .../service/impl/AlertDefineServiceImpl.java b/.../service/impl/AlertDefineServiceImpl.java → .../service/impl/AlertDefineServiceImpl.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package com.usthe.alert.service.impl;
+package org.dromara.hertzbeat.alert.service.impl;
 
-import com.usthe.alert.dao.AlertDefineBindDao;
-import com.usthe.alert.dao.AlertDefineDao;
-import com.usthe.common.entity.alerter.AlertDefine;
-import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
-import com.usthe.alert.service.AlertDefineService;
+import org.dromara.hertzbeat.alert.dao.AlertDefineBindDao;
+import org.dromara.hertzbeat.alert.dao.AlertDefineDao;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefine;
+import org.dromara.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
+import org.dromara.hertzbeat.alert.service.AlertDefineService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;