Skip to content

Grafana Alertmanager: Bump alerting for templateable webhooks#11195

Merged
JacobsonMT merged 2 commits intomainfrom
jacobsonmt/upgrade-alerting-template-webhook
Apr 11, 2025
Merged

Grafana Alertmanager: Bump alerting for templateable webhooks#11195
JacobsonMT merged 2 commits intomainfrom
jacobsonmt/upgrade-alerting-template-webhook

Conversation

@JacobsonMT
Copy link
Copy Markdown
Contributor

@JacobsonMT JacobsonMT commented Apr 11, 2025

Pulls in grafana/alerting#309 for templateable webhook support in remote Grafana Alertmanager.

Also changes the function remote Grafana AM uses to create the combined template to the correct one in grafana/alerting. This makes sure it automatically loads the func map that GMA uses. This change should actually fix another issue in the previous code: alertingTemplates.DefaultTemplateString should be loaded before user defined templates so that they can be overridden.

@JacobsonMT JacobsonMT requested review from a team and stevesg as code owners April 11, 2025 13:58
@github-project-automation github-project-automation Bot moved this to In review in Alerting Apr 11, 2025
Automatically loads the right func map that GMA uses.

Actually fixes another issue in the previous code. alertingTemplates.DefaultTemplateString
should be loaded *before* user defined templates so that they can be overridden.
Copy link
Copy Markdown
Contributor

@56quarters 56quarters left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@JacobsonMT JacobsonMT merged commit 8db48ab into main Apr 11, 2025
26 checks passed
@github-project-automation github-project-automation Bot moved this from In review to Done in Alerting Apr 11, 2025
@JacobsonMT JacobsonMT deleted the jacobsonmt/upgrade-alerting-template-webhook branch April 11, 2025 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants