Merge pull request #4353 from m-burst/patch-1

grobinson-grafana · web-flow · commit 79805945102a · 2025-04-15T15:18:37.000+01:00
Fix error handling in template rendering for Telegram
diff --git a/notify/telegram/telegram.go b/notify/telegram/telegram.go
@@ -80,6 +80,9 @@ func (n *Notifier) Notify(ctx context.Context, alert ...*types.Alert) (bool, err
 	}
 
 	messageText, truncated := notify.TruncateInRunes(tmpl(n.conf.Message), maxMessageLenRunes)
+	if err != nil {
+		return false, err
+	}
 	if truncated {
 		n.logger.Warn("Truncated message", "alert", key, "max_runes", maxMessageLenRunes)
 	}

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ func (n Notifier) Notify(ctx context.Context, alert ...types.Alert) (bool, err`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`messageText, truncated := notify.TruncateInRunes(tmpl(n.conf.Message), maxMessageLenRunes)`
	`83`	`+ if err != nil {`
	`84`	`+ return false, err`
	`85`	`+ }`
`83`	`86`	`if truncated {`
`84`	`87`	`n.logger.Warn("Truncated message", "alert", key, "max_runes", maxMessageLenRunes)`
`85`	`88`	`}`