Просмотр исходного кода

20230811-添加agent初始化接口

iaun 3 лет назад
Родитель
Сommit
a8a53b19f0

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

@@ -2,7 +2,11 @@ package cn.iaun.it.controller;
 
 import cn.iaun.it.model.ItMonitorData;
 import cn.iaun.it.model.ItMonitorItem;
+import cn.iaun.it.model.ItMonitorItemGroup;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
+import cn.iaun.it.model.vo.monitor.controller.ItMonitorApiAgentInitReqVo;
 import cn.iaun.it.model.vo.monitor.controller.ItMonitorApiDataSetReqVo;
 import cn.iaun.it.service.ItMonitorService;
 import cn.iaun.it.util.Result;
@@ -99,4 +103,51 @@ public class ItMonitorApiController {
         }
         return new Result<>(ResultCode.FAILED);
     }
+
+    @PostMapping("/agent/init")
+    public Result<List<ItMonitorApiAgentInitVo>> agentInit(HttpServletRequest request, @Validated @RequestBody ItMonitorApiAgentInitReqVo reqVo) {
+        String ip = request.getRemoteAddr();
+        System.out.println(reqVo);
+        System.out.println(ip);
+
+        boolean auth = itMonitorService.apiAuthCheck(reqVo.getResourceId(), ip, reqVo.getKey());
+        if (!auth) {
+            return new Result<>(ResultCode.AGENT_KEY_ERROR);
+        }
+        List<ItMonitorApiAgentInitItemGroupVo> itemGroups = itMonitorService.apiGetItemGroupsByResourceId(reqVo.getResourceId());
+
+        if (itemGroups.isEmpty()) {
+            return new Result<>(ResultCode.FAILED_PARAM_INVALID);
+        }
+        List<Long> groupIds = new ArrayList<>();
+
+        for (ItMonitorApiAgentInitItemGroupVo item : itemGroups) {
+            groupIds.add(item.getGroupId());
+        }
+
+        List<ItMonitorItem> items = itMonitorService.apiGetItemsByItemGroupIds(groupIds);
+        Map<Long, List<ItMonitorItem>> map = new HashMap<>();
+        for (ItMonitorItem item : items) {
+            if (!map.containsKey(item.getItemGroupId())) {
+                map.put(item.getItemGroupId(), new ArrayList<>());
+            }
+            map.get(item.getItemGroupId()).add(item);
+        }
+
+        for (ItMonitorApiAgentInitItemGroupVo group : itemGroups) {
+            group.setItems(map.get(group.getGroupId()));
+        }
+
+
+        List<ItMonitorApiAgentInitVo> results = new ArrayList<>();
+        for (ItMonitorApiAgentInitItemGroupVo group : itemGroups) {
+            ItMonitorApiAgentInitVo vo = new ItMonitorApiAgentInitVo();
+            vo.setItemGroupId(group.getGroupId());
+            vo.setData(group);
+            results.add(vo);
+        }
+
+        return new Result<>(ResultCode.SUCCESS, results);
+    }
+
 }

+ 4 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorItemGroupMapper.java

@@ -1,10 +1,14 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItMonitorItemGroup;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ItMonitorItemGroupMapper extends BaseMapper<ItMonitorItemGroup> {
     Long getByGroupId(Long groupId);
+    List<ItMonitorApiAgentInitItemGroupVo> selectByResourceId(Long resourceId);
 }

+ 4 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorItemMapper.java

@@ -4,7 +4,11 @@ import cn.iaun.it.model.ItMonitorItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ItMonitorItemMapper extends BaseMapper<ItMonitorItem> {
     Long selectByItemId(Long itemId, Long groupId);
+
+    List<ItMonitorItem> selectByItemGroupId(List<Long> itemGroupIds);
 }

+ 2 - 0
src/main/java/cn/iaun/it/mapper/ItMonitorResourceMapper.java

@@ -2,8 +2,10 @@ package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItMonitorResource;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface ItMonitorResourceMapper extends BaseMapper<ItMonitorResource> {
+    Boolean apiAuthCheck(Long resourceId, String agentIP, String agentKey);
 }

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

@@ -0,0 +1,25 @@
+package cn.iaun.it.model.vo.monitor;
+
+import cn.iaun.it.model.ItMonitorItem;
+import cn.iaun.it.model.ItMonitorItemGroup;
+
+import java.util.List;
+
+public class ItMonitorApiAgentInitItemGroupVo extends ItMonitorItemGroup {
+    private List<ItMonitorItem> items;
+
+    @Override
+    public String toString() {
+        return "ItMonitorApiAgentInitItemGroupVo{" +
+                "items=" + items +
+                '}' + super.toString();
+    }
+
+    public List<ItMonitorItem> getItems() {
+        return items;
+    }
+
+    public void setItems(List<ItMonitorItem> items) {
+        this.items = items;
+    }
+}

+ 32 - 0
src/main/java/cn/iaun/it/model/vo/monitor/ItMonitorApiAgentInitVo.java

@@ -0,0 +1,32 @@
+package cn.iaun.it.model.vo.monitor;
+
+import java.util.List;
+
+public class ItMonitorApiAgentInitVo {
+    private Long itemGroupId;
+    private ItMonitorApiAgentInitItemGroupVo data;
+
+    @Override
+    public String toString() {
+        return "ItMonitorApiAgentInitVo{" +
+                "itemGroupId=" + itemGroupId +
+                ", data=" + data +
+                '}';
+    }
+
+    public Long getItemGroupId() {
+        return itemGroupId;
+    }
+
+    public void setItemGroupId(Long itemGroupId) {
+        this.itemGroupId = itemGroupId;
+    }
+
+    public ItMonitorApiAgentInitItemGroupVo getData() {
+        return data;
+    }
+
+    public void setData(ItMonitorApiAgentInitItemGroupVo data) {
+        this.data = data;
+    }
+}

+ 30 - 0
src/main/java/cn/iaun/it/model/vo/monitor/controller/ItMonitorApiAgentInitReqVo.java

@@ -0,0 +1,30 @@
+package cn.iaun.it.model.vo.monitor.controller;
+
+public class ItMonitorApiAgentInitReqVo {
+    private Long resourceId;
+    private String key;
+
+    @Override
+    public String toString() {
+        return "ItMonitorApiAgentInitReqVo{" +
+                "resourceId=" + resourceId +
+                ", key='" + key + '\'' +
+                '}';
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}

+ 7 - 0
src/main/java/cn/iaun/it/service/ItMonitorService.java

@@ -1,6 +1,7 @@
 package cn.iaun.it.service;
 
 import cn.iaun.it.model.*;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -107,4 +108,10 @@ public interface ItMonitorService {
 
     // apis
     ItMonitorApiDataResourceInfoVo apiGetDataResourceInfo(Long resourceId, String ip);
+
+    boolean apiAuthCheck(Long resourceId, String agentIP, String agentKey);
+
+    List<ItMonitorApiAgentInitItemGroupVo> apiGetItemGroupsByResourceId(Long resourceId);
+
+    List<ItMonitorItem> apiGetItemsByItemGroupIds(List<Long> itemGroupIds);
 }

+ 20 - 0
src/main/java/cn/iaun/it/service/impl/ItMonitorServiceImpl.java

@@ -2,6 +2,7 @@ package cn.iaun.it.service.impl;
 
 import cn.iaun.it.mapper.*;
 import cn.iaun.it.model.*;
+import cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo;
 import cn.iaun.it.model.vo.monitor.ItMonitorApiDataResourceInfoVo;
 import cn.iaun.it.service.ItMonitorService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -299,4 +300,23 @@ public class ItMonitorServiceImpl implements ItMonitorService {
     public ItMonitorApiDataResourceInfoVo apiGetDataResourceInfo(Long resourceId, String agentIP) {
         return itMonitorDataMapper.apiSelectDataResourceInfo(resourceId, agentIP);
     }
+
+    @Override
+    public boolean apiAuthCheck(Long resourceId, String agentIP, String agentKey) {
+        Boolean res = itMonitorResourceMapper.apiAuthCheck(resourceId, agentIP, agentKey);
+        if (res != null) {
+            return res;
+        }
+        return false;
+    }
+
+    @Override
+    public List<ItMonitorApiAgentInitItemGroupVo> apiGetItemGroupsByResourceId(Long resourceId) {
+        return itMonitorItemGroupMapper.selectByResourceId(resourceId);
+    }
+
+    @Override
+    public List<ItMonitorItem> apiGetItemsByItemGroupIds(List<Long> itemGroupIds) {
+        return itMonitorItemMapper.selectByItemGroupId(itemGroupIds);
+    }
 }

+ 22 - 3
src/main/resources/db/data.sql

@@ -149,7 +149,7 @@ 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');
+VALUES (2, 1, 2, 1, '资源192.168.254.1');
 
 
 delete
@@ -163,13 +163,15 @@ 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);
+INSERT INTO `it_monitor_agent` (`agent_id`, `agent_name`, `agent_ip`, `agent_key_id`)
+VALUES (2, 'agent2_local', '192.168.254.1', 2);
 
 delete
 from `it_monitor_item_group`;
 INSERT INTO `it_monitor_item_group` (`group_id`, `group_name`, `template_id`, `interval`, `top_item_id`, `is_table`)
 VALUES (1, 'CPU使用率', 1, 10, -1, 1);
 INSERT INTO `it_monitor_item_group` (`group_id`, `group_name`, `template_id`, `interval`, `top_item_id`, `is_table`)
-VALUES (2, 'CPU信息', 1, 10, -1, 0);
+VALUES (2, 'CPU信息', 1, 600, -1, 0);
 INSERT INTO `it_monitor_item_group` (`group_id`, `group_name`, `template_id`, `interval`, `top_item_id`, `is_table`)
 VALUES (3, '内存', 1, 10, -1, 0);
 
@@ -179,7 +181,24 @@ from `it_monitor_item`;
 INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
 VALUES (1, '使用率', 'group1.usage', 1, 2);
 INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
-VALUES (2, '核心数', 'group2.cores', 2, 1);
+VALUES (2, 'CPU', 'group2.cpu', 2, 1);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (3, '架构', 'group2.arch', 2, 0);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (4, '位数', 'group2.bits', 2, 1);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (5, '核心数', 'group2.cores', 2, 1);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (6, '百分比', 'group3.percent', 3, 2);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (7, '总大小', 'group3.total', 3, 3);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (8, '已用', 'group3.used', 3, 3);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (9, '缓存', 'group3.cache', 3, 3);
+INSERT INTO `it_monitor_item` (`item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type`)
+VALUES (10, '空闲', 'group3.free', 3, 3);
+
 
 
 delete

+ 7 - 0
src/main/resources/mapper/ItMonitorItemGroupMapper.xml

@@ -8,4 +8,11 @@
         where group_id = #{groupId}
         limit 1
     </select>
+    <select id="selectByResourceId" resultType="cn.iaun.it.model.vo.monitor.ItMonitorApiAgentInitItemGroupVo">
+        SELECT `group_id`, `group_name`, `template_id`, `interval`, `top_item_id`, `is_table`
+        FROM it_monitor_item_group mig
+        WHERE mig.template_id IN (SELECT mr.template_id
+                                  FROM it_monitor_resource mr
+                                  where mr.resource_id = #{resourceId})
+    </select>
 </mapper>

+ 7 - 0
src/main/resources/mapper/ItMonitorItemMapper.xml

@@ -9,4 +9,11 @@
           and item_group_id = #{groupId}
         limit 1
     </select>
+    <select id="selectByItemGroupId" resultType="cn.iaun.it.model.ItMonitorItem">
+        select `item_id`, `item_name`, `item_key_name`, `item_group_id`, `item_type` from it_monitor_item
+        where
+        <foreach collection="itemGroupIds" item="item" open="`item_group_id` IN (" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
 </mapper>

+ 14 - 0
src/main/resources/mapper/ItMonitorResourceMapper.xml

@@ -0,0 +1,14 @@
+<?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="cn.iaun.it.mapper.ItMonitorResourceMapper">
+
+    <select id="apiAuthCheck" resultType="java.lang.Boolean">
+        SELECT true
+        FROM it_monitor_resource mr
+                 LEFT JOIN it_monitor_agent ma ON mr.agent_id = ma.agent_id
+                 LEFT JOIN it_monitor_agent_key mak ON ma.agent_key_id = mak.agent_key_id
+        WHERE mr.resource_id = #{resourceId}
+          AND ma.agent_ip = #{agentIP}
+          AND mak.`key` = #{agentKey}
+    </select>
+</mapper>