fixed alert message

Wang-Ray · Dec 21, 2018 · 9febe9f · 9febe9f
1 parent d2c87e5
commit 9febe9f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/kafka-eagle-common/src/main/resources/system-config.properties b/kafka-eagle-common/src/main/resources/system-config.properties
@@ -60,12 +60,12 @@ kafka.eagle.sasl.mechanism=PLAIN
 ######################################
 # kafka jdbc driver address
 ######################################
-#kafka.eagle.driver=com.mysql.jdbc.Driver
-#kafka.eagle.url=jdbc:mysql://127.0.0.1:3306/ke?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-#kafka.eagle.username=root
-#kafka.eagle.password=123456
-
-kafka.eagle.driver=org.sqlite.JDBC
-kafka.eagle.url=jdbc:sqlite:/Users/dengjie/workspace/kafka-egale/kafka-eagle-web/src/main/resources/db/ke.db
+kafka.eagle.driver=com.mysql.jdbc.Driver
+kafka.eagle.url=jdbc:mysql://127.0.0.1:3306/ke3?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
 kafka.eagle.username=root
-kafka.eagle.password=root
+kafka.eagle.password=123456
+
+#kafka.eagle.driver=org.sqlite.JDBC
+#kafka.eagle.url=jdbc:sqlite:/Users/dengjie/workspace/kafka-egale/kafka-eagle-web/src/main/resources/db/ke.db
+#kafka.eagle.username=root
+#kafka.eagle.password=root
diff --git a/kafka-eagle-web/src/main/java/org/smartloli/kafka/eagle/web/quartz/AlertQuartz.java b/kafka-eagle-web/src/main/java/org/smartloli/kafka/eagle/web/quartz/AlertQuartz.java
@@ -175,11 +175,6 @@ private void alert(String clusterAlias, List<OffsetsLiteInfo> offsetLites) {
 							MailProvider provider = new MailFactory();
 							String subject = "Kafka Eagle Consumer Alert";
 							String address = alertInfo.getOwner();
-							// String content = "Group is [" +
-							// alertInfo.getGroup() + "],Topic is [" +
-							// alertInfo.getTopic() + "],current lag is [" +
-							// offset.getLag() + "],expired lag is [" +
-							// alertInfo.getLag() + "].";
 							LagContentModule lcm = new LagContentModule();
 							lcm.setCluster(clusterAlias);
 							lcm.setConsumerLag(offset.getLag() + "");
@@ -257,12 +252,9 @@ public void cluster() {
 								try {
 									MailProvider provider = new MailFactory();
 									String subject = "Kafka Eagle On-Site Inspection Alert";
-									// String content = "Thread Service [" +
-									// host + ":" + port + "] has crashed,please
-									// check it.";
 									ClusterContentModule ccm = new ClusterContentModule();
 									ccm.setCluster(cluster.getCluster());
-									ccm.setServer(cluster.getServer());
+									ccm.setServer(host + ":" + port);
 									ccm.setTime(CalendarUtils.getDate());
 									ccm.setType(cluster.getType());
 									ccm.setUser(cluster.getOwner());