Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AzureMonitor: Display variables in resource picker for Azure Monitor Logs #34648

Merged
merged 3 commits into from May 26, 2021

Conversation

joshhunt
Copy link
Contributor

What this PR does / why we need it:

Lists template variables in the Azure Monitor Logs resource picker

image
image

Which issue(s) this PR fixes:

Fixes #34590

@joshhunt joshhunt added datasource/Azure Azure Monitor Datasource add to changelog labels May 25, 2021
@joshhunt joshhunt requested a review from a team as a code owner May 25, 2021 11:53
@joshhunt joshhunt requested review from sunker and a team and removed request for a team May 25, 2021 11:53
Copy link
Member

@sarahzinger sarahzinger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

Copy link
Contributor

@sunker sunker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fantastic! Just need to handle that case when there's no variables defined. Either remove the template variable group in that case, or handle error in NestedRows.onRowToggleCollapse

@joshhunt joshhunt merged commit b4ce068 into main May 26, 2021
@joshhunt joshhunt deleted the joshhunt/resource-picker-template-variables branch May 26, 2021 08:42
@joshhunt joshhunt added this to the 8.0.0-beta3 milestone May 26, 2021
@joshhunt joshhunt added the old backport v8.0.x Mark PR for automatic backport to v8.0.x label May 26, 2021
@grafanabot
Copy link
Contributor

The backport to v8.0.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-34648-to-v8.0.x origin/v8.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b4ce068f0e6adbe353be30d4c374beef108078bc
# Push it to GitHub
git push --set-upstream origin backport-34648-to-v8.0.x
git switch main
# Remove the local backport branch
git branch -D backport-34648-to-v8.0.x

Then, create a pull request where the base branch is v8.0.x and the compare/head branch is backport-34648-to-v8.0.x.

@joshhunt joshhunt added old backport v8.0.x Mark PR for automatic backport to v8.0.x and removed old backport v8.0.x Mark PR for automatic backport to v8.0.x labels May 26, 2021
grafanabot pushed a commit that referenced this pull request May 26, 2021
* AzureMonitor: Display variables in Resource Picker

* tests

* hide template variable group when there's no template variables

(cherry picked from commit b4ce068)
joshhunt added a commit that referenced this pull request May 27, 2021
)

* AzureMonitor: Display variables in Resource Picker

* tests

* hide template variable group when there's no template variables

(cherry picked from commit b4ce068)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
@hugohaggmark hugohaggmark changed the title AzureMonitor: Display variables in Logs resource picker AzureMonitor: Display variables in resource picker for Azure Monitor Logs Jun 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/frontend datasource/Azure Azure Monitor Datasource old backport v8.0.x Mark PR for automatic backport to v8.0.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

AzureMonitor: List template variables in Resource Picker
4 participants