From bc27aafd7e51dbfb7b1b40b0f2084247f91bf248 Mon Sep 17 00:00:00 2001 From: liugq Date: Sun, 6 Aug 2023 16:39:30 +0800 Subject: [PATCH] fix wrong template variable message with sending test rule message --- service/alerting/elasticsearch/engine.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/service/alerting/elasticsearch/engine.go b/service/alerting/elasticsearch/engine.go index 65d8cffb..e3fefe67 100644 --- a/service/alerting/elasticsearch/engine.go +++ b/service/alerting/elasticsearch/engine.go @@ -941,11 +941,24 @@ func (engine *Engine) Test(rule *alerting.Rule, msgType string) ([]alerting.Acti alerting2.ParamEventID: util.GetUUID(), alerting2.ParamTimestamp: time.Now().Unix(), } ) - title, message := rule.GetNotificationTitleAndMessage() - err = attachTitleMessageToCtx(title, message, paramsCtx) - if err != nil { - return nil, err + if msgType == "escalation" || msgType == "notification" { + title, message := rule.GetNotificationTitleAndMessage() + err = attachTitleMessageToCtx(title, message, paramsCtx) + if err != nil { + return nil, err + } + }else if msgType == "recover_notification" { + if rule.RecoveryNotificationConfig == nil { + return nil, fmt.Errorf("recovery notification must not be empty") + } + err = attachTitleMessageToCtx(rule.RecoveryNotificationConfig.Title, rule.RecoveryNotificationConfig.Message, paramsCtx) + if err != nil { + return nil, err + } + }else{ + return nil, fmt.Errorf("unkonwn parameter msg type") } + var channels []alerting.Channel switch msgType { case "escalation":