Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return error when TmplText errors in sns notifier #3531

Merged
merged 1 commit into from
Jun 13, 2024

Conversation

emanlodovice
Copy link
Contributor

Update sns notifier to return the error that TmplText returns instead of completely ignoringg it

Fixes #3528

@emanlodovice emanlodovice force-pushed the sns-raise-template-error branch 3 times, most recently from 8c872db to 53ddf63 Compare September 19, 2023 07:22
@emanlodovice emanlodovice force-pushed the sns-raise-template-error branch 4 times, most recently from 8ffb4a2 to e5ef62b Compare September 28, 2023 22:53
@emanlodovice
Copy link
Contributor Author

@gotjosh good day, can you have a look at this fix? Thank you

@emanlodovice
Copy link
Contributor Author

emanlodovice commented Oct 5, 2023

oops, just realized that this template error is classified as other in the error metric, going to change it to be classified as clientError

@emanlodovice
Copy link
Contributor Author

updated

Copy link
Contributor

@LeviHarrison LeviHarrison left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@gotjosh gotjosh merged commit 603a728 into prometheus:main Jun 13, 2024
8 checks passed
@TheMeier
Copy link
Contributor

TheMeier commented Jun 14, 2024

@gotjosh
This did break the tests:

notify/sns/sns.go:32:2: missing go.sum entry for module providing package github.com/pkg/errors (imported by github.com/prometheus/alertmanager/notify/sns); to add:
        go get github.com/prometheus/alertmanager/notify/sns

https://app.circleci.com/pipelines/github/prometheus/alertmanager/5173/workflows/a1d2baef-4384-4617-a4b5-8c3c451a9a0f/jobs/22363

If you add the package and update go.mod and go.sum locally tests fail with:

# github.com/prometheus/alertmanager/notify/sns
notify/sns/sns.go:32:2: errors redeclared in this block
	notify/sns/sns.go:18:2: other declaration of errors
notify/sns/sns.go:32:2: "github.com/pkg/errors" imported and not used
notify/sns/sns.go:120:74: undefined: errors.Wrap
notify/sns/sns.go:155:74: undefined: errors.Wrap
notify/sns/sns.go:162:75: undefined: errors.Wrap
notify/sns/sns.go:179:75: undefined: errors.Wrap
notify/sns/sns.go:187:75: undefined: errors.Wrap
notify/sns/sns.go:193:74: undefined: errors.Wrap
notify/sns/sns.go:210:75: undefined: errors.Wrap

gotjosh added a commit that referenced this pull request Jun 14, 2024
gotjosh added a commit that referenced this pull request Jun 14, 2024
TheMeier pushed a commit to TheMeier/alertmanager that referenced this pull request Sep 29, 2024
TheMeier pushed a commit to TheMeier/alertmanager that referenced this pull request Sep 29, 2024
gotjosh added a commit that referenced this pull request Oct 24, 2024
* Release v0.28.0-rc.0

* [CHANGE] Templating errors in the SNS integration now return an error. #3531 #3879
* [FEATURE] Add a new Microsoft Teams integration based on Flows #4024
* [FEATURE] Add a new Rocket.Chat integration #3600
* [FEATURE] Add a new Jira integration #3590 #3931
* [FEATURE] Add support for `GOMEMLIMIT`, enable it via the feature flag `--enable-feature=auto-gomemlimit`. #3895
* [FEATURE] Add support for `GOMAXPROCS`, enable it via the feature flag `--enable-feature=auto-gomaxprocs`. #3837
* [FEATURE] Add support for limits of silences including the maximum number of active and pending silences, and the maximum size per silence (in bytes). You can use the flags `--silences.max-silences` and `--silences.max-silence-size-bytes` to set them accordingly #3852 #3862 #3866 #3885 #3886 #3877
* [FEATURE] Muted alerts now show whether they are suppressed or not in both the `/api/v2/alerts` endpoint and the Alertmanager UI. #3793 #3797 #3792
* [ENHANCEMENT] Add support for `content`, `username` and `avatar_url` in the Discord integration. `content` and `username` also support templating. #4007
* [ENHANCEMENT] Only invalidate the silences cache if a new silence is created or an existing silence replaced - should improve latency on both `GET api/v2/alerts` and `POST api/v2/alerts` API endpoint. #3961
* [ENHANCEMENT] Add image source label to Dockerfile. To get changelogs shown when using Renovate #4062
* [ENHANCEMENT] Build using go 1.23 #4071
* [ENHANCEMENT] Support setting a global SMTP TLS configuration. #3732
* [ENHANCEMENT] The setting `room_id` in the WebEx integration can now be templated to allow for dynamic room IDs. #3801
* [ENHANCEMENT] Enable setting `message_thread_id` for the Telegram integration. #3638
* [ENHANCEMENT] Support the `since` and `humanizeDuration` functions to templates. This means users can now format time to more human-readable text. #3863
* [ENHANCEMENT] Support the `date` and `tz` functions to templates. This means users can now format time in a specified format and also change the timezone to their specific locale. #3812
* [ENHANCEMENT] Latency metrics now support native histograms. #3737
* [BUGFIX] Fix the SMTP integration not correctly closing an SMTP submission, which may lead to unsuccessful dispatches being marked as successful. #4006
* [BUGFIX]  The `ParseMode` option is now set explicitly in the Telegram integration. If we don't HTML tags had not been parsed by default. #4027
* [BUGFIX] Fix a memory leak that was caused by updates silences continuously. #3930
* [BUGFIX] Fix hiding secret URLs when the URL is incorrect. #3887
* [BUGFIX] Fix a race condition in the alerts - it was more of a hypothetical race condition that could have occurred in the alert reception pipeline. #3648
* [BUGFIX] Fix a race condition in the alert delivery pipeline that would cause a firing alert that was delivered earlier to be deleted from the aggregation group when instead it should have been delivered again. #3826
* [BUGFIX] Fix version in APIv1 deprecation notice. #3815
* [BUGFIX] Fix crash errors when using `url_file` in the Webhook integration. #3800
* [BUGFIX] fix `Route.ID()` returns conflicting IDs. #3803
* [BUGFIX] Fix deadlock on the alerts memory store. #3715
* [BUGFIX] Fix `amtool template render` when using the default values. #3725
* [BUGFIX] Fix `webhook_url_file` for both the Discord and Microsoft Teams integrations. #3728 #3745

---------

Signed-off-by: SuperQ <[email protected]>
Signed-off-by: gotjosh <[email protected]>
Co-authored-by: gotjosh <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SNS notifier swallows errors related to missing templates used in the config
5 participants