From e20b37b590400e2ea66ddf3b84cf9d6795d892d2 Mon Sep 17 00:00:00 2001 From: Akkia Date: Sun, 17 Apr 2022 21:06:30 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E5=A2=9E=E5=8A=A0=E6=9B=B4=E5=A4=9A?= =?UTF-8?q?=E5=8D=A0=E4=BD=8D=E7=AC=A6=E4=B8=8E=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/notification.go | 34 +++++++++++++++-- model/notification_test.go | 59 +++++++++++++++++++++++++----- service/rpc/nezha.go | 4 +- service/singleton/alertsentinel.go | 4 +- 4 files changed, 84 insertions(+), 17 deletions(-) diff --git a/model/notification.go b/model/notification.go index acc20b0..3e631d4 100644 --- a/model/notification.go +++ b/model/notification.go @@ -157,14 +157,42 @@ func (ns *NotificationServerBundle) Send(message string) error { return nil } +// replaceParamInString 替换字符串中的占位符 func replaceParamsInString(s *Server, str string, message string, mod func(string) string) string { if mod != nil { str = strings.ReplaceAll(str, "#NEZHA#", mod(message)) + if s != nil { + str = strings.ReplaceAll(str, "#SERVER.NAME#", mod(s.Name)) + str = strings.ReplaceAll(str, "#SERVER.IP#", mod(s.Host.IP)) + str = strings.ReplaceAll(str, "#SERVER.CPU#", mod(fmt.Sprintf("%f", s.State.CPU))) + str = strings.ReplaceAll(str, "#SERVER.MEM#", mod(fmt.Sprintf("%d", s.State.MemUsed))) + str = strings.ReplaceAll(str, "#SERVER.SWAP#", mod(fmt.Sprintf("%d", s.State.SwapUsed))) + str = strings.ReplaceAll(str, "#SERVER.DISK#", mod(fmt.Sprintf("%d", s.State.DiskUsed))) + str = strings.ReplaceAll(str, "#SERVER.NETINSPEED#", mod(fmt.Sprintf("%d", s.State.NetInSpeed))) + str = strings.ReplaceAll(str, "#SERVER.NETOUTSPEED#", mod(fmt.Sprintf("%d", s.State.NetOutSpeed))) + str = strings.ReplaceAll(str, "#SERVER.TRANSFERIN#", mod(fmt.Sprintf("%d", s.State.NetInTransfer))) + str = strings.ReplaceAll(str, "#SERVER.TRANSFEROUT#", mod(fmt.Sprintf("%d", s.State.NetOutTransfer))) + str = strings.ReplaceAll(str, "#SERVER.LOAD1#", mod(fmt.Sprintf("%f", s.State.Load1))) + str = strings.ReplaceAll(str, "#SERVER.LOAD5#", mod(fmt.Sprintf("%f", s.State.Load5))) + str = strings.ReplaceAll(str, "#SERVER.LOAD15#", mod(fmt.Sprintf("%f", s.State.Load15))) + } } else { str = strings.ReplaceAll(str, "#NEZHA#", message) - } - if s != nil { - str = strings.ReplaceAll(str, "#SERVER#", s.Name) + if s != nil { + str = strings.ReplaceAll(str, "#SERVER.NAME#", s.Name) + str = strings.ReplaceAll(str, "#SERVER.IP#", s.Host.IP) + str = strings.ReplaceAll(str, "#SERVER.CPU#", fmt.Sprintf("%f", s.State.CPU)) + str = strings.ReplaceAll(str, "#SERVER.MEM#", fmt.Sprintf("%d", s.State.MemUsed)) + str = strings.ReplaceAll(str, "#SERVER.SWAP#", fmt.Sprintf("%d", s.State.SwapUsed)) + str = strings.ReplaceAll(str, "#SERVER.DISK#", fmt.Sprintf("%d", s.State.DiskUsed)) + str = strings.ReplaceAll(str, "#SERVER.NETINSPEED#", fmt.Sprintf("%d", s.State.NetInSpeed)) + str = strings.ReplaceAll(str, "#SERVER.NETOUTSPEED#", fmt.Sprintf("%d", s.State.NetOutSpeed)) + str = strings.ReplaceAll(str, "#SERVER.TRANSFERIN#", fmt.Sprintf("%d", s.State.NetInTransfer)) + str = strings.ReplaceAll(str, "#SERVER.TRANSFEROUT#", fmt.Sprintf("%d", s.State.NetOutTransfer)) + str = strings.ReplaceAll(str, "#SERVER.LOAD1#", fmt.Sprintf("%f", s.State.Load1)) + str = strings.ReplaceAll(str, "#SERVER.LOAD5#", fmt.Sprintf("%f", s.State.Load5)) + str = strings.ReplaceAll(str, "#SERVER.LOAD15#", fmt.Sprintf("%f", s.State.Load15)) + } } return str } diff --git a/model/notification_test.go b/model/notification_test.go index f36ec3b..e6a007a 100644 --- a/model/notification_test.go +++ b/model/notification_test.go @@ -37,14 +37,43 @@ func execCase(t *testing.T, item testSt) { RequestHeader: item.header, } server := Server{ - Common: Common{}, - Name: "ServerName", - Tag: "", - Secret: "", - Note: "", - DisplayIndex: 0, - Host: nil, - State: nil, + Common: Common{}, + Name: "ServerName", + Tag: "", + Secret: "", + Note: "", + DisplayIndex: 0, + Host: &Host{ + Platform: "", + PlatformVersion: "", + CPU: nil, + MemTotal: 0, + DiskTotal: 0, + SwapTotal: 0, + Arch: "", + Virtualization: "", + BootTime: 0, + IP: "1.1.1.1", + CountryCode: "", + Version: "", + }, + State: &HostState{ + CPU: 0, + MemUsed: 0, + SwapUsed: 8888, + DiskUsed: 0, + NetInTransfer: 0, + NetOutTransfer: 0, + NetInSpeed: 0, + NetOutSpeed: 0, + Uptime: 0, + Load1: 0, + Load5: 0, + Load15: 0, + TcpConnCount: 0, + UdpConnCount: 0, + ProcessCount: 0, + }, LastActive: time.Time{}, TaskClose: nil, TaskStream: nil, @@ -139,16 +168,26 @@ func TestNotification(t *testing.T) { }, { url: "https://example.com/?m=#NEZHA#", - body: `{"Server":"#SERVER#"}`, + body: `{"Server":"#SERVER.NAME#","ServerIP":"#SERVER.IP#","ServerSWAP":#SERVER.SWAP#}`, reqMethod: NotificationRequestMethodPOST, header: `{"asd":"dsa11"}`, reqType: NotificationRequestTypeJSON, expectURL: "https://example.com/?m=" + msg, expectMethod: http.MethodPost, expectContentType: reqTypeJSON, - expectBody: `{"Server":"ServerName"}`, + expectBody: `{"Server":"ServerName","ServerIP":"1.1.1.1","ServerSWAP":8888}`, expectHeader: map[string]string{"asd": "dsa11"}, }, + { + url: "https://example.com/?m=#NEZHA#", + body: `{"#NEZHA#":"#NEZHA#","Server":"#SERVER.NAME#","ServerIP":"#SERVER.IP#","ServerSWAP":"#SERVER.SWAP#"}`, + reqMethod: NotificationRequestMethodPOST, + reqType: NotificationRequestTypeForm, + expectURL: "https://example.com/?m=" + msg, + expectMethod: http.MethodPost, + expectContentType: reqTypeForm, + expectBody: "%23NEZHA%23=" + msg + "&Server=ServerName&ServerIP=1.1.1.1&ServerSWAP=8888", + }, } for _, c := range cases { diff --git a/service/rpc/nezha.go b/service/rpc/nezha.go index 2bca2c5..441ca75 100644 --- a/service/rpc/nezha.go +++ b/service/rpc/nezha.go @@ -29,10 +29,10 @@ func (s *NezhaHandler) ReportTask(c context.Context, r *pb.TaskResult) (*pb.Rece singleton.ServerLock.RLock() defer singleton.ServerLock.RUnlock() if cr.PushSuccessful && r.GetSuccessful() { - singleton.SendNotification(cr.NotificationTag, fmt.Sprintf("[任务成功] %s ，服务器：%s，日志：\n%s", cr.Name, singleton.ServerList[clientID].Name, r.GetData()), false) + singleton.SendNotification(cr.NotificationTag, fmt.Sprintf("$%d$[任务成功] %s ，服务器：%s，日志：\n%s", singleton.ServerList[clientID].ID, cr.Name, singleton.ServerList[clientID].Name, r.GetData()), false) } if !r.GetSuccessful() { - singleton.SendNotification(cr.NotificationTag, fmt.Sprintf("[任务失败] %s ，服务器：%s，日志：\n%s", cr.Name, singleton.ServerList[clientID].Name, r.GetData()), false) + singleton.SendNotification(cr.NotificationTag, fmt.Sprintf("$%d$[任务失败] %s ，服务器：%s，日志：\n%s", singleton.ServerList[clientID].ID, cr.Name, singleton.ServerList[clientID].Name, r.GetData()), false) } singleton.DB.Model(cr).Updates(model.Cron{ LastExecutedAt: time.Now().Add(time.Second * -1 * time.Duration(r.GetDelay())), diff --git a/service/singleton/alertsentinel.go b/service/singleton/alertsentinel.go index a97397a..c300e6c 100644 --- a/service/singleton/alertsentinel.go +++ b/service/singleton/alertsentinel.go @@ -149,11 +149,11 @@ func checkStatus() { max, passed := alert.Check(alertsStore[alert.ID][server.ID]) if !passed { alertsPrevState[alert.ID][server.ID] = _RuleCheckFail - message := fmt.Sprintf("[主机故障] %s(%s) 规则：%s", server.Name, IPDesensitize(server.Host.IP), alert.Name) + message := fmt.Sprintf("$%d$[主机故障] %s(%s) 规则：%s", server.ID, server.Name, IPDesensitize(server.Host.IP), alert.Name) go SendNotification(alert.NotificationTag, message, true) } else { if alertsPrevState[alert.ID][server.ID] == _RuleCheckFail { - message := fmt.Sprintf("[主机恢复] %s(%s) 规则：%s", server.Name, IPDesensitize(server.Host.IP), alert.Name) + message := fmt.Sprintf("$%d$[主机恢复] %s(%s) 规则：%s", server.ID, server.Name, IPDesensitize(server.Host.IP), alert.Name) go SendNotification(alert.NotificationTag, message, true) } alertsPrevState[alert.ID][server.ID] = _RuleCheckPass