Selaa lähdekoodia

20230807-完善监控api

iaun 3 vuotta sitten
vanhempi
sitoutus
8e5078678f

+ 4 - 2
src/main/java/cn/iaun/it/config/WebMvcConfig.java

@@ -16,11 +16,13 @@ public class WebMvcConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(getTokenInterceptor())
                 .addPathPatterns("/**")
-                .excludePathPatterns("/user/login");
+                .excludePathPatterns("/user/login")
+                .excludePathPatterns("/api/**");
 
         registry.addInterceptor(getPermissionInterceptor())
                 .addPathPatterns("/*/**")
-                .excludePathPatterns("/user/**");
+                .excludePathPatterns("/user/**")
+                .excludePathPatterns("/api/**");
 
         WebMvcConfigurer.super.addInterceptors(registry);
     }

+ 30 - 0
src/main/java/cn/iaun/it/controller/ItMonitorApiController.java

@@ -0,0 +1,30 @@
+package cn.iaun.it.controller;
+
+import cn.iaun.it.model.vo.monitor.controller.ItMonitorApiDataSetReqVo;
+import cn.iaun.it.service.ItMonitorService;
+import cn.iaun.it.util.Result;
+import org.springframework.validation.annotation.Validated;
+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 javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/api/monitor")
+public class ItMonitorApiController {
+    private final ItMonitorService itMonitorService;
+
+    public ItMonitorApiController(ItMonitorService itMonitorService) {
+        this.itMonitorService = itMonitorService;
+    }
+
+    @PostMapping("/data/set")
+    public Result<?> setMonitorData(HttpServletRequest request, @Validated @RequestBody ItMonitorApiDataSetReqVo itMonitorApiDataSetReqVo) {
+
+        String ip = request.getRemoteAddr();
+        System.out.println(ip);
+        return null;
+    }
+}

+ 4 - 0
src/main/java/cn/iaun/it/model/ItMonitorData.java

@@ -1,11 +1,15 @@
 package cn.iaun.it.model;
 
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 public class ItMonitorData {
+    @NotNull
     private Long resourceId;
+    @NotNull
     private Long itemId;
     private Date recordTime;
+    @NotNull
     private String data;
 
     @Override

+ 25 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorApiDataSetReqVo.java

@@ -0,0 +1,25 @@
+package cn.iaun.it.model.vo.monitor.controller;
+
+import cn.iaun.it.model.ItMonitorData;
+
+import javax.validation.constraints.NotBlank;
+
+public class ItMonitorApiDataSetReqVo extends ItMonitorData {
+    @NotBlank
+    private String agentKey;
+
+    @Override
+    public String toString() {
+        return "ItMonitorApiDataSetReqVo{" +
+                "agentKey='" + agentKey + '\'' +
+                "}\n" + super.toString();
+    }
+
+    public String getAgentKey() {
+        return agentKey;
+    }
+
+    public void setAgentKey(String agentKey) {
+        this.agentKey = agentKey;
+    }
+}

+ 55 - 11
src/main/resources/db/data.sql

@@ -125,14 +125,58 @@ values (1, 1, '服务器111'),
 ;
 
 delete
-from `it_monitor_data`;
-INSERT INTO `it_monitor_data` (`resource_id`, `item_id`, `record_time`, `data`)
-VALUES (1, 1, '2023-08-04 14:54:25', '1234');
-INSERT INTO `it_monitor_data` (`resource_id`, `item_id`, `record_time`, `data`)
-VALUES (1, 1, '2023-08-05 14:54:36', '4321');
-INSERT INTO `it_monitor_data` (`resource_id`, `item_id`, `record_time`, `data`)
-VALUES (1, 2, '2023-08-04 15:00:32', '1111');
-INSERT INTO `it_monitor_data` (`resource_id`, `item_id`, `record_time`, `data`)
-VALUES (1, 2, '2023-08-05 15:00:48', '2222');
-INSERT INTO `it_monitor_data` (`resource_id`, `item_id`, `record_time`, `data`)
-VALUES (3, 3, '2023-08-05 15:04:29', '3333');
+from `it_monitor_template`;
+INSERT INTO `it_monitor_template` (`template_id`, `template_name`)
+VALUES (1, '模板1');
+INSERT INTO `it_monitor_template` (`template_id`, `template_name`)
+VALUES (2, '模板2');
+INSERT INTO `it_monitor_template` (`template_id`, `template_name`)
+VALUES (3, '模板3');
+INSERT INTO `it_monitor_template` (`template_id`, `template_name`)
+VALUES (4, '模板4');
+
+delete
+from `it_monitor_resource_group`;
+INSERT INTO `it_monitor_resource_group` (`group_id`, `group_name`)
+VALUES (1, '资源组1');
+INSERT INTO `it_monitor_resource_group` (`group_id`, `group_name`)
+VALUES (2, '资源组2');
+INSERT INTO `it_monitor_resource_group` (`group_id`, `group_name`)
+VALUES (3, '资源组3');
+
+delete
+from `it_monitor_resource`;
+INSERT INTO `it_monitor_resource` (`resource_id`, `template_id`, `agent_id`, `resource_group_id`, `resource_name`)
+VALUES (1, 1, 1, 1, '资源1');
+INSERT INTO `it_monitor_resource` (`resource_id`, `template_id`, `agent_id`, `resource_group_id`, `resource_name`)
+VALUES (2, 1, 2, 2, '资源2');
+
+
+delete
+from `it_monitor_agent_key`;
+INSERT INTO `it_monitor_agent_key` (`agent_key_id`, `key`, `remark`)
+VALUES (1, '123456', '备注1');
+INSERT INTO `it_monitor_agent_key` (`agent_key_id`, `key`, `remark`)
+VALUES (2, '654321', '');
+
+delete
+from `it_monitor_agent`;
+INSERT INTO `it_monitor_agent` (`agent_id`, `agent_name`, `agent_ip`, `agent_key_id`)
+VALUES (1, 'agent1_local', '127.0.0.1', 1);
+
+delete
+from `it_monitor_item_group`;
+INSERT INTO `it_monitor_item_group` (`group_id`, `group_name`, `template_id`, `interval`, `top_item_id`)
+VALUES (1, '指标组1', 1, 5, -1);
+
+delete
+from `it_monitor_item`;
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (1, 'item1', 'group1.item1', 1, 1);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (2, 'item2', 'group1.item2', 1, 2);
+
+delete
+from `it_monitor_threshold`;
+INSERT INTO `it_monitor_threshold` (`item_id`, `resource_id`, `alarm_type`, `threshold_type`, `threshold`, `times`)
+VALUES (1, 1, 0, 2, '50', 5);