Alerting: Fix persisting result fingerprint that is used by recovery threshold #91224
Conversation
This file contains hidden or 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
|
This PR must be merged before a backport PR will be created. |
3 similar comments
|
This PR must be merged before a backport PR will be created. |
|
This PR must be merged before a backport PR will be created. |
|
This PR must be merged before a backport PR will be created. |
alexweav
approved these changes
Jul 30, 2024
JacobsonMT
approved these changes
Jul 30, 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-91224-to-v10.4.x origin/v10.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 537f1fb857cdefabd0bef1d97f87a7966ead12e6When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v10.4.x
# Create the PR body template
PR_BODY=$(gh pr view 91224 --json body --template 'Backport 537f1fb857cdefabd0bef1d97f87a7966ead12e6 from #91224{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v10.4.x] Alerting: Fix persisting result fingerprint that is used by recovery threshold' --body-file - --label 'type/bug' --label 'area/backend' --label 'add to changelog' --label 'backport' --base v10.4.x --milestone 10.4.x --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v10.4.x
# Create a pull request where the `base` branch is `v10.4.x` and the `compare`/`head` branch is `backport-91224-to-v10.4.x`.
# Remove the local backport branch
git switch main
git branch -D backport-91224-to-v10.4.x |
|
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-91224-to-v11.0.x origin/v11.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 537f1fb857cdefabd0bef1d97f87a7966ead12e6When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v11.0.x
# Create the PR body template
PR_BODY=$(gh pr view 91224 --json body --template 'Backport 537f1fb857cdefabd0bef1d97f87a7966ead12e6 from #91224{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v11.0.x] Alerting: Fix persisting result fingerprint that is used by recovery threshold' --body-file - --label 'type/bug' --label 'area/backend' --label 'add to changelog' --label 'backport' --base v11.0.x --milestone 11.0.x --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v11.0.x
# Create a pull request where the `base` branch is `v11.0.x` and the `compare`/`head` branch is `backport-91224-to-v11.0.x`.
# Remove the local backport branch
git switch main
git branch -D backport-91224-to-v11.0.x |
|
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-91224-to-v11.1.x origin/v11.1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 537f1fb857cdefabd0bef1d97f87a7966ead12e6When the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v11.1.x
# Create the PR body template
PR_BODY=$(gh pr view 91224 --json body --template 'Backport 537f1fb857cdefabd0bef1d97f87a7966ead12e6 from #91224{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[v11.1.x] Alerting: Fix persisting result fingerprint that is used by recovery threshold' --body-file - --label 'type/bug' --label 'area/backend' --label 'add to changelog' --label 'backport' --base v11.1.x --milestone 11.1.x --webOr, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-91224-to-v11.1.x
# Create a pull request where the `base` branch is `v11.1.x` and the `compare`/`head` branch is `backport-91224-to-v11.1.x`.
# Remove the local backport branch
git switch main
git branch -D backport-91224-to-v11.1.x |
giorgioatmerqury
pushed a commit
to cybermerqury/grafana
that referenced
this pull request
Aug 21, 2024
…threshold (grafana#91224) * fix persister to save result fingerprint * revert change * fmt
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 is this feature?
This PR fixes state persister to populate the result fingerprint field introduced in #75189 and accidentally removed in #80384
Also, it updates the state manager to always update result fingerprint when it does not match the existing one and emit a log message.
Why do we need this feature?
PR #80384 introduced a regression, which resulted in ResultFingerprint not being saved to the storage. Therefore, if the Grafana restarts the current state is fetched from the database, and the state's fingerprint remains empty. During the lifetime of the state, the resulting fingerprint is not updated, which breaks recovery threshold functionality that relies on this hash: the state manager provides an empty hash to the evaluator, and that hash does not match anything. Therefore, all dimensions that are supposed to be considered "loaded", and therefore evaluated using the unloading threshold, are evaluated against the loading threshold.
The state remains empty because the state manager never updates the result fingerprint of the existing state.
Who is this feature for?
Users of recovery threshold.
Which issue(s) does this PR fix?:
Related to and potentially fixes #87226