docs/rition.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80027 (8.0.27)
  File Encoding         : 65001
 
- Date: 10/05/2024 14:22:09
+ Date: 08/05/2024 10:15:09
 */
 
 SET NAMES utf8mb4;
@@ -25,7 +25,6 @@ CREATE TABLE `alert` (
   `id` bigint NOT NULL,
   `instance_id` varchar(64) NOT NULL COMMENT '出现警告的实例id',
   `rule` bigint NOT NULL COMMENT '触发的规则',
-  `value` double NOT NULL COMMENT '警告时的数值',
   `time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '警告出现的时间',
   `status` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
@@ -39,13 +38,15 @@ CREATE TABLE `alert` (
 DROP TABLE IF EXISTS `contract`;
 CREATE TABLE `contract` (
   `id` bigint NOT NULL,
+  `instance_id` varchar(64) NOT NULL COMMENT '绑定的实例',
   `contract` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '联系方式',
   `type` tinyint NOT NULL COMMENT '联系方式类型',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `status` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  KEY `idx_id` (`id`)
+  KEY `idx_id` (`id`),
+  KEY `idx_instance` (`instance_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 -- ----------------------------
@@ -86,15 +87,17 @@ CREATE TABLE `record` (
 DROP TABLE IF EXISTS `rule`;
 CREATE TABLE `rule` (
   `id` bigint NOT NULL COMMENT '规则id',
-  `expr` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '需要计算的指标项或者表达式',
+  `instance_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '规则对应的实例id',
-  `cond` tinyint NOT NULL COMMENT '触发条件',
+  `expression` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '需要计算的指标项或者表达式',
+  `condition` tinyint NOT NULL COMMENT '触发条件',
   `threshold` varchar(32) NOT NULL COMMENT '阈值',
-  `trig` tinyint NOT NULL COMMENT '触发方法，实时计算或定时计算',
+  `trigger` tinyint NOT NULL COMMENT '触发方法，实时计算或定时计算',
-  `comment` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '规则描述',
+  `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '' COMMENT '规则描述',
   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `status` tinyint NOT NULL DEFAULT '0',
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `idx_instance` (`instance_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 
 SET FOREIGN_KEY_CHECKS = 1;

rition-center/api/pom.xml

@@ -43,10 +43,10 @@
             <artifactId>notify</artifactId>
             <version>${revision}</version>
         </dependency>
+
         <dependency>
-            <groupId>net.rition</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>panel</artifactId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <version>${revision}</version>
         </dependency>
     </dependencies>
 </project>

rition-center/api/src/main/java/rition/backend/aop/exception/GlobalExceptionHandler.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
 import org.springframework.web.servlet.NoHandlerFoundException;
-import org.springframework.web.servlet.resource.NoResourceFoundException;
 import rition.backend.api.v1.dto.response.Response;
 import rition.common.exception.ServiceException;
 import rition.common.exception.code.ServiceCode;
@@ -45,18 +44,6 @@ public class GlobalExceptionHandler {
         return Response.error(ServiceCode.ApiNotImplement);
     }
 
-    /**
-     * 404
-     *
-     * @param e 异常
-     * @return 统一响应
-     */
-    @ResponseBody
-    @ExceptionHandler(NoResourceFoundException.class)
-    public Response<Object> baseException(NoResourceFoundException e) {
-        return Response.error(ServiceCode.ApiNotImplement);
-    }
-
     /**
      * 处理参数不完整的请求异常
      *

rition-center/api/src/main/java/rition/backend/api/interceptor/NotFoundPathInterceptor.java

@@ -1,36 +0,0 @@
-package rition.backend.api.interceptor;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.annotation.Nonnull;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-import rition.backend.api.v1.dto.response.Response;
-import rition.common.exception.code.ServiceCode;
-
-@Component
-public class NotFoundPathInterceptor implements HandlerInterceptor {
-    private final ObjectMapper objectMapper;
-
-    public NotFoundPathInterceptor(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
-    @Override
-    public void postHandle(@Nonnull HttpServletRequest request,
-                           @Nonnull HttpServletResponse servletResponse,
-                           @Nonnull Object handler,
-                           ModelAndView modelAndView) throws Exception {
-        if (servletResponse.getStatus() == HttpStatus.NOT_FOUND.value()) {
-            var response = Response.error(ServiceCode.ApiNotImplement);
-            var json = objectMapper.writeValueAsString(response);
-
-            servletResponse.setContentType("application/json");
-            servletResponse.setCharacterEncoding("utf-8");
-            servletResponse.getWriter().write(json);
-        }
-    }
-}

rition-center/api/src/main/java/rition/backend/api/v1/collector/DataCollectingController.java

@@ -9,7 +9,7 @@ import rition.backend.annotation.paramter.RequestId;
 import rition.backend.api.v1.dto.request.MetricDataUploadRequest;
 import rition.backend.api.v1.dto.response.Response;
 import rition.backend.service.MetricDataCollectingService;
-import rition.common.data.dto.service.MetricDataDto;
+import rition.common.data.dto.MetricDataDto;
 
 import java.util.HashMap;
 import java.util.List;

rition-center/api/src/main/java/rition/backend/api/v1/dto/request/AlertRuleAddRequest.java

@@ -22,7 +22,7 @@ public class AlertRuleAddRequest {
     /**
      * 阈值
      */
-    private Double threshold;
+    private String threshold;
 
     /**
      * 触发方法，实时计算或定时计算

rition-center/api/src/main/java/rition/backend/api/v1/dto/response/AlertResponse.java

@@ -1,39 +0,0 @@
-package rition.backend.api.v1.dto.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class AlertResponse {
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 出现警告的实例id
-     */
-    private String instanceId;
-
-    /**
-     * 触发的规则
-     */
-    private Long rule;
-
-    /**
-     * 触发时的数值
-     */
-    private Double value;
-
-    /**
-     * 警告出现的时间
-     */
-    private Long time;
-}

rition-center/api/src/main/java/rition/backend/api/v1/dto/response/ContractResponse.java

@@ -1,34 +0,0 @@
-package rition.backend.api.v1.dto.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ContractResponse {
-    /**
-     * id
-     */
-    private Long id;
-
-    /**
-     * 联系方式
-     */
-    private String contract;
-
-    /**
-     * 联系方式类型
-     */
-    private Integer type;
-
-    /**
-     * create_time
-     */
-    private Long createTime;
-}

rition-center/api/src/main/java/rition/backend/api/v1/dto/response/MetricDataResponse.java

@@ -1,29 +0,0 @@
-package rition.backend.api.v1.dto.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-import java.util.Map;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MetricDataResponse {
-    /**
-     * 监控指标值，使用json格式存储
-     */
-    private Map<String, MetricDataResponseItem> metricData;
-
-    @Data
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    public static class MetricDataResponseItem {
-        private List<Long> time;
-        private List<Double> value;
-    }
-}

rition-center/api/src/main/java/rition/backend/api/v1/dto/response/RuleResponse.java

@@ -1,54 +0,0 @@
-package rition.backend.api.v1.dto.response;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class RuleResponse {
-    /**
-     * 规则id
-     */
-    private Long id;
-
-    /**
-     * 需要计算的指标项或者表达式
-     */
-    private String expression;
-
-    /**
-     * 触发条件
-     */
-    private Integer condition;
-
-    /**
-     * 阈值
-     */
-    private Double threshold;
-
-    /**
-     * 触发方法，实时计算或定时计算
-     */
-    private Integer trigger;
-
-    /**
-     * 规则描述
-     */
-    private String description;
-
-    /**
-     * create_time
-     */
-    private Long createTime;
-
-    /**
-     * update_time
-     */
-    private Long updateTime;
-}

rition-center/api/src/main/java/rition/backend/api/v1/panel/AlertHistoryController.java

@@ -1,46 +0,0 @@
-package rition.backend.api.v1.panel;
-
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import rition.backend.api.v1.dto.response.AlertResponse;
-import rition.backend.api.v1.dto.response.Response;
-import rition.common.data.dto.PagingData;
-import rition.common.data.entity.AlertEntity;
-import rition.service.panel.AlertHistoryService;
-
-@RestController
-@RequestMapping("/panel/alerts")
-public class AlertHistoryController {
-    private final AlertHistoryService alertHistoryService;
-
-    public AlertHistoryController(AlertHistoryService alertHistoryService) {
-        this.alertHistoryService = alertHistoryService;
-    }
-
-    @GetMapping("/list")
-    public Response<PagingData<AlertResponse>> getContractList(
-            @RequestParam(value = "instance_id", required = false) String instanceId,
-            @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
-            @RequestParam(value = "page_size", required = false, defaultValue = "10") Integer pageSize
-    ) {
-
-        PagingData<AlertEntity> alertEntityPagingData = new PagingData<>(page, pageSize);
-        var result = alertHistoryService.getAlertHistory(instanceId, alertEntityPagingData);
-
-        PagingData<AlertResponse> alertResponsePagingData = PagingData.copyOnlyPagingValues(result);
-        for (AlertEntity entity : result.getData()) {
-            alertResponsePagingData.getData().add(AlertResponse.builder()
-                    .id(entity.getId())
-                    .instanceId(entity.getInstanceId())
-                    .rule(entity.getRule())
-                    .value(entity.getValue())
-                    .time(entity.getTime().toEpochMilli())
-                    .build()
-            );
-        }
-
-        return Response.success(alertResponsePagingData);
-    }
-}

rition-center/api/src/main/java/rition/backend/api/v1/panel/AlertRuleController.java

@@ -3,63 +3,24 @@ package rition.backend.api.v1.panel;
 import org.springframework.web.bind.annotation.*;
 import rition.backend.api.v1.dto.request.AlertRuleAddRequest;
 import rition.backend.api.v1.dto.response.Response;
-import rition.backend.api.v1.dto.response.RuleResponse;
-import rition.common.data.dto.service.panel.AlertRuleAddDto;
-import rition.common.data.entity.RuleEntity;
-import rition.service.panel.AlertRuleService;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
-@RequestMapping("/panel/rules")
+@RequestMapping("/rules")
 public class AlertRuleController {
-    private final AlertRuleService alertRuleService;
+    @GetMapping("/list/{instanceId}")
-
+    public Response<Object> getAlertRuleList(@PathVariable("instanceId") String instanceId) {
-    public AlertRuleController(AlertRuleService alertRuleService) {
+        return Response.success();
-        this.alertRuleService = alertRuleService;
-    }
-
-    @GetMapping("/list")
-    public Response<List<RuleResponse>> getAlertRuleList() {
-        List<RuleEntity> ruleEntityList = alertRuleService.getRule();
-        List<RuleResponse> ruleResponseList = new ArrayList<>(ruleEntityList.size());
-        for (RuleEntity ruleEntity : ruleEntityList) {
-            RuleResponse response = new RuleResponse();
-            response.setId(ruleEntity.getId());
-            response.setExpression(ruleEntity.getExpr());
-            response.setCondition(ruleEntity.getCond());
-            response.setThreshold(ruleEntity.getThreshold());
-            response.setTrigger(ruleEntity.getTrig());
-            response.setDescription(ruleEntity.getComment());
-            response.setCreateTime(ruleEntity.getCreateTime().toEpochMilli());
-            response.setUpdateTime(ruleEntity.getUpdateTime().toEpochMilli());
-
-            ruleResponseList.add(response);
-        }
-
-        return Response.success(ruleResponseList);
     }
 
-    @PostMapping("/add")
+    @PostMapping("/add/{instanceId}")
-    public Response<Object> addAlertRule(@RequestBody AlertRuleAddRequest alertRuleAddRequest) {
+    public Response<Object> addAlertRule(@PathVariable("instanceId") String instanceId,
-        AlertRuleAddDto alertRuleAddDto = new AlertRuleAddDto();
+                                        @RequestBody AlertRuleAddRequest alertRuleAddRequest) {
-        alertRuleAddDto.setInstanceId(alertRuleAddRequest.getInstanceId());
-        alertRuleAddDto.setExpression(alertRuleAddRequest.getExpression());
-        alertRuleAddDto.setCondition(alertRuleAddRequest.getCondition());
-        alertRuleAddDto.setThreshold(alertRuleAddRequest.getThreshold());
-        alertRuleAddDto.setTrigger(alertRuleAddRequest.getTrigger());
-        alertRuleAddDto.setDescription(alertRuleAddRequest.getDescription());
-
-        alertRuleService.addAlertRule(alertRuleAddDto);
-
         return Response.success();
     }
 
-    @PostMapping("/delete")
+    @PostMapping("/delete/{instanceId}")
-    public Response<Object> deleteAlertRule(@RequestParam("id") Long alertRuleId) {
+    public Response<Object> deleteAlertRule(@PathVariable("instanceId") String instanceId,
-        alertRuleService.deleteRule(alertRuleId);
+                                           @RequestParam("id") String alertRuleId) {
-
         return Response.success();
     }
 }

rition-center/api/src/main/java/rition/backend/api/v1/panel/ContractController.java

@@ -2,56 +2,25 @@ package rition.backend.api.v1.panel;
 
 import org.springframework.web.bind.annotation.*;
 import rition.backend.api.v1.dto.request.ContractAddRequest;
-import rition.backend.api.v1.dto.response.ContractResponse;
 import rition.backend.api.v1.dto.response.Response;
-import rition.common.data.dto.service.panel.ContractAddDto;
-import rition.common.data.entity.ContractEntity;
-import rition.service.panel.ContractService;
-
-import java.util.ArrayList;
-import java.util.List;
 
 @RestController
-@RequestMapping("/panel/contract")
+@RequestMapping("/contract")
 public class ContractController {
-    private final ContractService contractService;
+    @GetMapping("/list/{instanceId}")
-
+    public Response<Object> getContractList(@PathVariable("instanceId") String instanceId) {
-    public ContractController(ContractService contractService) {
+        return Response.success();
-        this.contractService = contractService;
-    }
-
-    @GetMapping("/list")
-    public Response<List<ContractResponse>> getContractList() {
-        List<ContractEntity> contractEntityList = contractService.getContractList();
-        List<ContractResponse> responseList = new ArrayList<>(contractEntityList.size());
-        for (var contractEntity : contractEntityList) {
-            ContractResponse response = new ContractResponse();
-            response.setId(contractEntity.getId());
-            response.setContract(contractEntity.getContract());
-            response.setType(contractEntity.getType());
-            response.setCreateTime(contractEntity.getCreateTime().toEpochMilli());
-
-            responseList.add(response);
-        }
-
-        return Response.success(responseList);
     }
 
-    @PostMapping("/add")
+    @PostMapping("/add/{instanceId}")
-    public Response<Object> addContract(@RequestBody ContractAddRequest contractAddRequest) {
+    public Response<Object> addContract(@PathVariable("instanceId") String instanceId,
-        ContractAddDto contractAddDto = new ContractAddDto();
+                                        @RequestBody ContractAddRequest contractAddRequest) {
-        contractAddDto.setContract(contractAddRequest.getContract());
-        contractAddDto.setType(contractAddRequest.getType());
-
-        contractService.addContract(contractAddDto);
-
         return Response.success();
     }
 
-    @PostMapping("/delete")
+    @PostMapping("/delete/{instanceId}")
-    public Response<Object> deleteContract(@RequestParam("id") Long contractId) {
+    public Response<Object> deleteContract(@PathVariable("instanceId") String instanceId,
-        contractService.deleteContract(contractId);
+                                           @RequestParam("id") String contractId) {
-
         return Response.success();
     }
 }

rition-center/api/src/main/java/rition/backend/api/v1/panel/MetricsViewController.java

@@ -1,138 +1,18 @@
 package rition.backend.api.v1.panel;
 
-import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import rition.backend.api.v1.dto.request.MetricDataRequest;
-import rition.backend.api.v1.dto.response.MetricDataResponse;
 import rition.backend.api.v1.dto.response.Response;
-import rition.common.data.dto.service.MetricDataDto;
-import rition.common.data.entity.MetricRecordEntity;
-import rition.common.data.enums.Constants;
-import rition.service.panel.MetricService;
 
-import java.time.Instant;
-import java.util.*;
-
-@Slf4j
 @RestController
 @RequestMapping("/panel/metrics")
 public class MetricsViewController {
 
-    private final MetricService metricService;
+    @GetMapping("/list")
-    private final RedisTemplate<String, Object> redisTemplate;
+    public Response<Object> getMetrics(@RequestBody MetricDataRequest metricDataRequest) {
-
+        return Response.success();
-    public MetricsViewController(MetricService metricService, RedisTemplate<String, Object> redisTemplate) {
-        this.metricService = metricService;
-        this.redisTemplate = redisTemplate;
-    }
-
-    @PostMapping("/list")
-    public Response<MetricDataResponse> getMetrics(@RequestBody MetricDataRequest metricDataRequest) {
-        MetricDataResponse metricDataResponse = new MetricDataResponse();
-        metricDataResponse.setMetricData(new HashMap<>(metricDataRequest.getMetricItems().size()));
-
-        // 如果未给定范围参数，则使用最近一小时的数据
-        if (metricDataRequest.getStart() == null || metricDataRequest.getEnd() == null) {
-            List<Object> recentMetricDataList =
-                    redisTemplate.opsForList().range(
-                            Constants.RedisKeys.RECENT_METRIC_CACHE, 0, Constants.MAX_METRIC_CACHE_NUM
-                    );
-            if (recentMetricDataList == null) {
-                return Response.success(MetricDataResponse.builder().metricData(new HashMap<>()).build());
-            }
-
-            for (String metricItem : metricDataRequest.getMetricItems()) {
-                metricDataResponse.getMetricData().put(metricItem, MetricDataResponse.MetricDataResponseItem.builder()
-                        .time(new ArrayList<>(recentMetricDataList.size()))
-                        .value(new ArrayList<>(recentMetricDataList.size()))
-                        .build()
-                );
-            }
-
-            for (Object recentMetricData : recentMetricDataList) {
-                var metricDataDto = (MetricDataDto) recentMetricData;
-                Map<String, Double> data = metricDataDto.getData();
-                for (String metric : data.keySet()) {
-                    var metricResponseData = metricDataResponse.getMetricData().get(metric);
-                    metricResponseData.getTime().add(metricDataDto.getTimestamp());
-                    metricResponseData.getValue().add(data.get(metric));
-                }
-            }
-
-            return Response.success(metricDataResponse);
-        }
-
-        var entityResult = metricService.getMetricDataRange(
-                metricDataRequest.getInstanceId(),
-                this.filterMetricItems(metricDataRequest.getMetricItems()),
-                Instant.ofEpochMilli(metricDataRequest.getStart()),
-                Instant.ofEpochMilli(metricDataRequest.getEnd())
-        );
-
-        // 转换数据
-
-        for (String metricItem : metricDataRequest.getMetricItems()) {
-            metricDataResponse.getMetricData().put(metricItem, MetricDataResponse.MetricDataResponseItem.builder()
-                    .time(new ArrayList<>(entityResult.size()))
-                    .value(new ArrayList<>(entityResult.size()))
-                    .build()
-            );
-        }
-
-        for (MetricRecordEntity entity : entityResult) {
-            var data = entity.getMetricData();
-            for (String metric : data.keySet()) {
-                var metricResponseData = metricDataResponse.getMetricData().get(metric);
-                metricResponseData.getTime().add(entity.getTime().toEpochMilli());
-                metricResponseData.getValue().add(data.get(metric));
-            }
-        }
-
-        return Response.success(metricDataResponse);
-    }
-
-
-    private static final HashSet<String> allowedMetricItems = new HashSet<>(22);
-
-    static {
-        allowedMetricItems.add("up");
-        allowedMetricItems.add("node_load5");
-        allowedMetricItems.add("node_sockstat_TCP_tw");
-        allowedMetricItems.add("node_cpu_seconds_total");
-        allowedMetricItems.add("node_memory_Cached_bytes");
-        allowedMetricItems.add("node_memory_Buffers_bytes");
-        allowedMetricItems.add("node_memory_MemFree_bytes");
-        allowedMetricItems.add("node_disk_read_bytes_total");
-        allowedMetricItems.add("node_filesystem_free_bytes");
-        allowedMetricItems.add("node_filesystem_size_bytes");
-        allowedMetricItems.add("node_memory_MemTotal_bytes");
-        allowedMetricItems.add("node_netstat_Tcp_CurrEstab");
-        allowedMetricItems.add("node_filesystem_avail_bytes");
-        allowedMetricItems.add("node_disk_written_bytes_total");
-        allowedMetricItems.add("node_disk_reads_completed_total");
-        allowedMetricItems.add("node_network_receive_drop_total");
-        allowedMetricItems.add("node_disk_writes_completed_total");
-        allowedMetricItems.add("node_network_receive_bytes_total");
-        allowedMetricItems.add("node_network_transmit_drop_total");
-        allowedMetricItems.add("node_network_transmit_bytes_total");
-        allowedMetricItems.add("node_network_receive_packets_total");
-        allowedMetricItems.add("node_network_transmit_packets_total");
-    }
-
-    private List<String> filterMetricItems(List<String> metricItems) {
-        List<String> filteredMetricItems = new ArrayList<>(metricItems.size());
-        for (String metricItem : metricItems) {
-            if (allowedMetricItems.contains(metricItem)) {
-                filteredMetricItems.add(metricItem);
-            } else {
-                log.warn("[MetricService]: 请求的指标值含有非允许的指标值：{}", metricItem);
-            }
-        }
-
-        return filteredMetricItems;
     }
 }

rition-center/api/src/main/java/rition/backend/api/v1/panel/PanelController.java

@@ -0,0 +1,10 @@
+package rition.backend.api.v1.panel;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/panel")
+public class PanelController {
+
+}

rition-center/api/src/main/java/rition/backend/configure/OpenAPIConfigure.java

@@ -1,35 +0,0 @@
-package rition.backend.configure;
-
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.servers.Server;
-import lombok.Getter;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-
-@Getter
-@Component
-@Configuration
-public class OpenAPIConfigure {
-    private String serverUrl;
-
-    @Value("${wusthelper.docs.server-url:/}")
-    public void setServerUrl(String serverUrl) {
-        this.serverUrl = serverUrl;
-    }
-
-    @Bean
-    public OpenAPI openAPI() {
-        var info = new Info()
-                .title("Rition-center")
-                .description("Rition-center api")
-                .version("v1");
-
-        return new OpenAPI()
-                .info(info);
-    }
-}

rition-center/api/src/main/java/rition/backend/configure/WebAppConfig.java

@@ -5,8 +5,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import rition.backend.api.interceptor.NotFoundPathInterceptor;
 import rition.backend.api.interceptor.ResponseIdInterceptor;
 import rition.backend.api.resolver.RequestIdArgumentResolver;
 
@@ -14,30 +12,25 @@ import java.util.List;
 
 @Configuration
 @SpringBootConfiguration
-public class WebMvcConfigure implements WebMvcConfigurer {
+public class WebAppConfig extends WebMvcConfigurationSupport {
 
     private final RequestIdArgumentResolver requestIdArgumentResolver;
     private final ResponseIdInterceptor requestIdInterceptor;
-    private final NotFoundPathInterceptor notFoundPathInterceptor;
 
-    public WebMvcConfigure(RequestIdArgumentResolver requestIdArgumentResolver,
+    public WebAppConfig(RequestIdArgumentResolver requestIdArgumentResolver,
-                           ResponseIdInterceptor requestIdInterceptor, NotFoundPathInterceptor notFoundPathInterceptor) {
+                        ResponseIdInterceptor requestIdInterceptor) {
         this.requestIdArgumentResolver = requestIdArgumentResolver;
         this.requestIdInterceptor = requestIdInterceptor;
-        this.notFoundPathInterceptor = notFoundPathInterceptor;
     }
 
     @Override
-    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+    protected void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
         argumentResolvers.add(requestIdArgumentResolver);
     }
 
     @Override
-    public void addInterceptors(InterceptorRegistry registry) {
+    protected void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(requestIdInterceptor)
                 .addPathPatterns("/**");
-
-        registry.addInterceptor(notFoundPathInterceptor)
-                .addPathPatterns("/**");
     }
 }

rition-center/api/src/main/java/rition/backend/service/MetricDataCollectingService.java

@@ -4,11 +4,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import rition.common.data.dto.MetricDataDto;
 import rition.common.data.dto.log.RequestProcessTraceRecord;
-import rition.common.data.dto.service.MetricDataDto;
-import rition.common.data.enums.Constants;
 import rition.service.collector.MetricCollectingService;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Map;
 
 /**
@@ -30,6 +31,8 @@ public class MetricDataCollectingService {
         this.redisTemplate = redisTemplate;
     }
 
+    private static final String PROCESS_TRACE_REDIS_KEY_FORMAT = "rition:request:trace:%s";
+
     /**
      * 接收处理好的监控指标数据，异步处理，请求发送后，处理状态使用requestId追踪，处理结果放置于redis
      *
@@ -54,7 +57,7 @@ public class MetricDataCollectingService {
         }
 
         try {
-            redisTemplate.opsForValue().set(Constants.RedisKeys.PROCESS_TRACE.formatted(requestId), record);
+            redisTemplate.opsForValue().set(PROCESS_TRACE_REDIS_KEY_FORMAT.formatted(requestId), record);
         } catch (Exception e2) {
             log.error("请求结果保存出现异常: ", e2);
             log.error("请求结果：{}", record);

rition-center/api/src/main/java/rition/backend/service/panel/PanelMetricService.java

@@ -1,7 +0,0 @@
-package rition.backend.service.panel;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class PanelMetricService {
-}

rition-center/api/src/main/resources/application.yml

@@ -5,12 +5,9 @@ server:
 
 spring:
   profiles:
-    include: collector, monitor, panel
+    include: collector, monitor
   data:
     redis:
       host: ${REDIS_HOST:127.0.0.1}
       port: ${REDIS_PORT:6379}
       password: ${REDIS_PASSWORD:Test2333!}
-logging:
-  level:
-    rition: debug

rition-center/api/src/test/java/panel/MetricServiceTest.java

@@ -1,39 +0,0 @@
-package panel;
-
-import org.junit.jupiter.api.Test;
-import org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis;
-import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ContextConfiguration;
-import rition.backend.RitionBackendMain;
-import rition.common.data.dao.mapper.MetricRecordMapper;
-
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@MybatisTest
-@ContextConfiguration(classes = RitionBackendMain.class)
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-public class MetricServiceTest {
-    @Autowired
-    MetricRecordMapper metricRecordMapper;
-
-    @Test
-    public void testGetMetricRecord() {
-        List<String> metricItems = new ArrayList<>();
-        metricItems.add("node_network_receive_packets_total");
-        metricItems.add("node_sockstat_TCP_tw");
-        var result = metricRecordMapper.getMetricDataGroupByHour(
-                "7273a1ea-0089-4674-b606-b1b8d809d866",
-                metricItems,
-                Instant.parse("2024-04-17T14:00:00.00Z"),
-                Instant.parse("2024-04-17T16:00:00.00Z")
-        );
-
-        System.out.println(Arrays.toString(result.toArray()));
-    }
-}

rition-center/common/src/main/java/rition/common/configure/RedisLuaConfigure.java

@@ -1,21 +0,0 @@
-package rition.common.configure;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.data.redis.core.script.DefaultRedisScript;
-import org.springframework.data.redis.core.script.RedisScript;
-import org.springframework.scripting.support.ResourceScriptSource;
-
-@Configuration
-public class RedisLuaConfigure {
-    @Bean(name = "constLenQueueRedisScript")
-    public RedisScript<Object> constLenQueueRedisScript() {
-        Resource luaResource = new ClassPathResource("redis/const_len_queue.lua");
-        DefaultRedisScript<Object> redisScript = new DefaultRedisScript<>();
-        redisScript.setScriptSource(new ResourceScriptSource(luaResource));
-
-        return redisScript;
-    }
-}

rition-center/common/src/main/java/rition/common/data/dao/mapper/AlertMapper.java

@@ -1,9 +0,0 @@
-package rition.common.data.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import rition.common.data.entity.AlertEntity;
-
-@Mapper
-public interface AlertMapper extends BaseMapper<AlertEntity> {
-}

rition-center/common/src/main/java/rition/common/data/dao/mapper/ContractMapper.java

@@ -1,7 +0,0 @@
-package rition.common.data.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import rition.common.data.entity.ContractEntity;
-
-public interface ContractMapper extends BaseMapper<ContractEntity> {
-}

rition-center/common/src/main/java/rition/common/data/dao/mapper/MetricRecordMapper.java

@@ -1,35 +0,0 @@
-package rition.common.data.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Component;
-import rition.common.data.entity.MetricRecordEntity;
-
-import java.time.Instant;
-import java.util.List;
-
-@Mapper
-@Component
-public interface MetricRecordMapper extends BaseMapper<MetricRecordEntity> {
-    int insertBatchSomeColumn(List<MetricRecordEntity> entityList);
-
-    List<MetricRecordEntity> getMetricDataGroupByHour(
-            @Param("instanceId") String instanceId,
-            @Param("metricItems") List<String> metricItems,
-            @Param("startTime") Instant startTime, @Param("endTime") Instant endTime
-    );
-
-    List<MetricRecordEntity> getMetricDataGroupByMinute(
-            @Param("instanceId") String instanceId,
-            @Param("metricItems") List<String> metricItems,
-            @Param("startTime") Instant startTime, @Param("endTime") Instant endTime
-    );
-
-    List<MetricRecordEntity> getMetricDataGroupBySomeMinute(
-            @Param("minutes") Integer minutes,
-            @Param("instanceId") String instanceId,
-            @Param("metricItems") List<String> metricItems,
-            @Param("startTime") Instant startTime, @Param("endTime") Instant endTime
-    );
-}

rition-center/common/src/main/java/rition/common/data/dao/mapper/RuleMapper.java

@@ -1,9 +0,0 @@
-package rition.common.data.dao.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import rition.common.data.entity.RuleEntity;
-
-@Mapper
-public interface RuleMapper extends BaseMapper<RuleEntity> {
-}

rition-center/common/src/main/java/rition/common/data/dto/MetricDataDto.java

@@ -1,5 +1,5 @@
 
-package rition.common.data.dto.service;
+package rition.common.data.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

rition-center/common/src/main/java/rition/common/data/dto/PagingData.java

@@ -1,54 +0,0 @@
-package rition.common.data.dto;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class PagingData<T> {
-    private long currentPage;
-    private long pageSize;
-    private long totalPage;
-
-    private long totalResult;
-
-    private Collection<T> data;
-
-    public PagingData(long currentPage, long pageSize) {
-        this.currentPage = currentPage;
-        this.pageSize = pageSize;
-    }
-
-    public PagingData<T> copy() {
-        PagingData<T> pagingData = new PagingData<>();
-
-        pagingData.setCurrentPage(this.getCurrentPage());
-        pagingData.setPageSize(this.getPageSize());
-        pagingData.setTotalPage(this.getTotalPage());
-        pagingData.setTotalResult(this.getTotalResult());
-        pagingData.setData(this.getData());
-
-        return pagingData;
-    }
-
-    public static <K> PagingData<K> copyOnlyPagingValues(PagingData<?> source) {
-        PagingData<K> pagingData = new PagingData<>();
-
-        pagingData.setCurrentPage(source.getCurrentPage());
-        pagingData.setPageSize(source.getPageSize());
-        pagingData.setTotalPage(source.getTotalPage());
-        pagingData.setTotalResult(source.getTotalResult());
-        pagingData.setData(new ArrayList<>(source.data.size()));
-
-        return pagingData;
-    }
-}
-

rition-center/common/src/main/java/rition/common/data/dto/service/AlertRuleDto.java

@@ -1,54 +0,0 @@
-package rition.common.data.dto.service;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.Instant;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class AlertRuleDto {
-    /**
-     * 规则id
-     */
-    private Long id;
-
-    /**
-     * 规则对应的实例id
-     */
-    private String instanceId;
-
-    /**
-     * 需要计算的指标项或者表达式
-     */
-    private String expression;
-
-    /**
-     * 触发条件
-     */
-    private Integer condition;
-
-    /**
-     * 阈值
-     */
-    private Double threshold;
-
-    /**
-     * 触发方法，实时计算或定时计算
-     */
-    private Integer trigger;
-
-    /**
-     * 规则描述
-     */
-    private String description;
-
-    /**
-     * create_time
-     */
-    private Instant createTime;
-}

rition-center/common/src/main/java/rition/common/data/dto/service/panel/AlertRuleAddDto.java

@@ -1,36 +0,0 @@
-package rition.common.data.dto.service.panel;
-
-import lombok.Data;
-
-@Data
-public class AlertRuleAddDto {
-    /**
-     * 规则对应的实例id
-     */
-    private String instanceId;
-
-    /**
-     * 需要计算的指标项或者表达式
-     */
-    private String expression;
-
-    /**
-     * 触发条件
-     */
-    private Integer condition;
-
-    /**
-     * 阈值
-     */
-    private Double threshold;
-
-    /**
-     * 触发方法，实时计算或定时计算
-     */
-    private Integer trigger;
-
-    /**
-     * 规则描述
-     */
-    private String description;
-}

rition-center/common/src/main/java/rition/common/data/dto/service/panel/AlertRuleDto.java

@@ -1,36 +0,0 @@
-package rition.common.data.dto.service.panel;
-
-import lombok.Data;
-
-@Data
-public class AlertRuleDto {
-    /**
-     * 规则对应的实例id
-     */
-    private String instanceId;
-
-    /**
-     * 需要计算的指标项或者表达式
-     */
-    private String expression;
-
-    /**
-     * 触发条件
-     */
-    private Integer condition;
-
-    /**
-     * 阈值
-     */
-    private Double threshold;
-
-    /**
-     * 触发方法，实时计算或定时计算
-     */
-    private Integer trigger;
-
-    /**
-     * 规则描述
-     */
-    private String description;
-}

rition-center/common/src/main/java/rition/common/data/dto/service/panel/ContractAddDto.java

@@ -1,17 +0,0 @@
-package rition.common.data.dto.service.panel;
-
-import lombok.Data;
-
-@Data
-public class ContractAddDto {
-
-    /**
-     * 联系方式
-     */
-    private String contract;
-
-    /**
-     * 联系方式类型
-     */
-    private Integer type;
-}

rition-center/common/src/main/java/rition/common/data/entity/AlertEntity.java

@@ -29,11 +29,6 @@ public class AlertEntity {
      */
     private Long rule;
 
-    /**
-     * 触发时的数值
-     */
-    private Double value;
-
     /**
      * 警告出现的时间
      */

rition-center/common/src/main/java/rition/common/data/entity/ContractEntity.java

@@ -22,6 +22,11 @@ public class ContractEntity {
      */
     private Long id;
 
+    /**
+     * 绑定的实例
+     */
+    private String instanceId;
+
     /**
      * 联系方式
      */

rition-center/common/src/main/java/rition/common/data/entity/RuleEntity.java

@@ -23,29 +23,34 @@ public class RuleEntity {
     private Long id;
 
     /**
-     * 需要计算的指标项或者表达式(expression)
+     * 规则对应的实例id
      */
-    private String expr;
+    private String instanceId;
 
     /**
-     * 触发条件(condition)
+     * 需要计算的指标项或者表达式
      */
-    private Integer cond;
+    private String expression;
+
+    /**
+     * 触发条件
+     */
+    private Integer condition;
 
     /**
      * 阈值
      */
-    private Double threshold;
+    private String threshold;
 
     /**
-     * 触发方法，实时计算或定时计算(trigger)
+     * 触发方法，实时计算或定时计算
      */
-    private Integer trig;
+    private Integer trigger;
 
     /**
      * 规则描述
      */
-    private String comment;
+    private String description;
 
     /**
      * create_time

rition-center/common/src/main/java/rition/common/data/enums/Constants.java

@@ -9,15 +9,4 @@ public class Constants {
         public static final Integer NORMAL = 0;
         public static final Integer DELETED = 1;
     }
-
-    public static class RedisKeys {
-        public static final String RULE_CACHE = "rition:cache:rule";
-        public static final String RECENT_METRIC_CACHE = "rition:cache:metrics";
-        public static final String PROCESS_TRACE = "rition:request:trace:%s";
-    }
-
-    /**
-     * 缓存最近一小时的数据
-     */
-    public static final int MAX_METRIC_CACHE_NUM = 3600/5;
 }

rition-center/common/src/main/java/rition/common/exception/ServiceException.java

@@ -43,14 +43,4 @@ public class ServiceException extends RuntimeException {
     public static void error(int code) throws ServiceException {
         throw new ServiceException(code);
     }
-
-    /**
-     * 直接按错误码抛出异常
-     *
-     * @param code 错误码
-     * @throws ServiceException .
-     */
-    public static void error(ServiceCode code) throws ServiceException {
-        throw new ServiceException(code);
-    }
 }

rition-center/common/src/main/java/rition/common/exception/code/ServiceCode.java

@@ -13,10 +13,7 @@ public enum ServiceCode {
     ParamWrong(10_00_03, "参数错误"),
     PermissionDenied(10_00_04, "权限不足"),
     TokenInvalid(10_00_05, "用户凭据无效，登录态失效"),
-    UnknownErr(10_00_06, "服务器内部错误"),
+    UnknownErr(10_00_06, "服务器内部错误");
-
-    ContractTooManyData(11_00_00, "联系通知信息过多"),
-    ;
 
     private final int code;
 

rition-center/common/src/main/resources/mapper/MetricRecordMapper.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="rition.common.data.dao.mapper.MetricRecordMapper">
-    <resultMap id="metricDataEntity" type="rition.common.data.entity.MetricRecordEntity">
-        <result property="metricData" column="metric_data" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-    </resultMap>
-
-    <select id="getMetricDataGroupByHour" resultMap="metricDataEntity" resultType="rition.common.data.entity.MetricRecordEntity">
-        SELECT JSON_OBJECT(
-            <foreach collection="metricItems" item="metricItem" separator=",">
-                "${metricItem}", ${metricItem}
-            </foreach>
-        ) AS metric_data,
-        t AS time
-        FROM (
-            SELECT
-            <foreach collection="metricItems" item="metricItem">
-                avg(JSON_EXTRACT(metric_data, "$.${metricItem}")) as ${metricItem},
-            </foreach>
-            DATE_FORMAT(time,'%Y-%m-%d %H:00:00') as t
-            FROM record WHERE `time` BETWEEN #{startTime} and #{endTime} and `instance_id` = #{instanceId}
-            GROUP BY t ORDER BY t
-        ) AS tab;
-
-        <!--
-        SELECT
-            JSON_OBJECT('node_sockstat_TCP_tw', node_sockstat_TCP_tw),
-            t AS time
-        FROM (
-            SELECT
-                avg(JSON_EXTRACT(metric_data, "$.node_sockstat_TCP_tw")) node_sockstat_TCP_tw,
-                DATE_FORMAT(time,'%Y-%m-%d %H:00:00') as t
-            FROM record
-            WHERE `time` BETWEEN '2024-04-17 14:00:00' and '2024-04-17 15:00:00'
-            GROUP BY t ORDER BY t
-        ) AS tab
-        -->
-    </select>
-
-    <select id="getMetricDataGroupByMinute" resultMap="metricDataEntity" resultType="rition.common.data.entity.MetricRecordEntity">
-        SELECT JSON_OBJECT(
-            <foreach collection="metricItems" item="metricItem" separator=",">
-                "${metricItem}", ${metricItem}
-            </foreach>
-        ) AS metric_data,
-        t AS time
-        FROM (
-            SELECT
-            <foreach collection="metricItems" item="metricItem">
-                avg(JSON_EXTRACT(metric_data, "$.${metricItem}")) as ${metricItem},
-            </foreach>
-            DATE_FORMAT(time,'%Y-%m-%d %H:%i:00') as t
-            FROM record WHERE `time` BETWEEN #{startTime} and #{endTime} and `instance_id` = #{instanceId}
-            GROUP BY t ORDER BY t
-        ) AS tab;
-    </select>
-
-    <select id="getMetricDataGroupBySomeMinute" resultMap="metricDataEntity" resultType="rition.common.data.entity.MetricRecordEntity">
-        SELECT JSON_OBJECT(
-            <foreach collection="metricItems" item="metricItem" separator=",">
-                "${metricItem}", ${metricItem}
-            </foreach>
-        ) AS metric_data,
-        t AS time
-        FROM (
-            SELECT
-            <foreach collection="metricItems" item="metricItem">
-                avg(JSON_EXTRACT(metric_data, "$.${metricItem}")) as ${metricItem},
-            </foreach>
-            DATE_FORMAT(
-                concat( date( `time` ), ' ', HOUR ( `time` ), ':', floor( MINUTE ( `time` ) / #{minutes} ) * ${minutes} ),
-                '%Y-%m-%d %H:%i:00'
-            ) as t
-            FROM record WHERE `time` BETWEEN #{startTime} and #{endTime} and `instance_id` = #{instanceId}
-            GROUP BY t ORDER BY t
-        ) AS tab;
-    </select>
-
-</mapper>

rition-center/common/src/main/resources/redis/const_len_queue.lua

@@ -1,7 +0,0 @@
-local key = KEYS[1]
-local max_len = tonumber(ARGV[1])
-local val = ARGV[2]
-if (redis.call('llen', key) > max_len) then
-    redis.call('lpop', key)
-end
-redis.call('rpush', key, val)

rition-center/pom.xml

@@ -33,8 +33,6 @@
         <mybatis-sb-starter.version>3.0.3</mybatis-sb-starter.version>
         <mybatis.version>3.5.16</mybatis.version>
         <mybatis-plus.version>3.5.6</mybatis-plus.version>
-
-        <spring-doc.version>2.5.0</spring-doc.version>
     </properties>
 
     <dependencies>
@@ -73,23 +71,6 @@
             <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <!-- swagger -->
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>${spring-doc.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <version>${spring-doc.version}</version>
-        </dependency>
-
         <!-- id生成 -->
         <dependency>
             <groupId>com.github.yitter</groupId>

rition-center/service/collector/src/main/java/rition/service/collector/MetricCollectingService.java

@@ -2,16 +2,12 @@ package rition.service.collector;
 
 import com.github.yitter.idgen.YitIdHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
-import rition.common.data.dao.mapper.MetricRecordMapper;
+import rition.common.data.dto.MetricDataDto;
-import rition.common.data.dto.service.MetricDataDto;
 import rition.common.data.entity.MetricRecordEntity;
-import rition.common.data.enums.Constants;
 import rition.service.collector.configure.CollectorServiceKafkaConfigure;
+import rition.service.collector.dao.mapper.MetricRecordMapper;
 
 import java.time.Instant;
 import java.util.ArrayList;
@@ -29,23 +25,13 @@ public class MetricCollectingService {
 
     private final String collectedDataTopic;
     private final MetricRecordMapper metricRecordMapper;
-    private final RedisTemplate<String, MetricDataDto> redisTemplate;
-
-    private final RedisScript<Object> constLenQueueRedisScript;
 
     public MetricCollectingService(KafkaTemplate<String, MetricDataDto> kafkaTemplate,
                                    CollectorServiceKafkaConfigure collectorServiceKafkaConfigure,
-                                   MetricRecordMapper metricRecordMapper,
+                                   MetricRecordMapper metricRecordMapper) {
-                                   RedisTemplate<String, MetricDataDto> redisTemplate,
-
-                                   @Qualifier("constLenQueueRedisScript") RedisScript<Object> constLenQueueRedisScript) {
-
         this.kafkaTemplate = kafkaTemplate;
         this.collectedDataTopic = collectorServiceKafkaConfigure.getDataCollecting().getTopic();
         this.metricRecordMapper = metricRecordMapper;
-        this.redisTemplate = redisTemplate;
-
-        this.constLenQueueRedisScript = constLenQueueRedisScript;
     }
 
     private static final int METRIC_NUMS = 22;
@@ -61,8 +47,7 @@ public class MetricCollectingService {
     public void receiveData(Map<Long, Map<String, MetricDataDto>> collectedMetricData) {
         List<MetricRecordEntity> batchSaveEntityList = new ArrayList<>(DEFAULT_DB_BATCH_SIZE);
         int turn = 0;
-        List<Long> sortedTime = collectedMetricData.keySet().stream().sorted().toList();
+        for (Long timestamp : collectedMetricData.keySet()) {
-        for (Long timestamp : sortedTime) {
             Map<String, MetricDataDto> instanceMetricData = collectedMetricData.get(timestamp);
             for (String instanceId : instanceMetricData.keySet()) {
                 MetricDataDto metricDataDto = instanceMetricData.get(instanceId);
@@ -79,7 +64,7 @@ public class MetricCollectingService {
                 // kafka发布
                 kafkaTemplate.send(this.collectedDataTopic, metricDataDto);
 
-                // 分批入库，只是针对大批量请求的处理
+                // 分批入库
                 batchSaveEntityList.add(entity);
                 if (turn >= DEFAULT_DB_BATCH_SIZE) {
                     metricRecordMapper.insertBatchSomeColumn(batchSaveEntityList);
@@ -89,13 +74,6 @@ public class MetricCollectingService {
                 } else {
                     turn++;
                 }
-
-                // 缓存最近数据
-                redisTemplate.execute(
-                        constLenQueueRedisScript,
-                        List.of(Constants.RedisKeys.RECENT_METRIC_CACHE),
-                        Constants.MAX_METRIC_CACHE_NUM, metricDataDto
-                );
             }
         }
 

rition-center/service/collector/src/main/java/rition/service/collector/configure/MybatisPlusConfigure.java

@@ -0,0 +1,8 @@
+package rition.service.collector.configure;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MybatisPlusConfigure {
+
+}

rition-center/service/collector/src/main/java/rition/service/collector/dao/BatchSQLInjector.java

@@ -1,4 +1,4 @@
-package rition.common.data.dao;
+package rition.service.collector.dao;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;

rition-center/service/collector/src/main/java/rition/service/collector/dao/mapper/MetricRecordMapper.java

@@ -0,0 +1,12 @@
+package rition.service.collector.dao.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import rition.common.data.entity.MetricRecordEntity;
+
+import java.util.List;
+
+@Mapper
+public interface MetricRecordMapper extends BaseMapper<MetricRecordEntity> {
+    int insertBatchSomeColumn(List<MetricRecordEntity> entityList);
+}

rition-center/service/collector/src/main/resources/mapper/MetricRecordMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="rition.service.collector.dao.mapper.MetricRecordMapper">
+
+</mapper>

rition-center/service/monitor/src/main/java/rition/service/monitor/MonitorService.java

@@ -3,7 +3,7 @@ package rition.service.monitor;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.stereotype.Service;
-import rition.common.data.dto.service.MetricDataDto;
+import rition.common.data.dto.MetricDataDto;
 
 @Service
 public class MonitorService {

rition-center/service/monitor/src/main/resources/application-monitor.yml

@@ -13,7 +13,7 @@ spring:
         spring:
           json:
             trusted:
-              packages: "rition.common.data.*"
+              packages: "rition.common.data.dto"
     producer:
       retries: 4
       compression-type: zstd

rition-center/service/panel/src/main/java/rition/service/panel/AlertHistoryService.java

@@ -1,48 +0,0 @@
-package rition.service.panel;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.stereotype.Service;
-import rition.common.data.dao.mapper.AlertMapper;
-import rition.common.data.dto.PagingData;
-import rition.common.data.entity.AlertEntity;
-import rition.common.data.enums.Constants;
-
-@Service
-public class AlertHistoryService {
-    private final AlertMapper alertMapper;
-
-    public AlertHistoryService(AlertMapper alertMapper) {
-        this.alertMapper = alertMapper;
-    }
-
-    /**
-     * 分页获取报警信息
-     *
-     * @param instanceId 实例id
-     * @param pagingData 分页数据，查询完成后会对此对象进行修改
-     * @return 分页数据，含结果，实际上与参数里的pagingData是同一个对象
-     */
-    public PagingData<AlertEntity> getAlertHistory(String instanceId, PagingData<AlertEntity> pagingData) {
-        LambdaQueryWrapper<AlertEntity> query;
-        if (instanceId != null) {
-            query = new LambdaQueryWrapper<AlertEntity>()
-                    .eq(AlertEntity::getInstanceId, instanceId)
-                    .eq(AlertEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-        } else {
-            query = new LambdaQueryWrapper<AlertEntity>()
-                    .eq(AlertEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-        }
-
-        Page<AlertEntity> page = new Page<>(pagingData.getCurrentPage(), pagingData.getPageSize());
-        var result = alertMapper.selectPage(page, query);
-
-        pagingData.setData(result.getRecords());
-        pagingData.setTotalResult(result.getTotal());
-        pagingData.setTotalPage(result.getPages());
-        pagingData.setCurrentPage(result.getCurrent());
-        pagingData.setPageSize(result.getSize());
-
-        return pagingData;
-    }
-}

rition-center/service/panel/src/main/java/rition/service/panel/AlertRuleService.java

@@ -1,78 +0,0 @@
-package rition.service.panel;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.yitter.idgen.YitIdHelper;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import rition.common.data.dao.mapper.RuleMapper;
-import rition.common.data.dto.service.AlertRuleDto;
-import rition.common.data.dto.service.panel.AlertRuleAddDto;
-import rition.common.data.entity.RuleEntity;
-import rition.common.data.enums.Constants;
-
-import java.time.Instant;
-import java.util.List;
-
-@Service
-public class AlertRuleService {
-
-    private final RuleMapper ruleMapper;
-    private final RedisTemplate<String, AlertRuleDto> redisTemplate;
-
-    public AlertRuleService(RuleMapper ruleMapper,
-                            RedisTemplate<String, AlertRuleDto> redisTemplate) {
-        this.ruleMapper = ruleMapper;
-        this.redisTemplate = redisTemplate;
-    }
-
-    public void addAlertRule(AlertRuleAddDto alertRuleAddDto) {
-        RuleEntity ruleEntity = new RuleEntity();
-        ruleEntity.setId(YitIdHelper.nextId());
-        ruleEntity.setExpr(alertRuleAddDto.getExpression());
-        ruleEntity.setCond(alertRuleAddDto.getCondition());
-        ruleEntity.setThreshold(alertRuleAddDto.getThreshold());
-        ruleEntity.setTrig(alertRuleAddDto.getTrigger());
-        ruleEntity.setComment(alertRuleAddDto.getDescription());
-
-        var now = Instant.now();
-        ruleEntity.setCreateTime(now);
-        ruleEntity.setUpdateTime(now);
-        ruleEntity.setStatus(Constants.EntityCommonStatus.NORMAL);
-
-        ruleMapper.insert(ruleEntity);
-
-        AlertRuleDto alertRuleDto = new AlertRuleDto();
-        alertRuleDto.setId(ruleEntity.getId());
-        alertRuleDto.setExpression(ruleEntity.getExpr());
-        alertRuleDto.setCondition(ruleEntity.getCond());
-        alertRuleDto.setThreshold(ruleEntity.getThreshold());
-        alertRuleDto.setTrigger(ruleEntity.getTrig());
-        alertRuleDto.setDescription(ruleEntity.getComment());
-        alertRuleDto.setCreateTime(now);
-
-        // 规则缓存到redis
-        redisTemplate.opsForHash().put(Constants.RedisKeys.RULE_CACHE, alertRuleDto.getId().toString(), alertRuleDto);
-    }
-
-    public List<RuleEntity> getRule() {
-        var query = new LambdaQueryWrapper<RuleEntity>()
-                .eq(RuleEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-
-        return ruleMapper.selectList(query);
-    }
-
-    public int deleteRule(Long ruleId) {
-        var query = new LambdaUpdateWrapper<RuleEntity>()
-                .set(RuleEntity::getStatus, Constants.EntityCommonStatus.DELETED)
-                .eq(RuleEntity::getId, ruleId)
-                .eq(RuleEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-        var updatedRows = ruleMapper.update(query);
-        // 删除相应的缓存
-        if (updatedRows != 0) {
-            redisTemplate.opsForHash().delete(Constants.RedisKeys.RULE_CACHE, ruleId);
-        }
-
-        return updatedRows;
-    }
-}

rition-center/service/panel/src/main/java/rition/service/panel/ContractService.java

@@ -1,64 +0,0 @@
-package rition.service.panel;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.yitter.idgen.YitIdHelper;
-import org.springframework.stereotype.Service;
-import rition.common.data.dao.mapper.ContractMapper;
-import rition.common.data.dto.service.panel.ContractAddDto;
-import rition.common.data.entity.ContractEntity;
-import rition.common.data.enums.Constants;
-import rition.common.exception.ServiceException;
-import rition.common.exception.code.ServiceCode;
-
-import java.time.Instant;
-import java.util.List;
-
-@Service
-public class ContractService {
-
-    private final ContractMapper contractMapper;
-
-    public ContractService(ContractMapper contractMapper) {
-        this.contractMapper = contractMapper;
-    }
-
-    public List<ContractEntity> getContractList() {
-        var query = new LambdaQueryWrapper<ContractEntity>()
-                .eq(ContractEntity::getStatus, Constants.EntityCommonStatus.NORMAL)
-                .last("limit 100");
-
-        return contractMapper.selectList(query);
-    }
-
-    private static final int MAX_CONTRACT_NUM = 20;
-
-    public void addContract(ContractAddDto contractAddDto) {
-        var countQuery = new LambdaQueryWrapper<ContractEntity>()
-                .eq(ContractEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-        var count = contractMapper.selectCount(countQuery);
-        if (count > MAX_CONTRACT_NUM) {
-            ServiceException.error(ServiceCode.ContractTooManyData);
-        }
-
-        var now = Instant.now();
-        var entity = ContractEntity.builder()
-                .id(YitIdHelper.nextId())
-                .contract(contractAddDto.getContract())
-                .type(contractAddDto.getType())
-                .createTime(now)
-                .updateTime(now)
-                .status(Constants.EntityCommonStatus.NORMAL)
-                .build();
-
-        contractMapper.insert(entity);
-    }
-
-    public void deleteContract(Long id) {
-        var query = new LambdaUpdateWrapper<ContractEntity>()
-                .set(ContractEntity::getStatus, Constants.EntityCommonStatus.DELETED)
-                .eq(ContractEntity::getId, id)
-                .eq(ContractEntity::getStatus, Constants.EntityCommonStatus.NORMAL);
-        contractMapper.update(query);
-    }
-}

rition-center/service/panel/src/main/java/rition/service/panel/MetricService.java

@@ -1,52 +0,0 @@
-package rition.service.panel;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import rition.common.data.dao.mapper.MetricRecordMapper;
-import rition.common.data.entity.MetricRecordEntity;
-
-import java.time.Instant;
-import java.util.List;
-
-@Slf4j
-@Service
-public class MetricService {
-
-    private final MetricRecordMapper metricRecordMapper;
-
-    public MetricService(MetricRecordMapper metricRecordMapper) {
-        this.metricRecordMapper = metricRecordMapper;
-    }
-
-    private static final long HOUR = 3600 * 1000;
-    private static final long DAY = 24 * 3600 * 1000;
-    private static final long MONTH = 30L * 24 * 3600 * 1000;
-
-    /**
-     * 按时间范围获取监测数据
-     *
-     * @param instanceId  实例id
-     * @param metricItems 监测指标项
-     * @param start       开始时间
-     * @param end         结束时间
-     * @return 监测指标数据，指标数据为给定的指标平均统计
-     */
-    public List<MetricRecordEntity> getMetricDataRange(String instanceId,
-                                                       List<String> metricItems,
-                                                       Instant start, Instant end) {
-        // 时间跨度小于6小时：时间粒度为1分钟
-        // 时间跨度大于6小时：时间粒度为5分钟
-        // 时间跨度大于12小时：时间粒度为10分钟
-        // 时间跨度超过15天：时间粒度为小时
-        var diff = end.minusMillis(start.toEpochMilli()).toEpochMilli();
-        if (diff < HOUR * 6) {
-            return metricRecordMapper.getMetricDataGroupByMinute(instanceId, metricItems, start, end);
-        } else if (diff < HOUR * 12) {
-            return metricRecordMapper.getMetricDataGroupBySomeMinute(5, instanceId, metricItems, start, end);
-        } else if (diff < DAY * 15) {
-            return metricRecordMapper.getMetricDataGroupBySomeMinute(10, instanceId, metricItems, start, end);
-        } else {
-            return metricRecordMapper.getMetricDataGroupByHour(instanceId, metricItems, start, end);
-        }
-    }
-}

rition-center/service/panel/src/main/java/rition/service/panel/PanelService.java

@@ -0,0 +1,7 @@
+package rition.service.panel;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class PanelService {
+}

rition-center/service/panel/src/main/resources/application-panel.yml

@@ -1,6 +0,0 @@
-spring:
-  datasource:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/rition?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
-    username: root
-    password: Test2333!

rition-panel/package.json

@@ -17,7 +17,6 @@
     "axios": "^1.2.1",
     "echarts": "^5.5.0",
     "element-plus": "^2.7.2",
-    "moment": "^2.30.1",
     "quasar": "^2.16.0",
     "tailwindcss": "^3.4.3",
     "vue": "^3.4.18",

rition-panel/quasar.config.js

@@ -82,15 +82,7 @@ module.exports = configure(function (/* ctx */) {
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
     devServer: {
       // https: true
-      open: false, // opens browser window automatically
+      open: false // opens browser window automatically
-      proxy: {
-        // with options
-        '/api': {
-          target: 'http://127.0.0.1:8000',
-          changeOrigin: true,
-          // rewrite: (path) => path.replace(/^\/api/, '/api')
-        }
-      }
     },
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
@@ -108,7 +100,7 @@ module.exports = configure(function (/* ctx */) {
       // directives: [],
       lang: 'zh-CN',
       // Quasar plugins
-      plugins: ['Dialog', 'Loading']
+      plugins: []
     },
 
     // animations: 'all', // --- includes all animations

rition-panel/src/boot/axios.js

@@ -7,10 +7,7 @@ import axios from 'axios'
 // good idea to move this instance creation inside of the
 // "export default () => {}" function below (which runs individually
 // for each client)
-const api = axios.create({
+const api = axios.create({ baseURL: 'https://api.example.com' })
-  baseURL: window.location.origin + "/api",
-  timeout: 10 * 1000
-})
 
 export default boot(({ app }) => {
   // for use inside Vue files (Options API) through this.$axios and this.$api

rition-panel/src/css/app.scss

@@ -2,7 +2,3 @@
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-
-html, body, #q-app {
-  height: 100%;
-}

rition-panel/src/layouts/MainLayout.vue

@@ -24,7 +24,7 @@
       </q-list>
     </q-drawer>
 
-    <q-page-container class="h-full">
+    <q-page-container>
       <router-view/>
     </q-page-container>
   </q-layout>
@@ -45,7 +45,7 @@ const linksList = [
     link: '/'
   },
   {
-    title: '通知设置',
+    title: '通知信息',
     icon: 'notifications',
     link: '/contract'
   },

rition-panel/src/pages/AlertListPage.vue

@@ -1,58 +1,17 @@
 <script setup>
 import {ref} from "vue";
-import {api} from "boot/axios";
-import moment from "moment";
-import {useQuasar} from "quasar";
 
-const quasar = useQuasar()
-
-const alertList = ref([])
-
-const instanceId = ref()
-
-function getAlerts() {
-  api.get('/panel/alerts/list')
-    .then(resp => {
-      const response = resp.data
-      const data = response.data
-      alertList.value = data.data
-    })
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-getAlerts()
 </script>
 
 <template>
   <div class="flex flex-col gap-2 p-2">
-    <div class="flex flex-row gap-4 items-center">
-
-      <q-input class="w-96" v-model="instanceId" label="实例ID"/>
-
-      <q-separator vertical></q-separator>
-
-      <q-btn unelevated color="primary" @click="getAlerts">刷新</q-btn>
-    </div>
 
-    <el-table :data="alertList" border style="width: 100%;height: 100%">
+    <el-table border style="width: 100%" height="250">
       <el-table-column fixed prop="id" label="ID"/>
       <el-table-column prop="instanceId" label="实例ID"/>
       <el-table-column prop="rule" label="触发规则"/>
       <el-table-column prop="value" label="触发值"/>
-      <el-table-column label="时间">
+      <el-table-column prop="time" label="时间"/>
-        <template #default="scope">
-          <span>{{ moment(scope.row.time).format("YYYY-MM-DD HH:mm:ss") }}</span>
-        </template>
-      </el-table-column>
     </el-table>
 
   </div>

rition-panel/src/pages/ContractPage.vue

@@ -1,10 +1,5 @@
 <script setup>
 import {reactive, ref} from "vue";
-import {api} from "boot/axios";
-import moment from "moment/moment";
-import {useQuasar} from "quasar";
-
-const quasar = useQuasar()
 
 const addDialogPanelOpen = ref(false)
 
@@ -13,74 +8,10 @@ const addDialogPanelOpen = ref(false)
  * @type {{contract: string, type: number}}
  */
 const form = reactive({
-  contract: '',
+  contract:'',
   type: undefined
 })
 
-const contractList = ref([])
-
-function getContractList() {
-  api.get('/panel/contract/list')
-    .then(r => {
-      contractList.value = r.data.data
-    })
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-getContractList()
-
-function addContract() {
-  api.post('/panel/contract/add', form)
-    .then(() => getContractList())
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-function deleteContract(id) {
-  api.post('/panel/contract/delete', undefined, {
-    params: {
-      id: id
-    }
-  })
-    .then(() => getContractList())
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-const deleteDialogOpen = ref(false)
-const deleteId = ref()
-
-const contractTypeText = {
-  "0": "电话",
-  "1": "短信",
-  "2": "邮件",
-}
-
 </script>
 
 <template>
@@ -89,34 +20,24 @@ const contractTypeText = {
       <q-btn unelevated color="primary" @click="addDialogPanelOpen = !addDialogPanelOpen">添加</q-btn>
     </div>
 
-    <el-table :data="contractList" border style="width: 100%;height: 100%">
+    <el-table border style="width: 100%" height="250">
       <el-table-column fixed prop="id" label="ID"/>
+      <el-table-column prop="instanceId" label="实例ID"/>
       <el-table-column prop="contract" label="联系信息"/>
-      <el-table-column label="类型">
+      <el-table-column prop="type" label="类型"/>
-        <template #default="scope">
+      <el-table-column prop="addTime" label="添加时间"/>
-          <span>{{ contractTypeText[scope.row.type] }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="添加时间">
-        <template #default="scope">
-          <span>{{ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作">
-        <template #default="scope">
-          <q-btn unelevated color="red" @click="deleteDialogOpen = true;deleteId = scope.row.id">删除</q-btn>
-        </template>
-      </el-table-column>
     </el-table>
 
     <el-dialog v-model="addDialogPanelOpen" title="添加联系信息" width="500">
       <el-form :model="form">
-        <el-form-item label="联系信息">
+        <el-form-item label="联系信息" >
-          <el-input v-model="form.contract" autocomplete="off"/>
+          <el-input v-model="form.contract" autocomplete="off" />
         </el-form-item>
         <el-form-item label="联系方式">
           <el-select v-model="form.type" placeholder="选择一个联系方式">
-            <el-option v-for="(name, val) in contractTypeText" :key="val" :label="name" :value="val"/>
+            <el-option label="电话" value="0" />
+            <el-option label="短信" value="1" />
+            <el-option label="邮件" value="2" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -124,19 +45,7 @@ const contractTypeText = {
       <template #footer>
         <div class="dialog-footer">
           <q-btn unelevated @click="addDialogPanelOpen = false">取消</q-btn>
-          <q-btn class="ml-2" unelevated color="primary" @click="addDialogPanelOpen = false;addContract()">确认</q-btn>
+          <q-btn class="ml-2" unelevated color="primary" @click="addDialogPanelOpen = false">确认</q-btn>
-        </div>
-      </template>
-    </el-dialog>
-
-    <el-dialog v-model="deleteDialogOpen" title="确认" width="500">
-      <span>确认删除？</span>
-      <template #footer>
-        <div class="dialog-footer flex flex-row gap-2 justify-end">
-          <q-btn unelevated @click="deleteDialogOpen = false">取消</q-btn>
-          <q-btn unelevated color="red" @click="deleteDialogOpen = false;deleteContract(deleteId)">
-            确认
-          </q-btn>
         </div>
       </template>
     </el-dialog>

rition-panel/src/pages/MetricPage.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {ref, provide, reactive, computed} from "vue";
+import {ref, provide, reactive} from "vue";
 
 import VChart, {THEME_KEY} from "vue-echarts";
 
@@ -7,8 +7,7 @@ import {use} from 'echarts/core'
 import {LineChart} from 'echarts/charts'
 import {GridComponent, LegendComponent, TitleComponent, TooltipComponent} from 'echarts/components'
 import {CanvasRenderer} from 'echarts/renderers'
-import {api} from "boot/axios";
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs';
-import {useQuasar} from "quasar";
 
 use([
   GridComponent,
@@ -21,161 +20,45 @@ use([
 
 // provide(THEME_KEY, "dark");
 
-const options = ref([])
+const option = reactive({
-
+  grid: {
-const timeRange = ref([
+    left: "1%",
-  new Date('2024-04-17 12:00:00'),
+    right: "2%",
-  new Date('2024-04-17 16:00:00'),
+    top: "20%",
-])
+    bottom: "1%",
-
+    containLabel: true
-const availableMetricItems = [
-  "up",
-  "node_load5",
-  "node_sockstat_TCP_tw",
-  "node_cpu_seconds_total",
-  "node_memory_Cached_bytes",
-  "node_memory_Buffers_bytes",
-  "node_memory_MemFree_bytes",
-  "node_disk_read_bytes_total",
-  "node_filesystem_free_bytes",
-  "node_filesystem_size_bytes",
-  "node_memory_MemTotal_bytes",
-  "node_netstat_Tcp_CurrEstab",
-  "node_filesystem_avail_bytes",
-  "node_disk_written_bytes_total",
-  "node_disk_reads_completed_total",
-  "node_network_receive_drop_total",
-  "node_disk_writes_completed_total",
-  "node_network_receive_bytes_total",
-  "node_network_transmit_drop_total",
-  "node_network_transmit_bytes_total",
-  "node_network_receive_packets_total",
-  "node_network_transmit_packets_total",
-]
-
-const metricText = {
-  "up": "服务器离线/上线",
-  "node_load5": "5分钟负载",
-  "node_sockstat_TCP_tw": "TIME-WAIT连接",
-  "node_cpu_seconds_total": "CPU使用时间",
-  "node_memory_Cached_bytes": "缓存内存",
-  "node_memory_Buffers_bytes": "缓冲内存",
-  "node_memory_MemFree_bytes": "空闲内存",
-  "node_disk_read_bytes_total": "磁盘读总字节",
-  "node_disk_written_bytes_total": "磁盘写总字节",
-  "node_filesystem_free_bytes": "文件系统空闲空间",
-  "node_filesystem_size_bytes": "文件系统总大小",
-  "node_memory_MemTotal_bytes": "总内存",
-  "node_netstat_Tcp_CurrEstab": "已连接TCP数",
-  "node_filesystem_avail_bytes": "文件系统可用空间",
-  "node_disk_reads_completed_total": "磁盘IO读次数",
-  "node_disk_writes_completed_total": "磁盘IO写次数",
-  "node_network_receive_drop_total": "接收丢包数",
-  "node_network_transmit_drop_total": "发送丢包数",
-  "node_network_receive_bytes_total": "接收总字节",
-  "node_network_transmit_bytes_total": "发送总字节",
-  "node_network_receive_packets_total": "总接收包数",
-  "node_network_transmit_packets_total": "总发送包数"
-}
-
-/**
- *
- * @type {import('vue').Ref<string[]>}
- */
-const selectedMetric = ref([
-  "node_cpu_seconds_total",
-  "node_memory_MemFree_bytes",
-  "node_filesystem_free_bytes",
-  "node_disk_read_bytes_total",
-  "node_disk_written_bytes_total",
-  "node_network_receive_bytes_total",
-  "node_network_transmit_bytes_total",
-  "node_network_receive_packets_total",
-  "node_network_transmit_packets_total",
-])
-
-const instanceId = ref('7273a1ea-0089-4674-b606-b1b8d809d866')
-
-const quasar = useQuasar()
-
-/**
- * @typedef {{
- *   "instanceId": string,
- *   "start": number,
- *   "end": number,
- *   "metricItems": string[]
- * }} MetricRequest
- */
-function getMetricData() {
-  api.post('/panel/metrics/list', {
-    instanceId: instanceId.value,
-    start: Number(timeRange.value[0]),
-    end: Number(timeRange.value[1]),
-    metricItems: selectedMetric.value
-  })
-    .then(r => {
-      const response = r.data
-      if (response.code != 0) {
-        throw response.message
-      }
-      const opts = []
-      const metricOptionsMap = new Map
-      for (const selectedMetricElement of selectedMetric.value) {
-        metricOptionsMap.set(selectedMetricElement, {
-          grid: {left: "1%", right: "2%", top: "20%", bottom: "1%", containLabel: true},
-          title: {text: metricText[selectedMetricElement], left: "center", textStyle: {fontSize: 16}},
-          tooltip: {trigger: 'axis'},
-          xAxis: {
-            type: 'time'
   },
-          yAxis: {
+  title: {
-            type: 'value', scale: true,
+    text: "CPU使用率",
-            axisLabel: {
+    left: "center",
-              color: '#444343',
+    textStyle: {
-              formatter: function (value, index) {
+      fontSize: 16
-                if (value >= 1e9) {
-                  return (value / 1e9).toFixed(2) + 'G';
-                } else if (value >= 1e6) {
-                  return (value / 1e6).toFixed(2) + 'M';
-                } else if (value >= 1e3) {
-                  return (value / 1e3).toFixed(2) + 'K';
-                } else {
-                  return value;
     }
   },
+  tooltip: {
+    trigger: 'axis'
   },
-          },
+  xAxis: {},
-          series: [{data: [], type: 'line', smooth: true}]
+  yAxis: {},
-        })
+  series: [
+    {
+      data: [
+        [0, 20],
+        [10, 10],
+        [20, 64],
+        [40, 12],
+        [50, 15],
+      ],
+      type: 'line',
+      smooth: true
     }
+  ]
+});
 
-      const data = response.data.metricData
+const timeRange = ref([
-      for (const metric in data) {
+  new Date(Number(new Date()) - 86400000),
-        const metricDataItem = data[metric]
+  new Date()
-        for (let i = 0; i < metricDataItem.time.length; i++) {
+])
-          metricOptionsMap.get(metric).series[0].data.push([metricDataItem.time[i], metricDataItem.value[i]])
-        }
-      }
-
-      for (const metricOptionsMapElement of metricOptionsMap.values()) {
-        opts.push(metricOptionsMapElement)
-      }
-
-      options.value = opts
-    })
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-getMetricData()
 
 </script>
 
@@ -187,29 +70,23 @@ getMetricData()
         <el-date-picker v-model="timeRange" type="datetimerange"/>
       </div>
 
-      <q-separator vertical></q-separator>
-      <q-select filled dense options-dense
-                v-model="selectedMetric"
-                multiple
-                :options="availableMetricItems"
-                :option-label="opt => metricText[opt]"
-                label="想要查看的指标数据"
-                style="width: 35rem"
-                transition-show="jump-up"
-                transition-hide="jump-up"
-      />
-
-      <q-separator vertical></q-separator>
-
-      <q-input class="flex-1" v-model="instanceId" label="实例ID"/>
-
       <q-separator vertical></q-separator>
 
-      <q-btn unelevated color="primary" @click="getMetricData">刷新</q-btn>
+      <q-btn unelevated color="primary">刷新</q-btn>
     </div>
 
     <div class="flex flex-row gap-10">
-      <v-chart v-for="option in options" :key="option" :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
+      <v-chart :autoresize=true class="chart" :option="option"/>
     </div>
   </div>
 </template>

rition-panel/src/pages/RulePage.vue

@@ -1,18 +1,12 @@
 <script setup>
 import {reactive, ref} from "vue";
-import {api} from "boot/axios";
-import moment from "moment/moment";
-import {useQuasar} from "quasar";
-
-const quasar = useQuasar()
 
 const addDialogPanelOpen = ref(false)
-
 /**
  *
  * @type {{condition: number, expression: string, description: string, threshold: string, trigger: number}}
  */
-const ruleForm = reactive({
+const form = reactive({
   expression: "",
   condition: undefined,
   threshold: "",
@@ -20,151 +14,57 @@ const ruleForm = reactive({
   description: ""
 })
 
-const rules = ref([])
-
-function getRules() {
-  api.get('/panel/rules/list')
-    .then(r => {
-      const response = r.data
-      rules.value = response.data
-    })
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-getRules()
-
-function addRule() {
-  api.post('/panel/rules/add', ruleForm)
-    .then(() => getRules())
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-function deleteRule(id) {
-  api.post('/panel/rules/delete', undefined, {
-    params: {
-      id: id
-    }
-  })
-    .then(() => getRules())
-    .catch(msg => {
-      quasar.dialog({
-        title: '啊哈',
-        message: `请求时出现问题：${msg}`
-      })
-    })
-    .finally(() => quasar.loading.hide())
-  quasar.loading.show({
-    message: '与服务器通信中...'
-  })
-}
-
-const deleteDialogOpen = ref(false)
-const deleteId = ref()
-
-const triggerTypeNames = {
-  "0": "立即计算",
-  "1": "定时计算",
-}
-
-const conditionNames = {
-  "0": "小于\t<",
-  "1": "小于等于\t<=",
-  "2": "等于\t==",
-  "3": "大于等于\t>=",
-  "4": "大于\t>",
-}
 </script>
 
 <template>
-  <div class="h-full flex flex-col gap-2 p-2">
+  <div class="flex flex-col gap-2 p-2">
     <div class="flex flex-row gap-4">
       <q-btn unelevated color="primary" @click="addDialogPanelOpen = !addDialogPanelOpen">添加</q-btn>
     </div>
 
-    <el-table class="h-full" :data="rules" border style="width: 100%;height: 100%">
+    <el-table border style="width: 100%" height="250">
       <el-table-column fixed prop="id" label="ID"/>
-      <el-table-column prop="expression" label="计算指标或表达式"/>
+      <el-table-column prop="instanceId" label="实例ID"/>
-      <el-table-column label="判断条件">
+      <el-table-column prop="expression" label="计算值"/>
-        <template #default="scope">
+      <el-table-column prop="condition" label="条件"/>
-          <span>{{ conditionNames[scope.row.condition] }}</span>
-        </template>
-      </el-table-column>
       <el-table-column prop="threshold" label="阈值"/>
-      <el-table-column label="触发类型">
+      <el-table-column prop="trigger" label="触发类型"/>
-        <template #default="scope">
-          <span>{{ triggerTypeNames[scope.row.trigger] }}</span>
-        </template>
-      </el-table-column>
       <el-table-column prop="description" label="备注"/>
-      <el-table-column label="时间">
+      <el-table-column prop="addTime" label="添加时间"/>
-        <template #default="scope">
-          <span>{{ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作">
-        <template #default="scope">
-          <q-btn unelevated color="red" @click="deleteDialogOpen = true;deleteId = scope.row.id">删除</q-btn>
-        </template>
-      </el-table-column>
     </el-table>
 
     <el-dialog v-model="addDialogPanelOpen" title="添加联系信息" width="500">
-      <el-form :model="ruleForm">
+      <el-form :model="form">
-        <el-form-item label="值">
+          <el-form-item label="值" >
-          <el-input v-model="ruleForm.expression" autocomplete="off"/>
+            <el-input v-model="form.expression" autocomplete="off" />
           </el-form-item>
           <el-form-item label="条件">
-          <el-select v-model="ruleForm.condition" placeholder="选择判断条件">
+            <el-select v-model="form.condition" placeholder="选择判断条件">
-            <el-option v-for="(name, val) in conditionNames" :key="val" :label="name" :value="val"/>
+              <el-option label="<" value="0" />
+              <el-option label="<=" value="1" />
+              <el-option label="=" value="2" />
+              <el-option label=">=" value="3" />
+              <el-option label=">" value="4" />
             </el-select>
           </el-form-item>
-        <el-form-item label="阈值">
+          <el-form-item label="阈值" >
-          <el-input v-model="ruleForm.threshold" autocomplete="off"/>
+            <el-input v-model="form.threshold" autocomplete="off" />
           </el-form-item>
           <el-form-item label="触发类型">
-          <el-select v-model="ruleForm.trigger" placeholder="选择触发类型">
+            <el-select v-model="form.trigger" placeholder="选择触发类型">
-            <el-option v-for="(name, val) in triggerTypeNames" :key="val" :label="name" :value="val"/>
+              <el-option label="立即计算" value="0" />
+              <el-option label="定时计算" value="1" />
             </el-select>
           </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="ruleForm.description" type="textarea"></el-input>
+          <el-input v-model="form.description" type="textarea"></el-input>
         </el-form-item>
       </el-form>
 
       <template #footer>
         <div class="dialog-footer">
           <q-btn unelevated @click="addDialogPanelOpen = false">取消</q-btn>
-          <q-btn class="ml-2" unelevated color="primary" @click="addDialogPanelOpen = false;addRule()">确认</q-btn>
+          <q-btn class="ml-2" unelevated color="primary" @click="addDialogPanelOpen = false">确认</q-btn>
-        </div>
-      </template>
-    </el-dialog>
-
-    <el-dialog v-model="deleteDialogOpen" title="确认" width="500">
-      <span>确认删除？</span>
-      <template #footer>
-        <div class="dialog-footer flex flex-row gap-2 justify-end">
-          <q-btn unelevated @click="deleteDialogOpen = false">取消</q-btn>
-          <q-btn unelevated color="red" @click="deleteDialogOpen = false;deleteRule(deleteId)">
-            确认
-          </q-btn>
         </div>
       </template>
     </el-dialog>

rition-panel/yarn.lock

@@ -2455,11 +2455,6 @@ minimist@^1.2.6:
   resolved "https://registry.npmmirror.com/minipass/-/minipass-7.1.0.tgz#b545f84af94e567386770159302ca113469c80b8"
   integrity sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==
 
-moment@^2.30.1:
-  version "2.30.1"
-  resolved "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
-  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

rition-probe/client/http.go

@@ -40,7 +40,7 @@ func (c *Client) Report(dataItem []DataItem) (*ReportResponse, error) {
 			Metric:    item.Metric,
 			Value:     item.Value,
 			Tags:      tags,
-			Timestamp: time.Now().Unix(),
+			Timestamp: time.Now().UnixMilli(),
 		})
 	}
 
@@ -49,6 +49,8 @@ func (c *Client) Report(dataItem []DataItem) (*ReportResponse, error) {
 		return nil, err
 	}
 
+	fmt.Println(string(reportJsonBytes))
+
 	// send report data
 	resp, err := http.Post(c.config.CenterServer, "application/json", bytes.NewBuffer(reportJsonBytes))
 	if err != nil {

rition-probe/main.go

@@ -14,7 +14,7 @@ func main() {
 	diskDevice := flag.String("disk_dev", "", "监控的硬盘设备")
 	mount := flag.String("mount", "/", "监控的分区挂载位置")
 	netInterface := flag.String("net_dev", "", "监控的网卡设备")
-	interval := flag.Int("interval", 5, "上报间隔，单位为秒")
+	interval := flag.Int("interval", 30, "上报间隔，单位为秒")
 	flag.Parse()
 
 	hostname, _ := os.Hostname()