Fixes a number of bugs in silences #8525
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grobinson-grafana
requested review from
grafanabot,
a team and
stevesg
as code owners
| @@ -63,7 +63,7 @@ require ( | |||
| github.com/google/go-github/v57 v57.0.0 | |||
| github.com/google/uuid v1.6.0 | |||
| github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc | |||
| github.com/grafana/alerting v0.0.0-20240607182251-835aff588914 | |||
| github.com/grafana/alerting v0.0.0-20240626080128-8299cb22b8df | |||
There was a problem hiding this comment.
This comes from here. It is a branch that has two commits on top of 835aff5 to avoid bringing in the changes from #8515 while it is still in review.
The changes in this branch are cherry-picked from main, and were reviewed by @yuri-tceretian:
There was a problem hiding this comment.
@santihernandezc asked me why do this instead of using main from grafana/alerting. My reasoning for this was so I don't have to bring in changes from #8515 for the bug fix as I don't know if and when that PR will be approved. If you consider this to be unnecessary I will happily update the PR to use main.
grobinson-grafana
force-pushed
the
grobinson/fix-silences
branch
from
4b775a1
to
162a7c8
Compare
4 tasks
This commit fixes the following bugs in silences: - prometheus/alertmanager#3877 - prometheus/alertmanager#3898 - prometheus/alertmanager#3897 which could cause an existing silence to be deleted/expired when updating the silence failed. This could be because the replacing silence exceeded limits or was invalid. additional tests in upstream.
grobinson-grafana
force-pushed
the
grobinson/fix-silences
branch
from
fe93431
to
d84bd0d
Compare
grobinson-grafana
requested review from
gotjosh,
alexweav,
santihernandezc and
fayzal-g
56quarters
approved these changes
Jun 26, 2024
stevesg
approved these changes
Jun 26, 2024
|
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-8525-to-release-2.13 origin/release-2.13
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 1cfb65777a4dbf21c85b1467e67b925e32e3042e
# Push it to GitHub
git push --set-upstream origin backport-8525-to-release-2.13
git switch main
# Remove the local backport branch
git branch -D backport-8525-to-release-2.13Then, create a pull request where the |
dimitarvdimitrov
pushed a commit
that referenced
this pull request
Jul 2, 2024
This commit fixes the following bugs in silences: - prometheus/alertmanager#3877 - prometheus/alertmanager#3898 - prometheus/alertmanager#3897 which could cause an existing silence to be deleted/expired when updating the silence failed. This could be because the replacing silence exceeded limits or was invalid. (cherry picked from commit 1cfb657)
dimitarvdimitrov
added a commit
that referenced
this pull request
Jul 2, 2024
* Fixes a number of bugs in silences (#8525) This commit fixes the following bugs in silences: - prometheus/alertmanager#3877 - prometheus/alertmanager#3898 - prometheus/alertmanager#3897 which could cause an existing silence to be deleted/expired when updating the silence failed. This could be because the replacing silence exceeded limits or was invalid. (cherry picked from commit 1cfb657) * Update CHANGELOG.md (#8526) (cherry picked from commit 36f7af3) --------- Co-authored-by: George Robinson <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
This commit fixes the following bugs in silences:
which could cause an existing silence to be deleted/expired when updating the silence failed. This can happen when the replacing silence exceeded limits or was invalid.
Which issue(s) this PR fixes or relates to
Here are some screenshots showing the broken behavior, where an existing silence is expired because the limit was reached:
And here is the same update performed with the fix:
You can see the original silence is kept. This has also been tested for invalid silences and silences which are too large (exceed maximum size limit):
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.