fix: alarm content format clickvisual#982

kl7sn · May 4, 2023 · 52eb34a · 52eb34a
1 parent b2dec48
commit 52eb34a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/.github/ISSUE_TEMPLATE/ask-a-question.md b/.github/ISSUE_TEMPLATE/ask-a-question.md
@@ -1,6 +1,6 @@
 ---
 name: Ask a question
-about: Ask anything of ilogtail. It is recommended to ask a question in discussions.
+about: Ask anything of clickvisual. It is recommended to ask a question in discussions.
 title: "[QUESTION]:"
 labels: question
 assignees: ''
@@ -15,7 +15,7 @@ Before asking a question, please first consider:
 
 -------
 
-提问之前，建议先在 iLogtail 社区寻找答案。
+提问之前，建议先在 ClickVisual 社区寻找答案。
 
 - 查看 [存在的 discussions](https://github.com/clickvisual/clickvisual/discussions/)
 - 查看 [存在的 issues](https://github.com/clickvisual/clickvisual/issues/)

diff --git a/api/internal/service/alarm/pusher/factory.go b/api/internal/service/alarm/pusher/factory.go
@@ -51,28 +51,28 @@ func BuildAlarmMsg(notification db.Notification, table *db.BaseTable, alarm *db.
 	var buffer bytes.Buffer
 	// base info
 	if notification.GetStatus() == db.AlarmStatusNormal {
-		buffer.WriteString("<font color=#008000>您的告警已恢复</font>  ")
+		buffer.WriteString("<font color=#008000>您的告警已恢复</font>\n\n")
 	} else {
-		buffer.WriteString("<font color=#FF0000>您有待处理的告警</font>  ")
+		buffer.WriteString("<font color=#FF0000>您有待处理的告警</font>\n\n")
 	}
-	buffer.WriteString(fmt.Sprintf("【告警名称】: %s  ", alarm.Name))
+	buffer.WriteString(fmt.Sprintf("【告警名称】: %s\n\n", alarm.Name))
 	if alarm.Desc != "" {
-		buffer.WriteString(fmt.Sprintf("【告警描述】: %s  ", alarm.Desc))
+		buffer.WriteString(fmt.Sprintf("【告警描述】: %s\n\n", alarm.Desc))
 	}
 	users, phones := dutyOffices(alarm)
 	instance, _ := db.InstanceInfo(invoker.Db, table.Database.Iid)
 	statusText := "告警中"
 	for _, alert := range notification.Alerts {
 		end := alert.StartsAt.Add(time.Minute).Unix()
 		start := alert.StartsAt.Add(-alarm.GetInterval() - time.Minute).Unix()
-		buffer.WriteString(fmt.Sprintf("【触发时间】: %s  ", alert.StartsAt.Add(time.Hour*8).Format("2006-01-02 15:04:05")))
-		buffer.WriteString(fmt.Sprintf("【相关实例】: %s %s  ", instance.Name, instance.Desc))
-		buffer.WriteString(fmt.Sprintf("【日志库表】: %s %s  ", table.Name, table.Desc))
+		buffer.WriteString(fmt.Sprintf("【触发时间】: %s\n\n", alert.StartsAt.Add(time.Hour*8).Format("2006-01-02 15:04:05")))
+		buffer.WriteString(fmt.Sprintf("【相关实例】: %s %s\n\n", instance.Name, instance.Desc))
+		buffer.WriteString(fmt.Sprintf("【日志库表】: %s %s\n\n", table.Name, table.Desc))
 		if notification.GetStatus() == db.AlarmStatusNormal {
 			statusText = "已恢复"
-			buffer.WriteString("【告警状态】: <font color=#008000>已恢复</font>  ")
+			buffer.WriteString("【告警状态】: <font color=#008000>已恢复</font>\n\n")
 		} else {
-			buffer.WriteString("【告警状态】: <font color=red>告警中</font>  ")
+			buffer.WriteString("【告警状态】: <font color=red>告警中</font>\n\n")
 		}
 		dutyOfficesStr := ""
 		for _, user := range users {
@@ -84,24 +84,24 @@ func BuildAlarmMsg(notification db.Notification, table *db.BaseTable, alarm *db.
 		}
 		if dutyOfficesStr == "" {
 			user, _ := db.UserInfo(alarm.Uid)
-			buffer.WriteString(fmt.Sprintf("【告警创建】: %s  ", user.Nickname))
+			buffer.WriteString(fmt.Sprintf("【告警创建】: %s\n\n", user.Nickname))
 		} else {
-			buffer.WriteString(fmt.Sprintf("【告警责任】: %s  ", dutyOfficesStr))
+			buffer.WriteString(fmt.Sprintf("【告警责任】: %s\n\n", dutyOfficesStr))
 		}
 		jumpURL := fmt.Sprintf("%s/share?mode=0&tab=custom&tid=%d&kw=%s&start=%d&end=%d",
 			strings.TrimRight(econf.GetString("app.rootURL"), "/"), filter.Tid, url.QueryEscape(filter.When), start, end,
 		)
 		shortURL, err := shorturl.GenShortURL(jumpURL)
 		if err != nil {
 			elog.Error("shorturl.GenShortURL", elog.FieldErr(err), elog.String("jumpURL", jumpURL))
-			buffer.WriteString(fmt.Sprintf("【链接跳转】: %s", jumpURL))
+			buffer.WriteString(fmt.Sprintf("【链接跳转】: %s\n\n", jumpURL))
 		} else {
-			buffer.WriteString(fmt.Sprintf("【链接跳转】: %s", shortURL))
+			buffer.WriteString(fmt.Sprintf("【链接跳转】: %s\n\n", shortURL))
 		}
 		if partialLog != "" {
 			partialLog = strings.Replace(partialLog, "\"", "", -1)
 			if len(partialLog) > 600 {
-				buffer.WriteString(fmt.Sprintf("【告警详情】: %s ...", partialLog[0:599]))
+				buffer.WriteString(fmt.Sprintf("【告警详情】: %s ...more", partialLog[0:599]))
 			} else {
 				buffer.WriteString(fmt.Sprintf("【告警详情】: %s", partialLog))
 			}