Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .azuredevops/platformPipelines/platform.dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ stages:
- path: $(dependencyPath)/$(resourceType)/parameters/parameters.json
templateFilePath: $(templateFilePath)
displayName: Default LAW
- path: $(dependencyPath)/$(resourceType)/parameters/aut.parameters.json
templateFilePath: $(templateFilePath)
displayName: Automation account LAW
- path: $(dependencyPath)/$(resourceType)/parameters/appi.parameters.json
templateFilePath: $(templateFilePath)
displayName: AppInsights LAW
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/platform.dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
strategy:
fail-fast: false
matrix:
parameterFilePaths: ['appi.parameters.json', 'parameters.json']
parameterFilePaths: ['appi.parameters.json', 'aut.parameters.json', 'parameters.json']
steps:
- name: 'Checkout'
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions arm/Microsoft.Automation/automationAccounts/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ This module deploys an Azure Automation Account.
| `schedules` | _[schedules](schedules/readme.md)_ array | `[]` | | Optional. List of schedules to be created in the automation account. |
| `skuName` | string | `Basic` | `[Free, Basic]` | Optional. SKU name of the account. |
| `softwareUpdateConfigurations` | _[softwareUpdateConfigurations](softwareUpdateConfigurations/readme.md)_ array | `[]` | | Optional. List of softwareUpdateConfigurations to be created in the automation account |
| `systemAssignedIdentity` | bool | | | Optional. Enables system assigned managed identity on the resource. |
| `systemAssignedIdentity` | bool | `False` | | Optional. Enables system assigned managed identity on the resource. |
| `tags` | object | `{object}` | | Optional. Tags of the Automation Account resource. |
| `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. |
| `variables` | _[variables](variables/readme.md)_ array | `[]` | | Optional. List of variables to be created in the automation account. |
Expand Down Expand Up @@ -159,8 +159,8 @@ You can specify multiple user assigned identities to a resource by providing add
- [Automationaccounts/Variables](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Automation/2020-01-13-preview/automationAccounts/variables)
- [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings)
- [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks)
- [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints)
- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints/privateDnsZoneGroups)
- [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints)
- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups)
- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments)
- [Solutions](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationsManagement/2015-11-01-preview/solutions)
- [Workspaces/Linkedservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.OperationalInsights/2020-03-01-preview/workspaces/linkedServices)
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"value": "<<namePrefix>>-az-appi-x-001"
},
"workspaceResourceId": {
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
},
"roleAssignments": {
"value": [
Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.Web/sites/.parameters/wa.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"appInsightObject": {
"value": {
"name": "<<namePrefix>>-az-wa-x-001-appi",
"workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
"workspaceResourceId": "/subscriptions/<<subscriptionId>>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
}
},
"siteConfig": {
Expand Down
5 changes: 4 additions & 1 deletion docs/wiki/TestingDesign.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,10 @@ Since also dependency resources are in turn subject to dependencies with each ot
>**Note**: This resource has a global scope name.
1. Event hub namespace and Event hub: This resource is leveraged by all resources supporting diagnostic settings on an event hub.
>**Note**: This resource has a global scope name.
1. Log analytics workspace: This resource is leveraged by all resources supporting diagnostic settings on LAW.
1. Log analytics workspaces: These resources are leveraged by all resources supporting diagnostic settings on LAW. Multiple instances are deployed:
- '_adp-\<<namePrefix\>>-az-law-x-001_': Default LAW.
- '_adp-\<<namePrefix\>>-az-law-aut-001_': Dedicated LAW to be leveraged by the [automation account] resource.
- '_adp-\<<namePrefix\>>-az-law-appi-001_': Dedicated LAW to be leveraged by the [application insights] resource.
1. User assigned identity: This resource is leveraged by the [role assignment], [key vault] and [recovery services vault] dependency resources.
> **Note**: The object ID of the [user assigned identity] is needed by several dependency parameter files. However, before running the dependency pipeline for the first time, the [user assigned identity] resource does not exist yet, thus its object ID is unknown. For this reason, instead of the object ID value, some dependency parameter files contain the `"<<msiPrincipalId>>"` token, for which the correct value is retrieved and replaced by the pipeline at runtime.
1. Shared image gallery and definition: These resources are leveraged by the [image template] resource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"value": "adp-<<namePrefix>>-az-appi-x-001"
},
"workspaceResourceId": {
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-x-002"
"value": "/subscriptions/<<subscriptionId>>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<<namePrefix>>-az-law-appi-001"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-az-law-x-002"
"value": "adp-<<namePrefix>>-az-law-appi-001"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"contentVersion": "1.0.0.0",
"parameters": {
"name": {
"value": "adp-<<namePrefix>>-az-aut-law-001"
"value": "adp-<<namePrefix>>-az-law-aut-001"
}
}
}