test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(性能测试): 修复配置自定义监控不能正常查询的问题 

--bug=1018977 --user=刘瑞斌 【性能测试】高级配置-添加监控-执行测试-执行完监控没数据 https://www.tapd.cn/55049933/s/1279549
This commit is contained in:
CaptainB 2022-10-27 11:08:01 +08:00 committed by 刘瑞斌
parent 21df35416d
commit abe0cd67b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
performance-test/backend/src/main/java/io/metersphere/dto/Monitor.java
View File

@ -10,7 +10,7 @@ import java.util.List;
public class Monitor { public class Monitor {
private String name; private String name;
private String ip; private String ip;
private Integer port; private String port;
private String description; private String description;
private List<MonitorItem> monitorConfig; private List<MonitorItem> monitorConfig;
} }

8
performance-test/backend/src/main/java/io/metersphere/service/MetricQueryService.java
View File

@ -165,7 +165,7 @@ public class MetricQueryService {
int port = dto.getMonitorPort() == null ? 9100 : dto.getMonitorPort(); int port = dto.getMonitorPort() == null ? 9100 : dto.getMonitorPort();
Monitor e = new Monitor(); Monitor e = new Monitor();
e.setIp(dto.getIp()); e.setIp(dto.getIp());
e.setPort(port); e.setPort(String.valueOf(port));
instances.add(e); instances.add(e);
} }
}); });
@ -183,7 +183,7 @@ public class MetricQueryService {
Monitor monitor = new Monitor(); Monitor monitor = new Monitor();
monitor.setIp((String) m.get("ip")); monitor.setIp((String) m.get("ip"));
monitor.setName((String) m.get("name")); monitor.setName((String) m.get("name"));
monitor.setPort((int) m.get("port")); monitor.setPort(String.valueOf(m.get("port")));
monitor.setDescription((String) m.get("description")); monitor.setDescription((String) m.get("description"));
// todo // todo
monitor.setMonitorConfig((List<MonitorItem>) m.get("monitorConfig")); monitor.setMonitorConfig((List<MonitorItem>) m.get("monitorConfig"));
@ -270,7 +270,7 @@ public class MetricQueryService {
int port = monitorPort == null ? 9100 : monitorPort; int port = monitorPort == null ? 9100 : monitorPort;
Monitor monitor = new Monitor(); Monitor monitor = new Monitor();
monitor.setIp(dto.getIp()); monitor.setIp(dto.getIp());
monitor.setPort(port); monitor.setPort(String.valueOf(port));
result.add(monitor); result.add(monitor);
} }
}); });
@ -288,7 +288,7 @@ public class MetricQueryService {
Monitor monitor = new Monitor(); Monitor monitor = new Monitor();
monitor.setIp((String) o.get("ip")); monitor.setIp((String) o.get("ip"));
monitor.setName((String) o.get("name")); monitor.setName((String) o.get("name"));
monitor.setPort((int) o.get("port")); monitor.setPort(String.valueOf(o.get("port")));
monitor.setDescription((String) o.get("description")); monitor.setDescription((String) o.get("description"));
// todo // todo
monitor.setMonitorConfig((List<MonitorItem>) o.get("monitorConfig")); monitor.setMonitorConfig((List<MonitorItem>) o.get("monitorConfig"));