-
Notifications
You must be signed in to change notification settings - Fork 550
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
Bump github.com/prometheus/alertmanager from 0.25.1-0.20230502165937-0f3ab929fa37 to 0.26.0 #5840
Conversation
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>
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. |
@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>
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>
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>
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. |
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. |
…alertmanager-0.26.0
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. |
There was a problem hiding this 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, |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
100% correct.
The backport to
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 |
The backport to
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 |
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.
... (truncated)
Changelog
Sourced from github.com/prometheus/alertmanager's changelog.
... (truncated)
Commits
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)