Alerting: Fix Graphite subqueries #80744
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
gillesdemey
added
datasource/Graphite
area/alerting
gillesdemey
requested review from
konrad147 and
soniaAguilarPeiron
and removed request for
a team
bohandley
approved these changes
Jan 17, 2024
gillesdemey
commented
Jan 18, 2024
| @@ -136,6 +136,9 @@ export const QueryWrapper = ({ | |||
| } | |||
|
|
|||
| const showVizualisation = data.state !== LoadingState.NotStarted; | |||
| // ⚠️ the query editors want the entire array of queries passed as "DataQuery" NOT "AlertQuery" | |||
| // TypeScript isn't complaining here because the interfaces just happen to be compatible | |||
| const editorQueries = cloneDeep(queries.map((query) => query.model)); | |||
There was a problem hiding this comment.
Leaving this here for posterity; some editors mutate the queries prop they receive and those are managed by an immutable state and a reducer on the Alerting side – so we clone them before passing them forward.
soniaAguilarPeiron
approved these changes
Jan 18, 2024
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
Jan 18, 2024
(cherry picked from commit 8a4bd85)
|
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-80744-to-v9.4.x origin/v9.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 8a4bd85efdd4101c481244b62d70e03e315d820cWhen 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-80744-to-v9.4.x
# Create the PR body template
PR_BODY=$(gh pr view 80744 --json body --template 'Backport 8a4bd85efdd4101c481244b62d70e03e315d820c from #80744{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v9.4.x] Alerting: Fix Graphite subqueries" --body-file - --label "type/bug" --label "datasource/Graphite" --label "area/alerting" --label "area/frontend" --label "add to changelog" --label "backport" --base v9.4.x --milestone 9.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-80744-to-v9.4.x
# Create a pull request where the `base` branch is `v9.4.x` and the `compare`/`head` branch is `backport-80744-to-v9.4.x`.
# Remove the local backport branch
git switch main
git branch -D backport-80744-to-v9.4.x |
grafana-delivery-bot
bot
added
the
backport-failed
gillesdemey
added a commit
that referenced
this pull request
Jan 22, 2024
(cherry picked from commit 8a4bd85)
gillesdemey
added a commit
that referenced
this pull request
Jan 22, 2024
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 contains 2 notable changes to make Graphite subqueries work within alerting.
AlertQueryis compatible withDataQuery(they both haverefId: string) even though these are very different data structures.onChangehandler and writing the updates to its own state with a reducer. This PR adds thetargetFullproperty to it so it can be recorded in the backend and used for rule evaluation.Special notes for your reviewer:
I wasn't quite sure about the changes made to the Graphite editor and currently am a bit perplexed about why this does work for the panel editor.
I'd love to get some feedback if I'm on the wrong track here and if we need a different approach.