From cf36e3e2dddae6b7ebabf76c3f8e6a66ac84d73a Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sat, 2 Oct 2021 10:59:49 -0700 Subject: [PATCH 01/10] wip --- .../aks/existingClusterOnboarding.json | 176 ++++++++++++++++++ .../onboarding/aks/existingClusterParam.json | 18 ++ 2 files changed, 194 insertions(+) create mode 100644 scripts/onboarding/aks/existingClusterOnboarding.json create mode 100644 scripts/onboarding/aks/existingClusterParam.json diff --git a/scripts/onboarding/aks/existingClusterOnboarding.json b/scripts/onboarding/aks/existingClusterOnboarding.json new file mode 100644 index 000000000..d1f58bd48 --- /dev/null +++ b/scripts/onboarding/aks/existingClusterOnboarding.json @@ -0,0 +1,176 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "aksResourceId": { + "type": "string", + "metadata": { + "description": "AKS Cluster Resource ID" + } + }, + "workspaceLocation": { + "type": "string", + "metadata": { + "description": "Worksapce Location for data collection rule" + } + }, + "workspaceResourceId": { + "type": "string", + "metadata": { + "description": "Full Resource ID of the log analitycs workspace that will be used for data destination. For example /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroups/ResourceGroupName/providers/Microsoft.operationalinsights/workspaces/ws_xyz" + } + } + }, + "variables": { + "clusterName": "[split(parameters('aksResourceId'),'/')[8]]", + "dcrName": "[Concat('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "dataCollectionRuleId": "[resourceId('Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" + }, + "resources": [ + { + "type": "Microsoft.Resources/deployments", + "name": "[Concat('aks-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]", + "apiVersion": "2017-05-10", + "subscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", + "resourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", + "properties": { + "mode": "Incremental", + "template": { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": {}, + "variables": {}, + "resources": [ + { + "type": "Microsoft.Insights/dataCollectionRules", + "apiVersion": "2019-11-01-preview", + "name": "[variables('dcrName')]", + "location": "[parameters('workspaceLocation')]", + "kind": "Linux", + "properties": { + "dataSources": { + "extensions": [ + { + "name": "ContainerInsightsExtension", + "streams": [ + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" + ], + "extensionName": "ContainerInsights" + } + ] + }, + "destinations": { + "logAnalytics": [ + { + "workspaceResourceId": "[parameters('workspaceResourceId')]", + "name": "ciworkspace" + } + ] + }, + "dataFlows": [ + { + "streams": [ + "Microsoft-Perf", + "Microsoft-ContainerInventory", + "Microsoft-ContainerLog", + "Microsoft-ContainerLogV2", + "Microsoft-ContainerNodeInventory", + "Microsoft-KubeEvents", + "Microsoft-KubeHealth", + "Microsoft-KubeMonAgentEvents", + "Microsoft-KubeNodeInventory", + "Microsoft-KubePodInventory", + "Microsoft-KubePVInventory", + "Microsoft-KubeServices", + "Microsoft-InsightsMetrics" + ], + "destinations": [ + "ciworkspace" + ] + } + ] + } + } + ] + }, + "parameters": {} + } + }, + { + "type": "Microsoft.Resources/deployments", + "name": "[Concat('aks-monitoring-msi-dcra', '-', uniqueString(parameters('aksResourceId')))]", + "apiVersion": "2017-05-10", + "subscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", + "resourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", + "dependsOn": [ + "[Concat('aks-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]" + ], + "properties": { + "mode": "Incremental", + "template": { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": {}, + "variables": {}, + "resources": [ + { + "type": "Microsoft.ContainerService/managedClusters/providers/dataCollectionRuleAssociations", + "name": "[concat(variables('clusterName'),'/microsoft.insights/', parameters('associationName'))]", + "apiVersion": "2019-11-01-preview", + "properties": { + "description": "Association of data collection rule. Deleting this association will break the data collection for this AKS Cluster.", + "dataCollectionRuleId": "[variables('dataCollectionRuleId')]" + } + } + + ] + }, + "parameters": {} + } + }, + { + "type": "Microsoft.Resources/deployments", + "name": "[Concat('aks-monitoring-msi', '-', uniqueString(parameters('clusterResourceId')))]", + "apiVersion": "2017-05-10", + "subscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", + "resourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", + "dependsOn": [ + "[Concat('aks-monitoring-msi-dcra', '-', uniqueString(parameters('aksResourceId')))]", + ], + "properties": { + "mode": "Incremental", + "template": { + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": {}, + "variables": {}, + "resources": [ + { + "type": "Microsoft.ContainerService/managedClusters/providers/dataCollectionRuleAssociations", + "name": "[concat(variables('clusterName'),'/microsoft.insights/', parameters('associationName'))]", + "apiVersion": "2019-11-01-preview", + "properties": { + "description": "Association of data collection rule. Deleting this association will break the data collection for this AKS Cluster.", + "dataCollectionRuleId": "[variables('dataCollectionRuleId')]" + } + } + + ] + }, + "parameters": {} + } + } + ] +} \ No newline at end of file diff --git a/scripts/onboarding/aks/existingClusterParam.json b/scripts/onboarding/aks/existingClusterParam.json new file mode 100644 index 000000000..e88923a4d --- /dev/null +++ b/scripts/onboarding/aks/existingClusterParam.json @@ -0,0 +1,18 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "aksResourceId": { + "value": "/subscriptions//resourcegroups//providers/Microsoft.ContainerService/managedClusters/" + }, + "aksResourceLocation": { + "value": "" + }, + "workspaceResourceId": { + "value": "/subscriptions//resourceGroups//providers/Microsoft.OperationalInsights/workspaces/" + }, + "workspaceLocation": { + "value": "" + } + } + } \ No newline at end of file From d5dc8aa85867c147760e5315bf5c9819c346304e Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sat, 2 Oct 2021 20:29:57 -0700 Subject: [PATCH 02/10] wip --- .../existingClusterOnboarding.json | 49 +++++++++++++------ .../existingClusterParam.json | 0 2 files changed, 34 insertions(+), 15 deletions(-) rename scripts/onboarding/aks/{ => onboarding-using-msi-auth}/existingClusterOnboarding.json (78%) rename scripts/onboarding/aks/{ => onboarding-using-msi-auth}/existingClusterParam.json (100%) diff --git a/scripts/onboarding/aks/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json similarity index 78% rename from scripts/onboarding/aks/existingClusterOnboarding.json rename to scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index d1f58bd48..ec0257e4b 100644 --- a/scripts/onboarding/aks/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -8,6 +8,12 @@ "description": "AKS Cluster Resource ID" } }, + "aksResourceLocation": { + "type": "string", + "metadata": { + "description": "Location of the AKS resource e.g. \"East US\"" + } + }, "workspaceLocation": { "type": "string", "metadata": { @@ -22,17 +28,21 @@ } }, "variables": { + "clusterSubscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", + "clusterResourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", "clusterName": "[split(parameters('aksResourceId'),'/')[8]]", + "workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", + "workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", "dcrName": "[Concat('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", - "dataCollectionRuleId": "[resourceId('Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" + "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" }, "resources": [ { "type": "Microsoft.Resources/deployments", "name": "[Concat('aks-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]", "apiVersion": "2017-05-10", - "subscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", - "resourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", + "subscriptionId": "[variables('workspaceSubscriptionId')]", + "resourceGroup": "[variables('workspaceResourceGroup')]", "properties": { "mode": "Incremental", "template": { @@ -112,8 +122,8 @@ "type": "Microsoft.Resources/deployments", "name": "[Concat('aks-monitoring-msi-dcra', '-', uniqueString(parameters('aksResourceId')))]", "apiVersion": "2017-05-10", - "subscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", - "resourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", + "subscriptionId": "[variables('clusterSubscriptionId')]", + "resourceGroup": "[variables('clusterResourceGroup')]", "dependsOn": [ "[Concat('aks-monitoring-msi-dcr', '-', uniqueString(variables('dcrName')))]" ], @@ -142,12 +152,12 @@ }, { "type": "Microsoft.Resources/deployments", - "name": "[Concat('aks-monitoring-msi', '-', uniqueString(parameters('clusterResourceId')))]", + "name": "[Concat('aks-monitoring-msi-addon', '-', uniqueString(parameters('clusterResourceId')))]", "apiVersion": "2017-05-10", - "subscriptionId": "[split(parameters('aksResourceId'),'/')[2]]", - "resourceGroup": "[split(parameters('aksResourceId'),'/')[4]]", + "subscriptionId": "[variables('clusterSubscriptionId')]", + "resourceGroup": "[variables('clusterResourceGroup')]", "dependsOn": [ - "[Concat('aks-monitoring-msi-dcra', '-', uniqueString(parameters('aksResourceId')))]", + "[Concat('aks-monitoring-msi-dcra', '-', uniqueString(parameters('aksResourceId')))]" ], "properties": { "mode": "Incremental", @@ -158,15 +168,24 @@ "variables": {}, "resources": [ { - "type": "Microsoft.ContainerService/managedClusters/providers/dataCollectionRuleAssociations", - "name": "[concat(variables('clusterName'),'/microsoft.insights/', parameters('associationName'))]", - "apiVersion": "2019-11-01-preview", + "name": "[variables('clusterName')]", + "type": "Microsoft.ContainerService/managedClusters", + "location": "[parameters('aksResourceLocation')]", + "apiVersion": "2018-03-31", "properties": { - "description": "Association of data collection rule. Deleting this association will break the data collection for this AKS Cluster.", - "dataCollectionRuleId": "[variables('dataCollectionRuleId')]" + "mode": "Incremental", + "id": "[parameters('aksResourceId')]", + "addonProfiles": { + "omsagent": { + "enabled": true, + "config": { + "logAnalyticsWorkspaceResourceID": "[parameters('workspaceResourceId')]", + "useAADAuth": "true" + } + } + } } } - ] }, "parameters": {} diff --git a/scripts/onboarding/aks/existingClusterParam.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json similarity index 100% rename from scripts/onboarding/aks/existingClusterParam.json rename to scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json From 90cf103a27c7503cbc190637928cb379466f5e24 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sat, 2 Oct 2021 21:25:40 -0700 Subject: [PATCH 03/10] working --- .../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 ec0257e4b..a1b828854 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -34,6 +34,7 @@ "workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", "workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", "dcrName": "[Concat('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" }, "resources": [ @@ -137,7 +138,7 @@ "resources": [ { "type": "Microsoft.ContainerService/managedClusters/providers/dataCollectionRuleAssociations", - "name": "[concat(variables('clusterName'),'/microsoft.insights/', parameters('associationName'))]", + "name": "[concat(variables('clusterName'),'/microsoft.insights/', variables('associationName'))]", "apiVersion": "2019-11-01-preview", "properties": { "description": "Association of data collection rule. Deleting this association will break the data collection for this AKS Cluster.", @@ -152,7 +153,7 @@ }, { "type": "Microsoft.Resources/deployments", - "name": "[Concat('aks-monitoring-msi-addon', '-', uniqueString(parameters('clusterResourceId')))]", + "name": "[Concat('aks-monitoring-msi-addon', '-', uniqueString(parameters('aksResourceId')))]", "apiVersion": "2017-05-10", "subscriptionId": "[variables('clusterSubscriptionId')]", "resourceGroup": "[variables('clusterResourceGroup')]", From ad154cebee7c1a0e11b170b7f22ca1c582cad022 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sat, 2 Oct 2021 21:35:42 -0700 Subject: [PATCH 04/10] working --- .../existingClusterOnboarding.json | 7 +++++++ .../onboarding-using-msi-auth/existingClusterParam.json | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index a1b828854..ee6791a08 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -14,6 +14,12 @@ "description": "Location of the AKS resource e.g. \"East US\"" } }, + "aksResourceTagValues": { + "type": "object", + "metadata": { + "description": "Existing all tags on AKS Cluster Resource" + } + }, "workspaceLocation": { "type": "string", "metadata": { @@ -172,6 +178,7 @@ "name": "[variables('clusterName')]", "type": "Microsoft.ContainerService/managedClusters", "location": "[parameters('aksResourceLocation')]", + "tags": "[parameters('aksResourceTagValues')]", "apiVersion": "2018-03-31", "properties": { "mode": "Incremental", diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json index e88923a4d..7b0819d47 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json @@ -8,6 +8,13 @@ "aksResourceLocation": { "value": "" }, + "aksResourceTagValues": { + "value": { + "": "", + "": "", + "": "" + } + }, "workspaceResourceId": { "value": "/subscriptions//resourceGroups//providers/Microsoft.OperationalInsights/workspaces/" }, From f52976c09b7511fd05e0926c87a4c058dae6aa46 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sat, 2 Oct 2021 22:48:04 -0700 Subject: [PATCH 05/10] working --- .../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 ee6791a08..a9984f7c2 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -39,7 +39,7 @@ "clusterName": "[split(parameters('aksResourceId'),'/')[8]]", "workspaceSubscriptionId": "[split(parameters('workspaceResourceId'),'/')[2]]", "workspaceResourceGroup": "[split(parameters('workspaceResourceId'),'/')[4]]", - "dcrName": "[Concat('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "dcrName": "[Concat('CIDCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" }, From d5a5bfef657448b28a2ab92b834158d378896024 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sun, 3 Oct 2021 10:37:25 -0700 Subject: [PATCH 06/10] working --- .../existingClusterOnboarding.json | 9 ++++++++- .../onboarding-using-msi-auth/existingClusterParam.json | 7 +++++++ 2 files changed, 15 insertions(+), 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 a9984f7c2..8c929022b 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -31,6 +31,12 @@ "metadata": { "description": "Full Resource ID of the log analitycs workspace that will be used for data destination. For example /subscriptions/00000000-0000-0000-0000-0000-00000000/resourceGroups/ResourceGroupName/providers/Microsoft.operationalinsights/workspaces/ws_xyz" } + }, + "dcrResourceTagValues": { + "type": "object", + "metadata": { + "description": "Existing or new tags on DCR Cluster Resource" + } } }, "variables": { @@ -63,7 +69,8 @@ "apiVersion": "2019-11-01-preview", "name": "[variables('dcrName')]", "location": "[parameters('workspaceLocation')]", - "kind": "Linux", + "tags": "[parameters('dcrResourceTagValues')]", + "kind": "Custom", "properties": { "dataSources": { "extensions": [ diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json index 7b0819d47..60b39a12e 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json @@ -20,6 +20,13 @@ }, "workspaceLocation": { "value": "" + }, + "dcrResourceTagValues": { + "value": { + "": "", + "": "", + "": "" + } } } } \ No newline at end of file From b9fa331a07ef8d59e1a375cc8c4b1a5d24d82492 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Sun, 3 Oct 2021 10:55:18 -0700 Subject: [PATCH 07/10] working --- .../existingClusterOnboarding.json | 2 +- .../existingClusterParam.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json index 8c929022b..3f1d06ba3 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -70,7 +70,7 @@ "name": "[variables('dcrName')]", "location": "[parameters('workspaceLocation')]", "tags": "[parameters('dcrResourceTagValues')]", - "kind": "Custom", + "kind": "Linux", "properties": { "dataSources": { "extensions": [ diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json index 60b39a12e..d94ac69c2 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json @@ -10,9 +10,9 @@ }, "aksResourceTagValues": { "value": { - "": "", - "": "", - "": "" + "": "", + "": "", + "": "" } }, "workspaceResourceId": { @@ -23,9 +23,9 @@ }, "dcrResourceTagValues": { "value": { - "": "", - "": "", - "": "" + "": "", + "": "", + "": "" } } } From 0b00c784d8b5bab1cb6330d2a80cb770ef52945c Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Mon, 4 Oct 2021 09:30:53 -0700 Subject: [PATCH 08/10] working --- .../onboarding-using-msi-auth/existingClusterOnboarding.json | 2 +- .../aks/onboarding-using-msi-auth/existingClusterParam.json | 2 +- 2 files changed, 2 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 3f1d06ba3..0faf75060 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json @@ -207,4 +207,4 @@ } } ] -} \ No newline at end of file +} diff --git a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json index d94ac69c2..31f0f9c49 100644 --- a/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json +++ b/scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json @@ -29,4 +29,4 @@ } } } - } \ No newline at end of file + } From 1da99a01d01b6a2dd8a266ebcb1fa5f23b427c54 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Thu, 7 Oct 2021 17:59:53 -0700 Subject: [PATCH 09/10] shorten dcr prefix to DCR- to handle default workspace name length --- .../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 0faf75060..c5cae50e4 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('CIDCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "dcrName": "[Concat('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" }, From 9cd35b8b86469b8fc6182f7a098639c75f9ffb99 Mon Sep 17 00:00:00 2001 From: Ganga Mahesh Siddem Date: Fri, 8 Oct 2021 17:29:41 -0700 Subject: [PATCH 10/10] use MSCI- prefix similar to MSVMI- for dcr --- .../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 c5cae50e4..c77e3203d 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('DCR', '-', split(parameters('workspaceResourceId'),'/')[8])]", + "dcrName": "[Concat('MSCI', '-', split(parameters('workspaceResourceId'),'/')[8])]", "associationName": "ContainerInsightsExtension", "dataCollectionRuleId": "[resourceId(variables('workspaceSubscriptionId'), variables('workspaceResourceGroup'), 'Microsoft.Insights/dataCollectionRules', variables('dcrName'))]" },