[manager] 查询监控接口新增metrics返回字段

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

@@ -10,6 +10,7 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
+import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_ONLY;
 import static io.swagger.annotations.ApiModelProperty.AccessMode.READ_WRITE;
 
 /**
@@ -37,9 +38,14 @@ public class MonitorDto {
     @Valid
     private List<Param> params;
 
+    @ApiModelProperty(value = "指标组列表", accessMode = READ_ONLY, position = 2)
+    @NotNull
+    @Valid
+    private List<String> metrics;
+
     /**
      * 是否探测
      */
-    @ApiModelProperty(value = "是否进行探测", accessMode = READ_WRITE, position = 2)
+    @ApiModelProperty(value = "是否进行探测", accessMode = READ_WRITE, position = 3)
     private boolean detected;
 }

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

@@ -2,6 +2,7 @@ package com.usthe.manager.service.impl;
 
 import com.usthe.common.entity.job.Configmap;
 import com.usthe.common.entity.job.Job;
+import com.usthe.common.entity.job.Metrics;
 import com.usthe.common.entity.message.CollectRep;
 import com.usthe.common.util.AesUtil;
 import com.usthe.common.util.CommonConstants;
@@ -275,10 +276,14 @@ public class MonitorServiceImpl implements MonitorService {
     public MonitorDto getMonitor(long id) throws RuntimeException {
         Optional<Monitor> monitorOptional = monitorDao.findById(id);
         if (monitorOptional.isPresent()) {
+            Monitor monitor = monitorOptional.get();
             MonitorDto monitorDto = new MonitorDto();
-            monitorDto.setMonitor(monitorOptional.get());
+            monitorDto.setMonitor(monitor);
             List<Param> params = paramDao.findParamsByMonitorId(id);
             monitorDto.setParams(params);
+            Job job = appService.getAppDefine(monitor.getApp());
+            List<String> metrics = job.getMetrics().stream().map(Metrics::getName).collect(Collectors.toList());
+            monitorDto.setMetrics(metrics);
             return monitorDto;
         } else {
             return null;