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: select plugin route from cloudname #27273

Merged
merged 2 commits into from Aug 31, 2020
Merged

AzureMonitor: select plugin route from cloudname #27273

merged 2 commits into from Aug 31, 2020

Conversation

@kylebrandt
Copy link
Contributor

@kylebrandt kylebrandt commented Aug 28, 2020

What this PR does / why we need it:
For the Azure Monitor service the Azure Monitor data source, selects the plugin route.

Which issue(s) this PR fixes:
maybe fixes #27243

Notes for Reviewer
#27243 (comment) explains this

maybe fixes #27243
@kylebrandt kylebrandt added this to the 7.2 milestone Aug 31, 2020
@kylebrandt kylebrandt marked this pull request as ready for review Aug 31, 2020
@kylebrandt kylebrandt requested a review from grafana/backend-platform as a code owner Aug 31, 2020
@kylebrandt kylebrandt requested review from wbrowne and marefr and removed request for grafana/backend-platform Aug 31, 2020
Copy link
Member

@marefr marefr left a comment

Left a comment

var azureMonitorRoute *plugins.AppPluginRoute
for _, route := range plugin.Routes {
if route.Path == "azuremonitor" {
if strings.Contains(route.Path, cloudName) {

This comment has been minimized.

@marefr

marefr Aug 31, 2020
Member

Shouldn't it still be equals here?

This comment has been minimized.

@kylebrandt

kylebrandt Aug 31, 2020
Author Contributor

Yes, I think somehow I confused myself when looking at the plugin json and where cloudName comes from in the context of the different services.

@marefr
marefr approved these changes Aug 31, 2020
Copy link
Member

@marefr marefr left a comment

LGTM

Given the referenced issue is making a request to the backend and not going through the data proxy this should make it work better 👍

@kylebrandt kylebrandt merged commit 06323b8 into master Aug 31, 2020
2 checks passed
2 checks passed
continuous-integration/drone/pr Build is passing
Details
license/cla Contributor License Agreement is signed.
Details
@kylebrandt kylebrandt deleted the AzureMonChina branch Aug 31, 2020
pull bot added a commit to digitalocean/grafana that referenced this pull request Aug 31, 2020
* AzureMonitor: select plugin route from cloudname
fixes grafana#27243
marcusolsson added a commit to marcusolsson/grafana that referenced this pull request Sep 22, 2020
* AzureMonitor: select plugin route from cloudname
fixes grafana#27243
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants