IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-09 23:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

AzureMonitor: Fix issue where resource group name is missing on the resource picker button (#36400)

Browse Source 
* AzureMonitor: Fix issue where resource group name is missing in the UI

* fix
This commit is contained in:
Josh Hunt 2021-07-06 10:22:47 +01:00 committed by GitHub
parent a18d3007a7
commit 2a4191a2ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
View File

@ -27,7 +27,7 @@ export function isGUIDish(input: string) {
export function findRow(rows: ResourceRowGroup, id: string): ResourceRow | undefined { export function findRow(rows: ResourceRowGroup, id: string): ResourceRow | undefined {
for (const row of rows) { for (const row of rows) {
if (row.id === id) { if (row.id.toLowerCase() === id.toLowerCase()) {
return row; return row;
} }

6
public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts
View File

@ -94,19 +94,19 @@ export default class ResourcePickerData {
const query = ` const query = `
resourcecontainers resourcecontainers
| where type == "microsoft.resources/subscriptions" | where type == "microsoft.resources/subscriptions"
| where id == "${subscriptionURI}" | where id =~ "${subscriptionURI}"
| project subscriptionName=name, subscriptionId | project subscriptionName=name, subscriptionId
| join kind=leftouter ( | join kind=leftouter (
resourcecontainers resourcecontainers
| where type == "microsoft.resources/subscriptions/resourcegroups" | where type == "microsoft.resources/subscriptions/resourcegroups"
| where id == "${resourceGroupURI}" | where id =~ "${resourceGroupURI}"
| project resourceGroupName=name, resourceGroup, subscriptionId | project resourceGroupName=name, resourceGroup, subscriptionId
) on subscriptionId ) on subscriptionId
| join kind=leftouter ( | join kind=leftouter (
resources resources
| where id == "${resourceURI}" | where id =~ "${resourceURI}"
| project resourceName=name, subscriptionId | project resourceName=name, subscriptionId
) on subscriptionId ) on subscriptionId