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

[web-app,manager] 监控启动取消纳管功能

Browse Source
This commit is contained in:
tomsun28
2021-12-03 21:25:26 +08:00
parent 96f962736e
commit 204072cb92
6 changed files with 206 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
manager/src/main/java/com/usthe/manager/controller/MonitorsController.java
View File

@@ -93,4 +93,29 @@ public class MonitorsController {
Message<Void> message = new Message<>();
return ResponseEntity.ok(message);
}
@DeleteMapping("manage")
@ApiOperation(value = "批量取消纳管监控", notes = "根据监控ID列表批量取消纳管监控项")
public ResponseEntity<Message<Void>> cancelManageMonitors(
@ApiParam(value = "监控IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids
) {
if (ids != null && !ids.isEmpty()) {
monitorService.cancelManageMonitors(new HashSet<>(ids));
}
Message<Void> message = new Message<>();
return ResponseEntity.ok(message);
}
@GetMapping("manage")
@ApiOperation(value = "批量启动纳管监控", notes = "根据监控ID列表批量启动纳管监控项")
public ResponseEntity<Message<Void>> enableManageMonitors(
@ApiParam(value = "监控IDs", example = "6565463543") @RequestParam(required = false) List<Long> ids
) {
if (ids != null && !ids.isEmpty()) {
monitorService.enableManageMonitors(new HashSet<>(ids));
}
Message<Void> message = new Message<>();
return ResponseEntity.ok(message);
}
}

13
manager/src/main/java/com/usthe/manager/service/MonitorService.java
View File

@@ -8,6 +8,7 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.jpa.domain.Specification;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -80,4 +81,16 @@ public interface MonitorService {
* @return 查询结果
*/
Page<Monitor> getMonitors(Specification<Monitor> specification, PageRequest pageRequest);
/**
* 根据监控ID列表批量取消纳管监控项
* @param ids 监控IDs
*/
void cancelManageMonitors(HashSet<Long> ids);
/**
* 根据监控ID列表批量启动纳管监控项
* @param ids 监控IDs
*/
void enableManageMonitors(HashSet<Long> ids);
}

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

@@ -27,6 +27,7 @@ import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -282,4 +283,48 @@ public class MonitorServiceImpl implements MonitorService {
public Page<Monitor> getMonitors(Specification<Monitor> specification, PageRequest pageRequest) {
return monitorDao.findAll(specification, pageRequest);
}
@Override
public void cancelManageMonitors(HashSet<Long> ids) {
// 更新监控状态 删除对应的监控周期性任务
// jobId不删除 待启动纳管之后再次复用jobId
List<Monitor> managedMonitors = monitorDao.findMonitorsByIdIn(ids)
.stream().filter(monitor ->
monitor.getStatus() != CommonConstants.UN_MANAGE && monitor.getJobId() != null)
.peek(monitor -> monitor.setStatus(CommonConstants.UN_MANAGE))
.collect(Collectors.toList());
if (!managedMonitors.isEmpty()) {
monitorDao.saveAll(managedMonitors);
for (Monitor monitor : managedMonitors) {
jobScheduling.cancelAsyncCollectJob(monitor.getJobId());
}
}
}
@Override
public void enableManageMonitors(HashSet<Long> ids) {
// 更新监控状态 新增对应的监控周期性任务
List<Monitor> unManagedMonitors = monitorDao.findMonitorsByIdIn(ids)
.stream().filter(monitor ->
monitor.getStatus() == CommonConstants.UN_MANAGE && monitor.getJobId() != null)
.peek(monitor -> monitor.setStatus(CommonConstants.AVAILABLE))
.collect(Collectors.toList());
if (!unManagedMonitors.isEmpty()) {
monitorDao.saveAll(unManagedMonitors);
for (Monitor monitor : unManagedMonitors) {
// 构造采集任务Job实体
Job appDefine = appService.getAppDefine(monitor.getApp());
appDefine.setMonitorId(monitor.getId());
appDefine.setInterval(monitor.getIntervals());
appDefine.setCyclic(true);
appDefine.setTimestamp(System.currentTimeMillis());
List<Param> params = paramDao.findParamsByMonitorId(monitor.getId());
List<Configmap> configmaps = params.stream().map(param ->
new Configmap(param.getField(), param.getValue(), param.getType())).collect(Collectors.toList());
appDefine.setConfigmap(configmaps);
// 下发采集任务
jobScheduling.addAsyncCollectJob(appDefine);
}
}
}
}