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

Bump github.com/prometheus/alertmanager from 0.25.1-0.20230502165937-0f3ab929fa37 to 0.26.0 #5840

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 28, 2023

Bumps github.com/prometheus/alertmanager from 0.25.1-0.20230502165937-0f3ab929fa37 to 0.26.0.

Release notes

Sourced from github.com/prometheus/alertmanager's releases.

0.26.0 / 2023-08-23

  • [CHANGE] Telegram Integration: api_url is now optional. #2981
  • [CHANGE] Telegram Integration: ParseMode default is now HTML instead of MarkdownV2. #2981
  • [CHANGE] Webhook Integration: url is now marked as a secret. It will no longer show up in the logs as clear-text. #3228
  • [CHANGE] Metrics: New label reason for alertmanager_notifications_failed_total metric to indicate the type of error of the alert delivery. #3094 #3307
  • [FEATURE] Clustering: New flag --cluster.label, to help to block any traffic that is not meant for the cluster. #3354
  • [FEATURE] Integrations: Add Microsoft Teams as a supported integration. #3324
  • [ENHANCEMENT] Telegram Integration: Support bot_token_file for loading this secret from a file. #3226
  • [ENHANCEMENT] Webhook Integration: Support url_file for loading this secret from a file. #3223
  • [ENHANCEMENT] Webhook Integration: Leading and trailing white space is now removed for the contents of url_file. #3363
  • [ENHANCEMENT] Pushover Integration: Support options device and sound (sound was previously supported but undocumented). #3318
  • [ENHANCEMENT] Pushover Integration: Support user_key_file and token_file for loading this secret from a file. #3200
  • [ENHANCEMENT] Slack Integration: Support errors wrapped in successful (HTTP status code 200) responses. #3121
  • [ENHANCEMENT] API: Add CORS and Cache-Control HTTP headers to all version 2 API routes. #3195
  • [ENHANCEMENT] UI: Receiver name is now visible as part of the alerts page. #3289
  • [ENHANCEMENT] Templating: Better default text when using {{ .Annotations }} and {{ .Labels }}. #3256
  • [ENHANCEMENT] Templating: Introduced a new function trimSpace which removes leading and trailing white spaces. #3223
  • [ENHANCEMENT] CLI: amtool silence query now supports the --id flag to query an individual silence. #3241
  • [ENHANCEMENT] Metrics: Introduced alertmanager_nflog_maintenance_total and alertmanager_nflog_maintenance_errors_total to monitor maintenance of the notification log. #3286
  • [ENHANCEMENT] Metrics: Introduced alertmanager_silences_maintenance_total and alertmanager_silences_maintenance_errors_total to monitor maintenance of silences. #3285
  • [ENHANCEMENT] Logging: Log GroupKey and alerts on alert delivery when using debug mode. #3438
  • [BUGFIX] Configuration: Empty list of receivers and inhibit_rules would cause the alertmanager to crash. #3209
  • [BUGFIX] Templating: Fixed a race condition when using the title function. It is now race-safe. #3278
  • [BUGFIX] API: Fixed duplicate receiver names in the api/v2/receivers API endpoint. #3338
  • [BUGFIX] API: Attempting to delete a silence now returns the correct status code, 404 instead of 500. #3352
  • [BUGFIX] Clustering: Fixes a panic when tls_client_config is empty. #3443
  • [BUGFIX] Fix stored XSS via the /api/v1/alerts endpoint in the Alertmanager UI.

0.26.0-rc.0 / 2023-08-17

  • [CHANGE] Telegram Integration: api_url is now optional. #2981
  • [CHANGE] Telegram Integration: ParseMode default is now HTML instead of MarkdownV2. #2981
  • [CHANGE] Webhook Integration: url is now marked as a secret. It will no longer show up in the logs as clear-text. #3228
  • [CHANGE] Metrics: New label reason for alertmanager_notifications_failed_total metric to indicate the type of error of the alert delivery. #3094 #3307
  • [FEATURE] Clustering: New flag --cluster.label, to help to block any traffic that is not meant for the cluster. #3354
  • [FEATURE] Integrations: Add Microsoft Teams as a supported integration. #3324
  • [ENHANCEMENT] Telegram Integration: Support bot_token_file for loading this secret from a file. #3226
  • [ENHANCEMENT] Webhook Integration: Support url_file for loading this secret from a file. #3223
  • [ENHANCEMENT] Webhook Integration: Leading and trailing white space is now removed for the contents of url_file. #3363
  • [ENHANCEMENT] Pushover Integration: Support options device and sound (sound was previously supported but undocumented). #3318
  • [ENHANCEMENT] Pushover Integration: Support user_key_file and token_file for loading this secret from a file. #3200
  • [ENHANCEMENT] Slack Integration: Support errors wrapped in successful (HTTP status code 200) responses. #3121
  • [ENHANCEMENT] API: Add CORS and Cache-Control HTTP headers to all version 2 API routes. #3195
  • [ENHANCEMENT] UI: Receiver name is now visible as part of the alerts page. #3289
  • [ENHANCEMENT] Templating: Better default text when using {{ .Annotations }} and {{ .Labels }}. #3256
  • [ENHANCEMENT] Templating: Introduced a new function trimSpace which removes leading and trailing white spaces. #3223
  • [ENHANCEMENT] CLI: amtool silence query now supports the --id flag to query an individual silence. #3241
  • [ENHANCEMENT] Metrics: Introduced alertmanager_nflog_maintenance_total and alertmanager_nflog_maintenance_errors_total to monitor maintenance of the notification log. #3286
  • [ENHANCEMENT] Metrics: Introduced alertmanager_silences_maintenance_total and alertmanager_silences_maintenance_errors_total to monitor maintenance of silences. #3285
  • [ENHANCEMENT] Logging: Log GroupKey and alerts on alert delivery when using debug mode. #3438
  • [BUGFIX] Configuration: Empty list of receivers and inhibit_rules would cause the alertmanager to crash. #3209

... (truncated)

Changelog

Sourced from github.com/prometheus/alertmanager's changelog.

0.26.0 / 2023-08-23

  • [CHANGE] Telegram Integration: api_url is now optional. #2981
  • [CHANGE] Telegram Integration: ParseMode default is now HTML instead of MarkdownV2. #2981
  • [CHANGE] Webhook Integration: url is now marked as a secret. It will no longer show up in the logs as clear-text. #3228
  • [CHANGE] Metrics: New label reason for alertmanager_notifications_failed_total metric to indicate the type of error of the alert delivery. #3094 #3307
  • [FEATURE] Clustering: New flag --cluster.label, to help to block any traffic that is not meant for the cluster. #3354
  • [FEATURE] Integrations: Add Microsoft Teams as a supported integration. #3324
  • [ENHANCEMENT] Telegram Integration: Support bot_token_file for loading this secret from a file. #3226
  • [ENHANCEMENT] Webhook Integration: Support url_file for loading this secret from a file. #3223
  • [ENHANCEMENT] Webhook Integration: Leading and trailing white space is now removed for the contents of url_file. #3363
  • [ENHANCEMENT] Pushover Integration: Support options device and sound (sound was previously supported but undocumented). #3318
  • [ENHANCEMENT] Pushover Integration: Support user_key_file and token_file for loading this secret from a file. #3200
  • [ENHANCEMENT] Slack Integration: Support errors wrapped in successful (HTTP status code 200) responses. #3121
  • [ENHANCEMENT] API: Add CORS and Cache-Control HTTP headers to all version 2 API routes. #3195
  • [ENHANCEMENT] UI: Receiver name is now visible as part of the alerts page. #3289
  • [ENHANCEMENT] Templating: Better default text when using {{ .Annotations }} and {{ .Labels }}. #3256
  • [ENHANCEMENT] Templating: Introduced a new function trimSpace which removes leading and trailing white spaces. #3223
  • [ENHANCEMENT] CLI: amtool silence query now supports the --id flag to query an individual silence. #3241
  • [ENHANCEMENT] Metrics: Introduced alertmanager_nflog_maintenance_total and alertmanager_nflog_maintenance_errors_total to monitor maintenance of the notification log. #3286
  • [ENHANCEMENT] Metrics: Introduced alertmanager_silences_maintenance_total and alertmanager_silences_maintenance_errors_total to monitor maintenance of silences. #3285
  • [ENHANCEMENT] Logging: Log GroupKey and alerts on alert delivery when using debug mode. #3438
  • [BUGFIX] Configuration: Empty list of receivers and inhibit_rules would cause the alertmanager to crash. #3209
  • [BUGFIX] Templating: Fixed a race condition when using the title function. It is now race-safe. #3278
  • [BUGFIX] API: Fixed duplicate receiver names in the api/v2/receivers API endpoint. #3338
  • [BUGFIX] API: Attempting to delete a silence now returns the correct status code, 404 instead of 500. #3352
  • [BUGFIX] Clustering: Fixes a panic when tls_client_config is empty. #3443
  • [BUGFIX] Fix stored XSS via the /api/v1/alerts endpoint in the Alertmanager UI.

0.25.0 / 2022-12-22

  • [CHANGE] Change the default parse_mode value from MarkdownV2 to HTML for Telegram. #2981
  • [CHANGE] Make api_url field optional for Telegram. #2981
  • [CHANGE] Use CanonicalMIMEHeaderKey instead of TitleCasing for email headers. #3080
  • [CHANGE] Reduce the number of notification logs broadcasted between peers by expiring them after (2 * repeat interval). #2982
  • [FEATURE] Add proxy_url support for OAuth2 in HTTP client configuration. #3010
  • [FEATURE] Reload TLS certificate and key from disk when updated. #3168
  • [FEATURE] Add Discord integration. #2948
  • [FEATURE] Add Webex integration. #3132
  • [ENHANCEMENT] Add --web.systemd-socket flag to systemd socket activation listeners instead of port listeners (Linux only). #3140
  • [ENHANCEMENT] Add enable_http2 support in HTTP client configuration. #3010
  • [ENHANCEMENT] Add min_version support to select the minimum TLS version in HTTP client configuration. #3010
  • [ENHANCEMENT] Add max_version support to select the maximum TLS version in HTTP client configuration. #3168
  • [ENHANCEMENT] Emit warning logs when truncating messages in notifications. #3145
  • [ENHANCEMENT] Add --data.maintenance-interval flag to define the interval between the garbage collection and snapshotting to disk of the silences and the notification logs. #2849
  • [ENHANCEMENT] Support HEAD method for the /-/healty and /-/ready endpoints. #3039
  • [ENHANCEMENT] Truncate messages with the ellipsis character instead of the 3-dots string .... #3072
  • [ENHANCEMENT] Add support for reading global and local SMTP passwords from files. #3038
  • [ENHANCEMENT] Add Location support to time intervals. #2782
  • [ENHANCEMENT] UI: Add 'Link' button to alerts in list. #2880

... (truncated)

Commits

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [github.com/prometheus/alertmanager](https://github.com/prometheus/alertmanager) from 0.25.1-0.20230502165937-0f3ab929fa37 to 0.26.0.
- [Release notes](https://github.com/prometheus/alertmanager/releases)
- [Changelog](https://github.com/prometheus/alertmanager/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/alertmanager/commits/v0.26.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/alertmanager
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot requested review from grafanabot and a team as code owners August 28, 2023 06:34
@dependabot dependabot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels Aug 28, 2023
@github-actions
Copy link
Contributor

This library is not auto-approved

Unfortunately, this library is a major version update or it is not included in our allowlist, which means it cannot be auto-approved. If you believe it should be considered for auto-approval, please open a pull request to add it to the allowlist configuration.

To add this library to the allowlist, please modify the allowlist.json file and include the necessary details for review.

@pracucci
Copy link
Collaborator

pracucci commented Aug 28, 2023

@gotjosh Do you still want to skip this?

For any reviewer: please double check if there's any new config option that we should forbid setting in Mimir (see alertmanager firewall and disabled security-sensitive features).

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
@pstibrany pstibrany requested a review from a team as a code owner September 4, 2023 07:59
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

This library is not auto-approved

Unfortunately, this library is a major version update or it is not included in our allowlist, which means it cannot be auto-approved. If you believe it should be considered for auto-approval, please open a pull request to add it to the allowlist configuration.

To add this library to the allowlist, please modify the allowlist.json file and include the necessary details for review.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

This library is not auto-approved

Unfortunately, this library is a major version update or it is not included in our allowlist, which means it cannot be auto-approved. If you believe it should be considered for auto-approval, please open a pull request to add it to the allowlist configuration.

To add this library to the allowlist, please modify the allowlist.json file and include the necessary details for review.

Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
@pstibrany pstibrany requested a review from a team as a code owner September 4, 2023 08:10
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

This library is not auto-approved

Unfortunately, this library is a major version update or it is not included in our allowlist, which means it cannot be auto-approved. If you believe it should be considered for auto-approval, please open a pull request to add it to the allowlist configuration.

To add this library to the allowlist, please modify the allowlist.json file and include the necessary details for review.

@pstibrany
Copy link
Member

@gotjosh Do you still want to skip this?

For any reviewer: please double check if there's any new config option that we should forbid setting in Mimir (see alertmanager firewall and disabled security-sensitive features).

There's no new config option in this PR, except new integration for Microsoft Teams. We now pass our "firewall" dialer to http options of that integration.

@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2023

This library is not auto-approved

Unfortunately, this library is a major version update or it is not included in our allowlist, which means it cannot be auto-approved. If you believe it should be considered for auto-approval, please open a pull request to add it to the allowlist configuration.

To add this library to the allowlist, please modify the allowlist.json file and include the necessary details for review.

Copy link
Contributor

@gotjosh gotjosh left a comment

Choose a reason for hiding this comment

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

LGTM - just need one answer to a question from @JohnnyQQQQ.

@@ -142,6 +142,7 @@ func Create(
probeInterval time.Duration,
tlsTransportConfig *TLSTransportConfig,
allowInsecureAdvertise bool,
label string,
Copy link
Contributor

Choose a reason for hiding this comment

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

@JohnnyQQQQ do you think it's worth bringing this into Mimir? I can't remember the exact set of conditions under which you faced this problem for the Alertmanager.

Copy link
Member

Choose a reason for hiding this comment

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

This function doesn't seem to be used by Mimir. @gotjosh confirmed that privately: "OH right — we completely removed support for gossip-based alertmanager cluster. Memberlist in only used in the ring which already supports this."

Copy link
Contributor

Choose a reason for hiding this comment

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

100% correct.

@pstibrany pstibrany merged commit e1731c5 into main Sep 4, 2023
29 checks passed
@pstibrany pstibrany deleted the dependabot/go_modules/github.com/prometheus/alertmanager-0.26.0 branch September 4, 2023 09:14
@grafanabot
Copy link
Contributor

The backport to release-2.10 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5840-to-release-2.10 origin/release-2.10
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e1731c57f5c8ea0695043c9b1b6d27946780a67e
# Push it to GitHub
git push --set-upstream origin backport-5840-to-release-2.10
git switch main
# Remove the local backport branch
git branch -D backport-5840-to-release-2.10

Then, create a pull request where the base branch is release-2.10 and the compare/head branch is backport-5840-to-release-2.10.

@grafanabot
Copy link
Contributor

The backport to release-2.9 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5840-to-release-2.9 origin/release-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x e1731c57f5c8ea0695043c9b1b6d27946780a67e
# Push it to GitHub
git push --set-upstream origin backport-5840-to-release-2.9
git switch main
# Remove the local backport branch
git branch -D backport-5840-to-release-2.9

Then, create a pull request where the base branch is release-2.9 and the compare/head branch is backport-5840-to-release-2.9.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.9 backport release-2.10 backport-failed dependencies Pull requests that update a dependency file go Pull requests that update Go code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants