OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[manager,webapp]bugfix#5 website monitor path Illegal character in path

Browse Source 
[manager,webapp]bugfix website monitor path Illegal character in path
This commit is contained in:
tomsun28
2022-03-04 13:56:43 +08:00
committed by GitHub
parent f3557b2859 35f5bda51a
commit ff8f99c567
5 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
collector/src/main/java/com/usthe/collector/dispatch/timer/WheelTimerTask.java
View File

@@ -55,6 +55,8 @@ public class WheelTimerTask implements TimerTask {
log.error("Aes Decode value {} error.", item.getValue());
}
item.setValue(decodeValue);
} else if (item.getValue() != null && item.getValue() instanceof String) {
item.setValue(((String) item.getValue()).trim());
}
})
.collect(Collectors.toMap(Configmap::getKey, item -> item));

1
common/src/main/java/com/usthe/common/util/IpDomainUtil.java
View File

@@ -33,6 +33,7 @@ public class IpDomainUtil {
if (ipDomain == null || "".equals(ipDomain)) {
return false;
}
ipDomain = ipDomain.trim();
if (LOCALHOST.equalsIgnoreCase(ipDomain)) {
return true;
}

8
manager/src/main/java/com/usthe/manager/service/impl/MonitorServiceImpl.java
View File

@@ -126,9 +126,15 @@ public class MonitorServiceImpl implements MonitorService {
public void validate(MonitorDto monitorDto, Boolean isModify) throws IllegalArgumentException {
// 请求监控参数与监控参数定义映射校验匹配
Monitor monitor = monitorDto.getMonitor();
monitor.setHost(monitor.getHost().trim());
monitor.setName(monitor.getName().trim());
Map<String, Param> paramMap = monitorDto.getParams()
.stream()
.peek(param -> param.setMonitorId(monitor.getId()))
.peek(param -> {
param.setMonitorId(monitor.getId());
String value = param.getValue() == null ? null : param.getValue().trim();
param.setValue(value);
})
.collect(Collectors.toMap(Param::getField, param -> param));
// 校验名称唯一性
if (isModify != null) {

10
web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
View File

@@ -112,11 +112,16 @@ export class MonitorEditComponent implements OnInit {
});
return;
}
this.monitor.host = this.monitor.host.trim();
this.monitor.name = this.monitor.name.trim();
// todo 暂时单独设置host属性值
this.params.forEach(param => {
if (param.field === 'host') {
param.value = this.monitor.host;
}
if (param.value != null && typeof param.value == 'string') {
param.value = (param.value as string).trim();
}
});
let addMonitor = {
detected: this.detected,
@@ -151,11 +156,16 @@ export class MonitorEditComponent implements OnInit {
});
return;
}
this.monitor.host = this.monitor.host.trim();
this.monitor.name = this.monitor.name.trim();
// todo 暂时单独设置host属性值
this.params.forEach(param => {
if (param.field === 'host') {
param.value = this.monitor.host;
}
if (param.value != null && typeof param.value == 'string') {
param.value = (param.value as string).trim();
}
});
let detectMonitor = {
detected: this.detected,

10
web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts
View File

@@ -93,11 +93,16 @@ export class MonitorNewComponent implements OnInit {
});
return;
}
this.monitor.host = this.monitor.host.trim();
this.monitor.name = this.monitor.name.trim();
// todo 暂时单独设置host属性值
this.params.forEach(param => {
if (param.field === 'host') {
param.value = this.monitor.host;
}
if (param.value != null && typeof param.value == 'string') {
param.value = (param.value as string).trim();
}
});
let addMonitor = {
detected: this.detected,
@@ -132,11 +137,16 @@ export class MonitorNewComponent implements OnInit {
});
return;
}
this.monitor.host = this.monitor.host.trim();
this.monitor.name = this.monitor.name.trim();
// todo 暂时单独设置host属性值
this.params.forEach(param => {
if (param.field === 'host') {
param.value = this.monitor.host;
}
if (param.value != null && typeof param.value == 'string') {
param.value = (param.value as string).trim();
}
});
let detectMonitor = {
detected: true,