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

fix: 代码名称优化 #huacheng

Browse Source
This commit is contained in:
huacheng
2022-04-05 22:11:24 +08:00
parent e99dd2e870
commit 4ad7972956
2 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java
View File

@@ -7,7 +7,7 @@ import com.usthe.common.entity.alerter.Alert;
import com.usthe.alert.service.AlertService;
import com.usthe.manager.pojo.dto.DingTalkWebHookDto;
import com.usthe.manager.pojo.dto.FlyBookWebHookDto;
import com.usthe.manager.pojo.dto.WeWorkWebHookDto;
import com.usthe.manager.pojo.dto.WxWorkWebHookDto;
import com.usthe.common.util.CommonConstants;
import com.usthe.common.entity.manager.Monitor;
import com.usthe.common.entity.manager.NoticeReceiver;
@@ -31,6 +31,7 @@ import java.util.List;
/**
* 告警信息入库分发
*
* @author tom
* @date 2021/12/10 12:58
*/
@@ -107,9 +108,9 @@ public class DispatchAlarm {
}
} else {
// 若是恢复告警 需对监控状态进行恢复
if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
monitorService.updateMonitorStatus(alert.getMonitorId(), CommonConstants.AVAILABLE_CODE);
}
if (alert.getStatus() == CommonConstants.ALERT_STATUS_CODE_RESTORED) {
monitorService.updateMonitorStatus(alert.getMonitorId(), CommonConstants.AVAILABLE_CODE);
}
}
// 告警落库
alertService.addAlert(alert);
@@ -122,22 +123,37 @@ public class DispatchAlarm {
for (NoticeReceiver receiver : receivers) {
switch (receiver.getType()) {
// todo 短信通知
case 0: break;
case 1: sendEmailAlert(receiver, alert); break;
case 2: sendWebHookAlert(receiver, alert); break;
case 3: sendWeChatAlert(receiver, alert); break;
case 4: sendWeWorkRobotAlert(receiver, alert); break;
case 5: sendDingTalkRobotAlert(receiver, alert); break;
case 6: sendFlyBookAlert(receiver,alert); break;
default: break;
case 0:
break;
case 1:
sendEmailAlert(receiver, alert);
break;
case 2:
sendWebHookAlert(receiver, alert);
break;
case 3:
sendWeChatAlert(receiver, alert);
break;
case 4:
sendWeWorkRobotAlert(receiver, alert);
break;
case 5:
sendDingTalkRobotAlert(receiver, alert);
break;
case 6:
sendFlyBookAlert(receiver, alert);
break;
default:
break;
}
}
}
/**
* 通过飞书发送告警信息
*
* @param receiver 接收人
* @param alert 告警信息
* @param alert 告警信息
*/
private void sendFlyBookAlert(NoticeReceiver receiver, Alert alert) {
FlyBookWebHookDto flyBookWebHookDto = new FlyBookWebHookDto();
@@ -184,8 +200,9 @@ public class DispatchAlarm {
/**
* 通过钉钉机器人发送告警信息
* @param receiver 通知配置信息
* @param alert 告警信息
*
* @param receiver 通知配置信息
* @param alert 告警信息
*/
private void sendDingTalkRobotAlert(NoticeReceiver receiver, Alert alert) {
DingTalkWebHookDto dingTalkWebHookDto = new DingTalkWebHookDto();
@@ -217,12 +234,13 @@ public class DispatchAlarm {
/**
* 通过企业微信发送告警信息
* @param receiver 通知配置信息
* @param alert 告警信息
*
* @param receiver 通知配置信息
* @param alert 告警信息
*/
private void sendWeWorkRobotAlert(NoticeReceiver receiver, Alert alert) {
WeWorkWebHookDto weWorkWebHookDTO = new WeWorkWebHookDto();
WeWorkWebHookDto.MarkdownDTO markdownDTO = new WeWorkWebHookDto.MarkdownDTO();
WxWorkWebHookDto wxWorkWebHookDTO = new WxWorkWebHookDto();
WxWorkWebHookDto.MarkdownDTO markdownDTO = new WxWorkWebHookDto.MarkdownDTO();
StringBuilder content = new StringBuilder();
content.append("<font color=\"info\">[TanCloud探云告警通知]</font>\n告警目标对象 : <font color=\"info\">")
.append(alert.getTarget()).append("</font>\n")
@@ -231,16 +249,16 @@ public class DispatchAlarm {
if (alert.getPriority() < CommonConstants.ALERT_PRIORITY_CODE_WARNING) {
content.append("告警级别 : <font color=\"warning\">")
.append(CommonUtil.transferAlertPriority(alert.getPriority())).append("</font>\n");
}else {
} else {
content.append("告警级别 : <font color=\"comment\">")
.append(CommonUtil.transferAlertPriority(alert.getPriority())).append("</font>\n");
}
content.append("内容详情 : ").append(alert.getContent());
markdownDTO.setContent(content.toString());
weWorkWebHookDTO.setMarkdown(markdownDTO);
String webHookUrl = WeWorkWebHookDto.WEBHOOK_URL + receiver.getWechatId();
wxWorkWebHookDTO.setMarkdown(markdownDTO);
String webHookUrl = WxWorkWebHookDto.WEBHOOK_URL + receiver.getWechatId();
try {
ResponseEntity<String> entity = restTemplate.postForEntity(webHookUrl, weWorkWebHookDTO, String.class);
ResponseEntity<String> entity = restTemplate.postForEntity(webHookUrl, wxWorkWebHookDTO, String.class);
if (entity.getStatusCode() == HttpStatus.OK) {
log.debug("Send weWork webHook: {} Success", webHookUrl);
} else {
@@ -273,10 +291,10 @@ public class DispatchAlarm {
}
private void sendEmailAlert(final NoticeReceiver receiver,final Alert alert){
try{
private void sendEmailAlert(final NoticeReceiver receiver, final Alert alert) {
try {
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage,true,"UTF-8");
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
messageHelper.setSubject("TanCloud探云-监控告警");
//设置发件人Email
messageHelper.setFrom(emailFromUser);
@@ -286,10 +304,10 @@ public class DispatchAlarm {
//构建邮件模版
String process = mailService.buildAlertHtmlTemplate(alert);
//设置邮件内容模版
messageHelper.setText(process,true);
messageHelper.setText(process, true);
javaMailSender.send(mimeMessage);
}catch (Exception e){
log.error("[邮箱告警] error，Exception information={}",e.getMessage());
} catch (Exception e) {
log.error("[邮箱告警] error，Exception information={}", e.getMessage());
}
}

12
manager/src/main/java/com/usthe/manager/pojo/dto/WeWorkWebHookDto.java → manager/src/main/java/com/usthe/manager/pojo/dto/WxWorkWebHookDto.java
View File

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
/**
* 企业微信机器人请求消息体
*
* @author 花城
* @version 1.0
* @date 2022/2/21 6:55 下午
@@ -15,15 +16,22 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class WeWorkWebHookDto {
public class WxWorkWebHookDto {
public static final String WEBHOOK_URL = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=";
/**
* markdown格式
*/
private static final String MARKDOWN = "markdown";
/**
* 文本格式
*/
private static final String TEXT = "TEXT";
/**
* 消息类型
*/
private String msgtype = MARKDOWN;
private String msgType = MARKDOWN;
/**
* markdown消息