From efbfb42f15abab24b098eb067f35b00532f10698 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Tue, 6 Jul 2021 11:46:08 +0200
Subject: [PATCH] AzureMonitor: Fix issue where resource group name is missing
 on the resource picker button (#36400) (#36462)

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

* fix

(cherry picked from commit 2a4191a2ee211006609cd4d76063016ed804ed70)

Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
---
 .../components/ResourcePicker/utils.ts                      | 2 +-
 .../resourcePicker/resourcePickerData.ts                    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
index 5d6d8fdd598..6c30a0a434f 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/ResourcePicker/utils.ts
@@ -27,7 +27,7 @@ export function isGUIDish(input: string) {
 
 export function findRow(rows: ResourceRowGroup, id: string): ResourceRow | undefined {
   for (const row of rows) {
-    if (row.id === id) {
+    if (row.id.toLowerCase() === id.toLowerCase()) {
       return row;
     }
 
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts
index 77cba8b7bfe..444769f9982 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/resourcePicker/resourcePickerData.ts
@@ -94,19 +94,19 @@ export default class ResourcePickerData {
     const query = `
       resourcecontainers
         | where type == "microsoft.resources/subscriptions"
-        | where id == "${subscriptionURI}"
+        | where id =~ "${subscriptionURI}"
         | project subscriptionName=name, subscriptionId
 
         | join kind=leftouter (
           resourcecontainers
             | where type == "microsoft.resources/subscriptions/resourcegroups"
-            | where id == "${resourceGroupURI}"
+            | where id =~ "${resourceGroupURI}"
             | project resourceGroupName=name, resourceGroup, subscriptionId
         ) on subscriptionId
 
         | join kind=leftouter (
           resources
-            | where id == "${resourceURI}"
+            | where id =~ "${resourceURI}"
             | project resourceName=name, subscriptionId
         ) on subscriptionId