[v11.0.x] CloudMonitoring: Improve legacy query migrations #87648
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
![grafana-delivery-bot[bot]](https://avatars.githubusercontent.com/in/329617?s=60&v=4){kind=small}
* Match backend and correctly migrate metricType Update tests * Ensure project is migrated or set if not defined * Improve migrations logic (cherry picked from commit 95667f6)
grafana-delivery-bot
bot
requested review from
asimpson,
bossinc,
aangelisc and
alyssabull
and removed request for
a team
grafana-delivery-bot
bot
added
add to changelog
area/frontend
backport
aangelisc
approved these changes
May 10, 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.
Backport 95667f6 from #86069
There were various issues with the query migrations that take place for Cloud Monitoring (particularly legacy queries).
This PR addresses those by ensuring the backend and frontend migrations are more closely aligned.
metricTypeproperty is defined in a legacy query it will be correctly migrated to thefiltersproperty.I've also cleaned up the migration effect as I found an edge case where a query would be migrated but then not actually used because another effect being called would wipe out the migrated query.
Also, updated the tests for these cases.
Fixes #70734 (there were two distinct issues in there but they've been bundled into one).