From 35fde12f6ddf322865155f2066ae584154d4dcbf Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Fri, 25 Dec 2015 10:42:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BB=A5=E5=89=8D=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=EF=BC=8C=E7=9B=AE=E5=89=8D=E5=B0=86=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=8B=AC=E7=AB=8B=EF=BC=8C=E5=B0=86=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E6=A8=A1=E6=9D=BF=E4=BB=8E=E5=91=8A=E8=AD=A6=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E8=AF=BB=E5=8F=96=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skywalking/alarm/model/MailInfo.java | 9 -------- .../alarm/procesor/AlarmMessageProcessor.java | 21 +++++++++++++------ .../src/main/resources/config.properties | 6 ++++-- .../src/main/resources/mail-template.config | 1 + 4 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 skywalking-alarm/src/main/resources/mail-template.config diff --git a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/model/MailInfo.java b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/model/MailInfo.java index c774f6bb5..38f6eea36 100644 --- a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/model/MailInfo.java +++ b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/model/MailInfo.java @@ -5,8 +5,6 @@ public class MailInfo { private String[] mailCc; - private String mailTemp; - public String[] getMailTo() { return mailTo; } @@ -23,11 +21,4 @@ public class MailInfo { this.mailCc = mailCc; } - public String getMailTemp() { - return mailTemp; - } - - public void setMailTemp(String mailTemp) { - this.mailTemp = mailTemp; - } } diff --git a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java index 4d53a4a6d..c755388dc 100644 --- a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java +++ b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java @@ -1,6 +1,5 @@ package com.ai.cloud.skywalking.alarm.procesor; -import com.ai.cloud.skywalking.alarm.dao.AlarmMessageDao; import com.ai.cloud.skywalking.alarm.model.AlarmRule; import com.ai.cloud.skywalking.alarm.model.ApplicationInfo; import com.ai.cloud.skywalking.alarm.model.MailInfo; @@ -20,13 +19,25 @@ import java.io.StringWriter; import java.sql.SQLException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; public class AlarmMessageProcessor { private static Logger logger = LogManager .getLogger(AlarmMessageProcessor.class); + static String mailTemplate = ""; + + static { + Properties properties = new Properties(); + try { + properties.load(AlarmMessageProcessor.class.getResourceAsStream("/mail-template_new.config")); + mailTemplate = properties.getProperty("template.default"); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void process(UserInfo userInfo, AlarmRule rule) throws TemplateException, IOException, SQLException { Set warningTracingIds = new HashSet(); Set warningMessageKeys = new HashSet(); @@ -63,9 +74,9 @@ public class AlarmMessageProcessor { rule.getPreviousFireTimeM() * 10000 * 6))); parameter.put("endDate", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date( currentFireMinuteTime * 10000 * 6))); - String mailContext = generateContent(rule + String mailContext = generateContent(/*rule .getConfigArgsDescriber().getMailInfo() - .getMailTemp(), parameter); + .getMailTemp()*/mailTemplate, parameter); if (mailContext.length() > 0) { MailInfo mailInfo = rule.getConfigArgsDescriber() .getMailInfo(); @@ -142,6 +153,4 @@ public class AlarmMessageProcessor { t.process(parameter, out); return out.getBuffer().toString(); } - - private static Map idCodeMapper = new ConcurrentHashMap(); } diff --git a/skywalking-alarm/src/main/resources/config.properties b/skywalking-alarm/src/main/resources/config.properties index 80810ead9..568abe809 100644 --- a/skywalking-alarm/src/main/resources/config.properties +++ b/skywalking-alarm/src/main/resources/config.properties @@ -7,7 +7,8 @@ server.daemon_thread_wait_interval=50000 processthread.thread_wait_interval=5000 #zookeeper连接地址 -zkpath.connect_str=10.1.241.18:29181,10.1.241.19:29181,10.1.241.20:29181 +#zkpath.connect_str=10.1.241.18:29181,10.1.241.19:29181,10.1.241.20:29181 +zkpath.connect_str=127.0.0.1:29181 #zookeeper连接超时时间(单位:毫秒) zkpath.connect_timeout=1000 #zookeeper重试次数 @@ -46,7 +47,8 @@ db.max_pool_size=20 db.connect_timeout=10000 #告警信息存在的redis服务器地址 -alarm.redis_server=10.1.241.18:16379 +#alarm.redis_server=10.1.241.18:16379 +alarm.redis_server=127.0.0.1:6379 #redis的最大空闲连接数 alarm.redis_max_idle=20 #redis的最小空闲连接数 diff --git a/skywalking-alarm/src/main/resources/mail-template.config b/skywalking-alarm/src/main/resources/mail-template.config new file mode 100644 index 000000000..cf00b1bc6 --- /dev/null +++ b/skywalking-alarm/src/main/resources/mail-template.config @@ -0,0 +1 @@ +template.default=templete1_welcome

\u5c0a\u656c\u7684SkyWalking\u7528\u6237\u60a8\u597d:

\u81ea${startDate!}\u8d77\uff0c\u5230${endDate!}\u6b62\uff0c\u5e73\u53f0\u63a5\u6536\u5230\u76d1\u63a7\u544a\u8b66\u4fe1\u606f\u5982\u4e0b\uff1a

<#if warningTracingIds??><#list warningTracingIds as traceId>

  • ${traceId!}

    • \ No newline at end of file