floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename recovery_notification_config.channels to recovery_notification_config.normal

This commit is contained in:
liugq 2023-07-27 10:29:02 +08:00
parent d6d1013e0a
commit e6d08bc128
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/alerting/rule.go
View File

@ -18,7 +18,7 @@ type Rule struct {
Resource Resource `json:"resource" elastic_mapping:"resource:{type:object}"` Resource Resource `json:"resource" elastic_mapping:"resource:{type:object}"`
Metrics Metric `json:"metrics" elastic_mapping:"metrics:{type:object}"` Metrics Metric `json:"metrics" elastic_mapping:"metrics:{type:object}"`
Conditions Condition `json:"conditions" elastic_mapping:"conditions:{type:object}"` Conditions Condition `json:"conditions" elastic_mapping:"conditions:{type:object}"`
Channels NotificationConfig `json:"channels,omitempty" elastic_mapping:"channels:{type:object}"` Channels *NotificationConfig `json:"channels,omitempty" elastic_mapping:"channels:{type:object}"`
NotificationConfig *NotificationConfig `json:"notification_config,omitempty" elastic_mapping:"notification_config:{type:object}"` NotificationConfig *NotificationConfig `json:"notification_config,omitempty" elastic_mapping:"notification_config:{type:object}"`
RecoveryNotificationConfig *RecoveryNotificationConfig `json:"recovery_notification_config,omitempty" elastic_mapping:"recovery_notification_config:{type:object}"` RecoveryNotificationConfig *RecoveryNotificationConfig `json:"recovery_notification_config,omitempty" elastic_mapping:"recovery_notification_config:{type:object}"`
Schedule Schedule `json:"schedule" elastic_mapping:"schedule:{type:object}"` Schedule Schedule `json:"schedule" elastic_mapping:"schedule:{type:object}"`
@ -61,7 +61,7 @@ func (rule *Rule) GetNotificationConfig() *NotificationConfig {
if rule.NotificationConfig != nil { if rule.NotificationConfig != nil {
return rule.NotificationConfig return rule.NotificationConfig
} }
return &rule.Channels return rule.Channels
} }
func (rule *Rule) GetNotificationTitleAndMessage() (string, string) { func (rule *Rule) GetNotificationTitleAndMessage() (string, string) {
if rule.NotificationConfig != nil { if rule.NotificationConfig != nil {
@ -87,7 +87,7 @@ type RecoveryNotificationConfig struct {
Title string `json:"title"` //text template Title string `json:"title"` //text template
Message string `json:"message"` // text template Message string `json:"message"` // text template
AcceptTimeRange TimeRange `json:"accept_time_range,omitempty"` AcceptTimeRange TimeRange `json:"accept_time_range,omitempty"`
Channels []Channel `json:"channels,omitempty"` Normal []Channel `json:"normal,omitempty"`
} }
type MessageTemplate struct{ type MessageTemplate struct{

2
service/alerting/elasticsearch/engine.go
View File

@ -687,7 +687,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
if err != nil { if err != nil {
return err return err
} }
actionResults, _ := performChannels(recoverCfg.Channels, paramsCtx) actionResults, _ := performChannels(recoverCfg.Normal, paramsCtx)
alertItem.ActionExecutionResults = actionResults alertItem.ActionExecutionResults = actionResults
} }
} }