new notify process #2464
Open
new notify process #2464
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
710leo
reviewed
Feb 14, 2025
|
|
||
| func MessageTemplateGetsAll(ctx *ctx.Context) ([]*MessageTemplate, error) { | ||
| if !ctx.IsCenter { | ||
| templates, err := poster.GetByUrls[[]*MessageTemplate](ctx, "/v1/n9e/message-templates") |
710leo
reviewed
Feb 14, 2025
models/notify_channel.go
Outdated
| "encoding/base64" | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/ccfos/nightingale/v6/pkg/ctx" |
710leo
reviewed
Feb 14, 2025
|
|
||
| func NotifyChannelGetsAll(ctx *ctx.Context) ([]*NotifyChannelConfig, error) { | ||
| if !ctx.IsCenter { | ||
| channels, err := poster.GetByUrls[[]*NotifyChannelConfig](ctx, "/v1/n9e/notify-channels") |
710leo
reviewed
Feb 14, 2025
models/notify_channel.go
Outdated
| func GetSMTPClient(nc *NotifyChannelConfig) (*smtp.Client, error) { | ||
| // 连接到 SMTP 服务器 | ||
| addr := fmt.Sprintf("%s:%d", nc.SMTPRequestConfig.Host, nc.SMTPRequestConfig.Port) | ||
| client, err := smtp.Dial(addr) |
There was a problem hiding this comment.
这里可以参考之前的 smtp 代码，使用 gomail.NewDialer，smtp.Dial不确定是否会踩坑
alert/dispatch/dispatch.go
Outdated
|
|
||
| switch notifyChannel.RequestType { | ||
| case "http": | ||
| notifyChannel.SendHTTP(content, params, e.notifyChannelCache.GetHttpClient(notifyChannel.ID)) |
There was a problem hiding this comment.
这里需要把 events 也传进去，方便在 http 参数和 body 中使用，更灵活一些
alert/dispatch/dispatch.go
Outdated
| userGroups := e.userGroupCache.GetByUserGroupIds(p.UserGroupIDs) | ||
| var origin []string | ||
| var val []string | ||
| if notifyChannel.ParamConfig.UserInfo.ContactKey == "phone" { |
There was a problem hiding this comment.
这里缺少了对用户的其他联系方式的处理，比如公司内部 im，个人相关的 token
models/notify_channel.go
Outdated
|
|
||
| // 将 MessageTemplate 与变量配置的信息渲染进 reqBody | ||
| body, err := ncc.parseRequestBody(content, param) | ||
| if err != nil { |
models/notify_channel.go
Outdated
| return body.Bytes(), err | ||
| } | ||
|
|
||
| func (ncc *NotifyChannelConfig) replaceVariables(param map[string]string) { |
models/notify_channel.go
Outdated
| for i := range params { | ||
| param := params[i] | ||
| var to []string | ||
| if ncc.ParamConfig.BatchSend { |
models/notify_channel.go
Outdated
|
|
||
| m.SetHeader("From", ncc.SMTPRequestConfig.From) | ||
| m.SetHeader("To", strings.Join(to, ",")) | ||
| m.SetHeader("Subject", "Test Email") |
There was a problem hiding this comment.
这里 Subject 可以使用 tpl.subject,body 可以使用 tpl.content
memsto/notify_channel_cache.go
Outdated
| httpClient[lst[i].ID] = cli | ||
| case "smtp": | ||
| ch := make(chan *models.EmailContext) | ||
| ncc.startEmailSender(lst[i].ID, lst[i].SMTPRequestConfig, ch) |
There was a problem hiding this comment.
另外，这个可能存在 gorutine 泄露，如果 lst[i].ID 被删除之后，这里的 gorutine 会一直存在
710leo
reviewed
Feb 14, 2025
models/notify_channel.go
Outdated
| // 设置 TLS 配置 | ||
| tlsConfig := &tls.Config{ | ||
| //InsecureSkipVerify: nc.HTTPRequestConfig.TLS != nil && nc.HTTPRequestConfig.TLS.SkipVerify, | ||
| InsecureSkipVerify: true, |
alert/dispatch/dispatch.go
Outdated
| } | ||
|
|
||
| if notifyChannel.ParamConfig.BatchSend { | ||
| val = append(val, strings.Join(origin, ",")) |
There was a problem hiding this comment.
这里直接使用逗号把联系方式拼接起来，后面灵活度不太够，可能有接口参数要求是以 ; 分割，或者是字符串数组 phone=["123...","334..."]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
通知规则改造