diff --git a/.azuredevops/platformPipelines/platform.dependencies.yml b/.azuredevops/platformPipelines/platform.dependencies.yml index dd0300fa33..d6191cc43f 100644 --- a/.azuredevops/platformPipelines/platform.dependencies.yml +++ b/.azuredevops/platformPipelines/platform.dependencies.yml @@ -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 diff --git a/.github/workflows/platform.dependencies.yml b/.github/workflows/platform.dependencies.yml index 3876a9afac..a5152cfd4f 100644 --- a/.github/workflows/platform.dependencies.yml +++ b/.github/workflows/platform.dependencies.yml @@ -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 diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md index 47aa69ae06..8a35a9b672 100644 --- a/arm/Microsoft.Automation/automationAccounts/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/readme.md @@ -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. | @@ -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) diff --git a/arm/Microsoft.Insights/components/.parameters/parameters.json b/arm/Microsoft.Insights/components/.parameters/parameters.json index 737d8e7491..636d9f6c7d 100644 --- a/arm/Microsoft.Insights/components/.parameters/parameters.json +++ b/arm/Microsoft.Insights/components/.parameters/parameters.json @@ -6,7 +6,7 @@ "value": "<>-az-appi-x-001" }, "workspaceResourceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-002" + "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-appi-001" }, "roleAssignments": { "value": [ diff --git a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json b/arm/Microsoft.Web/sites/.parameters/wa.parameters.json index 4e87f2ef73..31b54a7317 100644 --- a/arm/Microsoft.Web/sites/.parameters/wa.parameters.json +++ b/arm/Microsoft.Web/sites/.parameters/wa.parameters.json @@ -22,7 +22,7 @@ "appInsightObject": { "value": { "name": "<>-az-wa-x-001-appi", - "workspaceResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<>-az-law-x-002" + "workspaceResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.OperationalInsights/workspaces/adp-<>-az-law-appi-001" } }, "siteConfig": { diff --git a/docs/wiki/TestingDesign.md b/docs/wiki/TestingDesign.md index e89cba832b..8639bc806a 100644 --- a/docs/wiki/TestingDesign.md +++ b/docs/wiki/TestingDesign.md @@ -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-\<>-az-law-x-001_': Default LAW. + - '_adp-\<>-az-law-aut-001_': Dedicated LAW to be leveraged by the [automation account] resource. + - '_adp-\<>-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 `"<>"` 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. diff --git a/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json b/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json index 5e75a61ea3..3792b6ba8f 100644 --- a/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.Insights/components/parameters/parameters.json @@ -6,7 +6,7 @@ "value": "adp-<>-az-appi-x-001" }, "workspaceResourceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-002" + "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-appi-001" } } } diff --git a/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json index 5af16c4175..87b0ebfdc5 100644 --- a/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/appi.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-<>-az-law-x-002" + "value": "adp-<>-az-law-appi-001" } } } diff --git a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json similarity index 77% rename from utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json rename to utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json index 1081107515..bf516996f8 100644 --- a/utilities/pipelines/dependencies/Microsoft.Automation/automationAccounts/parameters/law.parameters.json +++ b/utilities/pipelines/dependencies/Microsoft.OperationalInsights/workspaces/parameters/aut.parameters.json @@ -3,7 +3,7 @@ "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "adp-<>-az-aut-law-001" + "value": "adp-<>-az-law-aut-001" } } }