[v10.1.x] Cloudwatch: Prevent log group requests with ARNs if feature flag is off #75691
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}
grafana-delivery-bot
bot
requested review from
fridgepoet and
iwysiu
and removed request for
a team
grafana-delivery-bot
bot
added
add to changelog
area/backend
backport
katebrenner
approved these changes
Sep 28, 2023
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 b83a58e from #75672
What is this feature?
Bug Fix for GovCloud customers using the Cloudwatch Datasource plugin
AWS GovCloud users do not have support right now from AWS for querying log groups by arn. As of around 9.5 or so we've made this the default behavior, which meant that some gov cloud customers have queries saved with log group arns rather than names.
We then put this work back behind a feature flag, so that querying by arn could be turned off.
However this does not fix any previously saved queries that may still have logGroups saved in their queries, and any datasources that had been saved at this time with a default log group selection of logGroups rather than logGroupNames will cause the explore page queries to also fail as they will always have the default logGroups in their selection.
This PR ensures that if the feature flag is turned off we always ignore LogGroups in queries and only observe LogGroupNames.
Special notes for your reviewer:
Please check that: