[monitor]feature:remove duplicate port monitor yml

.gitignore

@@ -37,10 +37,4 @@ nbdist/
 ### VS Code ###
 .vscode/
 
-# dependencies
-node_modules
-.docusaurus
-yarn.lock
-
-# debug env
 application-dev.yml

README.md

@@ -35,7 +35,7 @@
 
 ----   
 
-[![tancloud](tancloud.gif)](https://www.bilibili.com/video/BV1DY4y1i7ts)             
+[![tancloud](tancloud.gif)](https://www.bilibili.com/video/BV1Vi4y1f7i8)           
 
 ----   
 
@@ -76,7 +76,7 @@
 
 ##### 安装TDengine
 1. docker安装TDengine   
-   `docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp --name tdengine tdengine/tdengine:2.4.0.12`
+   `docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/tcp -p 6030-6049:6030-6049/udp --name tdengine tdengine/tdengine:2.4.0.12`
 2. 创建名称为hertzbeat的数据库
 
 详细步骤参考 [依赖服务TDengine安装初始化](https://hertzbeat.com/docs/start/tdengine-init)    
@@ -93,7 +93,6 @@
 1. 下载您系统环境对应的安装包 [GITEE Release](https://gitee.com/dromara/hertzbeat/releases) [GITHUB Release](https://github.com/dromara/hertzbeat/releases)
 2. 配置HertzBeat的配置文件 hertzbeat/config/application.yml
 3. 部署启动 `$ ./startup.sh `
-4. 浏览器访问 localhost:1157 即可开始，默认账号密码 admin/admin
 
 详细步骤参考 [通过安装包安装HertzBeat](https://hertzbeat.com/docs/start/package-deploy)   
 

alerter/src/main/java/com/usthe/alert/controller/AlertsController.java

@@ -30,12 +30,11 @@ import java.util.List;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
- * Alarm Management API 告警管理API
+ * 告警管理API
- *
  * @author tom
  * @date 2021/12/9 10:32
  */
-@Api(tags = "en: Alarm batch management API, zh:告警批量管理API")
+@Api(tags = "告警批量管理API")
 @RestController
 @RequestMapping(path = "/alerts", produces = {APPLICATION_JSON_VALUE})
 public class AlertsController {
@@ -44,23 +43,23 @@ public class AlertsController {
     private AlertService alertService;
 
     @GetMapping
-    @ApiOperation(value = "Get a list of alarm information based on query filter items", notes = "根据查询过滤项获取告警信息列表")
+    @ApiOperation(value = "查询告警列表", notes = "根据查询过滤项获取告警信息列表")
     public ResponseEntity<Message<Page<Alert>>> getAlerts(
-            @ApiParam(value = "en: Alarm ID List,zh: 告警IDS", example = "6565466456") @RequestParam(required = false) List<Long> ids,
+            @ApiParam(value = "告警ID", example = "6565466456") @RequestParam(required = false) List<Long> ids,
-            @ApiParam(value = "en: Alarm monitor object ID,zh: 告警监控对象ID", example = "6565463543") @RequestParam(required = false) Long monitorId,
+            @ApiParam(value = "告警监控对象ID", example = "6565463543") @RequestParam(required = false) Long monitorId,
-            @ApiParam(value = "en: Alarm level,zh: 告警级别", example = "6565463543") @RequestParam(required = false) Byte priority,
+            @ApiParam(value = "告警级别", example = "6565463543") @RequestParam(required = false) Byte priority,
-            @ApiParam(value = "en: Alarm Status,zh: 告警状态", example = "6565463543") @RequestParam(required = false) Byte status,
+            @ApiParam(value = "告警状态", example = "6565463543") @RequestParam(required = false) Byte status,
-            @ApiParam(value = "en: Alarm content fuzzy query,zh:告警内容模糊查询", example = "linux") @RequestParam(required = false) String content,
+            @ApiParam(value = "告警内容模糊查询", example = "linux") @RequestParam(required = false) String content,
-            @ApiParam(value = "en: Sort field, default id,zh: 排序字段，默认id", example = "name") @RequestParam(defaultValue = "id") String sort,
+            @ApiParam(value = "排序字段，默认id", example = "name") @RequestParam(defaultValue = "id") String sort,
-            @ApiParam(value = "en: Sort Type,zh: 排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
+            @ApiParam(value = "排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order,
-            @ApiParam(value = "en: List current page,zh: 列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
+            @ApiParam(value = "列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex,
-            @ApiParam(value = "en: Number of list pagination,zh: 列表分页数量", example = "8") @RequestParam(defaultValue = "8") int pageSize) {
+            @ApiParam(value = "列表分页数量", example = "8") @RequestParam(defaultValue = "8") int pageSize) {
 
         Specification<Alert> specification = (root, query, criteriaBuilder) -> {
             List<Predicate> andList = new ArrayList<>();
 
             if (ids != null && !ids.isEmpty()) {
-                CriteriaBuilder.In<Long> inPredicate = criteriaBuilder.in(root.get("id"));
+                CriteriaBuilder.In<Long> inPredicate= criteriaBuilder.in(root.get("id"));
                 for (long id : ids) {
                     inPredicate.value(id);
                 }
@@ -93,9 +92,10 @@ public class AlertsController {
     }
 
     @DeleteMapping
-    @ApiOperation(value = "Delete alarms in batches", notes = "根据告警ID列表批量删除告警")
+    @ApiOperation(value = "批量删除告警", notes = "根据告警ID列表批量删除告警")
     public ResponseEntity<Message<Void>> deleteAlertDefines(
-            @ApiParam(value = "en:Alarm List ID,zh: 告警IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
+            @ApiParam(value = "告警IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids
+    ) {
         if (ids != null && !ids.isEmpty()) {
             alertService.deleteAlerts(new HashSet<>(ids));
         }
@@ -104,10 +104,10 @@ public class AlertsController {
     }
 
     @PutMapping(path = "/status/{status}")
-    @ApiOperation(value = "Batch modify alarm status, set read and unread", notes = "批量修改告警状态,设置已读未读")
+    @ApiOperation(value = "批量修改告警状态", notes = "批量修改告警状态,设置已读未读")
     public ResponseEntity<Message<Void>> applyAlertDefinesStatus(
-            @ApiParam(value = "en:Alarm status value,zh: 告警状态值", example = "0") @PathVariable Byte status,
+            @ApiParam(value = "告警状态值", example = "0") @PathVariable Byte status,
-            @ApiParam(value = "en:Alarm List IDS,zh: 告警IDS", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
+            @ApiParam(value = "告警IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids) {
         if (ids != null && status != null && !ids.isEmpty()) {
             alertService.editAlertStatus(status, ids);
         }
@@ -116,7 +116,7 @@ public class AlertsController {
     }
 
     @GetMapping(path = "/summary")
-    @ApiOperation(value = "Get alarm statistics", notes = "获取告警统计信息")
+    @ApiOperation(value = "获取告警统计信息", notes = "获取告警统计信息")
     public ResponseEntity<Message<AlertSummary>> getAlertsSummary() {
         AlertSummary alertSummary = alertService.getAlertsSummary();
         Message<AlertSummary> message = new Message<>(alertSummary);

alerter/src/main/java/com/usthe/alert/dao/AlertDao.java

@@ -12,35 +12,30 @@ import java.util.List;
 import java.util.Set;
 
 /**
- * Alert Database Operations Alert数据库表操作
+ * Alert 数据库操作
- *
  * @author tom
  * @date 2021/12/9 10:03
  */
 public interface AlertDao extends JpaRepository<Alert, Long>, JpaSpecificationExecutor<Alert> {
 
     /**
-     * Delete alerts based on ID list 根据ID列表删除告警
+     * 根据ID列表删除告警
-     *
+     * @param alertIds 告警ID列表
-     * @param alertIds Alert ID List  告警ID列表
      */
     void deleteAlertsByIdIn(Set<Long> alertIds);
 
     /**
      * 根据告警ID-状态值 更新告警状态
-     *
      * @param status 状态值
-     * @param ids    告警ID列表
+     * @param ids 告警ID列表
      */
     @Modifying
     @Query("update Alert set status = :status where id in :ids")
     void updateAlertsStatus(@Param(value = "status") Byte status, @Param(value = "ids") List<Long> ids);
 
     /**
-     * Query the number of unhandled alarms of each alarm severity
      * 查询各个告警级别的未处理告警数量
-     *
+     * @return 告警数量
-     * @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")
     List<AlertPriorityNum> findAlertPriorityNum();

alerter/src/main/java/com/usthe/alert/dto/AlertPriorityNum.java

@@ -4,8 +4,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 
 /**
- * Number of monitoring level alarms 监控级别告警数量
+ * 监控级别告警数量
- *
  * @author tom
  * @date 2022/3/6 19:52
  */
@@ -13,13 +12,7 @@ import lombok.Data;
 @AllArgsConstructor
 public class AlertPriorityNum {
 
-    /**
-     * Alarm level 告警级别
-     */
     private byte priority;
 
-    /**
-     * count 数量
-     */
     private long num;
 }

alerter/src/main/java/com/usthe/alert/dto/AlertSummary.java

@@ -9,43 +9,31 @@ import lombok.NoArgsConstructor;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 
 /**
- * Alarm Statistics Information  告警统计信息
+ * 告警统计信息
- *
  * @author tom
  * @date 2022/3/6 19:25
  */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(description = "en:Alarm Statistics Information,zh: 告警统计信息")
+@ApiModel(description = "告警统计信息")
 public class AlertSummary {
 
-    @ApiModelProperty(value = "Total number of alerts (including processed and unprocessed alerts)",
+    @ApiModelProperty(value = "告警总数量(包括已处理未处理告警)", example = "134", accessMode = READ_ONLY, position = 0)
-            notes = "告警总数量(包括已处理未处理告警)",
-            example = "134", accessMode = READ_ONLY, position = 0)
     private long total;
 
-    @ApiModelProperty(value = "Number of alerts handled",
+    @ApiModelProperty(value = "已处理告警数量", example = "34", accessMode = READ_ONLY, position = 1)
-            notes = "已处理告警数量",
-            example = "34", accessMode = READ_ONLY, position = 1)
     private long dealNum;
 
-    @ApiModelProperty(value = "Alarm handling rate",
+    @ApiModelProperty(value = "告警处理率", example = "39.34", accessMode = READ_ONLY, position = 2)
-            notes = "告警处理率",
-            example = "39.34", accessMode = READ_ONLY, position = 2)
     private float rate;
 
-    @ApiModelProperty(value = "Number of alarms whose alarm severity is warning alarms (referring to unhandled alarms)",
+    @ApiModelProperty(value = "告警级别为警告告警的告警数量(指未处理告警)", example = "43", accessMode = READ_ONLY, position = 3)
-            notes = "告警级别为警告告警的告警数量(指未处理告警)",
-            example = "43", accessMode = READ_ONLY, position = 3)
     private long priorityWarningNum;
 
-    @ApiModelProperty(value = "Number of alarms whose alarm severity is critical alarms (referring to unhandled alarms)",
+    @ApiModelProperty(value = "告警级别为严重告警的告警数量(指未处理告警)", example = "56", accessMode = READ_ONLY, position = 4)
-            notes = "告警级别为严重告警的告警数量(指未处理告警)",
-            example = "56", accessMode = READ_ONLY, position = 4)
     private long priorityCriticalNum;
 
-    @ApiModelProperty(value = "Number of alarms whose alarm severity is urgent alarms (referring to unhandled alarms)",
+    @ApiModelProperty(value = "告警级别为紧急告警的告警数量(指未处理告警)", example = "23", accessMode = READ_ONLY, position = 5)
-            notes = "告警级别为紧急告警的告警数量(指未处理告警)", example = "23", accessMode = READ_ONLY, position = 5)
     private long priorityEmergencyNum;
 }

alerter/src/main/java/com/usthe/alert/service/AlertService.java

@@ -10,54 +10,43 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * Alarm information management interface
  * 告警信息管理接口
- *
  * @author tom
  * @date 2021/12/9 10:06
  */
 public interface AlertService {
 
     /**
-     * Add alarm record
+     * 新增告警
-     * 新增告警记录
+     * @param alert 告警实体
-     *
+     * @throws RuntimeException 新增过程异常抛出
-     * @param alert Alert entity    告警实体
-     * @throws RuntimeException Add process exception throw     新增过程异常抛出
      */
     void addAlert(Alert alert) throws RuntimeException;
 
     /**
-     * Dynamic conditional query
      * 动态条件查询
-     *
+     * @param specification 查询条件
-     * @param specification Query conditions        查询条件
+     * @param pageRequest 分页参数
-     * @param pageRequest   pagination parameters     分页参数
+     * @return 查询结果
-     * @return search result    查询结果
      */
     Page<Alert> getAlerts(Specification<Alert> specification, PageRequest pageRequest);
 
     /**
-     * Delete alarms in batches according to the alarm ID list
      * 根据告警ID列表批量删除告警
-     *
+     * @param ids 告警IDs
-     * @param ids Alarm ID List  告警IDS
      */
     void deleteAlerts(HashSet<Long> ids);
 
     /**
-     * Update the alarm status according to the alarm ID-status value
      * 根据告警ID-状态值 更新告警状态
-     *
+     * @param status 待修改为的告警状态
-     * @param status Alarm status to be modified    待修改为的告警状态
+     * @param ids 待修改的告警IDs
-     * @param ids    Alarm ID  List to be modified          待修改的告警ID集合
      */
     void editAlertStatus(Byte status, List<Long> ids);
 
     /**
-     * Get alarm statistics information 获取告警统计信息
+     * 获取告警统计信息
-     *
+     * @return 告警统计
-     * @return Alarm statistics information 告警统计
      */
     AlertSummary getAlertsSummary();
 

alerter/src/main/java/com/usthe/alert/service/impl/AlertServiceImpl.java

@@ -20,8 +20,7 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * Realization of Alarm Information Service 告警信息服务实现
+ * 告警信息服务实现
- *
  * @author tom
  * @date 2021/12/10 15:39
  */
@@ -56,24 +55,18 @@ public class AlertServiceImpl implements AlertService {
     @Override
     public AlertSummary getAlertsSummary() {
         AlertSummary alertSummary = new AlertSummary();
-        //Statistics on the alarm information in the alarm state
-        //统计正在告警状态下的告警信息
         List<AlertPriorityNum> priorityNums = alertDao.findAlertPriorityNum();
         if (priorityNums != null) {
             for (AlertPriorityNum priorityNum : priorityNums) {
                 switch (priorityNum.getPriority()) {
                     case CommonConstants
                             .ALERT_PRIORITY_CODE_WARNING:
-                        alertSummary.setPriorityWarningNum(priorityNum.getNum());
+                        alertSummary.setPriorityWarningNum(priorityNum.getNum());break;
-                        break;
                     case CommonConstants.ALERT_PRIORITY_CODE_CRITICAL:
-                        alertSummary.setPriorityCriticalNum(priorityNum.getNum());
+                        alertSummary.setPriorityCriticalNum(priorityNum.getNum());break;
-                        break;
                     case CommonConstants.ALERT_PRIORITY_CODE_EMERGENCY:
-                        alertSummary.setPriorityEmergencyNum(priorityNum.getNum());
+                        alertSummary.setPriorityEmergencyNum(priorityNum.getNum());break;
-                        break;
+                    default: break;
-                    default:
-                        break;
                 }
             }
         }

collector/pom.xml

@@ -115,11 +115,6 @@
             <artifactId>ojdbc8</artifactId>
             <version>21.5.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>com.oracle.database.nls</groupId>
-            <artifactId>orai18n</artifactId>
-            <version>21.5.0.0</version>
-        </dependency>
     </dependencies>
 
 </project>

collector/src/main/java/com/usthe/collector/collect/common/http/CommonHttpClient.java

@@ -108,8 +108,8 @@ public class CommonHttpClient {
                     .setConnectTimeout(CONNECT_TIMEOUT)
                     // 数据传输最大响应间隔时间
                     .setSocketTimeout(SOCKET_TIMEOUT)
-                    // 遇到301 302自动重定向跳转
+                    // 遇到301 302不自动重定向跳转
-                    .setRedirectsEnabled(true)
+                    .setRedirectsEnabled(false)
                     .build();
             // 连接池
             connectionManager = new PoolingHttpClientConnectionManager(registry);

collector/src/main/java/com/usthe/collector/collect/http/HttpCollectImpl.java

@@ -7,7 +7,6 @@ import com.google.gson.JsonParser;
 import com.usthe.collector.collect.AbstractCollect;
 import com.usthe.collector.collect.common.http.CommonHttpClient;
 import com.usthe.collector.dispatch.DispatchConstants;
-import com.usthe.collector.util.CollectUtil;
 import com.usthe.collector.util.CollectorConstants;
 import com.usthe.collector.util.JsonPathParser;
 import com.usthe.common.entity.job.Metrics;
@@ -101,7 +100,7 @@ public class HttpCollectImpl extends AbstractCollect {
                 String parseType = metrics.getHttp().getParseType();
                 try {
                     if (DispatchConstants.PARSE_DEFAULT.equals(parseType)) {
-                        parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                        parseResponseByDefault(resp, metrics.getAliasFields(), builder, responseTime);
                     } else if (DispatchConstants.PARSE_JSON_PATH.equals(parseType)) {
                         parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                     } else if (DispatchConstants.PARSE_PROMETHEUS.equals(parseType)) {
@@ -109,11 +108,11 @@ public class HttpCollectImpl extends AbstractCollect {
                     } else if (DispatchConstants.PARSE_XML_PATH.equals(parseType)) {
                         parseResponseByXmlPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
                     } else if (DispatchConstants.PARSE_WEBSITE.equals(parseType)){
-                        parseResponseByWebsite(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                        parseResponseByWebsite(resp, metrics.getAliasFields(), builder, responseTime);
                     } else if (DispatchConstants.PARSE_SITE_MAP.equals(parseType)) {
                         parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
                     } else {
-                        parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                        parseResponseByDefault(resp, metrics.getAliasFields(), builder, responseTime);
                     }
                 } catch (Exception e) {
                     log.info("parse error: {}.", e.getMessage(), e);
@@ -170,16 +169,13 @@ public class HttpCollectImpl extends AbstractCollect {
         }
     }
 
-    private void parseResponseByWebsite(String resp, List<String> aliasFields, HttpProtocol http,
+    private void parseResponseByWebsite(String resp, List<String> aliasFields,
                                         CollectRep.MetricsData.Builder builder, Long responseTime) {
         CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-        // 网站关键词数量监测
+        // todo resp 网站关键字监测
-        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
         for (String alias : aliasFields) {
             if (CollectorConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
                 valueRowBuilder.addColumns(responseTime.toString());
-            } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                valueRowBuilder.addColumns(Integer.toString(keywordNum));
             } else {
                 valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
             }
@@ -281,7 +277,6 @@ public class HttpCollectImpl extends AbstractCollect {
     private void parseResponseByJsonPath(String resp, List<String> aliasFields, HttpProtocol http,
                                          CollectRep.MetricsData.Builder builder, Long responseTime) {
         List<Map<String, Object>> results = JsonPathParser.parseContentWithJsonPath(resp, http.getParseScript());
-        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
         for (Map<String, Object> stringMap : results) {
             CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
             for (String alias : aliasFields) {
@@ -291,8 +286,6 @@ public class HttpCollectImpl extends AbstractCollect {
                 } else {
                     if (CollectorConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
                         valueRowBuilder.addColumns(responseTime.toString());
-                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumns(Integer.toString(keywordNum));
                     } else {
                         valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
                     }
@@ -307,10 +300,9 @@ public class HttpCollectImpl extends AbstractCollect {
 
     }
 
-    private void parseResponseByDefault(String resp, List<String> aliasFields, HttpProtocol http,
+    private void parseResponseByDefault(String resp, List<String> aliasFields,
                                         CollectRep.MetricsData.Builder builder, Long responseTime) {
         JsonElement element = JsonParser.parseString(resp);
-        int keywordNum = CollectUtil.countMatchKeyword(resp, http.getKeyword());
         if (element.isJsonArray()) {
             JsonArray array = element.getAsJsonArray();
             for (JsonElement jsonElement : array) {
@@ -325,8 +317,6 @@ public class HttpCollectImpl extends AbstractCollect {
                         } else {
                             if (CollectorConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
                                 valueRowBuilder.addColumns(responseTime.toString());
-                            } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                                valueRowBuilder.addColumns(Integer.toString(keywordNum));
                             } else {
                                 valueRowBuilder.addColumns(CommonConstants.NULL_VALUE);
                             }

collector/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java

@@ -247,10 +247,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
                         value = aliasFieldValueMap.get(realField);
                     }
                 }
-                // 处理可能带单位的指标数值 比如 34%, 34Mb，并将数值小数点限制到4位
-                if (CommonConstants.TYPE_NUMBER == field.getType()) {
-                    value = CommonUtil.parseDoubleStr(value, field.getUnit());
-                }
                 if (value == null) {
                     value = CommonConstants.NULL_VALUE;
                 }

collector/src/main/java/com/usthe/collector/util/CollectUtil.java

@@ -1,35 +0,0 @@
-package com.usthe.collector.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 采集器工具类
- * @author tom
- * @date 2022/4/6 09:35
- */
-public class CollectUtil {
-
-    /**
-     * 关键字匹配计数
-     * @param content 内容
-     * @param keyword 关键字
-     * @return 匹配次数
-     */
-    public static int countMatchKeyword(String content, String keyword) {
-        if (content == null || "".equals(content) || keyword == null || "".equals(keyword.trim())) {
-            return 0;
-        }
-        try {
-            Pattern pattern = Pattern.compile(keyword);
-            Matcher matcher = pattern.matcher(content);
-            int count = 0;
-            while (matcher.find()) {
-                count++;
-            }
-            return count;
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-}

collector/src/main/java/com/usthe/collector/util/CollectorConstants.java

@@ -9,8 +9,6 @@ public interface CollectorConstants {
 
     String RESPONSE_TIME = "responseTime";
 
-    String KEYWORD = "keyword";
-
     String STATUS_CODE = "statusCode";
 
     String ERROR_MSG = "errorMsg";

collector/src/test/java/com/usthe/collector/collect/telnet/TelnetCollectImplTest.java

@@ -4,7 +4,6 @@ import org.apache.commons.net.telnet.TelnetClient;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
-import java.net.ConnectException;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -21,7 +20,7 @@ class TelnetCollectImplTest {
             telnetClient = new TelnetClient("vt200");
             telnetClient.setConnectTimeout(5000);
             TelnetClient finalTelnetClient = telnetClient;
-            assertThrows(ConnectException.class,() -> finalTelnetClient.connect("127.0.0.1",0));
+            assertDoesNotThrow(() -> finalTelnetClient.connect("baidu.com",80));
             telnetClient.disconnect();
         } catch (IOException e) {
             e.printStackTrace();

common/src/main/java/com/usthe/common/entity/alerter/Alert.java

@@ -23,8 +23,7 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 
 /**
- * Alarm record entity 告警记录实体
+ * 告警记录
- *
  * @author tom
  * @date 2021/12/9 15:37
  */
@@ -34,68 +33,52 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(description = "en: Alarm record entity zh: 告警记录实体")
+@ApiModel(description = "告警记录实体")
 public class Alert {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value = "Alarm record entity primary key index ID",
+    @ApiModelProperty(value = "告警记录实体主键索引ID", example = "87584674384", accessMode = READ_ONLY, position = 0)
-            notes = "告警记录实体主键索引ID",
-            example = "87584674384", accessMode = READ_ONLY, position = 0)
     private Long id;
 
-    @ApiModelProperty(value = "Alert target object: monitor availability-available metrics-app.metrics.field",
+    @ApiModelProperty(value = "告警目标对象: 监控可用性-available 指标-app.metrics.field",
-            notes = "告警目标对象: 监控可用性-available 指标-app.metrics.field",
             example = "1", accessMode = READ_WRITE, position = 1)
     @Length(max = 255)
     private String target;
 
-    @ApiModelProperty(value = "Monitoring ID associated with the alarm object",
+    @ApiModelProperty(value = "告警对象关联的监控ID", example = "87432674336", accessMode = READ_WRITE, position = 2)
-            notes = "告警对象关联的监控ID",
-            example = "87432674336", accessMode = READ_WRITE, position = 2)
     private Long monitorId;
 
-    @ApiModelProperty(value = "Monitoring name associated with the alarm object",
+    @ApiModelProperty(value = "告警对象关联的监控名称", example = "Linux_192.132.23.1",
-            notes = "告警对象关联的监控名称",
+            accessMode = READ_WRITE, position = 3)
-            example = "Linux_192.132.23.1", accessMode = READ_WRITE, position = 3)
     private String monitorName;
 
-    @ApiModelProperty(value = "Alarm definition ID associated with the alarm",
+    @ApiModelProperty(value = "告警关联的告警定义ID", example = "8743267443543", accessMode = READ_WRITE, position = 4)
-            notes = "告警关联的告警定义ID",
-            example = "8743267443543", accessMode = READ_WRITE, position = 4)
     private Long alertDefineId;
 
-    @ApiModelProperty(value = "Alarm level 0: high-emergency-critical alarm-red 1: medium-critical-critical alarm-orange 2: low-warning-warning alarm-yellow",
+    @ApiModelProperty(value = "告警级别 0:高-emergency-紧急告警-红色 1:中-critical-严重告警-橙色 2:低-warning-警告告警-黄色",
-            notes = "告警级别 0:高-emergency-紧急告警-红色 1:中-critical-严重告警-橙色 2:低-warning-警告告警-黄色",
             example = "1", accessMode = READ_WRITE, position = 5)
     @Min(0)
     @Max(2)
     private byte priority;
 
-    @ApiModelProperty(value = "The actual content of the alarm notification",
+    @ApiModelProperty(value = "告警通知实际内容", example = "linux_192.134.32.1: 534543534 cpu usage high",
-            notes = "告警通知实际内容",
-            example = "linux_192.134.32.1: 534543534 cpu usage high",
             accessMode = READ_WRITE, position = 6)
     @Length(max = 1024)
     private String content;
 
-    @ApiModelProperty(value = "Alarm status: 0-normal alarm (to be processed) 1-threshold triggered but not reached the number of alarms 2-recovered alarm 3-processed",
+    @ApiModelProperty(value = "告警状态: 0-正常告警(待处理) 1-阈值触发但未达到告警次数 2-恢复告警 3-已处理",
-            notes = "告警状态: 0-正常告警(待处理) 1-阈值触发但未达到告警次数 2-恢复告警 3-已处理",
             example = "1", accessMode = READ_WRITE, position = 7)
     @Min(0)
     @Max(2)
     private byte status;
 
-    @ApiModelProperty(value = "Alarm threshold trigger times",
+    @ApiModelProperty(value = "告警阈值触发次数", example = "3", accessMode = READ_WRITE, position = 8)
-            notes = "告警阈值触发次数",
-            example = "3", accessMode = READ_WRITE, position = 8)
     @Min(0)
     @Max(10)
     private int times;
 
-    @ApiModelProperty(value = "Alarm trigger time (timestamp in milliseconds)",
+    @ApiModelProperty(value = "告警触发时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 9)
-            notes = "告警触发时间(毫秒时间戳)",
-            example = "1612198922000", accessMode = READ_ONLY, position = 9)
     @Column(insertable = false, updatable = false)
     private LocalDateTime gmtCreate;
 

common/src/main/java/com/usthe/common/entity/job/protocol/HttpProtocol.java

@@ -49,6 +49,7 @@ public class HttpProtocol {
      * http请求携带的请求体
      */
     private String payload;
+
     /**
      * 认证信息
      */
@@ -65,10 +66,6 @@ public class HttpProtocol {
      * 数据解析脚本 当解析方式为 jsonPath or xmlPath时存在
      */
     private String parseScript;
-    /**
-     * 内容关键字
-     */
-    private String keyword;
 
     /**
      * 认证信息

common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java

@@ -23,9 +23,7 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 
 /**
- * Message notification recipient entity
  * 消息通知接收人实体
- *
  * @author tomsun28
  * @date 2021/11/13 22:19
  */
@@ -35,80 +33,56 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(description = "en: Message notification recipient entity,zh:消息通知接收人实体")
+@ApiModel(description = "消息通知接收人实体")
 public class NoticeReceiver {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value = "Recipient entity primary key index ID",
+    @ApiModelProperty(value = "接收人实体主键索引ID", example = "87584674384", accessMode = READ_ONLY, position = 0)
-            notes = "接收人实体主键索引ID",
-            example = "87584674384", accessMode = READ_ONLY, position = 0)
     private Long id;
 
-    @ApiModelProperty(value = "Recipient name",
+    @ApiModelProperty(value = "接收人名称", example = "tom", accessMode = READ_WRITE, position = 1)
-            notes = "接收人名称",
-            example = "tom", accessMode = READ_WRITE, position = 1)
     @Length(max = 100)
     @NotNull
     private String name;
 
-    @ApiModelProperty(value = "Notification information method: 0-SMS 1-Email 2-webhook 3-WeChat Official Account 4-Enterprise WeChat Robot 5-DingTalk Robot 6-FeiShu Robot",
+    @ApiModelProperty(value = "通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人 6-飞书机器人", accessMode = READ_WRITE, position = 2)
-            notes = "通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人 6-飞书机器人",
-            accessMode = READ_WRITE, position = 2)
     @Min(0)
     @Max(8)
     @NotNull
     private Byte type;
 
-    @ApiModelProperty(value = "Mobile number: Valid when the notification method is SMS",
+    @ApiModelProperty(value = "手机号, 通知方式为手机短信时有效", example = "18923435643", accessMode = READ_WRITE, position = 3)
-            notes = "手机号 :  通知方式为手机短信时有效",
-            example = "18923435643", accessMode = READ_WRITE, position = 3)
     @Length(max = 100)
     private String phone;
 
-    @ApiModelProperty(value = "Email account: Valid when the notification method is email",
+    @ApiModelProperty(value = "邮箱账号, 通知方式为邮箱时有效", example = "tom@qq.com", accessMode = READ_WRITE, position = 4)
-            notes = "邮箱账号 : 通知方式为邮箱时有效",
-            example = "tom@qq.com", accessMode = READ_WRITE, position = 4)
     @Length(max = 100)
     private String email;
 
-    @ApiModelProperty(value = "URL address: The notification method is valid for webhook",
+    @ApiModelProperty(value = "URL地址, 通知方式为webhook有效", example = "https://www.tancloud.cn", accessMode = READ_WRITE, position = 5)
-            notes = "URL地址 : 通知方式为webhook有效",
-            example = "https://www.tancloud.cn", accessMode = READ_WRITE, position = 5)
     @Length(max = 300)
     private String hookUrl;
 
-    @ApiModelProperty(value = "openId : The notification method is valid for WeChat official account or enterprise WeChat robot",
+    @ApiModelProperty(value = "openId, 通知方式为微信公众号或企业微信机器人有效", example = "343432", accessMode = READ_WRITE, position = 6)
-            notes = "openId : 通知方式为微信公众号或企业微信机器人有效",
-            example = "343432", accessMode = READ_WRITE, position = 6)
     @Length(max = 300)
     private String wechatId;
 
-    @ApiModelProperty(value = "Access token : The notification method is valid for DingTalk robot",
+    @ApiModelProperty(value = "访问token, 通知方式为钉钉机器人有效", example = "34823984635647", accessMode = READ_WRITE, position = 7)
-            notes = "访问token : 通知方式为钉钉机器人有效",
-            example = "34823984635647", accessMode = READ_WRITE, position = 7)
     @Length(max = 300)
     private String accessToken;
 
-    @ApiModelProperty(value = "The creator of this record",
+    @ApiModelProperty(value = "此条记录创建者", example = "tom", accessMode = READ_ONLY, position = 7)
-            notes = "此条记录创建者",
-            example = "tom", accessMode = READ_ONLY, position = 7)
     private String creator;
 
-    @ApiModelProperty(value = "This record was last modified by",
+    @ApiModelProperty(value = "此条记录最新修改者", example = "tom", accessMode = READ_ONLY, position = 8)
-            notes = "此条记录最新修改者",
-            example = "tom", accessMode = READ_ONLY, position = 8)
     private String modifier;
 
-    @ApiModelProperty(value = "Record creation time (millisecond timestamp)",
+    @ApiModelProperty(value = "记录创建时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 9)
-            notes = "记录创建时间(毫秒时间戳)",
-            example = "1612198922000", accessMode = READ_ONLY, position = 9)
     @Column(insertable = false, updatable = false)
     private LocalDateTime gmtCreate;
 
-    @ApiModelProperty(value = "Record the latest modification time (timestamp in milliseconds)",
+    @ApiModelProperty(value = "记录最新修改时间(毫秒时间戳)", example = "1612198444000", accessMode = READ_ONLY, position = 10)
-            notes = "记录最新修改时间(毫秒时间戳)",
-            example = "1612198444000", accessMode = READ_ONLY, position = 10)
     @Column(insertable = false, updatable = false)
     private LocalDateTime gmtUpdate;
 

common/src/main/java/com/usthe/common/entity/manager/NoticeRule.java

@@ -21,9 +21,7 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 
 /**
- * Notification strategy entity
  * 通知策略
- *
  * @author tomsun28
  * @date 2021/11/13 22:19
  */
@@ -33,65 +31,45 @@ import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(description = "en: Notify Policy Entity,zh: 通知策略实体")
+@ApiModel(description = "通知策略实体")
 public class NoticeRule {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value = "Notification Policy Entity Primary Key Index ID",
+    @ApiModelProperty(value = "通知策略实体主键索引ID", example = "87584674384", accessMode = READ_ONLY, position = 0)
-            notes = "通知策略实体主键索引ID",
-            example = "87584674384", accessMode = READ_ONLY, position = 0)
     private Long id;
 
-    @ApiModelProperty(value = "Policy name",
+    @ApiModelProperty(value = "策略名称", example = "dispatch-1", accessMode = READ_WRITE, position = 1)
-            notes = "策略名称",
-            example = "dispatch-1", accessMode = READ_WRITE, position = 1)
     @Length(max = 100)
     @NotNull
     private String name;
 
-    @ApiModelProperty(value = "Recipient ID",
+    @ApiModelProperty(value = "接收人ID", example = "4324324", accessMode = READ_WRITE, position = 2)
-            notes = "接收人ID",
-            example = "4324324", accessMode = READ_WRITE, position = 2)
     @NotNull
     private Long receiverId;
 
-    @ApiModelProperty(value = "Recipient identification",
+    @ApiModelProperty(value = "接收人标识", example = "tom", accessMode = READ_WRITE, position = 3)
-            notes = "接收人标识",
-            example = "tom", accessMode = READ_WRITE, position = 3)
     @Length(max = 100)
     @NotNull
     private String receiverName;
 
-    @ApiModelProperty(value = "Whether to enable this policy",
+    @ApiModelProperty(value = "是否启用此策略", example = "true", accessMode = READ_WRITE, position = 4)
-            notes = "是否启用此策略",
-            example = "true", accessMode = READ_WRITE, position = 4)
     private boolean enable = true;
 
-    @ApiModelProperty(value = "Whether to forward all",
+    @ApiModelProperty(value = "是否转发所有", example = "false", accessMode = READ_WRITE, position = 5)
-            notes = "是否转发所有",
-            example = "false", accessMode = READ_WRITE, position = 5)
     private boolean filterAll = true;
 
-    @ApiModelProperty(value = "The creator of this record",
+    @ApiModelProperty(value = "此条记录创建者", example = "tom", accessMode = READ_ONLY, position = 7)
-            notes = "此条记录创建者",
-            example = "tom", accessMode = READ_ONLY, position = 7)
     private String creator;
 
-    @ApiModelProperty(value = "This record was last modified by",
+    @ApiModelProperty(value = "此条记录最新修改者", example = "tom", accessMode = READ_ONLY, position = 8)
-            notes = "此条记录最新修改者",
-            example = "tom", accessMode = READ_ONLY, position = 8)
     private String modifier;
 
-    @ApiModelProperty(value = "This record creation time (millisecond timestamp)",
+    @ApiModelProperty(value = "记录创建时间(毫秒时间戳)", example = "1612198922000", accessMode = READ_ONLY, position = 9)
-            notes = "记录创建时间(毫秒时间戳)",
-            example = "1612198922000", accessMode = READ_ONLY, position = 9)
     @Column(insertable = false, updatable = false)
     private LocalDateTime gmtCreate;
 
-    @ApiModelProperty(value = "Record the latest modification time (timestamp in milliseconds)",
+    @ApiModelProperty(value = "记录最新修改时间(毫秒时间戳)", example = "1612198444000", accessMode = READ_ONLY, position = 10)
-            notes = "记录最新修改时间(毫秒时间戳)",
-            example = "1612198444000", accessMode = READ_ONLY, position = 10)
     @Column(insertable = false, updatable = false)
     private LocalDateTime gmtUpdate;
 

common/src/main/java/com/usthe/common/util/CommonUtil.java

@@ -2,8 +2,6 @@ package com.usthe.common.util;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -17,7 +15,7 @@ public class CommonUtil {
 
     private static final Pattern EMAIL_PATTERN = Pattern.compile("\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*");
 
-    private static final Pattern PHONE_PATTERN = Pattern.compile("^(((13[0-9])|(14[0-9])|(15[0-9])|(16[0-9])|(19[0-9])|(18[0-9])|(17[0-9]))+\\d{8})?$");
+    private static final Pattern PHONE_PATTERN = Pattern.compile("^(((13[0-9])|(15[0-9])|(18[0-9])|(17[0-9]))+\\d{8})?$");
 
     private static final int PHONE_LENGTH = 11;
 
@@ -38,30 +36,6 @@ public class CommonUtil {
         }
     }
 
-    /**
-     * 将字符串str,此字符串可能带单位,转换为double数字类型
-     * 将数值小数点限制到4位
-     * @param str string
-     * @param unit 字符串单位
-     * @return string格式的 double 数字 小数点最大到4位
-     */
-    public static String parseDoubleStr(String str, String unit) {
-        if (str == null || "".equals(str)) {
-            return null;
-        }
-        try {
-            if (unit != null && str.endsWith(unit)) {
-                str = str.substring(0, str.length() - unit.length());
-            }
-            BigDecimal bigDecimal = new BigDecimal(str);
-            double value = bigDecimal.setScale(4, RoundingMode.HALF_UP).doubleValue();
-            return String.valueOf(value);
-        } catch (Exception e) {
-            log.debug(e.getMessage(), e);
-            return null;
-        }
-    }
-
     /**
      * 邮箱格式校验
      * @param email 邮箱

common/src/test/java/com/usthe/common/util/CommonUtilTest.java

@@ -1,40 +0,0 @@
-package com.usthe.common.util;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * @author tom
- * @date 2022/4/7 17:18
- */
-class CommonUtilTest {
-
-    @Test
-    void testParseDoubleStr() {
-        assertEquals("9.3454",CommonUtil.parseDoubleStr("9.345435345", null));
-        assertEquals("9.3454",CommonUtil.parseDoubleStr("9.345435345%", "%"));
-        assertEquals("10.0",CommonUtil.parseDoubleStr("10%", "%"));
-        assertEquals("588.0",CommonUtil.parseDoubleStr("588Mb", "Mb"));
-    }
-
-    @Test
-    void validateEmail() {
-        assertTrue(CommonUtil.validateEmail("tom@usthe.com"));
-        assertTrue(CommonUtil.validateEmail("demo@qq.com"));
-        assertFalse(CommonUtil.validateEmail("tom.usthe.com"));
-    }
-
-    @Test
-    void validatePhoneNum() {
-        assertTrue(CommonUtil.validatePhoneNum("19234554432"));
-        assertTrue(CommonUtil.validatePhoneNum("13234554432"));
-        assertTrue(CommonUtil.validatePhoneNum("14234554432"));
-        assertTrue(CommonUtil.validatePhoneNum("16234554432"));
-        assertFalse(CommonUtil.validatePhoneNum("12234554432"));
-        assertFalse(CommonUtil.validatePhoneNum("11234554432"));
-        assertFalse(CommonUtil.validatePhoneNum("35234554432"));
-        assertFalse(CommonUtil.validatePhoneNum("46234554432"));
-    }
-
-}

home/blog/2022-04-08-hertzbeat-v1.0-beta.7.md

@@ -1,92 +0,0 @@
----
-title: HertzBeat入GVP啦，并 v1.0.beta.7 发布，易用友好的云监控系统     
-author: tom  
-author_title: tom   
-author_url: https://github.com/tomsun28  
-author_image_url: https://avatars.githubusercontent.com/u/24788200?s=400&v=4  
-tags: [opensource]  
----
-
-
-HertzBeat赫兹跳动 是一个由Dromara孵化的支持网站，API，PING，端口，数据库，全站，操作系统等监控类型，支持阈值告警，告警通知(邮箱，webhook，钉钉，企业微信，飞书机器人)，拥有易用友好的可视化操作界面的开源监控告警项目。
-
-很高兴Hertzbeat被评定为GVP - Gitee最有价值开源项目！
-
-
-![截屏2022-04-08 09.14.44.png](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/8899bc4e836943dba2ec9efeec4ff629~tplv-k3u1fbpfcp-watermark.image?)
-
-老哥们帮忙在Gitee STAR起来，冲！https://gitee.com/dromara/hertzbeat
-
-官网:hertzbeat.com | tancloud.cn
-
-然后来说说最新的版本，这个版本看这么多feature，其实简单来说主要是这几个
-
-支持了ORACLE数据库的监控，包括ORACLE的基本信息，表空间，连接数，TPS，QPS等指标
-
-支持了LINUX的CPU利用率，内存利用率，磁盘占用相关指标，使LINUX监控贴合实际业务
-
-还有前端参数支持了KEY-VALUE，以后我们就可以在页面上配置HTTP Headers等类似参数了，还有就是参数配置那优化改版，把非常用告警参数隐藏起来了，稍微好看些，然后支持了windows下bat启动脚本，更多的就是稳定性的提升和一些其它的小修复小需求啦！
-
-
-
-版本特性：
-
-1. feature 支持oracle数据库监控类型-xgf 由 @gf-8 贡献 thanks
-2. feature oracle监控支持tablespace,连接数,qps,tps等指标
-3. feature linux监控支持设置超时时间 (#49)
-4. feature 检测网站SSL证书是否过期 (#50) 由 @weihongbin 提出 thanks
-5. feature 页面配置参数支持KEY-VALUE数组(#57)
-6. feature API和网站监控支持页面配置Headers和Params (#58)(#59)
-7. feature API和网站监控支持页面配置 basic auth, digest auth (#60)
-8. feature http 端口跟随SSL是否启用变更443或80 (#61)
-9. feature 修改默认超时时间3000毫秒为6000毫秒 (#55)
-10. feature:make tdengine optional, not required (#62)
-11. feature:support win bat service (#65)
-12. feature:support hide advanced params define (#68)
-13. feature:enable auto redirect when 301 302 http code (#69)
-14. feature:only collect available metrics when detect (#70)
-15. feature:[website api]monitor support keyword match (#72)
-16. feature:support linux cpu usage,memory usage,disk free (#76)
-
-BUG修复
-1. 添加sqlserver关联文档，fix connection指标入库tdengine失败 (#41)
-2. 使用docker部署TDengine，开放tcp访问端口!16 由 @老姜bei 贡献 thanks
-3. 补充sureness配置文档 避免误配导致权限异常
-4. bugfix:monitors always timeout alert (#67)
-5. code format and optimization 由 @学习代码的小白 贡献 thanks
-6. bugfix: remove oracle field - database_type due 11g not support 由 @syongaaa 贡献 thanks
-7. bugfix:fix linux interface metrics no instance (#75)
-
-欢迎在线试用 https://console.tancloud.cn.
-
------------------------
-
-> [HertzBeat赫兹跳动](https://github.com/dromara/hertzbeat) 是一个支持网站，API，PING，端口，数据库，操作系统等监控类型，拥有易用友好的可视化操作界面的开源监控告警项目。  
-> 我们也提供了对应的 **[SAAS版本监控云](https://console.tancloud.cn)**，中小团队和个人无需再为了监控自己的网站资源，而去部署一套繁琐的监控系统，**[登录即可免费开始](https://console.tancloud.cn)**。     
-> HertzBeat 支持[自定义监控](https://hertzbeat.com/docs/advanced/extend-point) ,只用通过配置YML文件我们就可以自定义需要的监控类型和指标，来满足常见的个性化需求。   
-> HertzBeat 模块化，`manager, collector, scheduler, warehouse, alerter` 各个模块解耦合，方便理解与定制开发。       
-> HertzBeat 支持更自由化的告警配置(计算表达式)，支持告警通知，告警模版，邮件钉钉微信飞书等及时通知送达          
-> 欢迎登录 HertzBeat 的 [云环境TanCloud](https://console.tancloud.cn) 试用发现更多。          
-> 我们正在快速迭代中，欢迎参与加入一起共建项目开源生态。
-
-> `HertzBeat`的多类型支持，易扩展，低耦合，希望能帮助开发者和中小团队快速搭建自有监控系统。
-
-老铁们可以通过演示视频来直观了解功能： https://www.bilibili.com/video/BV1DY4y1i7ts
-
-欢迎在线试用 [https://console.tancloud.cn](https://gitee.com/link?target=https%3A%2F%2Fconsole.tancloud.cn)
-
-优化后的参数输入界面:
-![输入图片说明](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/c4b07908ba5a4b50a094a02dde6a38f3~tplv-k3u1fbpfcp-zoom-1.image "截屏2022-04-07 21.32.52.png")
-
-Linux新增指标:
-![输入图片说明](https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/92828224f8cd4cac84245aa4217b29e7~tplv-k3u1fbpfcp-zoom-1.image "截屏2022-04-07 17.50.22.png")
-
-ORACLE监控:   
-哦豁！oracle环境不在了，之前没有截图，先脑补一张！
-
-**仓库地址**
-
-[Github](https://github.com/dromara/hertzbeat) https://github.com/dromara/hertzbeat      
-[Gitee](https://gitee.com/dromara/hertzbeat) https://gitee.com/dromara/hertzbeat
-
-看到这里不妨给个Star支持下哦，灰常感谢，弯腰!!

home/docs/help/linux.md

@@ -38,7 +38,6 @@ sidebar_label: Linux操作系统
 | interrupt      | 个数 | CPU中断数量 |
 | load           | 无 | CPU最近1/5/15分钟的平均负载 |
 | context_switch | 个数 | 当前上下文切换数量 |
-| usage          | %  | CPU使用率 |  
 
 
 #### 指标集合：memory
@@ -50,7 +49,6 @@ sidebar_label: Linux操作系统
 | free          | Mb | 空闲内存容量 |
 | buff_cache    | Mb | 缓存占用内存 |  
 | available     | Mb | 剩余可用内存容 |   
-| usage          | %  | 内存使用率 |  
 
 #### 指标集合：disk
 
@@ -70,12 +68,3 @@ sidebar_label: Linux操作系统
 | receive_bytes          | byte | 入站数据流量(bytes)  |
 | transmit_bytes         | byte | 出站数据流量(bytes)  |
 
-#### 指标集合：disk_free
-
-| 指标名称      | 指标单位 | 指标帮助描述 |
-| ----------- | ----------- | ----------- |
-| filesystem     | 无  | 文件系统的名称 |
-| used           | Mb  | 已使用磁盘大小 |
-| available      | Mb  | 可用磁盘大小 |
-| usage          | %   | 使用率 |  
-| mounted        | 无  | 挂载点目录 |   

home/docs/start/tdengine-init.md

@@ -18,11 +18,10 @@ TDengine是一款国产的开源物联网时序型数据库，我们使用其替
    ```
 2. Docker安装TDengine
    ```
-   $ docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp -v /opt/taosdata:/var/lib/taos --name tdengine -e TZ=Asia/Shanghai tdengine/tdengine:2.4.0.12
+   $ docker run -d -p 6030-6049:6030-6049 -p 6030-6049:6030-6049/udp -v /opt/taosdata:/var/lib/taos --name tdengine tdengine/tdengine:2.4.0.12
    526aa188da767ae94b244226a2b2eec2b5f17dd8eff594533d9ec0cd0f3a1ccd
    ```
-   `-v /opt/taosdata:/var/lib/taos` 为tdengine数据目录本地持久化挂载，需将`/opt/taosdata`替换为实际本地存在的目录  
+   `-v /opt/taosdata:/var/lib/taos` 为tdengine数据目录本地持久化挂载，需将`/opt/taosdata`替换为实际本地存在的目录      
-   `-e TZ="Asia/Shanghai"` 为tdengine设置时区，这里可选设置对应的时区   
    使用```$ docker ps```查看数据库是否启动成功
 
 ### 创建数据库实例    
@@ -52,4 +51,4 @@ TDengine是一款国产的开源物联网时序型数据库，我们使用其替
    ```
 
 **注意⚠️若是安装包安装的TDengine2.3+版本**       
-> 除了启动server外，还需执行 `systemctl start taosadapter` 启动 adapter
+> 除了启动server外，还需执行 `systemctl start taosadapter` 启动 adapter      

home/src/pages/index.js

@@ -28,7 +28,7 @@ function Home() {
                     <h1 className="hero__title">
                         <img style={{width: '500px', marginTop: '100px'}} src={cdnTransfer('img/hertzbeat-brand.svg')} alt={'#'}/>
                     </h1>
-                    <p className="hero__subtitle"><Translate>易用友好的云监控系统</Translate></p>
+                    <p className="hero__subtitle"><Translate>易用友好的监控告警系统</Translate></p>
                     <div className={styles.social}>
                         <a href="https://console.tancloud.cn"><img src={cdnTransfer('img/badge/web-monitor.svg')} alt={''}/></a>
                         <a href="https://console.tancloud.cn"><img src={cdnTransfer('img/badge/ping-connect.svg')} alt={''}/></a>

manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java

@@ -30,9 +30,7 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * Alarm information storage and distribution
  * 告警信息入库分发
- *
  * @author tom
  * @date 2021/12/10 12:58
  */
@@ -72,7 +70,7 @@ public class DispatchAlarm {
                 try {
                     Alert alert = dataQueue.pollAlertData();
                     if (alert != null) {
-                        // Determining alarm type storage   判断告警类型入库
+                        // 判断告警类型入库
                         storeAlertData(alert);
                         // 通知分发
                         sendAlertDataListener(alert);
@@ -88,7 +86,7 @@ public class DispatchAlarm {
     }
 
     private void storeAlertData(Alert alert) {
-        // todo Using the cache does not directly manipulate the library    使用缓存不直接操作库
+        // todo 使用缓存不直接操作库
         Monitor monitor = monitorService.getMonitor(alert.getMonitorId());
         if (monitor == null) {
             log.warn("Dispatch alarm the monitorId: {} not existed, ignored.", alert.getMonitorId());
@@ -96,70 +94,50 @@ public class DispatchAlarm {
         }
         alert.setMonitorName(monitor.getName());
         if (monitor.getStatus() == CommonConstants.UN_MANAGE_CODE) {
-            // When monitoring is not managed, ignore and silence its alarm messages
             // 当监控未管理时  忽略静默其告警信息
             return;
         }
         if (monitor.getStatus() == CommonConstants.AVAILABLE_CODE) {
             if (CommonConstants.AVAILABLE.equals(alert.getTarget())) {
-                // Availability Alarm Need to change the monitoring status to unavailable
                 // 可用性告警 需变更监控状态为不可用
                 monitorService.updateMonitorStatus(monitor.getId(), CommonConstants.UN_AVAILABLE_CODE);
             } else if (CommonConstants.REACHABLE.equals(alert.getTarget())) {
-                // Reachability alarm The monitoring status needs to be changed to unreachable
                 // 可达性告警 需变更监控状态为不可达
                 monitorService.updateMonitorStatus(monitor.getId(), CommonConstants.UN_REACHABLE_CODE);
             }
         } else {
-            // If the alarm is restored, the monitoring state needs to be restored
             // 若是恢复告警 需对监控状态进行恢复
-            if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
+           if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
-                monitorService.updateMonitorStatus(alert.getMonitorId(), CommonConstants.AVAILABLE_CODE);
+               monitorService.updateMonitorStatus(alert.getMonitorId(), CommonConstants.AVAILABLE_CODE);
-            }
+           }
         }
-        // Alarm drop library  告警落库
+        // 告警落库
         alertService.addAlert(alert);
     }
 
     private void sendAlertDataListener(Alert alert) {
-        // todo Forward configured email WeChat webhook              转发配置的邮件 微信 webhook
+        // todo 转发配置的邮件 微信 webhook
         List<NoticeReceiver> receivers = matchReceiverByNoticeRules(alert);
-        // todo Send notification here temporarily single thread     发送通知这里暂时单线程
+        // todo 发送通知这里暂时单线程
         for (NoticeReceiver receiver : receivers) {
             switch (receiver.getType()) {
-                // todo SMS notification    短信通知
+                // todo 短信通知
-                case 0:
+                case 0: break;
-                    break;
+                case 1: sendEmailAlert(receiver, alert); break;
-                case 1:
+                case 2: sendWebHookAlert(receiver, alert); break;
-                    sendEmailAlert(receiver, alert);
+                case 3: sendWeChatAlert(receiver, alert); break;
-                    break;
+                case 4: sendWeWorkRobotAlert(receiver, alert); break;
-                case 2:
+                case 5: sendDingTalkRobotAlert(receiver, alert); break;
-                    sendWebHookAlert(receiver, alert);
+                case 6: sendFlyBookAlert(receiver,alert); break;
-                    break;
+                default: break;
-                case 3:
-                    sendWeChatAlert(receiver, alert);
-                    break;
-                case 4:
-                    sendWeWorkRobotAlert(receiver, alert);
-                    break;
-                case 5:
-                    sendDingTalkRobotAlert(receiver, alert);
-                    break;
-                case 6:
-                    sendFlyBookAlert(receiver, alert);
-                    break;
-                default:
-                    break;
             }
         }
     }
 
     /**
-     * Send alert information through FeiShu
      * 通过飞书发送告警信息
-     *
+     * @param receiver 接收人
-     * @param receiver Notification configuration information   通知配置信息
+     * @param alert 告警信息
-     * @param alert    Alarm information                        告警信息
      */
     private void sendFlyBookAlert(NoticeReceiver receiver, Alert alert) {
         FlyBookWebHookDto flyBookWebHookDto = new FlyBookWebHookDto();
@@ -205,11 +183,9 @@ public class DispatchAlarm {
     }
 
     /**
-     * Send alarm information through DingTalk robot
      * 通过钉钉机器人发送告警信息
-     *
+     * @param receiver  通知配置信息
-     * @param receiver Notification configuration information   通知配置信息
+     * @param alert     告警信息
-     * @param alert    Alarm information                        告警信息
      */
     private void sendDingTalkRobotAlert(NoticeReceiver receiver, Alert alert) {
         DingTalkWebHookDto dingTalkWebHookDto = new DingTalkWebHookDto();
@@ -240,11 +216,9 @@ public class DispatchAlarm {
     }
 
     /**
-     * Send alarm information through enterprise WeChat
      * 通过企业微信发送告警信息
-     *
+     * @param receiver  通知配置信息
-     * @param receiver Notification configuration information   通知配置信息
+     * @param alert     告警信息
-     * @param alert    Alarm information                        告警信息
      */
     private void sendWeWorkRobotAlert(NoticeReceiver receiver, Alert alert) {
         WeWorkWebHookDto weWorkWebHookDTO = new WeWorkWebHookDto();
@@ -257,7 +231,7 @@ public class DispatchAlarm {
         if (alert.getPriority() < CommonConstants.ALERT_PRIORITY_CODE_WARNING) {
             content.append("告警级别 : <font color=\"warning\">")
                     .append(CommonUtil.transferAlertPriority(alert.getPriority())).append("</font>\n");
-        } else {
+        }else {
             content.append("告警级别 : <font color=\"comment\">")
                     .append(CommonUtil.transferAlertPriority(alert.getPriority())).append("</font>\n");
         }
@@ -299,28 +273,28 @@ public class DispatchAlarm {
     }
 
 
-    private void sendEmailAlert(final NoticeReceiver receiver, final Alert alert) {
+    private void sendEmailAlert(final NoticeReceiver receiver,final Alert alert){
-        try {
+        try{
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-            MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
+            MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage,true,"UTF-8");
             messageHelper.setSubject("TanCloud探云-监控告警");
-            //Set sender Email 设置发件人Email
+            //设置发件人Email
             messageHelper.setFrom(emailFromUser);
-            //Set recipient Email 设定收件人Email
+            //设定收件人Email
-            messageHelper.setTo(receiver.getEmail());
+            messageHelper.setTo(receiver.getEmail());        
             messageHelper.setSentDate(new Date());
-            //Build email templates 构建邮件模版
+            //构建邮件模版
             String process = mailService.buildAlertHtmlTemplate(alert);
-            //Set Email Content Template 设置邮件内容模版
+            //设置邮件内容模版
-            messageHelper.setText(process, true);
+            messageHelper.setText(process,true);   
             javaMailSender.send(mimeMessage);
-        } catch (Exception e) {
+        }catch (Exception e){
-            log.error("[Email Alert] Exception，Exception information={}", e.getMessage());
+            log.error("[邮箱告警] error，Exception information={}",e.getMessage());
         }
     }
 
     private List<NoticeReceiver> matchReceiverByNoticeRules(Alert alert) {
-        // todo use cache 使用缓存
+        // todo 使用缓存
         return noticeConfigService.getReceiverFilterRule(alert);
     }
 

manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java

@@ -28,13 +28,11 @@ import java.util.List;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
- * Message Notification Configuration API
  * 消息通知配置API
- *
  * @author tom
  * @date 2021/12/16 16:18
  */
-@Api(tags = "en: Message Notification Configuration API,zh: 消息通知配置API")
+@Api(tags = "消息通知配置API")
 @RestController()
 @RequestMapping(value = "/notice", produces = {APPLICATION_JSON_VALUE})
 public class NoticeConfigController {
@@ -43,36 +41,33 @@ public class NoticeConfigController {
     private NoticeConfigService noticeConfigService;
 
     @PostMapping(path = "/receiver")
-    @ApiOperation(value = "Add a recipient", notes = "新增一个接收人")
+    @ApiOperation(value = "新增接收人", notes = "新增一个接收人")
     public ResponseEntity<Message<Void>> addNewNoticeReceiver(@Valid @RequestBody NoticeReceiver noticeReceiver) {
         noticeConfigService.addReceiver(noticeReceiver);
         return ResponseEntity.ok(new Message<>("Add success"));
     }
 
     @PutMapping(path = "/receiver")
-    @ApiOperation(value = "Modify existing recipient information", notes = "修改已存在的接收人信息")
+    @ApiOperation(value = "修改接收人", notes = "修改已存在的接收人信息")
     public ResponseEntity<Message<Void>> editNoticeReceiver(@Valid @RequestBody NoticeReceiver noticeReceiver) {
         noticeConfigService.editReceiver(noticeReceiver);
         return ResponseEntity.ok(new Message<>("Edit success"));
     }
 
     @DeleteMapping(path = "/receiver/{id}")
-    @ApiOperation(value = "Delete existing recipient information", notes = "删除已存在的接收人信息")
+    @ApiOperation(value = "删除指定接收人", notes = "删除已存在的接收人信息")
     public ResponseEntity<Message<Void>> deleteNoticeReceiver(
-            @ApiParam(value = "en: Recipient ID,zh: 接收人ID", example = "6565463543") @PathVariable("id") final Long receiverId) {
+            @ApiParam(value = "接收人ID", example = "6565463543") @PathVariable("id") final Long receiverId) {
-        // Returns success if it does not exist or if the deletion is successful
+        // 不存在或删除成功都返回成功
-        // todo 不存在或删除成功都返回成功
         noticeConfigService.deleteReceiver(receiverId);
         return ResponseEntity.ok(new Message<>("Delete success"));
     }
 
     @GetMapping(path = "/receivers")
-    @ApiOperation(value = "Get a list of message notification recipients based on query filter items",
+    @ApiOperation(value = "查询消息通知接收人", notes = "根据查询过滤项获取消息通知接收人列表")
-            notes = "根据查询过滤项获取消息通知接收人列表")
     public ResponseEntity<Message<List<NoticeReceiver>>> getReceivers(
-            @ApiParam(value = "en: Recipient name,zh: 接收人名称，模糊查询", example = "tom") @RequestParam(required = false) final String name) {
+            @ApiParam(value = "接收人名称，模糊查询", example = "tom") @RequestParam(required = false) final String name) {
 
-        //todo Writing can be optimized 写法可优化
         Specification<NoticeReceiver> specification = (root, query, criteriaBuilder) -> {
             Predicate predicate = criteriaBuilder.conjunction();
             if (name != null && !"".equals(name)) {
@@ -88,34 +83,32 @@ public class NoticeConfigController {
 
 
     @PostMapping(path = "/rule")
-    @ApiOperation(value = "Add a notification policy", notes = "新增一个通知策略")
+    @ApiOperation(value = "新增通知策略", notes = "新增一个通知策略")
     public ResponseEntity<Message<Void>> addNewNoticeRule(@Valid @RequestBody NoticeRule noticeRule) {
         noticeConfigService.addNoticeRule(noticeRule);
         return ResponseEntity.ok(new Message<>("Add success"));
     }
 
     @PutMapping(path = "/rule")
-    @ApiOperation(value = "Modify existing notification policy information", notes = "修改已存在的通知策略信息")
+    @ApiOperation(value = "修改通知策略", notes = "修改已存在的通知策略信息")
     public ResponseEntity<Message<Void>> editNoticeRule(@Valid @RequestBody NoticeRule noticeRule) {
         noticeConfigService.editNoticeRule(noticeRule);
         return ResponseEntity.ok(new Message<>("Edit success"));
     }
 
     @DeleteMapping(path = "/rule/{id}")
-    @ApiOperation(value = "Delete existing notification policy information", notes = "删除已存在的通知策略信息")
+    @ApiOperation(value = "删除指定通知策略", notes = "删除已存在的通知策略信息")
     public ResponseEntity<Message<Void>> deleteNoticeRule(
-            @ApiParam(value = "en: Notification Policy ID,zh: 通知策略ID", example = "6565463543") @PathVariable("id") final Long ruleId) {
+            @ApiParam(value = "通知策略ID", example = "6565463543") @PathVariable("id") final Long ruleId) {
-        // Returns success if it does not exist or if the deletion is successful
+        // 不存在或删除成功都返回成功
-        // todo 不存在或删除成功都返回成功
         noticeConfigService.deleteNoticeRule(ruleId);
         return ResponseEntity.ok(new Message<>("Delete success"));
     }
 
     @GetMapping(path = "/rules")
-    @ApiOperation(value = "Get a list of message notification policies based on query filter items",
+    @ApiOperation(value = "查询消息通知策略", notes = "根据查询过滤项获取消息通知策略列表")
-            notes = "根据查询过滤项获取消息通知策略列表")
     public ResponseEntity<Message<List<NoticeRule>>> getRules(
-            @ApiParam(value = "en: Recipient name,zh: 接收人名称，模糊查询", example = "rule1") @RequestParam(required = false) final String name) {
+            @ApiParam(value = "接收人名称，模糊查询", example = "rule1") @RequestParam(required = false) final String name) {
 
         Specification<NoticeRule> specification = (root, query, criteriaBuilder) -> {
             Predicate predicate = criteriaBuilder.conjunction();

manager/src/main/java/com/usthe/manager/controller/SummaryController.java

@@ -18,13 +18,11 @@ import java.util.List;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
 /**
- * System Summary Statistics API
  * 系统摘要统计API
- *
  * @author tom
  * @date 2021/12/7 15:57
  */
-@Api(tags = "en: System Summary Statistics API,zh: 系统摘要统计API")
+@Api(tags = "系统摘要统计API")
 @RestController
 @RequestMapping(path = "/summary", produces = {APPLICATION_JSON_VALUE})
 public class SummaryController {
@@ -33,7 +31,7 @@ public class SummaryController {
     private MonitorService monitorService;
 
     @GetMapping
-    @ApiOperation(value = "Query all application category monitoring statistics", notes = "查询所有应用类别监控统计信息")
+    @ApiOperation(value = "查询应用类别监控统计", notes = "查询所有应用类别监控统计信息")
     public ResponseEntity<Message<Dashboard>> appMonitors() {
         List<AppCount> appsCount = monitorService.getAllAppMonitorsCount();
         Message<Dashboard> message = new Message<>(new Dashboard(appsCount));

manager/src/main/java/com/usthe/manager/dao/MonitorDao.java

@@ -14,7 +14,6 @@ import java.util.Set;
 
 /**
  * AuthResources 数据库操作
- *
  * @author tomsun28
  * @date 2021/11/14 11:24
  */
@@ -23,14 +22,12 @@ public interface MonitorDao extends JpaRepository<Monitor, Long>, JpaSpecificati
 
     /**
      * 根据监控ID列表删除监控
-     *
      * @param monitorIds 监控ID列表
      */
     void deleteAllByIdIn(Set<Long> monitorIds);
 
     /**
      * 根据监控ID列表查询监控
-     *
      * @param monitorIds 监控ID列表
      * @return 监控列表
      */
@@ -38,7 +35,6 @@ public interface MonitorDao extends JpaRepository<Monitor, Long>, JpaSpecificati
 
     /**
      * 根据监控类型查询监控
-     *
      * @param app 监控类型
      * @return 监控列表
      */
@@ -46,35 +42,29 @@ public interface MonitorDao extends JpaRepository<Monitor, Long>, JpaSpecificati
 
     /**
      * 查询已下发采集任务的监控
-     *
      * @param status 监控状态
      * @return 监控列表
      */
     List<Monitor> findMonitorsByStatusNotInAndAndJobIdNotNull(List<Byte> status);
 
     /**
-     * Query monitoring by monitoring name 根据监控名称查询监控
+     * 根据监控名称查询监控
-     *
+     * @param name 监控名称
-     * @param name monitoring name 监控名称
+     * @return 监控列表
-     * @return monitoring list 监控列表
      */
     Optional<Monitor> findMonitorByNameEquals(String name);
 
     /**
-     * Query the monitoring category - the number of monitoring corresponding to the status
      * 查询监控类别-状态对应的监控数量
-     *
+     * @return 监控类别-状态与监控数量映射
-     * @return Monitoring Category-Status and Monitoring Quantity Mapping 监控类别-状态与监控数量映射
      */
     @Query("select new com.usthe.manager.pojo.dto.AppCount(mo.app, mo.status, COUNT(mo.id)) from Monitor mo group by mo.app, mo.status")
     List<AppCount> findAppsStatusCount();
 
     /**
-     * Update the status of the specified monitor
      * 更新指定监控的状态
-     *
+     * @param id 监控ID
-     * @param id     Monitor ID 监控ID
+     * @param status 监控状态
-     * @param status 监控状态 Monitor Status
      */
     @Modifying
     @Query("update Monitor set status = :status where id = :id")

manager/src/main/java/com/usthe/manager/pojo/dto/WeWorkWebHookDto.java

@@ -7,7 +7,6 @@ import lombok.NoArgsConstructor;
 
 /**
  * 企业微信机器人请求消息体
- *
  * @author 花城
  * @version 1.0
  * @date 2022/2/21 6:55 下午
@@ -19,14 +18,7 @@ import lombok.NoArgsConstructor;
 public class WeWorkWebHookDto {
 
     public static final String WEBHOOK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=";
-    /**
-     * markdown格式
-     */
     private static final String MARKDOWN = "markdown";
-    /**
-     * 文本格式
-     */
-    private static final String TEXT = "TEXT";
 
     /**
      * 消息类型

manager/src/main/java/com/usthe/manager/service/MailService.java

@@ -6,7 +6,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 
 /**
- * Email delivery service  邮箱发送服务
+ * 邮箱发送服务
  *
  * @author 花城
  * @version 1.0
@@ -15,11 +15,9 @@ import org.springframework.stereotype.Service;
 public interface MailService {
 
     /**
-     * Build an alert email template
      * 构建告警邮件模版
-     *
+     * @param alert     告警信息
-     * @param alert Alarm data element information  告警数据元信息
+     * @return          邮件内容
-     * @return content of email                邮件内容
      */
     String buildAlertHtmlTemplate(Alert alert);
 }

manager/src/main/java/com/usthe/manager/service/MonitorService.java

@@ -15,7 +15,6 @@ import java.util.Set;
 
 /**
  * 监控管理服务
- *
  * @author tomsun28
  * @date 2021/11/14 11:28
  */
@@ -24,43 +23,38 @@ public interface MonitorService {
 
     /**
      * 监控可用性探测
-     *
      * @param monitor 监控实体信息
-     * @param params  参数信息
+     * @param params 参数信息
      * @throws MonitorDetectException 探测失败抛出
      */
     void detectMonitor(Monitor monitor, List<Param> params) throws MonitorDetectException;
 
     /**
      * 新增监控
-     *
      * @param monitor 监控实体
-     * @param params  参数信息
+     * @param params 参数信息
      * @throws RuntimeException 新增过程异常抛出
      */
     void addMonitor(Monitor monitor, List<Param> params) throws RuntimeException;
 
     /**
      * 校验请求数据参数正确性
-     *
      * @param monitorDto monitorDto
-     * @param isModify   是否是修改监控
+     * @param isModify 是否是修改监控
      * @throws IllegalArgumentException 校验参数错误抛出
      */
     void validate(MonitorDto monitorDto, Boolean isModify) throws IllegalArgumentException;
 
     /**
      * 修改更新监控
-     *
      * @param monitor 监控实体
-     * @param params  参数信息
+     * @param params 参数信息
      * @throws RuntimeException 修改过程中异常抛出
      */
     void modifyMonitor(Monitor monitor, List<Param> params) throws RuntimeException;
 
     /**
      * 删除监控
-     *
      * @param id 监控ID
      * @throws RuntimeException 删除过程中异常抛出
      */
@@ -68,7 +62,6 @@ public interface MonitorService {
 
     /**
      * 批量删除监控
-     *
      * @param ids 监控ID
      * @throws RuntimeException 删除过程中异常抛出
      */
@@ -76,7 +69,6 @@ public interface MonitorService {
 
     /**
      * 获取监控信息
-     *
      * @param id 监控ID
      * @return MonitorDto
      * @throws RuntimeException 查询过程中异常抛出
@@ -85,55 +77,46 @@ public interface MonitorService {
 
     /**
      * 动态条件查询
-     *
      * @param specification 查询条件
-     * @param pageRequest   分页参数
+     * @param pageRequest 分页参数
      * @return 查询结果
      */
     Page<Monitor> getMonitors(Specification<Monitor> specification, PageRequest pageRequest);
 
     /**
      * 根据监控ID列表批量取消纳管监控项
-     *
      * @param ids 监控IDs
      */
     void cancelManageMonitors(HashSet<Long> ids);
 
     /**
      * 根据监控ID列表批量启动纳管监控项
-     *
      * @param ids 监控IDs
      */
     void enableManageMonitors(HashSet<Long> ids);
 
     /**
      * 查询监控类别及其对应的监控数量
-     *
      * @return 监控类别与监控数量映射
      */
     List<AppCount> getAllAppMonitorsCount();
 
     /**
-     * Query monitoring
      * 查询监控
-     *
+     * @param monitorId 监控ID
-     * @param monitorId Monitor ID  监控ID
+     * @return 监控信息
-     * @return Monitor information  监控信息
      */
     Monitor getMonitor(Long monitorId);
 
     /**
-     * Update the status of the specified monitor
      * 更新指定监控的状态
-     *
+     * @param monitorId 监控ID
-     * @param monitorId monitorId    监控ID
+     * @param status 监控状态
-     * @param status    monitor status  监控状态
      */
     void updateMonitorStatus(Long monitorId, byte status);
 
     /**
      * 查询指定监控类型下的所有监控信息列表
-     *
      * @param app 监控类型
      * @return 监控列表
      */

manager/src/main/java/com/usthe/manager/service/NoticeConfigService.java

@@ -8,86 +8,66 @@ import org.springframework.data.jpa.domain.Specification;
 import java.util.List;
 
 /**
- * Message notification configuration interface
  * 消息通知配置接口
- *
  * @author tom
  * @date 2021/12/16 16:14
  */
 public interface NoticeConfigService {
 
     /**
-     * Dynamic conditional query
      * 动态条件查询
-     *
+     * @param specification 查询条件
-     * @param specification Query conditions    查询条件
+     * @return 查询结果
-     * @return Search result    查询结果
      */
     List<NoticeReceiver> getNoticeReceivers(Specification<NoticeReceiver> specification);
 
     /**
-     * Dynamic conditional query
      * 动态条件查询
-     *
+     * @param specification 查询条件
-     * @param specification Query conditions    查询条件
+     * @return 查询结果
-     * @return Search result    查询结果
      */
     List<NoticeRule> getNoticeRules(Specification<NoticeRule> specification);
 
     /**
-     * Add a notification recipient
      * 新增一个通知接收人
-     *
+     * @param noticeReceiver 接收人信息
-     * @param noticeReceiver recipient information  接收人信息
      */
     void addReceiver(NoticeReceiver noticeReceiver);
 
     /**
-     * Modify notification recipients
      * 修改通知接收人
-     *
+     * @param noticeReceiver 接收人信息
-     * @param noticeReceiver recipient information  接收人信息
      */
     void editReceiver(NoticeReceiver noticeReceiver);
 
     /**
-     * Delete recipient information based on recipient ID
      * 根据接收人ID删除接收人信息
-     *
+     * @param receiverId 接收人ID
-     * @param receiverId Recipient ID   接收人ID
      */
     void deleteReceiver(Long receiverId);
 
     /**
-     * Added notification policy
      * 新增通知策略
-     *
+     * @param noticeRule 通知策略
-     * @param noticeRule Notification strategy  通知策略
      */
     void addNoticeRule(NoticeRule noticeRule);
 
     /**
-     * Modify Notification Policy
      * 修改通知策略
-     *
+     * @param noticeRule 通知策略
-     * @param noticeRule Notification strategy  通知策略
      */
     void editNoticeRule(NoticeRule noticeRule);
 
     /**
-     * Delete the specified notification policy
      * 删除指定的通知策略
-     *
+     * @param ruleId 通知策略ID
-     * @param ruleId Notification Policy ID     通知策略ID
      */
     void deleteNoticeRule(Long ruleId);
 
     /**
-     * According to the alarm information matching all notification policies, filter out the recipients who need to be notified
      * 根据告警信息与所有通知策略匹配，过滤出需要通知的接收人
-     *
+     * @param alert 告警信息
-     * @param alert Alarm information       告警信息
+     * @return 接收人
-     * @return Receiver     接收人
      */
     List<NoticeReceiver> getReceiverFilterRule(Alert alert);
 }

manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java

@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
 
 /**
  * 监控管理服务实现
- *
  * @author tomsun28
  * @date 2021/11/14 13:06
  */
@@ -80,10 +79,6 @@ public class MonitorServiceImpl implements MonitorService {
         List<Configmap> configmaps = params.stream().map(param ->
                 new Configmap(param.getField(), param.getValue(), param.getType())).collect(Collectors.toList());
         appDefine.setConfigmap(configmaps);
-        // 探测可用性只需要采集优先级为0的可用性指标集合
-        List<Metrics> availableMetrics = appDefine.getMetrics().stream()
-                .filter(item -> item.getPriority() == 0).collect(Collectors.toList());
-        appDefine.setMetrics(availableMetrics);
         List<CollectRep.MetricsData> collectRep = collectJobService.collectSyncJobData(appDefine);
         // 判断探测结果 失败则抛出探测异常
         if (collectRep == null || collectRep.isEmpty()) {
@@ -392,8 +387,7 @@ public class MonitorServiceImpl implements MonitorService {
         if (appCounts == null) {
             return null;
         }
-        //Statistical category information, calculate the number of corresponding states for each monitor
+        // 关联大类别信息 计算每个状态对应数量
-        //统计类别信息，计算每个监控分别对应状态的数量
         Map<String, AppCount> appCountMap = new HashMap<>(appCounts.size());
         for (AppCount item : appCounts) {
             AppCount appCount = appCountMap.getOrDefault(item.getApp(), new AppCount());
@@ -411,13 +405,10 @@ public class MonitorServiceImpl implements MonitorService {
                 case CommonConstants.UN_REACHABLE_CODE:
                     appCount.setUnReachableSize(appCount.getUnReachableSize() + item.getSize());
                     break;
-                default:
+                default: break;
-                    break;
             }
             appCountMap.put(item.getApp(), appCount);
         }
-        //Traverse the map obtained by statistics and convert it into a List<App Count> result set
-        //遍历统计得到的map，转换成List<App Count>结果集
         return appCountMap.values().stream().peek(item -> {
             item.setSize(item.getAvailableSize() + item.getUnManageSize()
                     + item.getUnReachableSize() + item.getUnAvailableSize());

manager/src/main/resources/define/app/api.yml

@@ -32,8 +32,6 @@ configmap:
     type: 3
   - key: params
     type: 3
-  - key: keyword
-    type: 1
 # 指标组列表
 metrics:
   # 第一个监控指标组 cpu
@@ -48,9 +46,6 @@ metrics:
       - field: responseTime
         type: 0
         unit: ms
-      - field: keyword
-        type: 0
-        unit: 次数
 # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
 # 当protocol为http协议时具体的采集配置
@@ -83,5 +78,4 @@ metrics:
         digestAuthPassword: ^_^password^_^
       # 响应数据解析方式: default-系统规则,jsonPath-jsonPath脚本,website-网站可用性指标监控
       # todo xmlPath-xmlPath脚本,prometheus-Prometheus数据规则
-      parseType: website
+      parseType: website
-      keyword: ^_^keyword^_^

manager/src/main/resources/define/app/linux.yml

@@ -68,26 +68,6 @@ metrics:
       - field: context_switch
         type: 0
         unit: 个数
-      - field: usage
-        type: 0
-        unit: '%'
-    # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换
-    aliasFields:
-      - info
-      - cores
-      - interrupt
-      - load
-      - context_switch
-      - idle
-    # (非必须)指标计算表达式,与上面的别名一起作用,计算出最终需要的指标值
-    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
-    calculates:
-      - info=info
-      - cores=cores
-      - interrupt=interrupt
-      - load=load
-      - context_switch=context_switch
-      - usage=100-idle
     # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: ssh
     # 当protocol为http协议时具体的采集配置
@@ -99,7 +79,7 @@ metrics:
       username: ^_^username^_^
       password: ^_^password^_^
       timeout: ^_^timeout^_^
-      script: "LANG=C lscpu | awk -F: '/Model name/ {print $2}';awk '/processor/{core++} END{print core}' /proc/cpuinfo;uptime | sed 's/,/ /g' | awk '{for(i=NF-2;i<=NF;i++)print $i }' | xargs;vmstat 1 1 | awk 'NR==3{print $11}';vmstat 1 1 | awk 'NR==3{print $12}';vmstat 1 1 | awk 'NR==3{print $15}'"
+      script: "LANG=C lscpu | awk -F: '/Model name/ {print $2}';awk '/processor/{core++} END{print core}' /proc/cpuinfo;uptime | sed 's/,/ /g' | awk '{for(i=NF-2;i<=NF;i++)print $i }' | xargs;vmstat 1 1 | awk 'NR==3{print $11}';vmstat 1 1 | awk 'NR==3{print $12}'"
       parseType: oneRow
 
   - name: memory
@@ -121,25 +101,6 @@ metrics:
       - field: available
         type: 0
         unit: Mb
-      - field: usage
-        type: 0
-        unit: '%'
-    # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换
-    aliasFields:
-      - total
-      - used
-      - free
-      - buff_cache
-      - available
-    # (非必须)指标计算表达式,与上面的别名一起作用,计算出最终需要的指标值
-    # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
-    calculates:
-      - total=total
-      - used=used
-      - free=free
-      - buff_cache=buff_cache
-      - available=available
-      - usage=(used / total) * 100
     # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: ssh
     # 当protocol为http协议时具体的采集配置
@@ -193,7 +154,6 @@ metrics:
       # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
       - field: interface_name
         type: 1
-        instance: true
       - field: receive_bytes
         type: 0
         unit: byte
@@ -212,36 +172,4 @@ metrics:
       password: ^_^password^_^
       timeout: ^_^timeout^_^
       script: cat /proc/net/dev | tail -n +3 | awk 'BEGIN{ print "interface_name receive_bytes transmit_bytes"} {print $1,$2,$10}'
-      parseType: multiRow
-
-  - name: disk_free
-    priority: 5
-    fields:
-      # 指标信息 包括 field名称   type字段类型:0-number数字,1-string字符串   instance是否为实例主键   unit:指标单位
-      - field: filesystem
-        type: 1
-      - field: used
-        type: 0
-        unit: Mb
-      - field: available
-        type: 0
-        unit: Mb
-      - field: usage
-        type: 0
-        unit: '%'
-      - field: mounted
-        type: 1
-        instance: true
-    # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
-    protocol: ssh
-    # 当protocol为http协议时具体的采集配置
-    ssh:
-      # 主机host: ipv4 ipv6 域名
-      host: ^_^host^_^
-      # 端口
-      port: ^_^port^_^
-      username: ^_^username^_^
-      password: ^_^password^_^
-      timeout: ^_^timeout^_^
-      script: df -m | tail -n +2 | awk 'BEGIN{ print "filesystem used available usage mounted"} {print $1,$3,$4,$5,$6}'
       parseType: multiRow

manager/src/main/resources/define/app/oracle.yml

@@ -32,6 +32,8 @@ metrics:
       - field: database_version
         type: 1
         instance: true
+      - field: database_type
+        type: 1
       - field: hostname
         type: 1
       - field: instance_name
@@ -43,6 +45,7 @@ metrics:
     # (非必须)监控指标别名，与上面的指标名映射。用于采集接口数据字段不直接是最终指标名称,需要此别名做映射转换
     aliasFields:
       - VERSION
+      - DATABASE_TYPE
       - HOST_NAME
       - INSTANCE_NAME
       - STARTUP_TIME
@@ -51,6 +54,7 @@ metrics:
     # eg: cores=core1+core2, usage=usage, waitTime=allTime-runningTime
     calculates:
       - database_version=VERSION
+      - database_type=DATABASE_TYPE
       - hostname=HOST_NAME
       - instance_name=INSTANCE_NAME
       - startup_time=STARTUP_TIME
@@ -175,4 +179,4 @@ metrics:
       queryType: columns
       # sql
       sql: select metric_name, value from gv$sysmetric where metric_name = 'I/O Megabytes per Second' or  metric_name = 'User Transaction Per Sec' or metric_name = 'I/O Requests per Second'
-      url: ^_^url^_^
+      url: ^_^url^_^

manager/src/main/resources/define/app/website.yml

@@ -18,12 +18,10 @@ configmap:
     type: 1
   - key: password
     type: 2
-  - key: keyword
-    type: 1
 # 指标组列表
 metrics:
   # 第一个监控指标组 cpu
-  # 注意：内置监控指标有 (responseTime - 响应时间, keyword - 关键字数量)
+  # 注意：内置监控指标有 (responseTime - 响应时间)
   - name: summary
     # 指标组调度优先级(0-127)越小优先级越高,优先级低的指标组会等优先级高的指标组采集完成后才会被调度,相同优先级的指标组会并行调度采集
     # 优先级为0的指标组为可用性指标组,即它会被首先调度,采集成功才会继续调度其它指标组,采集失败则中断调度
@@ -34,9 +32,6 @@ metrics:
       - field: responseTime
         type: 0
         unit: ms
-      - field: keyword
-        type: 0
-        unit: 次数
 # 监控采集使用协议 eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
 # 当protocol为http协议时具体的采集配置
@@ -60,5 +55,4 @@ metrics:
         digestAuthPassword: ^_^password^_^
       # 响应数据解析方式: default-系统规则,jsonPath-jsonPath脚本,website-网站可用性指标监控
       # todo xmlPath-xmlPath脚本,prometheus-Prometheus数据规则
-      parseType: website
+      parseType: website
-      keyword: ^_^keyword^_^

manager/src/main/resources/define/param/api.yml

@@ -90,8 +90,3 @@ param:
     type: password
     required: false
     hide: true
-  - field: keyword
-    name: 关键字
-    type: text
-    required: false
-    hide: true

manager/src/main/resources/define/param/website.yml

@@ -51,9 +51,4 @@ param:
     name: 密码
     type: password
     required: false
-    hide: true
-  - field: keyword
-    name: 关键字
-    type: text
-    required: false
     hide: true

script/assembly/server/assembly.xml

@@ -3,7 +3,7 @@
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd
 http://maven.apache.org/ASSEMBLY/2.0.0 ">
     <!--必填,会追加到打包文件名称的末尾-->
-    <id>1.0-beta.7</id>
+    <id>1.0-beta.6</id>
     <!--打包类型,可以设置多种类型,打包的时候不同的类型都会打包打出来-->
     <formats>
         <format>tar</format>

script/assembly/server/bin/entrypoint.sh

@@ -28,7 +28,9 @@ if [ ! -d $LOGS_DIR ]; then
 fi
 
 # JVM Configuration
-JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC "
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
+
+JAVA_MEM_OPTS=" -server -Xms256m -Xmx1024m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
 
 # 加载外部log文件的配置
 LOG_IMPL_FILE=logback-spring.xml
@@ -39,4 +41,4 @@ then
 fi
 CONFIG_FILES=" -Dlogging.path=$LOGS_DIR $LOGGING_CONFIG -Dspring.config.location=$CONF_DIR/ "
 echo -e "Starting the $SERVER_NAME ..."
-java $JAVA_MEM_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/$JAR_NAME --spring.profiles.active=prod
+java $JAVA_OPTS $JAVA_MEM_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/$JAR_NAME --spring.profiles.active=prod

script/assembly/server/bin/startup.bat

@@ -34,9 +34,9 @@ rem 项目日志输出绝对路径
 set LOGS_DIR=%DEPLOY_DIR%\logs
 
 rem JVM Configuration
-set JAVA_OPTS= -Duser.timezone=Asia/Shanghai
+set JAVA_OPTS= -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Duser.timezone=Asia/Shanghai
 
-set JAVA_MEM_OPTS= -server -XX:SurvivorRatio=6 -XX:+UseParallelGC
+set JAVA_MEM_OPTS= -server -Xms256m -Xmx1024m -XX:SurvivorRatio=2 -XX:+UseParallelGC
 
 rem 加载外部log文件的配置
 set LOGGING_CONFIG=-Dlogging.config=%CONF_DIR%\logback-spring.xml

script/assembly/server/bin/startup.sh

@@ -66,9 +66,9 @@ if [ ! -d $LOGS_DIR ]; then
 fi
 
 # JVM Configuration
-JAVA_OPTS=" -Duser.timezone=Asia/Shanghai"
+JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Duser.timezone=Asia/Shanghai"
 
-JAVA_MEM_OPTS=" -server -XX:SurvivorRatio=6 -XX:+UseParallelGC "
+JAVA_MEM_OPTS=" -server -Xms256m -Xmx1024m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
 
 # 加载外部log文件的配置
 LOG_IMPL_FILE=logback-spring.xml

script/docker-compose/docker-compose.yaml

@@ -35,7 +35,7 @@ services:
       - heartzbeat
 
   hertzbeat:
-    image: "tancloud/hertzbeat:1.0-beta.7"
+    image: "tancloud/hertzbeat:1.0-beta.6"
     container_name: hertzbeat
     hostname: hertzbeat
     restart: always

script/docker/server/Dockerfile

@@ -2,7 +2,7 @@ FROM openjdk:8-alpine
 
 MAINTAINER tomsun28 "tomsun28@outlook.com"
 
-ADD hertzbeat-1.0-beta.7.tar /opt/
+ADD hertzbeat-1.0-beta.6.tar /opt/
 
 RUN apk add --no-cache tzdata
 

web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.less

@@ -0,0 +1,8 @@
+.dynamic-button {
+  font-size: 20px;
+  margin-left: 45%;
+}
+
+.dynamic-button:hover {
+  font-size: 30px;
+}

web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts

@@ -16,7 +16,7 @@ import { MonitorService } from '../../../service/monitor.service';
 @Component({
   selector: 'app-monitor-modify',
   templateUrl: './monitor-edit.component.html',
-  styles: []
+  styleUrls: ['./monitor-edit.component.less']
 })
 export class MonitorEditComponent implements OnInit {
   constructor(
@@ -72,6 +72,7 @@ export class MonitorEditComponent implements OnInit {
       )
       .subscribe(message => {
         if (message.code === 0) {
+          this.paramDefines = message.data;
           this.params = [];
           this.advancedParams = [];
           this.paramDefines = [];