Skip to content

Gangams/arm template msi onboarding #659

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.

Sign up for GitHub

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

Merged
ganga1980 merged 12 commits into from
Oct 20, 2021
Merged

Gangams/arm template msi onboarding #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cf36e3e
wip
ganga1980 Oct 2, 2021
d5dc8aa
wip
ganga1980 Oct 3, 2021
90cf103
working
ganga1980 Oct 3, 2021
ad154ce
working
ganga1980 Oct 3, 2021
f52976c
working
ganga1980 Oct 3, 2021
d5a5bfe
working
ganga1980 Oct 3, 2021
b9fa331
working
ganga1980 Oct 3, 2021
0b00c78
working
ganga1980 Oct 4, 2021
1da99a0
shorten dcr prefix to DCR- to handle default workspace name length
ganga1980 Oct 8, 2021
12c27e2
Merge branch 'ci_dev' into gangams/arm-template-msi-onboarding
ganga1980 Oct 9, 2021
9cd35b8
use MSCI- prefix similar to MSVMI- for dcr
ganga1980 Oct 9, 2021
42c95d8
Merge branch 'ci_dev' into gangams/arm-template-msi-onboarding
ganga1980 Oct 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
210 changes: 210 additions & 0 deletions scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterOnboarding.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
{
"$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"
}
},
"aksResourceLocation": {
"type": "string",
"metadata": {
"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": {
"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"
}
},
"dcrResourceTagValues": {
"type": "object",
"metadata": {
"description": "Existing or new tags on DCR Cluster Resource"
}
}
},
"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('MSCI', '-', split(parameters('workspaceResourceId'),'/')[8])]",
"associationName": "ContainerInsightsExtension",
"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": "[variables('workspaceSubscriptionId')]",
"resourceGroup": "[variables('workspaceResourceGroup')]",
"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')]",
"tags": "[parameters('dcrResourceTagValues')]",
"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": "[variables('clusterSubscriptionId')]",
"resourceGroup": "[variables('clusterResourceGroup')]",
"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/', 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.",
"dataCollectionRuleId": "[variables('dataCollectionRuleId')]"
}
}

]
},
"parameters": {}
}
},
{
"type": "Microsoft.Resources/deployments",
"name": "[Concat('aks-monitoring-msi-addon', '-', uniqueString(parameters('aksResourceId')))]",
"apiVersion": "2017-05-10",
"subscriptionId": "[variables('clusterSubscriptionId')]",
"resourceGroup": "[variables('clusterResourceGroup')]",
"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": [
{
"name": "[variables('clusterName')]",
"type": "Microsoft.ContainerService/managedClusters",
"location": "[parameters('aksResourceLocation')]",
"tags": "[parameters('aksResourceTagValues')]",
"apiVersion": "2018-03-31",
"properties": {
"mode": "Incremental",
"id": "[parameters('aksResourceId')]",
"addonProfiles": {
"omsagent": {
"enabled": true,
"config": {
"logAnalyticsWorkspaceResourceID": "[parameters('workspaceResourceId')]",
"useAADAuth": "true"
}
}
}
}
}
]
},
"parameters": {}
}
}
]
}
32 changes: 32 additions & 0 deletions scripts/onboarding/aks/onboarding-using-msi-auth/existingClusterParam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"aksResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourcegroups/<ResourceGroup>/providers/Microsoft.ContainerService/managedClusters/<ResourceName>"
},
"aksResourceLocation": {
"value": "<aksClusterLocation>"
},
"aksResourceTagValues": {
"value": {
"<existingOrnew-tag-name1>": "<existingOrnew-tag-value1>",
"<existingOrnew-tag-name2>": "<existingOrnew-tag-value2>",
"<existingOrnew-tag-nameN>": "<existingOrnew-tag-valueN>"
}
},
"workspaceResourceId": {
"value": "/subscriptions/<SubscriptionId>/resourceGroups/<ResourceGroup>/providers/Microsoft.OperationalInsights/workspaces/<workspaceName>"
},
"workspaceLocation": {
"value": "<workspaceLocation>"
},
"dcrResourceTagValues": {
"value": {
"<existingOrnew-tag-name1>": "<existingOrnew-tag-value1>",
"<existingOrnew-tag-name2>": "<existingOrnew-tag-value2>",
"<existingOrnew-tag-nameN>": "<existingOrnew-tag-valueN>"
}
}
}
}