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

[alter,webapp]fix 告警定义关联监控问题

Browse Source
This commit is contained in:
tomsun28
2022-01-30 12:34:20 +08:00
parent 9cf56d7c01
commit 9b08d8d19b
9 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
alerter/src/main/java/com/usthe/alert/service/AlertDefineService.java
View File

@@ -1,7 +1,7 @@
package com.usthe.alert.service;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;
@@ -75,7 +75,7 @@ public interface AlertDefineService {
* @param alertId 告警定义ID
* @param alertDefineBinds 关联关系
*/
void applyBindAlertDefineMonitors(Long alertId, List<AlertDefineBind> alertDefineBinds);
void applyBindAlertDefineMonitors(Long alertId, List<AlertDefineMonitorBind> alertDefineBinds);
/**
* 查询与此监控ID关联的指定指标组匹配的告警定义
@@ -99,5 +99,5 @@ public interface AlertDefineService {
* @param alertDefineId 告警定义ID
* @return 监控列表关联信息
*/
List<AlertDefineBind> getBindAlertDefineMonitors(long alertDefineId);
List<AlertDefineMonitorBind> getBindAlertDefineMonitors(long alertDefineId);
}

6
alerter/src/main/java/com/usthe/alert/service/impl/AlertDefineServiceImpl.java
View File

@@ -3,7 +3,7 @@ package com.usthe.alert.service.impl;
import com.usthe.alert.dao.AlertDefineBindDao;
import com.usthe.alert.dao.AlertDefineDao;
import com.usthe.common.entity.alerter.AlertDefine;
import com.usthe.common.entity.alerter.AlertDefineBind;
import com.usthe.common.entity.alerter.AlertDefineMonitorBind;
import com.usthe.alert.service.AlertDefineService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,7 +73,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
}
@Override
public void applyBindAlertDefineMonitors(Long alertId, List<AlertDefineBind> alertDefineBinds) {
public void applyBindAlertDefineMonitors(Long alertId, List<AlertDefineMonitorBind> alertDefineBinds) {
// todo 校验此告警定义和监控是否存在
// 先删除此告警的所有关联
@@ -99,7 +99,7 @@ public class AlertDefineServiceImpl implements AlertDefineService {
}
@Override
public List<AlertDefineBind> getBindAlertDefineMonitors(long alertDefineId) {
public List<AlertDefineMonitorBind> getBindAlertDefineMonitors(long alertDefineId) {
return alertDefineBindDao.getAlertDefineBindsByAlertDefineIdEquals(alertDefineId);
}
}