Skip to content

Commit

Permalink
Merge pull request microsoft#669 from microsoft/arcbox_policyupdate
Browse files Browse the repository at this point in the history
Arcbox policyupdate
  • Loading branch information
dkirby-ms authored Jul 23, 2021
2 parents ec5e787 + 4a7b4dd commit 8461845
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 0 deletions.
15 changes: 15 additions & 0 deletions azure_jumpstart_arcbox/mgmt/mgmtArtifacts.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,21 @@
"product": "[concat('OMSGallery/', variables('Updates').galleryName)]"
}
},
{
"apiVersion": "2015-11-01-preview",
"type": "Microsoft.OperationsManagement/solutions",
"location": "[parameters('location')]",
"name": "[concat('VMInsights', '(', split(resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName')),'/')[8], ')')]",
"properties": {
"workspaceResourceId": "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName'))]"
},
"plan": {
"name": "[concat('VMInsights', '(', split(resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName')),'/')[8], ')')]",
"product": "[concat('OMSGallery/', 'VMInsights')]",
"promotionCode": "",
"publisher": "Microsoft"
}
},
{
"type": "Microsoft.Automation/automationAccounts",
"apiVersion": "2020-01-13-preview",
Expand Down
60 changes: 60 additions & 0 deletions azure_jumpstart_arcbox/mgmt/policyAzureArcBuiltins.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
"policyDefinitionForLinuxDeployLogAnalytics": "/providers/Microsoft.Authorization/policyDefinitions/9d2b61b4-1d14-4a63-be30-d4498e7ad2cf",
"policyDefinitionForWindowsDeployLogAnalytics": "/providers/Microsoft.Authorization/policyDefinitions/69af7d4a-7b18-4044-93a9-2651498ef203",
"policyDefinitionForAddResourceTag": "/providers/Microsoft.Authorization/policyDefinitions/4f9dc7db-30c1-420c-b61a-e1d640128d26",
"policyDefinitionForLinuxDeployDependencyAgent": "/providers/Microsoft.Authorization/policyDefinitions/9d2b61b4-1d14-4a63-be30-d4498e7ad2cf",
"policyDefinitionForWindowsDeployDependencyAgent": "/providers/Microsoft.Authorization/policyDefinitions/91cb9edd-cd92-4d2f-b2f2-bdd8d065a3d4",
"policyNameForLinuxDeployLogAnalytics": "policyLinuxDeployLogAnalytics",
"policyNameForWindowsDeployLogAnalytics": "policyWindowsDeployLogAnalytics",
"policyNameForLinuxDeployDependencyAgent": "policyLinuxDeployDependencyAgent",
"policyNameForWindowsDeployDependencyAgent": "policyWindowsDeployDependencyAgent",
"policyNameForAddResourceTag": "policyAddResourceTag",
"logAnalyticsContributorRoleDefinition": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', '92aaf0da-9dab-42b6-94a3-d43ce8d16293')]",
"tagContributorRoleDefinition": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', 'b24988ac-6180-42a0-ab88-20f7382dd24c')]"
Expand Down Expand Up @@ -85,6 +89,62 @@
"principalType": "ServicePrincipal"
}
},
{
"type": "Microsoft.Authorization/policyAssignments",
"name": "[variables('policyNameForLinuxDeployDependencyAgent')]",
"apiVersion": "2019-09-01",
"location": "[parameters('azureLocation')]",
"identity": {
"type": "SystemAssigned"
},
"properties": {
"scope": "[subscriptionResourceId('Microsoft.Resources/resourceGroups', resourceGroup().name)]",
"policyDefinitionId": "[variables('policyDefinitionForLinuxDeployDependencyAgent')]",
"parameters": {
"logAnalytics": {
"value": "[variables('logAnalyticsResource')]"
}
}
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"name": "[guid(variables('policyNameForLinuxDeployDependencyAgent'), resourceGroup().id)]",
"dependsOn": [ "[variables('policyNameForLinuxDeployDependencyAgent')]" ],
"apiVersion": "2020-04-01-preview",
"properties": {
"roleDefinitionId": "[variables('logAnalyticsContributorRoleDefinition')]",
"principalId": "[reference(resourceId('Microsoft.Authorization/policyAssignments', variables('policyNameForLinuxDeployDependencyAgent')),'2019-09-01', 'full').identity.principalId]",
"principalType": "ServicePrincipal"
}
},
{
"type": "Microsoft.Authorization/policyAssignments",
"name": "[variables('policyNameForWindowsDeployDependencyAgent')]",
"apiVersion": "2019-09-01",
"identity": {
"type": "SystemAssigned"
},
"location": "[parameters('azureLocation')]",
"properties": {
"scope": "[subscriptionResourceId('Microsoft.Resources/resourceGroups', resourceGroup().name)]",
"policyDefinitionId": "[variables('policyDefinitionForWindowsDeployDependencyAgent')]",
"parameters": {

}
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"name": "[guid(variables('policyNameForWindowsDeployDependencyAgent'), resourceGroup().id)]",
"dependsOn": [ "[variables('policyNameForWindowsDeployDependencyAgent')]" ],
"apiVersion": "2020-04-01-preview",
"properties": {
"roleDefinitionId": "[variables('logAnalyticsContributorRoleDefinition')]",
"principalId": "[reference(resourceId('Microsoft.Authorization/policyAssignments', variables('policyNameForWindowsDeployDependencyAgent')),'2019-09-01', 'full').identity.principalId]",
"principalType": "ServicePrincipal"
}
},
{
"type": "Microsoft.Authorization/policyAssignments",
"name": "[variables('policyNameForAddResourceTag')]",
Expand Down

0 comments on commit 8461845

Please sign in to comment.