From c9360e4bc4370ed46712598ffcab6609b0631289 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 9 Mar 2022 20:09:54 -0800 Subject: [PATCH 1/2] msi arm template updates --- .../onboarding-using-msi-auth/existingClusterOnboarding.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index c77e3203d..0d5f994fd 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -45,7 +45,7 @@ "clusterName": "[split(parameters('aksResourceId'),'/')[8]]", "workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", "workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", - "dcrName": "[Concat('MSCI', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "dcrName": "[Concat('MSCI', '-', variables('clusterName'), '-', trim(parameters('aksResourceLocation')))]", "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" }, From 31e0f36095838fd5075150443e3821fb0e276d3c Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Wed, 9 Mar 2022 23:19:00 -0800 Subject: [PATCH 2/2] handle space in location --- .../onboarding-using-msi-auth/existingClusterOnboarding.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index 0d5f994fd..d5b613537 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -35,7 +35,7 @@ "dcrResourceTagValues": { "type": "object", "metadata": { - "description": "Existing or new tags on DCR Cluster Resource" + "description": "Existing or new tags on DCR Resource" } } }, @@ -43,9 +43,10 @@ "clusterSubscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", "clusterResourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", "clusterName": "[split(parameters('aksResourceId'),'/')[8]]", + "clusterLocation": "[replace(parameters('aksResourceLocation'),' ', '')]", "workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", "workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", - "dcrName": "[Concat('MSCI', '-', variables('clusterName'), '-', trim(parameters('aksResourceLocation')))]", + "dcrName": "[Concat('MSCI', '-', variables('clusterName'), '-', variables('clusterLocation'))]", "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" },