Rebase branch on master and fix conflicts

richardgreg · richardgreg · commit 494a0641c887 · 2024-03-12T17:26:01.000+01:00
diff --git a/internal/alert/manager.go b/internal/alert/manager.go
@@ -174,8 +174,8 @@ func (am *alertManager) handleTelegramPost(alert core.Alert, policy *core.AlertP
 
 	// Create Telegram event trigger
 	event := &client.AlertEventTrigger{
-		Message:  am.interpolator.TelegramMessage(alert, policy.Msg),
-		Severity: alert.Sev,
+		Message: am.interpolator.TelegramMessage(alert, policy.Msg),
+		Alert:   alert,
 	}
 
 	for _, tc := range telegramClients {

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ func (am alertManager) handleTelegramPost(alert core.Alert, policy core.AlertP`
`174`	`174`
`175`	`175`	`// Create Telegram event trigger`
`176`	`176`	`event := &client.AlertEventTrigger{`
`177`		`- Message: am.interpolator.TelegramMessage(alert, policy.Msg),`
`178`		`- Severity: alert.Sev,`
	`177`	`+ Message: am.interpolator.TelegramMessage(alert, policy.Msg),`
	`178`	`+ Alert: alert,`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`for _, tc := range telegramClients {`