Skip to content

add [Messages in/sec] and fix alerting mail bug: {group} and {topic} hasn't been replaced with real value #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junhui merged 7 commits into from
Aug 1, 2017
Merged

add [Messages in/sec] and fix alerting mail bug: {group} and {topic} hasn't been replaced with real value #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1658540
missing a !
Hulva Jul 21, 2017
49614ab
JMX stuff
Hulva Jul 22, 2017
e195c3c
JMX in progress...
Hulva Jul 24, 2017
30d0514
jmx in progress...
Hulva Jul 25, 2017
ee3831f
jmx in progress...
Hulva Jul 25, 2017
022dc1d
JMX in progress...
Hulva Jul 26, 2017
3a3d9bd
fix email subject placeholder text not been replaced; add jmx metric …
Hulva Aug 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
407 changes: 202 additions & 205 deletions src/main/java/com/chickling/kmonitor/controller/JMXMetricController.java
View file
Open in desktop

Large diffs are not rendered by default.

78 changes: 0 additions & 78 deletions src/main/java/com/chickling/kmonitor/core/jmx/FormatedMeterMetric.java
View file
Open in desktop

This file was deleted.

147 changes: 0 additions & 147 deletions src/main/java/com/chickling/kmonitor/core/jmx/KafkaMetrics.java
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions src/main/java/com/chickling/kmonitor/core/jmx/metric/OSMetric.java
View file
Open in desktop

This file was deleted.

86 changes: 43 additions & 43 deletions src/main/java/com/chickling/kmonitor/email/EmailSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,56 +19,56 @@
*
*/
public class EmailSender {
private static Logger LOG = LoggerFactory.getLogger(EmailSender.class);
private static Logger LOG = LoggerFactory.getLogger(EmailSender.class);

private static AppConfig config;
private static AppConfig config;

public static void setConfig(AppConfig _config) {
config = _config;
}
public static void setConfig(AppConfig _config) {
config = _config;
}

public static void sendEmail(String message, String sendTo, String group_topic) {
Properties properties = System.getProperties();
public static void sendEmail(String message, String sendTo, String group_topic) {
Properties properties = System.getProperties();

if (config.getSmtpAuth()) {
properties.setProperty("mail.user", config.getSmtpUser());
properties.setProperty("mail.password", config.getSmtpPasswd());
}
properties.setProperty("mail.smtp.host", config.getSmtpServer());
if (config.getSmtpAuth()) {
properties.setProperty("mail.user", config.getSmtpUser());
properties.setProperty("mail.password", config.getSmtpPasswd());
}
properties.setProperty("mail.smtp.host", config.getSmtpServer());

Session session = Session.getDefaultInstance(properties);
Session session = Session.getDefaultInstance(properties);

MimeMessage mimeMessage = new MimeMessage(session);
MimeMessage mimeMessage = new MimeMessage(session);

try {
String[] sendToArr = sendTo.split(";");
mimeMessage.setFrom(new InternetAddress(config.getMailSender()));
if (sendToArr.length > 1) {
String cc = "";
for (int i = 1; i < sendToArr.length; i++) {
cc += i == sendToArr.length - 1 ? sendToArr[i] : sendToArr[i] + ",";
}
mimeMessage.addRecipients(Message.RecipientType.CC, InternetAddress.parse(cc));
}
mimeMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(sendToArr[0]));

String[] group_topicArr = group_topic.split("_");
String subject = config.getMailSubject();
if(subject.contains("{group}")) {
subject.replace("{group}", group_topicArr[0]);
}
if(subject.contains("{topic}")) {
subject.replace("{topic}", group_topicArr[1]);
}
mimeMessage.setSubject(config.getMailSubject());
mimeMessage.setSentDate(new Date());
mimeMessage.setContent(message, "text/html");
try {
String[] sendToArr = sendTo.split(";");
mimeMessage.setFrom(new InternetAddress(config.getMailSender()));
if (sendToArr.length > 1) {
String cc = "";
for (int i = 1; i < sendToArr.length; i++) {
cc += i == sendToArr.length - 1 ? sendToArr[i] : sendToArr[i] + ",";
}
mimeMessage.addRecipients(Message.RecipientType.CC, InternetAddress.parse(cc));
}
mimeMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(sendToArr[0]));

Transport.send(mimeMessage);
} catch (
String[] group_topicArr = group_topic.split("_");
String subject = config.getMailSubject();
if (subject.contains("{group}")) {
subject = subject.replace("{group}", group_topicArr[0]);
}
if (subject.contains("{topic}")) {
subject = subject.replace("{topic}", group_topicArr[1]);
}
mimeMessage.setSubject(subject);
mimeMessage.setSentDate(new Date());
mimeMessage.setContent(message, "text/html");

Exception e) {
LOG.error("sendEmail faild!", e);
}
}
Transport.send(mimeMessage);
} catch (

Exception e) {
LOG.error("sendEmail faild!", e);
}
}
}
Loading