CloudWatch: Add account support to variable queries #63822
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
iwysiu
commented
Feb 27, 2023
|
Backend code coverage report for PR #63822 |
|
Frontend code coverage report for PR #63822
|
iwysiu
requested review from
fridgepoet and
sarahzinger
and removed request for
a team
fridgepoet
approved these changes
Mar 1, 2023
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
Show resolved
Hide resolved
|
For any other readers, here's a screenshot of the field this PR adds in the variable query editor: |
iwysiu
commented
Mar 1, 2023
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
Show resolved
Hide resolved
idastambuk
reviewed
Mar 2, 2023
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
Show resolved
Hide resolved
| label="Account" | ||
| value={query.accountId ?? null} | ||
| onChange={(accountId?: string) => onQueryChange({ ...parsedQuery, accountId })} | ||
| options={accountState?.value.length ? [ALL_ACCOUNTS_OPTION, ...accountState?.value] : []} |
There was a problem hiding this comment.
Suggested change
| options={accountState?.value.length ? [ALL_ACCOUNTS_OPTION, ...accountState?.value] : []} | |
| options={[ALL_ACCOUNTS_OPTION, ...accountState?.value]} |
There's a condition above that checks for accountState.value.length, I dont think we need it here
iwysiu
commented
Mar 2, 2023
There was a problem hiding this comment.
Looks good, but I was testing the variable editor and when I select 'All' in the dropdown, nothing happens when I click the Run query button, so I dont see the change in query results as I expected. Is this intended behaviour?
The form auto-reruns the query, so if you select a log group query, look at the results, then select all for the account it should change
public/app/plugins/datasource/cloudwatch/components/VariableQueryEditor/VariableQueryEditor.tsx
Show resolved
Hide resolved
| label="Account" | ||
| value={query.accountId ?? null} | ||
| onChange={(accountId?: string) => onQueryChange({ ...parsedQuery, accountId })} | ||
| options={accountState?.value.length ? [ALL_ACCOUNTS_OPTION, ...accountState?.value] : []} |
idastambuk
approved these changes
Mar 3, 2023
baldm0mma
pushed a commit
that referenced
this pull request
Mar 6, 2023
Co-authored-by: Erik Sundell <erik.sundell87@gmail.com>
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?
Supports cross-account variable queries by adding the AccountId field to variable queries for log groups, metrics, dimension keys, and dimension values.
Why do we need this feature?
Cross account querying should also be supported by variable queries.
Which issue(s) does this PR fix?:
Fixes #61450
Special notes for your reviewer:
I went through all the variable query types and I believe that these are the only ones that support accountId