diff --git a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml index 0d263d687a..4e89156966 100644 --- a/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml +++ b/.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml @@ -231,12 +231,20 @@ jobs: # INVOKE TEST # # ----------- # $functionInput = @{ - templateFilePath = $templateFilePath - parameterFilePath = Join-Path '$(ParametersRepoRoot)' '${{ deploymentBlock.path }}' - location = '${{ parameters.location }}' - resourceGroupName = '${{ parameters.resourceGroupName }}' - subscriptionId = '${{ parameters.subscriptionId }}' - managementGroupId = '${{ parameters.managementGroupId }}' + templateFilePath = $templateFilePath + parameterFilePath = Join-Path '$(ParametersRepoRoot)' '${{ deploymentBlock.path }}' + location = '${{ parameters.location }}' + resourceGroupName = '${{ parameters.resourceGroupName }}' + subscriptionId = '${{ parameters.subscriptionId }}' + managementGroupId = '${{ parameters.managementGroupId }}' + additionalParameters = @{} + } + + $projectSettings = Get-Content -Path 'settings.json' | ConvertFrom-Json + if (-not [String]::IsNullOrEmpty($projectSettings.enableDefaultTelemetry)) { + $functionInput['additionalParameters'] += @{ + enableDefaultTelemetry = $projectSettings.enableDefaultTelemetry + } } Write-Verbose "Invoke task with" -Verbose @@ -272,13 +280,21 @@ jobs: # INVOKE DEPLOYMENT # # ----------------- # $functionInput = @{ - templateFilePath = $templateFilePath - parameterFilePath = Join-Path '$(parametersRepoRoot)' '${{ deploymentBlock.path }}' - location = '${{ parameters.location }}' - resourceGroupName = '${{ parameters.resourceGroupName }}' - subscriptionId = '${{ parameters.subscriptionId }}' - managementGroupId = '${{ parameters.managementGroupId }}' - doNotThrow = $true + templateFilePath = $templateFilePath + parameterFilePath = Join-Path '$(parametersRepoRoot)' '${{ deploymentBlock.path }}' + location = '${{ parameters.location }}' + resourceGroupName = '${{ parameters.resourceGroupName }}' + subscriptionId = '${{ parameters.subscriptionId }}' + managementGroupId = '${{ parameters.managementGroupId }}' + doNotThrow = $true + additionalParameters = @{} + } + + $projectSettings = Get-Content -Path 'settings.json' | ConvertFrom-Json + if (-not [String]::IsNullOrEmpty($projectSettings.enableDefaultTelemetry)) { + $functionInput['additionalParameters'] += @{ + enableDefaultTelemetry = $projectSettings.enableDefaultTelemetry + } } Write-Verbose "Invoke task with" -Verbose diff --git a/.github/actions/templates/validateModuleDeployment/action.yml b/.github/actions/templates/validateModuleDeployment/action.yml index 8723340ce7..97bcc17ec1 100644 --- a/.github/actions/templates/validateModuleDeployment/action.yml +++ b/.github/actions/templates/validateModuleDeployment/action.yml @@ -144,12 +144,20 @@ runs: # INVOKE TEST # # ----------- # $functionInput = @{ - templateFilePath = '${{ inputs.templateFilePath }}' - parameterFilePath = '${{ inputs.parameterFilePath }}' - location = '${{ inputs.location }}' - resourceGroupName = '${{ inputs.resourceGroupName }}' - subscriptionId = '${{ inputs.subscriptionId }}' - managementGroupId = '${{ inputs.managementGroupId }}' + templateFilePath = '${{ inputs.templateFilePath }}' + parameterFilePath = '${{ inputs.parameterFilePath }}' + location = '${{ inputs.location }}' + resourceGroupName = '${{ inputs.resourceGroupName }}' + subscriptionId = '${{ inputs.subscriptionId }}' + managementGroupId = '${{ inputs.managementGroupId }}' + additionalParameters = @{} + } + + $projectSettings = Get-Content -Path 'settings.json' | ConvertFrom-Json + if (-not [String]::IsNullOrEmpty($projectSettings.enableDefaultTelemetry)) { + $functionInput['additionalParameters'] += @{ + enableDefaultTelemetry = $projectSettings.enableDefaultTelemetry + } } Write-Verbose "Invoke task with" -Verbose @@ -172,13 +180,21 @@ runs: . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourceDeployment' 'New-ModuleDeployment.ps1') $functionInput = @{ - templateFilePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}' - parameterFilePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.parameterFilePath }}' - location = '${{ inputs.location }}' - resourceGroupName = '${{ inputs.resourceGroupName }}' - subscriptionId = '${{ inputs.subscriptionId }}' - managementGroupId = '${{ inputs.managementGroupId }}' - doNotThrow = $true + templateFilePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.templateFilePath }}' + parameterFilePath = Join-Path $env:GITHUB_WORKSPACE '${{ inputs.parameterFilePath }}' + location = '${{ inputs.location }}' + resourceGroupName = '${{ inputs.resourceGroupName }}' + subscriptionId = '${{ inputs.subscriptionId }}' + managementGroupId = '${{ inputs.managementGroupId }}' + doNotThrow = $true + additionalParameters = @{} + } + + $projectSettings = Get-Content -Path 'settings.json' | ConvertFrom-Json + if (-not [String]::IsNullOrEmpty($projectSettings.enableDefaultTelemetry)) { + $functionInput['additionalParameters'] += @{ + enableDefaultTelemetry = $projectSettings.enableDefaultTelemetry + } } Write-Verbose "Invoke task with" -Verbose diff --git a/arm/.global/global.module.tests.ps1 b/arm/.global/global.module.tests.ps1 index 8583dfb678..a1c328cfda 100644 --- a/arm/.global/global.module.tests.ps1 +++ b/arm/.global/global.module.tests.ps1 @@ -600,16 +600,16 @@ Describe 'Deployment template tests' -Tag Template { $moduleFolderName, $templateContent ) - $CuaIDFlag = @() + $enableDefaultTelemetryFlag = @() $Schemaverion = $templateContent.'$schema' if ((($Schemaverion.Split('/')[5]).Split('.')[0]) -eq (($RGdeployment.Split('/')[5]).Split('.')[0])) { - if (($templateContent.resources.type -ccontains 'Microsoft.Resources/deployments' -and $templateContent.resources.condition -like "*[not(empty(parameters('cuaId')))]*") -or ($templateContent.resources.resources.type -ccontains 'Microsoft.Resources/deployments' -and $templateContent.resources.resources.condition -like "*[not(empty(parameters('cuaId')))]*")) { - $CuaIDFlag += $true + if (($templateContent.resources.type -ccontains 'Microsoft.Resources/deployments' -and $templateContent.resources.condition -like "*[parameters('enableDefaultTelemetry')]*") -or ($templateContent.resources.resources.type -ccontains 'Microsoft.Resources/deployments' -and $templateContent.resources.resources.condition -like "*[parameters('enableDefaultTelemetry')]*")) { + $enableDefaultTelemetryFlag += $true } else { - $CuaIDFlag += $false + $enableDefaultTelemetryFlag += $false } } - $CuaIDFlag | Should -Not -Contain $false + $enableDefaultTelemetryFlag | Should -Not -Contain $false } It "[] The Location should be defined as a parameter, with the default value of 'resourceGroup().Location' or global for ResourceGroup deployment scope" -TestCases $deploymentFolderTestCases { diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/.bicep/nested_cuaId.bicep b/arm/.global/shared/telemetryId.bicep similarity index 100% rename from arm/Microsoft.ContainerService/managedClusters/agentPools/.bicep/nested_cuaId.bicep rename to arm/.global/shared/telemetryId.bicep diff --git a/arm/Microsoft.AnalysisServices/servers/.bicep/nested_cuaId.bicep b/arm/Microsoft.AnalysisServices/servers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.AnalysisServices/servers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep index a49d21a2f0..7950d8233d 100644 --- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep +++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep @@ -53,8 +53,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -93,9 +93,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource server 'Microsoft.AnalysisServices/servers@2017-08-01' = { diff --git a/arm/Microsoft.AnalysisServices/servers/readme.md b/arm/Microsoft.AnalysisServices/servers/readme.md index 524d12f5d6..df28ac4983 100644 --- a/arm/Microsoft.AnalysisServices/servers/readme.md +++ b/arm/Microsoft.AnalysisServices/servers/readme.md @@ -21,12 +21,12 @@ The following resources are required to be able to deploy this resource. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `firewallSettings` | object | `{object}` | | Optional. The inbound firewall rules to define on the server. If not specified, firewall is disabled. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep index f8766ec1f6..8bbf638029 100644 --- a/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep +++ b/arm/Microsoft.ApiManagement/service/.bicep/nested_authorizationServers.bicep @@ -34,8 +34,8 @@ param clientIdSecretName string @description('Required. Name of the secret that stores the Client or app secret registered with this authorization server. This property will not be filled on \'GET\' operations! Use \'/listSecrets\' POST request to get the value.') param clientSecretSecretName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Access token scope that is going to be requested by default. Can be overridden at the API level. Should be provided in the form of a string containing space-delimited values.') param defaultScope string = '' @@ -66,9 +66,16 @@ var defaultAuthorizationMethods = [ ] var setAuthorizationMethods = union(authorizationMethods, defaultAuthorizationMethods) -module pid_cuaId '../authorizationServers/.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json b/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json index 127fda3403..6e0aa4c385 100644 --- a/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json +++ b/arm/Microsoft.ApiManagement/service/.parameters/max.parameters.json @@ -11,9 +11,6 @@ "publisherName": { "value": "<>-az-amorg-x-001" }, - "cuaId": { - "value": "00000-0-000000" - }, "apis": { "value": [ { diff --git a/arm/Microsoft.ApiManagement/service/.parameters/parameters.json b/arm/Microsoft.ApiManagement/service/.parameters/parameters.json index a7ae0692b9..4cf5e8349e 100644 --- a/arm/Microsoft.ApiManagement/service/.parameters/parameters.json +++ b/arm/Microsoft.ApiManagement/service/.parameters/parameters.json @@ -11,9 +11,6 @@ "publisherName": { "value": "<>-az-amorg-x-001" }, - "cuaId": { - "value": "00000-0-000000" - }, "portalSettings": { "value": [ { diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/apiVersionSets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/apiVersionSets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep b/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep index b2cc5b3bb2..038302e853 100644 --- a/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/deploy.bicep @@ -1,8 +1,8 @@ @description('Required. The name of the of the API Management service.') param apiManagementServiceName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. API Version set name') param name string = 'default' @@ -10,9 +10,16 @@ param name string = 'default' @description('Optional. API Version set properties') param properties object = {} -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md b/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md index 9d2cb15f27..c0128cf247 100644 --- a/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md +++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/readme.md @@ -13,7 +13,7 @@ This module deploys API Management Service APIs Version Set. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `default` | | Optional. API Version set name | | `properties` | object | `{object}` | | Optional. API Version set properties | diff --git a/arm/Microsoft.ApiManagement/service/apis/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/apis/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/apis/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep index 49dad325db..8fd0ee29bb 100644 --- a/arm/Microsoft.ApiManagement/service/apis/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/apis/deploy.bicep @@ -32,8 +32,8 @@ param apiVersionDescription string = '' @description('Optional. Collection of authentication settings included into this API.') param authenticationSettings object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Description of the API. May include HTML formatting tags.') param apiDescription string = '' @@ -94,9 +94,16 @@ param value string = '' @description('Optional. Criteria to limit import of WSDL to a subset of the document.') param wsdlSelector object = {} -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/apis/policies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/apis/policies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep b/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep index a232bba149..dd8161aed8 100644 --- a/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/apis/policies/deploy.bicep @@ -7,8 +7,8 @@ param apiName string @description('Optional. The name of the policy') param name string = 'policy' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Format of the policyContent.') @allowed([ @@ -22,9 +22,16 @@ param format string = 'xml' @description('Required. Contents of the Policy as defined by the format.') param value string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md b/arm/Microsoft.ApiManagement/service/apis/policies/readme.md index d78e1f54d9..f212f12309 100644 --- a/arm/Microsoft.ApiManagement/service/apis/policies/readme.md +++ b/arm/Microsoft.ApiManagement/service/apis/policies/readme.md @@ -14,7 +14,7 @@ This module deploys API Management Service APIs policies. | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | | `apiName` | string | | | Required. The name of the of the API. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `format` | string | `xml` | `[rawxml, rawxml-link, xml, xml-link]` | Optional. Format of the policyContent. | | `name` | string | `policy` | | Optional. The name of the policy | | `value` | string | | | Required. Contents of the Policy as defined by the format. | diff --git a/arm/Microsoft.ApiManagement/service/apis/readme.md b/arm/Microsoft.ApiManagement/service/apis/readme.md index b57b0cc3c9..bb8b73739c 100644 --- a/arm/Microsoft.ApiManagement/service/apis/readme.md +++ b/arm/Microsoft.ApiManagement/service/apis/readme.md @@ -28,8 +28,8 @@ The following resources are required to be able to deploy this resource. | `apiVersionDescription` | string | | | Optional. Description of the API Version. | | `apiVersionSetId` | string | | | Optional. Indicates the Version identifier of the API version set | | `authenticationSettings` | object | `{object}` | | Optional. Collection of authentication settings included into this API. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `displayName` | string | | | Required. API name. Must be 1 to 300 characters long. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `format` | string | `openapi` | `[wadl-xml, wadl-link-json, swagger-json, swagger-link-json, wsdl, wsdl-link, openapi, openapi+json, openapi-link, openapi+json-link]` | Optional. Format of the Content in which the API is getting imported. | | `isCurrent` | bool | `True` | | Optional. Indicates if API revision is current API revision. | | `name` | string | | | Required. API revision identifier. Must be unique in the current API Management service instance. Non-current revision has ;rev=n as a suffix where n is the revision number. | @@ -39,7 +39,7 @@ The following resources are required to be able to deploy this resource. | `serviceUrl` | string | | | Optional. Absolute URL of the backend service implementing this API. Cannot be more than 2000 characters long. | | `sourceApiId` | string | | | Optional. API identifier of the source API. | | `subscriptionKeyParameterNames` | object | `{object}` | | Optional. Protocols over which API is made available. | -| `subscriptionRequired` | bool | | | Optional. Specifies whether an API or Product subscription is required for accessing the API. | +| `subscriptionRequired` | bool | `False` | | Optional. Specifies whether an API or Product subscription is required for accessing the API. | | `type` | string | `http` | `[http, soap]` | Optional. Type of API. | | `value` | string | | | Optional. Content value when Importing an API. | | `wsdlSelector` | object | `{object}` | | Optional. Criteria to limit import of WSDL to a subset of the document. | diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/authorizationServers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/authorizationServers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep b/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep index 4296f8108d..fb6d247c33 100644 --- a/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/authorizationServers/deploy.bicep @@ -33,8 +33,8 @@ param clientRegistrationEndpoint string = '' @secure() param clientSecret string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Access token scope that is going to be requested by default. Can be overridden at the API level. Should be provided in the form of a string containing space-delimited values.') param defaultScope string = '' @@ -65,9 +65,16 @@ var defaultAuthorizationMethods = [ ] var setAuthorizationMethods = union(authorizationMethods, defaultAuthorizationMethods) -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md b/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md index 17429c386c..e28b8842b4 100644 --- a/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md +++ b/arm/Microsoft.ApiManagement/service/authorizationServers/readme.md @@ -26,14 +26,14 @@ The following resources are required to be able to deploy this resource. | `clientId` | secureString | | | Required. Client or app ID registered with this authorization server. | | `clientRegistrationEndpoint` | string | | | Optional. Optional reference to a page where client or app registration for this authorization server is performed. Contains absolute URL to entity being referenced. | | `clientSecret` | secureString | | | Required. Client or app secret registered with this authorization server. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `defaultScope` | string | | | Optional. Access token scope that is going to be requested by default. Can be overridden at the API level. Should be provided in the form of a string containing space-delimited values. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `grantTypes` | array | | | Required. Form of an authorization grant, which the client uses to request the access token. - authorizationCode, implicit, resourceOwnerPassword, clientCredentials | | `name` | string | | | Required. Identifier of the authorization server. | | `resourceOwnerPassword` | string | | | Optional. Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner password. | | `resourceOwnerUsername` | string | | | Optional. Can be optionally specified when resource owner password grant type is supported by this authorization server. Default resource owner username. | | `serverDescription` | string | | | Optional. Description of the authorization server. Can contain HTML formatting tags. | -| `supportState` | bool | | | Optional. If true, authorization server will include state parameter from the authorization request to its response. Client may use state parameter to raise protocol security. | +| `supportState` | bool | `False` | | Optional. If true, authorization server will include state parameter from the authorization request to its response. Client may use state parameter to raise protocol security. | | `tokenBodyParameters` | array | `[]` | | Optional. Additional parameters required by the token endpoint of this authorization server represented as an array of JSON objects with name and value string properties, i.e. {"name" : "name value", "value": "a value"}. - TokenBodyParameterContract object | | `tokenEndpoint` | string | | | Optional. OAuth token endpoint. Contains absolute URI to entity being referenced. | diff --git a/arm/Microsoft.ApiManagement/service/backends/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/backends/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/backends/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep b/arm/Microsoft.ApiManagement/service/backends/deploy.bicep index f588942adf..0a4884aa34 100644 --- a/arm/Microsoft.ApiManagement/service/backends/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/backends/deploy.bicep @@ -7,8 +7,8 @@ param name string @description('Optional. Backend Credentials Contract Properties.') param credentials object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Backend Description.') param backendDescription string = '' @@ -37,9 +37,16 @@ param tls object = { @description('Required. Runtime URL of the Backend.') param url string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/backends/readme.md b/arm/Microsoft.ApiManagement/service/backends/readme.md index fcb1eb25d3..0681ff91fa 100644 --- a/arm/Microsoft.ApiManagement/service/backends/readme.md +++ b/arm/Microsoft.ApiManagement/service/backends/readme.md @@ -21,7 +21,7 @@ The following resources are required to be able to deploy this resource. | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | | `backendDescription` | string | | | Optional. Backend Description. | | `credentials` | object | `{object}` | | Optional. Backend Credentials Contract Properties. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Backend Name. | | `protocol` | string | `http` | | Optional. Backend communication protocol. - http or soap | | `proxy` | object | `{object}` | | Optional. Backend Proxy Contract Properties | diff --git a/arm/Microsoft.ApiManagement/service/caches/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/caches/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/caches/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep b/arm/Microsoft.ApiManagement/service/caches/deploy.bicep index d3cd881472..e0ae35cbdb 100644 --- a/arm/Microsoft.ApiManagement/service/caches/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/caches/deploy.bicep @@ -7,8 +7,8 @@ param name string @description('Required. Runtime connection string to cache. Can be referenced by a named value like so, {{}}') param connectionString string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Cache description') param cacheDescription string = '' @@ -19,9 +19,16 @@ param resourceId string = '' @description('Required. Location identifier to use cache from (should be either \'default\' or valid Azure region identifier)') param useFromLocation string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/caches/readme.md b/arm/Microsoft.ApiManagement/service/caches/readme.md index 78f948c8f0..309c505b58 100644 --- a/arm/Microsoft.ApiManagement/service/caches/readme.md +++ b/arm/Microsoft.ApiManagement/service/caches/readme.md @@ -21,7 +21,7 @@ The following resources are required to be able to deploy this resource. | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | | `cacheDescription` | string | | | Optional. Cache description | | `connectionString` | string | | | Required. Runtime connection string to cache. Can be referenced by a named value like so, {{}} | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Identifier of the Cache entity. Cache identifier (should be either 'default' or valid Azure region identifier). | | `resourceId` | string | | | Optional. Original uri of entity in external system cache points to. | | `useFromLocation` | string | | | Required. Location identifier to use cache from (should be either 'default' or valid Azure region identifier) | diff --git a/arm/Microsoft.ApiManagement/service/deploy.bicep b/arm/Microsoft.ApiManagement/service/deploy.bicep index 3472721152..c61f789526 100644 --- a/arm/Microsoft.ApiManagement/service/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/deploy.bicep @@ -8,8 +8,8 @@ param name string @maxLength(10) param certificates array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Custom properties of the API Management service.') param customProperties object = {} @@ -176,9 +176,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource apiManagementService 'Microsoft.ApiManagement/service@2021-08-01' = { diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/identityProviders/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/identityProviders/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep b/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep index d872e9ac08..ea5b58d04b 100644 --- a/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/identityProviders/deploy.bicep @@ -1,8 +1,8 @@ @description('Required. The name of the of the API Management service.') param apiManagementServiceName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Used to enable the deployment of the identityProviders child resource.') param enableIdentityProviders bool = false @@ -51,9 +51,16 @@ param name string var isAadB2C = (identityProviderType == 'aadB2C') -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md b/arm/Microsoft.ApiManagement/service/identityProviders/readme.md index 3f24fd36d2..5e403672d9 100644 --- a/arm/Microsoft.ApiManagement/service/identityProviders/readme.md +++ b/arm/Microsoft.ApiManagement/service/identityProviders/readme.md @@ -13,8 +13,8 @@ This module deploys API Management Service Identity Provider. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `enableIdentityProviders` | bool | | | Optional. Used to enable the deployment of the identityProviders child resource. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableIdentityProviders` | bool | `False` | | Optional. Used to enable the deployment of the identityProviders child resource. | | `identityProviderAllowedTenants` | array | `[]` | | Optional. List of Allowed Tenants when configuring Azure Active Directory login. - string | | `identityProviderAuthority` | string | | | Optional. OpenID Connect discovery endpoint hostname for AAD or AAD B2C. | | `identityProviderClientId` | string | | | Optional. Client ID of the Application in the external Identity Provider. Required if identity provider is used. | diff --git a/arm/Microsoft.ApiManagement/service/namedValues/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/namedValues/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/namedValues/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep b/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep index 2de7ec2747..831aba17df 100644 --- a/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/namedValues/deploy.bicep @@ -1,8 +1,8 @@ @description('Required. The name of the of the API Management service.') param apiManagementServiceName string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Required. Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters.') param displayName string @@ -24,9 +24,16 @@ param value string = newGuid() var keyVaultEmpty = empty(keyVault) -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/namedValues/readme.md b/arm/Microsoft.ApiManagement/service/namedValues/readme.md index 5d46abade1..4b3c031385 100644 --- a/arm/Microsoft.ApiManagement/service/namedValues/readme.md +++ b/arm/Microsoft.ApiManagement/service/namedValues/readme.md @@ -19,12 +19,12 @@ The following resources are required to be able to deploy this resource. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `displayName` | string | | | Required. Unique name of NamedValue. It may contain only letters, digits, period, dash, and underscore characters. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `keyVault` | object | `{object}` | | Optional. KeyVault location details of the namedValue. | | `name` | string | | | Required. Named value Name. | | `namedValueTags` | array | `[]` | | Optional. Tags that when provided can be used to filter the NamedValue list. - string | -| `secret` | bool | | | Optional. Determines whether the value is a secret and should be encrypted or not. Default value is false. | +| `secret` | bool | `False` | | Optional. Determines whether the value is a secret and should be encrypted or not. Default value is false. | | `value` | string | `[newGuid()]` | | Optional. Value of the NamedValue. Can contain policy expressions. It may not be empty or consist only of whitespace. This property will not be filled on 'GET' operations! Use '/listSecrets' POST request to get the value. | ### Parameter Usage: `keyVault` diff --git a/arm/Microsoft.ApiManagement/service/policies/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/policies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/policies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep b/arm/Microsoft.ApiManagement/service/policies/deploy.bicep index 727aa22ed3..3d537ef780 100644 --- a/arm/Microsoft.ApiManagement/service/policies/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/policies/deploy.bicep @@ -4,8 +4,8 @@ param apiManagementServiceName string @description('Optional. The name of the policy') param name string = 'policy' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Format of the policyContent.') @allowed([ @@ -19,9 +19,16 @@ param format string = 'xml' @description('Required. Contents of the Policy as defined by the format.') param value string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/policies/readme.md b/arm/Microsoft.ApiManagement/service/policies/readme.md index b6cefab6ce..c428f2b02d 100644 --- a/arm/Microsoft.ApiManagement/service/policies/readme.md +++ b/arm/Microsoft.ApiManagement/service/policies/readme.md @@ -13,7 +13,7 @@ This module deploys API Management Service Policy. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `format` | string | `xml` | `[rawxml, rawxml-link, xml, xml-link]` | Optional. Format of the policyContent. | | `name` | string | `policy` | | Optional. The name of the policy | | `value` | string | | | Required. Contents of the Policy as defined by the format. | diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/portalsettings/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/portalsettings/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep b/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep index 63b3f8255d..d6bf5a736e 100644 --- a/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/portalsettings/deploy.bicep @@ -1,8 +1,8 @@ @description('Required. The name of the of the API Management service.') param apiManagementServiceName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Required. Portal setting name') @allowed([ @@ -15,9 +15,16 @@ param name string @description('Optional. Portal setting properties.') param properties object = {} -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md b/arm/Microsoft.ApiManagement/service/portalsettings/readme.md index 912d8918b3..c433890e5f 100644 --- a/arm/Microsoft.ApiManagement/service/portalsettings/readme.md +++ b/arm/Microsoft.ApiManagement/service/portalsettings/readme.md @@ -13,7 +13,7 @@ This module deploys API Management Service Portal Setting. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | `[delegation, signin, signup]` | Required. Portal setting name | | `properties` | object | `{object}` | | Optional. Portal setting properties. | diff --git a/arm/Microsoft.ApiManagement/service/products/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/products/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/products/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/products/apis/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/products/apis/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/products/apis/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep index 416285c153..2d5482ae3d 100644 --- a/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/products/apis/deploy.bicep @@ -4,15 +4,22 @@ param apiManagementServiceName string @description('Required. The name of the of the Product.') param productName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Required. Name of the product API.') param name string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/products/apis/readme.md b/arm/Microsoft.ApiManagement/service/products/apis/readme.md index ff50366e0e..2c13ac7395 100644 --- a/arm/Microsoft.ApiManagement/service/products/apis/readme.md +++ b/arm/Microsoft.ApiManagement/service/products/apis/readme.md @@ -13,7 +13,7 @@ This module deploys API Management Service Product APIs. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the product API. | | `productName` | string | | | Required. The name of the of the Product. | diff --git a/arm/Microsoft.ApiManagement/service/products/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/deploy.bicep index 6c5fd141af..804c12ab98 100644 --- a/arm/Microsoft.ApiManagement/service/products/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/products/deploy.bicep @@ -4,8 +4,8 @@ param apiManagementServiceName string @description('Optional. Whether subscription approval is required. If false, new subscriptions will be approved automatically enabling developers to call the products APIs immediately after subscribing. If true, administrators must manually approve the subscription before the developer can any of the products APIs. Can be present only if subscriptionRequired property is present and has a value of false.') param approvalRequired bool = false -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Product description. May include HTML formatting tags.') param productDescription string = '' @@ -31,9 +31,16 @@ param subscriptionsLimit int = 1 @description('Optional. Product terms of use. Developers trying to subscribe to the product will be presented and required to accept these terms before they can complete the subscription process.') param terms string = '' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/products/groups/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/products/groups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/products/groups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep b/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep index e654096377..410e7122d3 100644 --- a/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/products/groups/deploy.bicep @@ -4,15 +4,22 @@ param apiManagementServiceName string @description('Required. The name of the of the Product.') param productName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Required. Name of the product group.') param name string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/products/groups/readme.md b/arm/Microsoft.ApiManagement/service/products/groups/readme.md index 63ea7a7238..bf3d4f0778 100644 --- a/arm/Microsoft.ApiManagement/service/products/groups/readme.md +++ b/arm/Microsoft.ApiManagement/service/products/groups/readme.md @@ -13,7 +13,7 @@ This module deploys API Management Service Product Groups. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the product group. | | `productName` | string | | | Required. The name of the of the Product. | diff --git a/arm/Microsoft.ApiManagement/service/products/readme.md b/arm/Microsoft.ApiManagement/service/products/readme.md index 9026f639fb..a4efd56e92 100644 --- a/arm/Microsoft.ApiManagement/service/products/readme.md +++ b/arm/Microsoft.ApiManagement/service/products/readme.md @@ -22,13 +22,13 @@ The following resources are required to be able to deploy this resource. | :-- | :-- | :-- | :-- | :-- | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | | `apis` | _[apis](apis/readme.md)_ array | `[]` | | Optional. Array of Product APIs. | -| `approvalRequired` | bool | | | Optional. Whether subscription approval is required. If false, new subscriptions will be approved automatically enabling developers to call the products APIs immediately after subscribing. If true, administrators must manually approve the subscription before the developer can any of the products APIs. Can be present only if subscriptionRequired property is present and has a value of false. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `approvalRequired` | bool | `False` | | Optional. Whether subscription approval is required. If false, new subscriptions will be approved automatically enabling developers to call the products APIs immediately after subscribing. If true, administrators must manually approve the subscription before the developer can any of the products APIs. Can be present only if subscriptionRequired property is present and has a value of false. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `groups` | _[groups](groups/readme.md)_ array | `[]` | | Optional. Array of Product Groups. | | `name` | string | | | Required. Product Name. | | `productDescription` | string | | | Optional. Product description. May include HTML formatting tags. | | `state` | string | `published` | | Optional. whether product is published or not. Published products are discoverable by users of developer portal. Non published products are visible only to administrators. Default state of Product is notPublished. - notPublished or published | -| `subscriptionRequired` | bool | | | Optional. Whether a product subscription is required for accessing APIs included in this product. If true, the product is referred to as "protected" and a valid subscription key is required for a request to an API included in the product to succeed. If false, the product is referred to as "open" and requests to an API included in the product can be made without a subscription key. If property is omitted when creating a new product it's value is assumed to be true. | +| `subscriptionRequired` | bool | `False` | | Optional. Whether a product subscription is required for accessing APIs included in this product. If true, the product is referred to as "protected" and a valid subscription key is required for a request to an API included in the product to succeed. If false, the product is referred to as "open" and requests to an API included in the product can be made without a subscription key. If property is omitted when creating a new product it's value is assumed to be true. | | `subscriptionsLimit` | int | `1` | | Optional. Whether the number of subscriptions a user can have to this product at the same time. Set to null or omit to allow unlimited per user subscriptions. Can be present only if subscriptionRequired property is present and has a value of false. | | `terms` | string | | | Optional. Product terms of use. Developers trying to subscribe to the product will be presented and required to accept these terms before they can complete the subscription process. | diff --git a/arm/Microsoft.ApiManagement/service/readme.md b/arm/Microsoft.ApiManagement/service/readme.md index 59b0616fa4..4bb6b14ddf 100644 --- a/arm/Microsoft.ApiManagement/service/readme.md +++ b/arm/Microsoft.ApiManagement/service/readme.md @@ -36,15 +36,15 @@ This module deploys an API management service. | `backends` | _[backends](backends/readme.md)_ array | `[]` | | Optional. Backends. | | `caches` | _[caches](caches/readme.md)_ array | `[]` | | Optional. Caches. | | `certificates` | array | `[]` | | Optional. List of Certificates that need to be installed in the API Management service. Max supported certificates that can be installed is 10. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customProperties` | object | `{object}` | | Optional. Custom properties of the API Management service. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | -| `disableGateway` | bool | | | Optional. Property only valid for an API Management service deployed in multiple locations. This can be used to disable the gateway in master region. | -| `enableClientCertificate` | bool | | | Optional. Property only meant to be used for Consumption SKU Service. This enforces a client certificate to be presented on each request to the gateway. This also enables the ability to authenticate the certificate in the policy on the gateway. | +| `disableGateway` | bool | `False` | | Optional. Property only valid for an API Management service deployed in multiple locations. This can be used to disable the gateway in master region. | +| `enableClientCertificate` | bool | `False` | | Optional. Property only meant to be used for Consumption SKU Service. This enforces a client certificate to be presented on each request to the gateway. This also enables the ability to authenticate the certificate in the policy on the gateway. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `hostnameConfigurations` | array | `[]` | | Optional. Custom hostname configuration of the API Management service. | | `identityProviders` | _[identityProviders](identityProviders/readme.md)_ array | `[]` | | Optional. Identity providers. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | @@ -61,13 +61,13 @@ This module deploys an API management service. | `products` | _[products](products/readme.md)_ array | `[]` | | Optional. Products. | | `publisherEmail` | string | | | Required. The email address of the owner of the service. | | `publisherName` | string | | | Required. The name of the owner of the service. | -| `restore` | bool | | | Optional. Undelete API Management Service if it was previously soft-deleted. If this flag is specified and set to True all other properties will be ignored. | +| `restore` | bool | `False` | | Optional. Undelete API Management Service if it was previously soft-deleted. If this flag is specified and set to True all other properties will be ignored. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `sku` | string | `Developer` | `[Consumption, Developer, Basic, Standard, Premium]` | Optional. The pricing tier of this API Management service. | | `skuCount` | int | `1` | `[1, 2]` | Optional. The instance size of this API Management service. | | `subnetResourceId` | string | | | Optional. The full resource ID of a subnet in a virtual network to deploy the API Management service in. | | `subscriptions` | _[subscriptions](subscriptions/readme.md)_ array | `[]` | | Optional. Subscriptions. | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | | `virtualNetworkType` | string | `None` | `[None, External, Internal]` | Optional. The type of VPN in which API Management service needs to be configured in. None (Default Value) means the API Management service is not part of any Virtual Network, External means the API Management deployment is set up inside a Virtual Network having an internet Facing Endpoint, and Internal means that API Management deployment is setup inside a Virtual Network having an Intranet Facing Endpoint only. | diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/.bicep/nested_cuaId.bicep b/arm/Microsoft.ApiManagement/service/subscriptions/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ApiManagement/service/subscriptions/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep b/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep index 0c7d4cc819..477bde8cd0 100644 --- a/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep +++ b/arm/Microsoft.ApiManagement/service/subscriptions/deploy.bicep @@ -4,8 +4,8 @@ param allowTracing bool = true @description('Required. The name of the of the API Management service.') param apiManagementServiceName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. User (user ID path) for whom subscription is being created in form /users/{userId}') param ownerId string = '' @@ -25,9 +25,16 @@ param state string = '' @description('Required. Subscription name.') param name string -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource service 'Microsoft.ApiManagement/service@2021-08-01' existing = { diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md b/arm/Microsoft.ApiManagement/service/subscriptions/readme.md index 9b3bd64143..8b749c99cb 100644 --- a/arm/Microsoft.ApiManagement/service/subscriptions/readme.md +++ b/arm/Microsoft.ApiManagement/service/subscriptions/readme.md @@ -20,7 +20,7 @@ The following resources are required to be able to deploy this resource. | :-- | :-- | :-- | :-- | :-- | | `allowTracing` | bool | `True` | | Optional. Determines whether tracing can be enabled. | | `apiManagementServiceName` | string | | | Required. The name of the of the API Management service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Subscription name. | | `ownerId` | string | | | Optional. User (user ID path) for whom subscription is being created in form /users/{userId} | | `primaryKey` | string | | | Optional. Primary subscription key. If not specified during request key will be generated automatically. | diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep b/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep index c6e25feff9..a468cbe3ae 100644 --- a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep +++ b/arm/Microsoft.Authorization/policyAssignments/resourceGroup/deploy.bicep @@ -56,12 +56,19 @@ param subscriptionId string = subscription().subscriptionId @sys.description('Optional. The Target Scope for the Policy. The name of the resource group for the policy assignment. If not provided, will use the current scope for deployment.') param resourceGroupName string = resourceGroup().name -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } var identity_var = identity == 'SystemAssigned' ? { diff --git a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md b/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md index 57000e6618..86e1e0974e 100644 --- a/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md +++ b/arm/Microsoft.Authorization/policyAssignments/resourceGroup/readme.md @@ -13,9 +13,9 @@ With this module you can perform policy assignments on a resource group level | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `description` | string | | | Optional. This message will be part of response in case of policy violation. | | `displayName` | string | | | Optional. The display name of the policy assignment. Maximum length is 128 characters. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enforcementMode` | string | `Default` | `[Default, DoNotEnforce]` | Optional. The policy assignment enforcement mode. Possible values are Default and DoNotEnforce. - Default or DoNotEnforce | | `identity` | string | `SystemAssigned` | `[SystemAssigned, None]` | Optional. The managed identity associated with the policy assignment. Policy assignments must include a resource identity when assigning 'Modify' policy definitions. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep b/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep index 22caa4f38c..8551f2bb91 100644 --- a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep +++ b/arm/Microsoft.Authorization/policyExemptions/resourceGroup/deploy.bicep @@ -36,12 +36,19 @@ param subscriptionId string = subscription().subscriptionId @sys.description('Optional. The name of the resource group to be exempted from the policy assignment. If not provided, will use the current scope for deployment.') param resourceGroupName string = resourceGroup().name -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { diff --git a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md b/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md index 57fedef4ee..0c4027d274 100644 --- a/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md +++ b/arm/Microsoft.Authorization/policyExemptions/resourceGroup/readme.md @@ -12,9 +12,9 @@ With this module you can create policy exemptions on a resource group level. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `description` | string | | | Optional. The description of the policy exemption. | | `displayName` | string | | | Optional. The display name of the policy exemption. Maximum length is 128 characters. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `exemptionCategory` | string | `Mitigated` | `[Mitigated, Waiver]` | Optional. The policy exemption category. Possible values are Waiver and Mitigated. Default is Mitigated | | `expiresOn` | string | | | Optional. The expiration date and time (in UTC ISO 8601 format yyyy-MM-ddTHH:mm:ssZ) of the policy exemption. e.g. 2021-10-02T03:57:00.000Z | | `metadata` | object | `{object}` | | Optional. The policy exemption metadata. Metadata is an open ended object and is typically a collection of key-value pairs. | diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep b/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep index 693661c13f..7e21441469 100644 --- a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep +++ b/arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep @@ -38,8 +38,8 @@ param conditionVersion string = '2.0' ]) param principalType string = '' -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var builtInRoleNames_var = { 'AcrPush': '/providers/Microsoft.Authorization/roleDefinitions/8311e382-0749-4cb8-b61a-304f252e45ec' @@ -327,9 +327,16 @@ var builtInRoleNames_var = { var roleDefinitionId_var = (contains(builtInRoleNames_var, roleDefinitionIdOrName) ? builtInRoleNames_var[roleDefinitionIdOrName] : roleDefinitionIdOrName) -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource roleAssignment 'Microsoft.Authorization/roleAssignments@2021-04-01-preview' = { diff --git a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md b/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md index aca00e1a3a..e8fcf2b0c9 100644 --- a/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md +++ b/arm/Microsoft.Authorization/roleAssignments/resourceGroup/readme.md @@ -14,9 +14,9 @@ With this module you can perform role assignments on a resource group level | :-- | :-- | :-- | :-- | :-- | | `condition` | string | | | Optional. The conditions on the role assignment. This limits the resources it can be assigned to | | `conditionVersion` | string | `2.0` | `[2.0]` | Optional. Version of the condition. Currently accepted value is "2.0" | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `delegatedManagedIdentityResourceId` | string | | | Optional. ID of the delegated managed identity resource | | `description` | string | | | Optional. Description of role assignment | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `principalId` | string | | | Required. The Principal or Object ID of the Security Principal (User, Group, Service Principal, Managed Identity) | | `principalType` | string | | `[ServicePrincipal, Group, User, ForeignGroup, Device, ]` | Optional. The principal type of the assigned principal ID. | | `resourceGroupName` | string | `[resourceGroup().name]` | | Optional. Name of the Resource Group to assign the RBAC role to. If not provided, will use the current scope for deployment. | diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep b/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep index d55962d78e..9ba0c6ec47 100644 --- a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep +++ b/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/deploy.bicep @@ -27,12 +27,19 @@ param resourceGroupName string = resourceGroup().name @sys.description('Optional. Role definition assignable scopes. If not provided, will use the current scope provided.') param assignableScopes array = [] -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' = { diff --git a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md b/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md index f42b3bab26..46485b6ecd 100644 --- a/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md +++ b/arm/Microsoft.Authorization/roleDefinitions/resourceGroup/readme.md @@ -14,9 +14,9 @@ With this module you can create role definitions on a resource group level | :-- | :-- | :-- | :-- | :-- | | `actions` | array | `[]` | | Optional. List of allowed actions. | | `assignableScopes` | array | `[]` | | Optional. Role definition assignable scopes. If not provided, will use the current scope provided. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `dataActions` | array | `[]` | | Optional. List of allowed data actions. This is not supported if the assignableScopes contains Management Group Scopes | | `description` | string | | | Optional. Description of the custom RBAC role to be created. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `notActions` | array | `[]` | | Optional. List of denied actions. | | `notDataActions` | array | `[]` | | Optional. List of denied data actions. This is not supported if the assignableScopes contains Management Group Scopes | | `resourceGroupName` | string | `[resourceGroup().name]` | | Optional. The name of the Resource Group where the Role Definition and Target Scope will be applied to. If not provided, will use the current scope for deployment. | diff --git a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/deploy.bicep index b1caa69c55..3a03845077 100644 --- a/arm/Microsoft.Automation/automationAccounts/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/deploy.bicep @@ -75,8 +75,8 @@ param roleAssignments array = [] @description('Optional. Tags of the Automation Account resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -124,9 +124,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' = { diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/jobSchedules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep index f21d47cd98..221b1747ad 100644 --- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/deploy.bicep @@ -16,12 +16,19 @@ param parameters object = {} @description('Optional. The hybrid worker group that the scheduled job should run on.') param runOn string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md b/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md index 6299676c1f..f713ff6338 100644 --- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/readme.md @@ -13,7 +13,7 @@ This module deploys an Azure Automation Account Job Schedule. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `automationAccountName` | string | | | Required. Name of the parent Automation Account. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `[newGuid()]` | | Optional. Name of the Automation Account job schedule. Must be a GUID. If not provided, a new GUID is generated. | | `parameters` | object | `{object}` | | Optional. List of job properties. | | `runbookName` | string | | | Required. The runbook property associated with the entity. | diff --git a/arm/Microsoft.Automation/automationAccounts/modules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/modules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/modules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep index 429f29d1ab..54a35dcdf8 100644 --- a/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/modules/deploy.bicep @@ -16,12 +16,19 @@ param location string = resourceGroup().location @description('Optional. Tags of the Automation Account resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/modules/readme.md b/arm/Microsoft.Automation/automationAccounts/modules/readme.md index 23a712f1fa..a5418d7002 100644 --- a/arm/Microsoft.Automation/automationAccounts/modules/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/modules/readme.md @@ -13,7 +13,7 @@ This module deploys an Azure Automation Account Module. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `automationAccountName` | string | | | Required. Name of the parent Automation Account. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | | | Required. Name of the Automation Account module. | | `tags` | object | `{object}` | | Optional. Tags of the Automation Account resource. | diff --git a/arm/Microsoft.Automation/automationAccounts/readme.md b/arm/Microsoft.Automation/automationAccounts/readme.md index 8a35a9b672..06382aac55 100644 --- a/arm/Microsoft.Automation/automationAccounts/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/readme.md @@ -25,12 +25,12 @@ This module deploys an Azure Automation Account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `gallerySolutions` | array | `[]` | | Optional. List of gallerySolutions to be created in the linked log analytics workspace | | `jobSchedules` | _[jobSchedules](jobSchedules/readme.md)_ array | `[]` | | Optional. List of jobSchedules to be created in the automation account. | | `linkedWorkspaceId` | string | | | Optional. ID of the log analytics workspace to be linked to the deployed automation account. | diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/runbooks/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/runbooks/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep index 48be20cae4..065a9df45a 100644 --- a/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/runbooks/deploy.bicep @@ -38,8 +38,8 @@ param location string = resourceGroup().location @description('Optional. Tags of the Automation Account resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var accountSasProperties = { signedServices: 'b' @@ -49,9 +49,16 @@ var accountSasProperties = { signedProtocol: 'https' } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md b/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md index ef083883fb..b48d123f2b 100644 --- a/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/runbooks/readme.md @@ -14,7 +14,7 @@ This module deploys an Azure Automation Account Runbook. | :-- | :-- | :-- | :-- | :-- | | `automationAccountName` | string | | | Required. Name of the parent Automation Account. | | `baseTime` | string | `[utcNow('u')]` | | Optional. Time used as a basis for e.g. the schedule start date. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | | | Required. Name of the Automation Account runbook. | | `runbookDescription` | string | | | Optional. The description of the runbook. | diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/schedules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/schedules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep index ded932f9bf..d9c54d5bae 100644 --- a/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/schedules/deploy.bicep @@ -41,12 +41,19 @@ param timeZone string = '' @description('Optional. Time used as a basis for e.g. the schedule start date.') param baseTime string = utcNow('u') -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/readme.md b/arm/Microsoft.Automation/automationAccounts/schedules/readme.md index 623e5c3f8f..591266ac73 100644 --- a/arm/Microsoft.Automation/automationAccounts/schedules/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/schedules/readme.md @@ -15,10 +15,10 @@ This module deploys an Azure Automation Account Schedule. | `advancedSchedule` | object | `{object}` | | Optional. The properties of the create Advanced Schedule. | | `automationAccountName` | string | | | Required. Name of the parent Automation Account. | | `baseTime` | string | `[utcNow('u')]` | | Optional. Time used as a basis for e.g. the schedule start date. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `expiryTime` | string | | | Optional. The end time of the schedule. | | `frequency` | string | `OneTime` | `[Day, Hour, Minute, Month, OneTime, Week]` | Optional. The frequency of the schedule. | -| `interval` | int | | | Optional. Anything | +| `interval` | int | `0` | | Optional. Anything | | `name` | string | | | Required. Name of the Automation Account schedule. | | `scheduleDescription` | string | | | Optional. The description of the schedule. | | `startTime` | string | | | Optional. The start time of the schedule. | diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep index 447aac7b6f..8536be21b2 100644 --- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/deploy.bicep @@ -177,14 +177,21 @@ param scheduleDescription string = '' @description('Generated. Do not touch. Is used to provide the base time for time comparison for startTime. If startTime is specified in HH:MM format, baseTime is used to check if the provided startTime has passed, adding one day before setting the deployment schedule.') param baseTime string = utcNow('u') -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var updateClassifications_var = '${replace(replace(replace(replace(string(updateClassifications), ',', ', '), '[', ''), ']', ''), '"', '')}' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2020-01-13-preview' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md index 7476b7a8a6..a993423bce 100644 --- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/readme.md @@ -15,10 +15,10 @@ This module deploys an Azure Automation Account Software update Configuration. | `automationAccountName` | string | | | Required. Name of the parent Automation Account | | `azureVirtualMachines` | array | `[]` | | Optional. List of azure resource IDs for azure virtual machines in scope for the deployment schedule. | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not touch. Is used to provide the base time for time comparison for startTime. If startTime is specified in HH:MM format, baseTime is used to check if the provided startTime has passed, adding one day before setting the deployment schedule. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `excludeUpdates` | array | `[]` | | Optional. KB numbers or Linux packages excluded in the deployment schedule. | | `expiryTime` | string | | | Optional. The end time of the deployment schedule in ISO 8601 format. YYYY-MM-DDTHH:MM:SS, 2021-12-31T23:00:00 | -| `expiryTimeOffsetMinutes` | int | | | Optional. The expiry time's offset in minutes. | +| `expiryTimeOffsetMinutes` | int | `0` | | Optional. The expiry time's offset in minutes. | | `frequency` | string | | `[OneTime, Hour, Day, Week, Month]` | Required. The frequency of the deployment schedule. When using 'Hour', 'Day', 'Week' or 'Month', an interval needs to be provided. | | `includeUpdates` | array | `[]` | | Optional. KB numbers or Linux packages included in the deployment schedule. | | `interval` | int | `1` | | Optional. The interval of the frequency for the deployment schedule. 1 Hour is every hour, 2 Day is every second day, etc. | @@ -28,7 +28,7 @@ This module deploys an Azure Automation Account Software update Configuration. | `monthlyOccurrences` | array | `[]` | | Optional. Can be used with frequency 'Month'. Provides the pattern/cadence for running the deployment schedule in a month. Takes objects formed like this {occurance(int),day(string)}. Day is the name of the day to run the deployment schedule, the occurance specifies which occurance of that day to run the deployment schedule. | | `name` | string | | | Required. The name of the Deployment schedule. | | `nextRun` | string | | | Optional. The next time the deployment schedule runs in ISO 8601 format. YYYY-MM-DDTHH:MM:SS, 2021-12-31T23:00:00 | -| `nextRunOffsetMinutes` | int | | | Optional. The next run's offset in minutes. | +| `nextRunOffsetMinutes` | int | `0` | | Optional. The next run's offset in minutes. | | `nonAzureComputerNames` | array | `[]` | | Optional. List of names of non-azure machines in scope for the deployment schedule. | | `nonAzureQueries` | array | `[]` | | Optional. Array of functions from a Log Analytics workspace, used to scope the deployment schedule. | | `operatingSystem` | string | | `[Windows, Linux]` | Required. The operating system to be configured by the deployment schedule. | diff --git a/arm/Microsoft.Automation/automationAccounts/variables/.bicep/nested_cuaId.bicep b/arm/Microsoft.Automation/automationAccounts/variables/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Automation/automationAccounts/variables/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep index 6473a994f7..5153497543 100644 --- a/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep +++ b/arm/Microsoft.Automation/automationAccounts/variables/deploy.bicep @@ -13,12 +13,19 @@ param description string = '' @sys.description('Optional. If the variable should be encrypted.') param isEncrypted bool = false -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' existing = { diff --git a/arm/Microsoft.Automation/automationAccounts/variables/readme.md b/arm/Microsoft.Automation/automationAccounts/variables/readme.md index 3ebee7601c..a7b856d38e 100644 --- a/arm/Microsoft.Automation/automationAccounts/variables/readme.md +++ b/arm/Microsoft.Automation/automationAccounts/variables/readme.md @@ -13,9 +13,9 @@ This module deploys a variable to an Azure Automation Account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `automationAccountName` | string | | | Required. Name of the parent Automation Account | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `description` | string | | | Optional. The description of the variable. | -| `isEncrypted` | bool | | | Optional. If the variable should be encrypted. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `isEncrypted` | bool | `False` | | Optional. If the variable should be encrypted. | | `name` | string | | | Required. The name of the variable. | | `value` | string | | | Required. The value of the variable. | diff --git a/arm/Microsoft.Batch/batchAccounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Batch/batchAccounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Batch/batchAccounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Batch/batchAccounts/deploy.bicep b/arm/Microsoft.Batch/batchAccounts/deploy.bicep index 56f965ed4d..3e48139bb5 100644 --- a/arm/Microsoft.Batch/batchAccounts/deploy.bicep +++ b/arm/Microsoft.Batch/batchAccounts/deploy.bicep @@ -32,8 +32,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -70,9 +70,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource batchAccount 'Microsoft.Batch/batchAccounts@2020-09-01' = { diff --git a/arm/Microsoft.Batch/batchAccounts/readme.md b/arm/Microsoft.Batch/batchAccounts/readme.md index ae2cce7e17..8c24a0eac0 100644 --- a/arm/Microsoft.Batch/batchAccounts/readme.md +++ b/arm/Microsoft.Batch/batchAccounts/readme.md @@ -12,12 +12,12 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[ServiceLog]` | `[ServiceLog]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.CognitiveServices/accounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.CognitiveServices/accounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.CognitiveServices/accounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json b/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json index bc8e4e4d63..a7eb9a7d6f 100644 --- a/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json +++ b/arm/Microsoft.CognitiveServices/accounts/.parameters/parameters.json @@ -11,9 +11,6 @@ "sku": { "value": "F0" }, - "cuaId": { - "value": "00000000-0000-0000-0000-000000000000" - }, "roleAssignments": { "value": [ { diff --git a/arm/Microsoft.CognitiveServices/accounts/deploy.bicep b/arm/Microsoft.CognitiveServices/accounts/deploy.bicep index 41343fb13c..bfda3ba9e7 100644 --- a/arm/Microsoft.CognitiveServices/accounts/deploy.bicep +++ b/arm/Microsoft.CognitiveServices/accounts/deploy.bicep @@ -106,8 +106,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -159,9 +159,16 @@ var networkAcls_var = { ipRules: ((empty(networkAcls)) ? null : ((length(networkAcls.ipRules) == 0) ? [] : networkAcls.ipRules)) } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource cognitiveServices 'Microsoft.CognitiveServices/accounts@2017-04-18' = { diff --git a/arm/Microsoft.CognitiveServices/accounts/readme.md b/arm/Microsoft.CognitiveServices/accounts/readme.md index 0868c93698..c7c4310d9b 100644 --- a/arm/Microsoft.CognitiveServices/accounts/readme.md +++ b/arm/Microsoft.CognitiveServices/accounts/readme.md @@ -17,13 +17,13 @@ This module deploys different kinds of cognitive services resources | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customSubDomainName` | string | | | Optional. Subdomain name used for token-based authentication. Required if 'networkAcls' are set. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `kind` | string | | `[AnomalyDetector, Bing.Autosuggest.v7, Bing.CustomSearch, Bing.EntitySearch, Bing.Search.v7, Bing.SpellCheck.v7, CognitiveServices, ComputerVision, ContentModerator, CustomVision.Prediction, CustomVision.Training, Face, FormRecognizer, ImmersiveReader, Internal.AllInOne, LUIS, LUIS.Authoring, Personalizer, QnAMaker, SpeechServices, TextAnalytics, TextTranslation]` | Required. Kind of the Cognitive Services. Use 'Get-AzCognitiveServicesAccountSku' to determine a valid combinations of 'kind' and 'sku' for your Azure region. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -35,7 +35,7 @@ This module deploys different kinds of cognitive services resources | `publicNetworkAccess` | string | `Enabled` | `[Enabled, Disabled]` | Optional. Subdomain name used for token-based authentication. Must be set if 'networkAcls' are set. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `sku` | string | `S0` | `[C2, C3, C4, F0, F1, S, S0, S1, S10, S2, S3, S4, S5, S6, S7, S8, S9]` | Optional. SKU of the Cognitive Services resource. Use 'Get-AzCognitiveServicesAccountSku' to determine a valid combinations of 'kind' and 'sku' for your Azure region. | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.Compute/availabilitySets/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/availabilitySets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/availabilitySets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/availabilitySets/deploy.bicep b/arm/Microsoft.Compute/availabilitySets/deploy.bicep index 008953afdf..d0c13491c7 100644 --- a/arm/Microsoft.Compute/availabilitySets/deploy.bicep +++ b/arm/Microsoft.Compute/availabilitySets/deploy.bicep @@ -30,12 +30,19 @@ param roleAssignments array = [] @description('Optional. Tags of the availability set resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-07-01' = { diff --git a/arm/Microsoft.Compute/availabilitySets/readme.md b/arm/Microsoft.Compute/availabilitySets/readme.md index e21c36dac3..1ea8fbb053 100644 --- a/arm/Microsoft.Compute/availabilitySets/readme.md +++ b/arm/Microsoft.Compute/availabilitySets/readme.md @@ -17,7 +17,7 @@ This template deploys an availability set | `availabilitySetFaultDomain` | int | `2` | | Optional. The number of fault domains to use. | | `availabilitySetSku` | string | `Aligned` | | Optional. Sku of the availability set. Use 'Aligned' for virtual machines with managed disks and 'Classic' for virtual machines with unmanaged disks. | | `availabilitySetUpdateDomain` | int | `5` | | Optional. The number of update domains to use. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Resource location. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. The name of the availability set that is being created. | diff --git a/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/diskEncryptionSets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep b/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep index 26cc93f6a6..a0200a9b0a 100644 --- a/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep +++ b/arm/Microsoft.Compute/diskEncryptionSets/deploy.bicep @@ -26,12 +26,19 @@ param roleAssignments array = [] @description('Optional. Tags of the disk encryption resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2021-04-01' = { diff --git a/arm/Microsoft.Compute/diskEncryptionSets/readme.md b/arm/Microsoft.Compute/diskEncryptionSets/readme.md index c3c63428f1..d6699e0c93 100644 --- a/arm/Microsoft.Compute/diskEncryptionSets/readme.md +++ b/arm/Microsoft.Compute/diskEncryptionSets/readme.md @@ -14,14 +14,14 @@ This template deploys a disk encryption set. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `encryptionType` | string | `EncryptionAtRestWithPlatformAndCustomerKeys` | `[EncryptionAtRestWithCustomerKey, EncryptionAtRestWithPlatformAndCustomerKeys]` | Optional. The type of key used to encrypt the data of the disk. For security reasons, it is recommended to set 'encryptionType' to 'EncryptionAtRestWithPlatformAndCustomerKeys' | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `encryptionType` | string | `EncryptionAtRestWithPlatformAndCustomerKeys` | `[EncryptionAtRestWithCustomerKey, EncryptionAtRestWithPlatformAndCustomerKeys]` | Optional. The type of key used to encrypt the data of the disk. For security reasons, it is recommended to set encryptionType to EncryptionAtRestWithPlatformAndCustomerKeys | | `keyUrl` | string | | | Required. Key URL (with version) pointing to a key or secret in KeyVault. | | `keyVaultId` | string | | | Required. Resource ID of the KeyVault containing the key or secret. | | `location` | string | `[resourceGroup().location]` | | Optional. Resource location. | | `name` | string | | | Required. The name of the disk encryption set that is being created. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `rotationToLatestKeyVersionEnabled` | bool | | | Optional. Set this flag to true to enable auto-updating of this disk encryption set to the latest key version. | +| `rotationToLatestKeyVersionEnabled` | bool | `False` | | Optional. Set this flag to true to enable auto-updating of this disk encryption set to the latest key version. | | `tags` | object | `{object}` | | Optional. Tags of the disk encryption resource. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.Compute/disks/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/disks/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/disks/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/disks/deploy.bicep b/arm/Microsoft.Compute/disks/deploy.bicep index e66713dc54..e23bc8466c 100644 --- a/arm/Microsoft.Compute/disks/deploy.bicep +++ b/arm/Microsoft.Compute/disks/deploy.bicep @@ -116,12 +116,19 @@ param roleAssignments array = [] @description('Optional. Tags of the availability set resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource disk 'Microsoft.Compute/disks@2021-08-01' = { diff --git a/arm/Microsoft.Compute/disks/readme.md b/arm/Microsoft.Compute/disks/readme.md index 1953fa2e69..b49d4b24b0 100644 --- a/arm/Microsoft.Compute/disks/readme.md +++ b/arm/Microsoft.Compute/disks/readme.md @@ -14,14 +14,14 @@ This template deploys a disk | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `acceleratedNetwork` | bool | | | Optional. True if the image from which the OS disk is created supports accelerated networking. | -| `burstingEnabled` | bool | | | Optional. Set to true to enable bursting beyond the provisioned performance target of the disk. | +| `acceleratedNetwork` | bool | `False` | | Optional. True if the image from which the OS disk is created supports accelerated networking. | +| `burstingEnabled` | bool | `False` | | Optional. Set to true to enable bursting beyond the provisioned performance target of the disk. | | `completionPercent` | int | `100` | | Optional. Percentage complete for the background copy when a resource is created via the CopyStart operation. | | `createOption` | string | `Empty` | `[Attach, Copy, CopyStart, Empty, FromImage, Import, ImportSecure, Restore, Upload, UploadPreparedSecure]` | Optional. Sources of a disk creation. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `diskIOPSReadWrite` | int | | | Optional. The number of IOPS allowed for this disk; only settable for UltraSSD disks. | -| `diskMBpsReadWrite` | int | | | Optional. The bandwidth allowed for this disk; only settable for UltraSSD disks. | -| `diskSizeGB` | int | | | Optional. If create option is empty, this field is mandatory and it indicates the size of the disk to create. | +| `diskIOPSReadWrite` | int | `0` | | Optional. The number of IOPS allowed for this disk; only settable for UltraSSD disks. | +| `diskMBpsReadWrite` | int | `0` | | Optional. The bandwidth allowed for this disk; only settable for UltraSSD disks. | +| `diskSizeGB` | int | `0` | | Optional. If create option is empty, this field is mandatory and it indicates the size of the disk to create. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `hyperVGeneration` | string | `V2` | `[V1, V2]` | Optional. The hypervisor generation of the Virtual Machine. Applicable to OS disks only. | | `imageReferenceId` | string | | | Optional. A relative uri containing either a Platform Image Repository or user image reference. | | `location` | string | `[resourceGroup().location]` | | Optional. Resource location. | @@ -35,7 +35,7 @@ This template deploys a disk | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `securityDataUri` | string | | | Optional. If create option is ImportSecure, this is the URI of a blob to be imported into VM guest state. | | `sku` | string | | `[Standard_LRS, Premium_LRS, StandardSSD_LRS, UltraSSD_LRS, Premium_ZRS, Premium_ZRS]` | Required. The disks sku name. Can be . | -| `sourceResourceId` | string | | | Optional. If create option is Copy, this is the ARM ID of the source snapshot or disk. | +| `sourceResourceId` | string | | | Optional. If create option is Copy, this is the ARM id of the source snapshot or disk. | | `sourceUri` | string | | | Optional. If create option is Import, this is the URI of a blob to be imported into a managed disk. | | `storageAccountId` | string | | | Optional. Required if create option is Import. The Azure Resource Manager identifier of the storage account containing the blob to import as a disk | | `tags` | object | `{object}` | | Optional. Tags of the availability set resource. | diff --git a/arm/Microsoft.Compute/galleries/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/galleries/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/galleries/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/galleries/deploy.bicep b/arm/Microsoft.Compute/galleries/deploy.bicep index 8e7140f091..68dcb74b96 100644 --- a/arm/Microsoft.Compute/galleries/deploy.bicep +++ b/arm/Microsoft.Compute/galleries/deploy.bicep @@ -25,12 +25,19 @@ param roleAssignments array = [] @description('Optional. Tags for all resources.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pidName '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource gallery 'Microsoft.Compute/galleries@2020-09-30' = { diff --git a/arm/Microsoft.Compute/galleries/images/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/galleries/images/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/galleries/images/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/galleries/images/deploy.bicep b/arm/Microsoft.Compute/galleries/images/deploy.bicep index e5bfdb09f4..1486ace36d 100644 --- a/arm/Microsoft.Compute/galleries/images/deploy.bicep +++ b/arm/Microsoft.Compute/galleries/images/deploy.bicep @@ -1,8 +1,8 @@ @description('Required. Name of the image definition.') param name string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Location for all resources.') param location string = resourceGroup().location @@ -94,9 +94,16 @@ param roleAssignments array = [] @description('Optional. Tags for all resources.') param tags object = {} -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource gallery 'Microsoft.Compute/galleries@2020-09-30' existing = { diff --git a/arm/Microsoft.Compute/galleries/images/readme.md b/arm/Microsoft.Compute/galleries/images/readme.md index 916fab525f..a17e0ed6fd 100644 --- a/arm/Microsoft.Compute/galleries/images/readme.md +++ b/arm/Microsoft.Compute/galleries/images/readme.md @@ -13,7 +13,7 @@ This module deploys an Image Definition in a Shared Image Gallery. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `endOfLife` | string | | | Optional. The end of life date of the gallery Image Definition. This property can be used for decommissioning purposes. This property is updatable. Allowed format: 2020-01-10T23:00:00.000Z | | `eula` | string | | | Optional. The Eula agreement for the gallery Image Definition. Has to be a valid URL. | | `excludedDiskTypes` | array | `[]` | | Optional. List of the excluded disk types. E.g. Standard_LRS | diff --git a/arm/Microsoft.Compute/galleries/readme.md b/arm/Microsoft.Compute/galleries/readme.md index 6086b7d95c..125abe56f2 100644 --- a/arm/Microsoft.Compute/galleries/readme.md +++ b/arm/Microsoft.Compute/galleries/readme.md @@ -15,7 +15,7 @@ This module deploys an Azure compute gallery (formerly known as shared image gal | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `galleryDescription` | string | | | Optional. Description of the Azure Shared Image Gallery | | `images` | _[images](images/readme.md)_ array | `[]` | | Optional. Images to create | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | diff --git a/arm/Microsoft.Compute/images/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/images/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/images/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/images/deploy.bicep b/arm/Microsoft.Compute/images/deploy.bicep index f17102d685..f731fbf42a 100644 --- a/arm/Microsoft.Compute/images/deploy.bicep +++ b/arm/Microsoft.Compute/images/deploy.bicep @@ -28,12 +28,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource image 'Microsoft.Compute/images@2021-04-01' = { diff --git a/arm/Microsoft.Compute/images/readme.md b/arm/Microsoft.Compute/images/readme.md index 21c3e1a47f..ca33421820 100644 --- a/arm/Microsoft.Compute/images/readme.md +++ b/arm/Microsoft.Compute/images/readme.md @@ -13,7 +13,7 @@ This module deploys a compute image. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `hyperVGeneration` | string | `V1` | | Optional. Gets the HyperVGenerationType of the VirtualMachine created from the image. - V1 or V2 | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | | | Required. The name of the image. | @@ -23,7 +23,7 @@ This module deploys a compute image. | `osType` | string | | | Required. This property allows you to specify the type of the OS that is included in the disk if creating a VM from a custom image. - Windows or Linux | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `zoneResilient` | bool | | | Optional. Default is false. Specifies whether an image is zone resilient or not. Zone resilient images can be created only in regions that provide Zone Redundant Storage (ZRS). | +| `zoneResilient` | bool | `False` | | Optional. Default is false. Specifies whether an image is zone resilient or not. Zone resilient images can be created only in regions that provide Zone Redundant Storage (ZRS). | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/proximityPlacementGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep b/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep index 0c215b8fdb..9372795682 100644 --- a/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep +++ b/arm/Microsoft.Compute/proximityPlacementGroups/deploy.bicep @@ -25,12 +25,19 @@ param roleAssignments array = [] @description('Optional. Tags of the proximity placement group resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource proximityPlacementGroup 'Microsoft.Compute/proximityPlacementGroups@2021-04-01' = { diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/readme.md b/arm/Microsoft.Compute/proximityPlacementGroups/readme.md index 3f4fb20860..a16f98b4a1 100644 --- a/arm/Microsoft.Compute/proximityPlacementGroups/readme.md +++ b/arm/Microsoft.Compute/proximityPlacementGroups/readme.md @@ -14,7 +14,7 @@ This template deploys a proximity placement group. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Resource location. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. The name of the proximity placement group that is being created. | diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep b/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep index f807c62188..aca81fadba 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/deploy.bicep @@ -260,8 +260,8 @@ param availabilityZones array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Required. The chosen OS type') @allowed([ @@ -338,9 +338,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource proximityPlacementGroup 'Microsoft.Compute/proximityPlacementGroups@2021-04-01' = if (!empty(proximityPlacementGroupName)) { @@ -396,7 +403,6 @@ resource vmss 'Microsoft.Compute/virtualMachineScaleSets@2021-04-01' = { secureBootEnabled: secureBootEnabled vTpmEnabled: vTpmEnabled } : null - } storageProfile: { imageReference: imageReference diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep index 85d0e125da..c3401b32a4 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/deploy.bicep @@ -32,12 +32,19 @@ param supressFailures bool = false @description('Required. Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available') param enableAutomaticUpgrade bool -@description('Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2021-07-01' existing = { diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md index d0d65b2b7c..5aba30f220 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/readme.md @@ -13,14 +13,14 @@ This module deploys a virtual machine scale set extension. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `autoUpgradeMinorVersion` | bool | | | Required. Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true | -| `cuaId` | string | | | Optional. Customer Usage Attribution id (GUID). This GUID must be previously registered | | `enableAutomaticUpgrade` | bool | | | Required. Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `forceUpdateTag` | string | | | Optional. How the extension handler should be forced to update even if the extension configuration has not changed | | `name` | string | | | Required. The name of the virtual machine scale set extension | | `protectedSettings` | secureObject | `{object}` | | Optional. Any object that contains the extension specific protected settings | | `publisher` | string | | | Required. The name of the extension handler publisher | | `settings` | object | `{object}` | | Optional. Any object that contains the extension specific settings | -| `supressFailures` | bool | | | Optional. Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false | +| `supressFailures` | bool | `False` | | Optional. Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false | | `type` | string | | | Required. Specifies the type of the extension; an example is "CustomScriptExtension" | | `typeHandlerVersion` | string | | | Required. Specifies the version of the script handler | | `virtualMachineScaleSetName` | string | | | Required. The name of the virtual machine scale set that extension is provisioned for | diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md b/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md index f4de5c1b00..8eb92f3794 100644 --- a/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md +++ b/arm/Microsoft.Compute/virtualMachineScaleSets/readme.md @@ -26,12 +26,11 @@ The following resources are required to be able to deploy this resource. | `additionalUnattendContent` | array | `[]` | | Optional. Specifies additional base-64 encoded XML formatted information that can be included in the Unattend.xml file, which is used by Windows Setup. - AdditionalUnattendContent object | | `adminPassword` | secureString | | | Optional. When specifying a Windows Virtual Machine, this value should be passed | | `adminUsername` | secureString | | | Required. Administrator username | -| `automaticRepairsPolicyEnabled` | bool | | | Optional. Specifies whether automatic repairs should be enabled on the virtual machine scale set. | +| `automaticRepairsPolicyEnabled` | bool | `False` | | Optional. Specifies whether automatic repairs should be enabled on the virtual machine scale set. | | `availabilityZones` | array | `[]` | | Optional. The virtual machine scale set zones. NOTE: Availability zones can only be set when you create the scale set. | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a registration token. | | `bootDiagnosticStorageAccountName` | string | | | Optional. Storage account used to store boot diagnostic information. Boot diagnostics will be disabled if no value is provided. | | `bootDiagnosticStorageAccountUri` | string | `[format('.blob.{0}/', environment().suffixes.storage)]` | | Optional. Storage account boot diagnostic base URI. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customData` | string | | | Optional. Custom data associated to the VM, this value will be automatically converted into base64 to account for the expected VM format. | | `dataDisks` | array | `[]` | | Optional. Specifies the data disks. For security reasons, it is recommended to specify DiskEncryptionSet into the dataDisk object. Restrictions: DiskEncryptionSet cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VM Scale sets. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | @@ -39,14 +38,15 @@ The following resources are required to be able to deploy this resource. | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | -| `disableAutomaticRollback` | bool | | | Optional. Whether OS image rollback feature should be disabled. | -| `disablePasswordAuthentication` | bool | | | Optional. Specifies whether password authentication should be disabled. | -| `doNotRunExtensionsOnOverprovisionedVMs` | bool | | | Optional. When Overprovision is enabled, extensions are launched only on the requested number of VMs which are finally kept. This property will hence ensure that the extensions do not run on the extra overprovisioned VMs. | -| `enableAutomaticOSUpgrade` | bool | | | Optional. Indicates whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the OS image becomes available. Default value is false. If this is set to true for Windows based scale sets, enableAutomaticUpdates is automatically set to false and cannot be set to true. | +| `disableAutomaticRollback` | bool | `False` | | Optional. Whether OS image rollback feature should be disabled. | +| `disablePasswordAuthentication` | bool | `False` | | Optional. Specifies whether password authentication should be disabled. | +| `doNotRunExtensionsOnOverprovisionedVMs` | bool | `False` | | Optional. When Overprovision is enabled, extensions are launched only on the requested number of VMs which are finally kept. This property will hence ensure that the extensions do not run on the extra overprovisioned VMs. | +| `enableAutomaticOSUpgrade` | bool | `False` | | Optional. Indicates whether OS upgrades should automatically be applied to scale set instances in a rolling fashion when a newer version of the OS image becomes available. Default value is false. If this is set to true for Windows based scale sets, enableAutomaticUpdates is automatically set to false and cannot be set to true. | | `enableAutomaticUpdates` | bool | `True` | | Optional. Indicates whether Automatic Updates is enabled for the Windows virtual machine. Default value is true. For virtual machine scale sets, this property can be updated and updates will take effect on OS reprovisioning. | -| `enableEvictionPolicy` | bool | | | Optional. Specifies the eviction policy for the low priority virtual machine. Will result in 'Deallocate' eviction policy. | -| `enableServerSideEncryption` | bool | | | Optional. Specifies if Windows VM disks should be encrypted with Server-side encryption + Customer managed Key. | -| `encryptionAtHost` | bool | `True` | | Optional. This property can be used by user in the request to enable or disable the Host Encryption for the virtual machine scale set. This will enable the encryption for all the disks including Resource/Temp disk at host itself. For security reasons, it is recommended to set encryptionAtHost to True. Restrictions: Cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VM Scale sets. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableEvictionPolicy` | bool | `False` | | Optional. Specifies the eviction policy for the low priority virtual machine. Will result in 'Deallocate' eviction policy. | +| `enableServerSideEncryption` | bool | `False` | | Optional. Specifies if Windows VM disks should be encrypted with Server-side encryption + Customer managed Key. | +| `encryptionAtHost` | bool | `True` | | Optional. This property can be used by user in the request to enable or disable the Host Encryption for the virtual machine. This will enable the encryption for all the disks including Resource/Temp disk at host itself. For security reasons, it is recommended to set encryptionAtHost to True. Restrictions: Cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your virtual machine scale sets. | | `extensionAntiMalwareConfig` | object | `{object}` | | Optional. The configuration for the [Anti Malware] extension. Must at least contain the ["enabled": true] property to be executed | | `extensionCustomScriptConfig` | object | `{object}` | | Optional. The configuration for the [Custom Script] extension. Must at least contain the ["enabled": true] property to be executed | | `extensionDependencyAgentConfig` | object | `{object}` | | Optional. The configuration for the [Dependency Agent] extension. Must at least contain the ["enabled": true] property to be executed | @@ -69,9 +69,9 @@ The following resources are required to be able to deploy this resource. | `monitoringWorkspaceId` | string | | | Optional. Resource ID of the monitoring log analytics workspace. | | `name` | string | | | Required. Name of the VMSS. | | `nicConfigurations` | array | `[]` | | Required. Configures NICs and PIPs. | -| `osDisk` | object | | | Required. Specifies the OS disk. For security reasons, it is recommended to specify DiskEncryptionSet into the osDisk object. Restrictions: DiskEncryptionSet cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VM Scale sets.| +| `osDisk` | object | | | Required. Specifies the OS disk. For security reasons, it is recommended to specify DiskEncryptionSet into the osDisk object. Restrictions: DiskEncryptionSet cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VM Scale sets. | | `osType` | string | | `[Windows, Linux]` | Required. The chosen OS type | -| `overprovision` | bool | | | Optional. Specifies whether the Virtual Machine Scale Set should be overprovisioned. | +| `overprovision` | bool | `False` | | Optional. Specifies whether the Virtual Machine Scale Set should be overprovisioned. | | `pauseTimeBetweenBatches` | string | `PT0S` | | Optional. The wait time between completing the update for all virtual machines in one batch and starting the next batch. The time duration should be specified in ISO 8601 format | | `plan` | object | `{object}` | | Optional. Specifies information about the marketplace image used to create the virtual machine. This element is only used for marketplace images. Before you can use a marketplace image from an API, you must enable the image for programmatic use. | | `provisionVMAgent` | bool | `True` | | Optional. Indicates whether virtual machine agent should be provisioned on the virtual machine. When this property is not specified in the request body, default behavior is to set it to true. This will ensure that VM Agent is installed on the VM so that extensions can be added to the VM later. | @@ -84,22 +84,22 @@ The following resources are required to be able to deploy this resource. | `scaleSetFaultDomain` | int | `2` | | Optional. Fault Domain count for each placement group. | | `scheduledEventsProfile` | object | `{object}` | | Optional. Specifies Scheduled Event related configurations | | `secrets` | array | `[]` | | Optional. Specifies set of certificates that should be installed onto the virtual machines in the scale set. | -| `securityType` | string | | `TrustedLaunch` | Optional. Specifies the SecurityType of the virtual machine scale set. It is set as TrustedLaunch to enable UefiSettings. | -| `secureBootEnabled` | bool | `False` | | Optional. Specifies whether secure boot should be enabled on the virtual machine scale set. This parameter is part of the UefiSettings. SecurityType should be set to TrustedLaunch to enable UefiSettings. | +| `secureBootEnabled` | bool | `False` | | Optional. Specifies whether secure boot should be enabled on the virtual machine scale set. This parameter is part of the UefiSettings. SecurityType should be set to TrustedLaunch to enable UefiSettings. | +| `securityType` | string | | | Optional. Specifies the SecurityType of the virtual machine scale set. It is set as TrustedLaunch to enable UefiSettings. | | `singlePlacementGroup` | bool | `True` | | Optional. When true this limits the scale set to a single placement group, of max size 100 virtual machines. NOTE: If singlePlacementGroup is true, it may be modified to false. However, if singlePlacementGroup is false, it may not be modified to true. | | `skuCapacity` | int | `1` | | Optional. The initial instance count of scale set VMs. | | `skuName` | string | | | Required. The SKU size of the VMs. | -| `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 resource. | -| `timeZone` | string | | | Optional. Specifies the time zone of the virtual machine. e.g. 'Pacific Standard Time'. Possible values can be 'TimeZoneInfo.id' value from time zones returned by TimeZoneInfo.GetSystemTimeZones. | -| `ultraSSDEnabled` | bool | | | Optional. The flag that enables or disables a capability to have one or more managed data disks with UltraSSD_LRS storage account type on the VM or VMSS. Managed disks with storage account type UltraSSD_LRS can be added to a virtual machine or virtual machine scale set only if this property is enabled. | +| `timeZone` | string | | | Optional. Specifies the time zone of the virtual machine. e.g. 'Pacific Standard Time'. Possible values can be TimeZoneInfo.id value from time zones returned by TimeZoneInfo.GetSystemTimeZones. | +| `ultraSSDEnabled` | bool | `False` | | Optional. The flag that enables or disables a capability to have one or more managed data disks with UltraSSD_LRS storage account type on the VM or VMSS. Managed disks with storage account type UltraSSD_LRS can be added to a virtual machine or virtual machine scale set only if this property is enabled. | | `upgradePolicyMode` | string | `Manual` | `[Manual, Automatic, Rolling]` | Optional. Specifies the mode of an upgrade to virtual machines in the scale set.' Manual - You control the application of updates to virtual machines in the scale set. You do this by using the manualUpgrade action. ; Automatic - All virtual machines in the scale set are automatically updated at the same time. - Automatic, Manual, Rolling | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | | `vmNamePrefix` | string | `vmssvm` | | Optional. Specifies the computer name prefix for all of the virtual machines in the scale set. | | `vmPriority` | string | `Regular` | `[Regular, Low, Spot]` | Optional. Specifies the priority for the virtual machine. | | `vTpmEnabled` | bool | `False` | | Optional. Specifies whether vTPM should be enabled on the virtual machine scale set. This parameter is part of the UefiSettings. SecurityType should be set to TrustedLaunch to enable UefiSettings. | | `winRM` | object | `{object}` | | Optional. Specifies the Windows Remote Management listeners. This enables remote Windows PowerShell. - WinRMConfiguration object. | -| `zoneBalance` | bool | | | Optional. Whether to force strictly even Virtual Machine distribution cross x-zones in case there is zone outage. | +| `zoneBalance` | bool | `False` | | Optional. Whether to force strictly even Virtual Machine distribution cross x-zones in case there is zone outage. | #### Marketplace images diff --git a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/virtualMachines/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/virtualMachines/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/virtualMachines/deploy.bicep b/arm/Microsoft.Compute/virtualMachines/deploy.bicep index 343134c31e..43e188148d 100644 --- a/arm/Microsoft.Compute/virtualMachines/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachines/deploy.bicep @@ -235,8 +235,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Generated. Do not provide a value! This date value is used to generate a registration token.') param baseTime string = utcNow('u') @@ -312,9 +312,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } module virtualMachine_nic '.bicep/nested_networkInterface.bicep' = [for (nicConfiguration, index) in nicConfigurations: { diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/.bicep/nested_cuaId.bicep b/arm/Microsoft.Compute/virtualMachines/extensions/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Compute/virtualMachines/extensions/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep b/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep index f7a048e1ae..274ba363a8 100644 --- a/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep +++ b/arm/Microsoft.Compute/virtualMachines/extensions/deploy.bicep @@ -35,12 +35,19 @@ param supressFailures bool = false @description('Required. Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available') param enableAutomaticUpgrade bool -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualMachine 'Microsoft.Compute/virtualMachines@2021-07-01' existing = { diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/readme.md b/arm/Microsoft.Compute/virtualMachines/extensions/readme.md index fd094e6b47..2b87b66a78 100644 --- a/arm/Microsoft.Compute/virtualMachines/extensions/readme.md +++ b/arm/Microsoft.Compute/virtualMachines/extensions/readme.md @@ -13,15 +13,15 @@ This module deploys a virtual machine extension. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `autoUpgradeMinorVersion` | bool | | | Required. Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enableAutomaticUpgrade` | bool | | | Required. Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `forceUpdateTag` | string | | | Optional. How the extension handler should be forced to update even if the extension configuration has not changed | | `location` | string | `[resourceGroup().location]` | | Optional. The location the extension is deployed to | | `name` | string | | | Required. The name of the virtual machine extension | | `protectedSettings` | secureObject | `{object}` | | Optional. Any object that contains the extension specific protected settings | | `publisher` | string | | | Required. The name of the extension handler publisher | | `settings` | object | `{object}` | | Optional. Any object that contains the extension specific settings | -| `supressFailures` | bool | | | Optional. Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false | +| `supressFailures` | bool | `False` | | Optional. Indicates whether failures stemming from the extension will be suppressed (Operational failures such as not connecting to the VM will not be suppressed regardless of this value). The default is false | | `type` | string | | | Required. Specifies the type of the extension; an example is "CustomScriptExtension" | | `typeHandlerVersion` | string | | | Required. Specifies the version of the script handler | | `virtualMachineName` | string | | | Required. The name of the virtual machine that extension is provisioned for | diff --git a/arm/Microsoft.Compute/virtualMachines/readme.md b/arm/Microsoft.Compute/virtualMachines/readme.md index e7d0503876..b8cde3a908 100644 --- a/arm/Microsoft.Compute/virtualMachines/readme.md +++ b/arm/Microsoft.Compute/virtualMachines/readme.md @@ -34,7 +34,6 @@ This module deploys one Virtual Machine with one or multiple nics and optionally | `bootDiagnosticStorageAccountUri` | string | `[format('.blob.{0}/', environment().suffixes.storage)]` | | Optional. Storage account boot diagnostic base URI. | | `certificatesToBeInstalled` | array | `[]` | | Optional. Specifies set of certificates that should be installed onto the virtual machine. | | `configurationProfileAssignments` | array | `[]` | | Optional. Any VM configuration profile assignments | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customData` | string | | | Optional. Custom data associated to the VM, this value will be automatically converted into base64 to account for the expected VM format. | | `dataDisks` | array | `[]` | | Optional. Specifies the data disks. For security reasons, it is recommended to specify DiskEncryptionSet into the dataDisk object. Restrictions: DiskEncryptionSet cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VMs. | | `dedicatedHostId` | string | | | Optional. Specifies resource ID about the dedicated host that the virtual machine resides in. | @@ -45,6 +44,7 @@ This module deploys one Virtual Machine with one or multiple nics and optionally | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `disablePasswordAuthentication` | bool | `False` | | Optional. Specifies whether password authentication should be disabled. | | `enableAutomaticUpdates` | bool | `True` | | Optional. Indicates whether Automatic Updates is enabled for the Windows virtual machine. Default value is true. For virtual machine scale sets, this property can be updated and updates will take effect on OS reprovisioning. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableEvictionPolicy` | bool | `False` | | Optional. Specifies the eviction policy for the low priority virtual machine. Will result in 'Deallocate' eviction policy. | | `enableServerSideEncryption` | bool | `False` | | Optional. Specifies if Windows VM disks should be encrypted with Server-side encryption + Customer managed Key. | | `encryptionAtHost` | bool | `True` | | Optional. This property can be used by user in the request to enable or disable the Host Encryption for the virtual machine. This will enable the encryption for all the disks including Resource/Temp disk at host itself. For security reasons, it is recommended to set encryptionAtHost to True. Restrictions: Cannot be enabled if Azure Disk Encryption (guest-VM encryption using bitlocker/DM-Crypt) is enabled on your VMs. | diff --git a/arm/Microsoft.Consumption/budgets/deploy.bicep b/arm/Microsoft.Consumption/budgets/deploy.bicep index e1784f25cb..5b0f4cb039 100644 --- a/arm/Microsoft.Consumption/budgets/deploy.bicep +++ b/arm/Microsoft.Consumption/budgets/deploy.bicep @@ -49,6 +49,9 @@ param contactRoles array = [] @description('Optional. List of action group resource IDs that will receive the alert.') param actionGroups array = [] +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + var budgetNameVar = empty(name) ? '${resetPeriod}-${category}-Budget' : name var notificationsArray = [for threshold in thresholds: { 'Actual_GreaterThan_${threshold}_Percentage': { @@ -64,6 +67,18 @@ var notificationsArray = [for threshold in thresholds: { var notifications = json(replace(replace(replace(string(notificationsArray), '[{', '{'), '}]', '}'), '}},{', '},')) +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource budget 'Microsoft.Consumption/budgets@2019-05-01' = { name: budgetNameVar properties: { diff --git a/arm/Microsoft.Consumption/budgets/readme.md b/arm/Microsoft.Consumption/budgets/readme.md index 47cfa0b885..4b9fa436f6 100644 --- a/arm/Microsoft.Consumption/budgets/readme.md +++ b/arm/Microsoft.Consumption/budgets/readme.md @@ -17,6 +17,7 @@ This module deploys budgets for subscriptions. | `category` | string | `Cost` | `[Cost, Usage]` | Optional. The category of the budget, whether the budget tracks cost or usage. | | `contactEmails` | array | `[]` | | Optional. The list of email addresses to send the budget notification to when the thresholds are exceeded. | | `contactRoles` | array | `[]` | | Optional. The list of contact roles to send the budget notification to when the thresholds are exceeded. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `endDate` | string | | | Optional. The end date for the budget. If not provided, it will default to 10 years from the start date. | | `name` | string | | | Optional. The name of the budget. | | `resetPeriod` | string | `Monthly` | `[Monthly, Quarterly, Annually, BillingMonth, BillingQuarter, BillingAnnual]` | Optional. The time covered by a budget. Tracking of the amount will be reset based on the time grain. BillingMonth, BillingQuarter, and BillingAnnual are only supported by WD customers. | diff --git a/arm/Microsoft.ContainerInstance/containerGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.ContainerInstance/containerGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ContainerInstance/containerGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep b/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep index e91376ab5b..4093280d4d 100644 --- a/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep +++ b/arm/Microsoft.ContainerInstance/containerGroups/deploy.bicep @@ -56,8 +56,8 @@ param userAssignedIdentities object = {} @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var identityType = systemAssignedIdentity ? (!empty(userAssignedIdentities) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(userAssignedIdentities) ? 'UserAssigned' : 'None') @@ -66,9 +66,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource containergroup 'Microsoft.ContainerInstance/containerGroups@2021-03-01' = { diff --git a/arm/Microsoft.ContainerInstance/containerGroups/readme.md b/arm/Microsoft.ContainerInstance/containerGroups/readme.md index 14e40fda56..8caef48ef5 100644 --- a/arm/Microsoft.ContainerInstance/containerGroups/readme.md +++ b/arm/Microsoft.ContainerInstance/containerGroups/readme.md @@ -17,7 +17,7 @@ The top-level resource in Azure Container Instances is the container group. A co | :-- | :-- | :-- | :-- | :-- | | `containername` | string | | | Required. Name for the container. | | `cpuCores` | int | `2` | | Optional. The number of CPU cores to allocate to the container. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `environmentVariables` | array | `[]` | | Optional. Envrionment variables of the container group. | | `image` | string | | | Required. Name of the image. | | `imageRegistryCredentials` | array | `[]` | | Optional. The image registry credentials by which the container group is created from. | @@ -29,7 +29,7 @@ The top-level resource in Azure Container Instances is the container group. A co | `osType` | string | `Linux` | | Optional. The operating system type required by the containers in the container group. - Windows or Linux. | | `ports` | array | `[System.Collections.Hashtable]` | | Optional. Port to open on the container and the public IP address. | | `restartPolicy` | string | `Always` | | Optional. Restart policy for all containers within the container group. - Always: Always restart. OnFailure: Restart on failure. Never: Never restart. - Always, OnFailure, Never | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.ContainerRegistry/registries/.bicep/nested_cuaId.bicep b/arm/Microsoft.ContainerRegistry/registries/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ContainerRegistry/registries/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ContainerRegistry/registries/deploy.bicep b/arm/Microsoft.ContainerRegistry/registries/deploy.bicep index d5e398d254..3ee0b00e08 100644 --- a/arm/Microsoft.ContainerRegistry/registries/deploy.bicep +++ b/arm/Microsoft.ContainerRegistry/registries/deploy.bicep @@ -114,8 +114,8 @@ param userAssignedIdentities object = {} @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -178,9 +178,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource registry 'Microsoft.ContainerRegistry/registries@2021-09-01' = { diff --git a/arm/Microsoft.ContainerRegistry/registries/readme.md b/arm/Microsoft.ContainerRegistry/registries/readme.md index e6f4de55c9..f4cc33a164 100644 --- a/arm/Microsoft.ContainerRegistry/registries/readme.md +++ b/arm/Microsoft.ContainerRegistry/registries/readme.md @@ -20,13 +20,13 @@ Azure Container Registry is a managed, private Docker registry service based on | :-- | :-- | :-- | :-- | :-- | | `acrAdminUserEnabled` | bool | `False` | | Optional. Enable admin user that have push / pull permission to the registry. | | `acrSku` | string | `Basic` | `[Basic, Premium, Standard]` | Optional. Tier of your Azure container registry. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `dataEndpointEnabled` | bool | `False` | | Optional. Enable a single data endpoint per region for serving data. Not relevant in case of disabled public access. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `encryptionStatus` | string | `disabled` | `[disabled, enabled]` | Optional. The value that indicates whether encryption is enabled or not. | | `exportPolicyStatus` | string | `disabled` | `[disabled, enabled]` | Optional. The value that indicates whether the export policy is enabled or not. | | `keyVaultProperties` | object | `{object}` | | Optional. Identity which will be used to access key vault and Key vault uri to access the encryption key. | diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep b/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep index 6f20793a4e..81a4b836ec 100644 --- a/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep +++ b/arm/Microsoft.ContainerRegistry/registries/replications/deploy.bicep @@ -20,12 +20,19 @@ param regionEndpointEnabled bool = true @description('Optional. Whether or not zone redundancy is enabled for this container registry') param zoneRedundancy string = 'Disabled' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource registry 'Microsoft.ContainerRegistry/registries@2021-09-01' existing = { diff --git a/arm/Microsoft.ContainerRegistry/registries/replications/readme.md b/arm/Microsoft.ContainerRegistry/registries/replications/readme.md index 5fc994b14a..96cc1b0e49 100644 --- a/arm/Microsoft.ContainerRegistry/registries/replications/readme.md +++ b/arm/Microsoft.ContainerRegistry/registries/replications/readme.md @@ -12,7 +12,7 @@ This module deploys ContainerRegistry Registries Replications. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | | | Required. The name of the replication. | | `regionEndpointEnabled` | bool | `True` | | Optional. Specifies whether the replication regional endpoint is enabled. Requests will not be routed to a replication whose regional endpoint is disabled, however its data will continue to be synced with other replications. | diff --git a/arm/Microsoft.ContainerService/managedClusters/.bicep/nested_cuaId.bicep b/arm/Microsoft.ContainerService/managedClusters/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ContainerService/managedClusters/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep b/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep index e5c76a6d5b..b57a756c96 100644 --- a/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep +++ b/arm/Microsoft.ContainerService/managedClusters/agentPools/deploy.bicep @@ -172,12 +172,19 @@ var upgradeSettings = { maxSurge: maxSurge } -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-08-01' existing = { diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md b/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md index af872ec00f..beda309cef 100644 --- a/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md +++ b/arm/Microsoft.ContainerService/managedClusters/agentPools/readme.md @@ -14,12 +14,12 @@ This module deploys an Agent Pool for a Container Service Managed Cluster | :-- | :-- | :-- | :-- | :-- | | `availabilityZones` | array | `[]` | | Optional. The list of Availability zones to use for nodes. This can only be specified if the AgentPoolType property is "VirtualMachineScaleSets". | | `count` | int | `1` | | Optional. Desired Number of agents (VMs) specified to host docker containers. Allowed values must be in the range of 0 to 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools. The default value is 1. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `enableAutoScaling` | bool | | `[True, False]` | Optional. Whether to enable auto-scaler | -| `enableEncryptionAtHost` | bool | | `[True, False]` | Optional. This is only supported on certain VM sizes and in certain Azure regions. For more information, see: /azure/aks/enable-host-encryption | -| `enableFIPS` | bool | | `[True, False]` | Optional. See Add a FIPS-enabled node pool (https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools#add-a-fips-enabled-node-pool-preview) for more details. | -| `enableNodePublicIP` | bool | | `[True, False]` | Optional. Some scenarios may require nodes in a node pool to receive their own dedicated public IP addresses. A common scenario is for gaming workloads, where a console needs to make a direct connection to a cloud virtual machine to minimize hops. For more information see assigning a public IP per node (https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools#assign-a-public-ip-per-node-for-your-node-pools). The default is false. | -| `enableUltraSSD` | bool | | `[True, False]` | Optional. Whether to enable UltraSSD | +| `enableAutoScaling` | bool | `False` | `[True, False]` | Optional. Whether to enable auto-scaler | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableEncryptionAtHost` | bool | `False` | `[True, False]` | Optional. This is only supported on certain VM sizes and in certain Azure regions. For more information, see: /azure/aks/enable-host-encryption | +| `enableFIPS` | bool | `False` | `[True, False]` | Optional. See Add a FIPS-enabled node pool (https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools#add-a-fips-enabled-node-pool-preview) for more details. | +| `enableNodePublicIP` | bool | `False` | `[True, False]` | Optional. Some scenarios may require nodes in a node pool to receive their own dedicated public IP addresses. A common scenario is for gaming workloads, where a console needs to make a direct connection to a cloud virtual machine to minimize hops. For more information see assigning a public IP per node (https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools#assign-a-public-ip-per-node-for-your-node-pools). The default is false. | +| `enableUltraSSD` | bool | `False` | `[True, False]` | Optional. Whether to enable UltraSSD | | `gpuInstanceProfile` | string | | `[MIG1g, MIG2g, MIG3g, MIG4g, MIG7g, ]` | Optional. GPUInstanceProfile to be used to specify GPU MIG instance profile for supported GPU VM SKU. | | `kubeletDiskType` | string | | | Optional. Determines the placement of emptyDir volumes, container runtime data root, and Kubelet ephemeral storage. | | `managedClusterName` | string | | | Required. Name of the managed cluster | @@ -33,7 +33,7 @@ This module deploys an Agent Pool for a Container Service Managed Cluster | `nodePublicIpPrefixId` | string | | | Optional. ResourceId of the node PublicIPPrefix | | `nodeTaints` | array | `[]` | | Optional. The taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule. | | `orchestratorVersion` | string | | | Optional. As a best practice, you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control plane. The node pool minor version must be within two minor versions of the control plane version. The node pool version cannot be greater than the control plane version. For more information see upgrading a node pool (https://docs.microsoft.com/en-us/azure/aks/use-multiple-node-pools#upgrade-a-node-pool). | -| `osDiskSizeGB` | int | | | Optional. OS Disk Size in GB to be used to specify the disk size for every machine in the master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified. | +| `osDiskSizeGB` | int | `0` | | Optional. OS Disk Size in GB to be used to specify the disk size for every machine in the master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified. | | `osDiskType` | string | | `[Ephemeral, Managed, ]` | Optional. The default is "Ephemeral" if the VM supports it and has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to "Managed". May not be changed after creation. For more information see Ephemeral OS (https://docs.microsoft.com/en-us/azure/aks/cluster-configuration#ephemeral-os). | | `osSku` | string | | `[CBLMariner, Ubuntu, ]` | Optional. Specifies an OS SKU. This value must not be specified if OSType is Windows. | | `osType` | string | `Linux` | `[Linux, Windows]` | Optional. The operating system type. The default is Linux. | diff --git a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep b/arm/Microsoft.ContainerService/managedClusters/deploy.bicep index 08c5242fb2..502aa90052 100644 --- a/arm/Microsoft.ContainerService/managedClusters/deploy.bicep +++ b/arm/Microsoft.ContainerService/managedClusters/deploy.bicep @@ -254,8 +254,8 @@ param diagnosticEventHubName string = '' @maxValue(365) param diagnosticLogsRetentionInDays int = 365 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] @@ -339,9 +339,16 @@ var lbProfile = { effectiveOutboundIPs: [] } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedCluster 'Microsoft.ContainerService/managedClusters@2021-10-01' = { diff --git a/arm/Microsoft.ContainerService/managedClusters/readme.md b/arm/Microsoft.ContainerService/managedClusters/readme.md index c2055cc157..f0c5b995ce 100644 --- a/arm/Microsoft.ContainerService/managedClusters/readme.md +++ b/arm/Microsoft.ContainerService/managedClusters/readme.md @@ -59,7 +59,6 @@ This module deploys Azure Kubernetes Cluster (AKS). | `autoScalerProfileUtilizationThreshold` | string | `0.5` | | Optional. Specifies the utilization threshold of the auto-scaler of the AKS cluster. | | `azurePolicyEnabled` | bool | `True` | | Optional. Specifies whether the azurepolicy add-on is enabled or not. | | `azurePolicyVersion` | string | `v2` | | Optional. Specifies the azure policy version to use. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | @@ -67,6 +66,7 @@ This module deploys Azure Kubernetes Cluster (AKS). | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `disableLocalAccounts` | bool | `False` | | Optional. If set to true, getting static credentials will be disabled for this cluster. This must only be used on Managed Clusters that are AAD enabled. | | `disableRunCommand` | bool | `False` | | Optional. Whether to disable run command for the cluster or not. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableKeyvaultSecretsProvider` | bool | `False` | | Optional. Specifies whether the KeyvaultSecretsProvider add-on is enabled or not. | | `enablePrivateCluster` | bool | `False` | | Optional. Specifies whether to create the cluster as a private cluster or not. | | `enablePrivateClusterPublicFQDN` | bool | `False` | | Optional. Whether to create additional public FQDN for private cluster or not. | diff --git a/arm/Microsoft.DataFactory/factories/.bicep/nested_cuaId.bicep b/arm/Microsoft.DataFactory/factories/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.DataFactory/factories/deploy.bicep b/arm/Microsoft.DataFactory/factories/deploy.bicep index d45404efbd..75fcb80f3a 100644 --- a/arm/Microsoft.DataFactory/factories/deploy.bicep +++ b/arm/Microsoft.DataFactory/factories/deploy.bicep @@ -122,8 +122,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var identityType = systemAssignedIdentity ? (!empty(userAssignedIdentities) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(userAssignedIdentities) ? 'UserAssigned' : 'None') @@ -132,9 +132,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' = { diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/.bicep/nested_cuaId.bicep b/arm/Microsoft.DataFactory/factories/integrationRuntime/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep b/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep index d1dda4351f..8be80fda90 100644 --- a/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep +++ b/arm/Microsoft.DataFactory/factories/integrationRuntime/deploy.bicep @@ -17,12 +17,19 @@ param managedVirtualNetworkName string = '' @description('Required. Integration Runtime type properties.') param typeProperties object -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } var managedVirtualNetwork_var = { diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md b/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md index 947227aaeb..707253f050 100644 --- a/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md +++ b/arm/Microsoft.DataFactory/factories/integrationRuntime/readme.md @@ -12,8 +12,8 @@ This module deploys a Managed or Self-Hosted Integration Runtime for an Azure Da | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `dataFactoryName` | string | | | Required. The name of the Azure Data Factory | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedVirtualNetworkName` | string | | | Optional. The name of the Managed Virtual Network if using type "Managed" | | `name` | string | | | Required. The name of the Integration Runtime | | `type` | string | | `[Managed, SelfHosted]` | Required. The type of Integration Runtime | diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/.bicep/nested_cuaId.bicep b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep index cac060cee4..d7bd389171 100644 --- a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep +++ b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/deploy.bicep @@ -4,12 +4,19 @@ param dataFactoryName string @description('Required. The name of the Managed Virtual Network') param name string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' - -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource dataFactory 'Microsoft.DataFactory/factories@2018-06-01' existing = { diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md index 2e8e348dd1..e137a9d6fd 100644 --- a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md +++ b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/readme.md @@ -12,8 +12,8 @@ This module deploys a Managed Virtual Network for an Azure Data Factory | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `dataFactoryName` | string | | | Required. The name of the Azure Data Factory | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the Managed Virtual Network | ## Outputs diff --git a/arm/Microsoft.DataFactory/factories/readme.md b/arm/Microsoft.DataFactory/factories/readme.md index 4e304a0a22..9c1f886b89 100644 --- a/arm/Microsoft.DataFactory/factories/readme.md +++ b/arm/Microsoft.DataFactory/factories/readme.md @@ -15,12 +15,12 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `gitAccountName` | string | | | Optional. The account name. | | `gitCollaborationBranch` | string | `main` | | Optional. The collaboration branch name. Default is 'main'. | | `gitConfigureLater` | bool | `True` | | Optional. Boolean to define whether or not to configure git during template deployment. | @@ -37,7 +37,7 @@ | `name` | string | | | Required. The name of the Azure Factory to create | | `publicNetworkAccess` | bool | `True` | | Optional. Enable or disable public network access. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.Databricks/workspaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.Databricks/workspaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Databricks/workspaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Databricks/workspaces/deploy.bicep b/arm/Microsoft.Databricks/workspaces/deploy.bicep index efe13ab5c6..03a6d4ff5c 100644 --- a/arm/Microsoft.Databricks/workspaces/deploy.bicep +++ b/arm/Microsoft.Databricks/workspaces/deploy.bicep @@ -49,8 +49,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -90,9 +90,16 @@ var diagnosticsLogs = [for log in logsToEnable: { var managedResourceGroupName = '${name}-rg' var managedResourceGroupId_var = '${subscription().id}/resourceGroups/${managedResourceGroupName}' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.Databricks/workspaces@2018-04-01' = { diff --git a/arm/Microsoft.Databricks/workspaces/readme.md b/arm/Microsoft.Databricks/workspaces/readme.md index a315da5653..2ce0edd729 100644 --- a/arm/Microsoft.Databricks/workspaces/readme.md +++ b/arm/Microsoft.Databricks/workspaces/readme.md @@ -13,12 +13,12 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[dbfs, clusters, accounts, jobs, notebook, ssh, workspace, secrets, sqlPermissions, instancePools]` | `[dbfs, clusters, accounts, jobs, notebook, ssh, workspace, secrets, sqlPermissions, instancePools]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/.bicep/nested_cuaId.bicep b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep index c2f7a8d0c7..d63d266671 100644 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep +++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/deploy.bicep @@ -33,12 +33,19 @@ param iconPath string = '' @sys.description('Optional. Index of the icon.') param iconIndex int = 0 -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2021-09-03-preview' existing = { diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md index be7ede508f..c7b36a6f4f 100644 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md +++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/readme.md @@ -15,14 +15,14 @@ This module deploys AVD Applications. | `appGroupName` | string | | | Required. Name of the Application Group to create the application(s) in. | | `commandLineArguments` | string | | | Optional. Command-Line Arguments for Application. | | `commandLineSetting` | string | `DoNotAllow` | `[Allow, DoNotAllow, Require]` | Optional. Specifies whether this published application can be launched with command-line arguments provided by the client, command-line arguments specified at publish time, or no command-line arguments at all. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `description` | string | | | Optional. Description of Application.. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `filePath` | string | | | Required. Specifies a path for the executable file for the application. | | `friendlyName` | string | | | Required. Friendly name of Application.. | -| `iconIndex` | int | | | Optional. Index of the icon. | +| `iconIndex` | int | `0` | | Optional. Index of the icon. | | `iconPath` | string | | | Optional. Path to icon. | | `name` | string | | | Required. Name of the Application to be created in the Application Group. | -| `showInPortal` | bool | | | Optional. Specifies whether to show the RemoteApp program in the RD Web Access server. | +| `showInPortal` | bool | `False` | | Optional. Specifies whether to show the RemoteApp program in the RD Web Access server. | ## Outputs diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep b/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep index d789f8d861..9626aefaba 100644 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep +++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/deploy.bicep @@ -52,8 +52,8 @@ param lock string = 'NotSpecified' @sys.description('Optional. Tags of the resource.') param tags object = {} -@sys.description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @sys.description('Optional. The name of logs that will be streamed.') @allowed([ @@ -79,9 +79,16 @@ var diagnosticsLogs = [for log in logsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostpools@2021-07-12' existing = { diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md b/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md index ada8ed2172..4b8143f167 100644 --- a/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md +++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/readme.md @@ -18,13 +18,13 @@ This module deploys an Azure virtual desktop application group. | :-- | :-- | :-- | :-- | :-- | | `applicationGroupType` | string | | `[RemoteApp, Desktop]` | Required. The type of the Application Group to be created. Allowed values: RemoteApp or Desktop | | `applications` | _[applications](applications/readme.md)_ array | `[]` | | Optional. List of applications to be created in the Application Group. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `description` | string | | | Optional. The description of the Application Group to be created. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of log analytics. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `friendlyName` | string | | | Optional. The friendly name of the Application Group to be created. | | `hostpoolName` | string | | | Required. Name of the Host Pool to be linked to this Application Group. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_cuaId.bicep b/arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DesktopVirtualization/hostpools/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep b/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep index 589b9b24f2..49a0748b03 100644 --- a/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep +++ b/arm/Microsoft.DesktopVirtualization/hostpools/deploy.bicep @@ -80,8 +80,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The type of preferred application group type, default to Desktop Application Group') @allowed([ @@ -129,9 +129,16 @@ var diagnosticsLogs = [for log in logsToEnable: { var tokenExpirationTime = dateTimeAdd(baseTime, tokenValidityLength) -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource hostPool 'Microsoft.DesktopVirtualization/hostpools@2021-07-12' = { diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/readme.md b/arm/Microsoft.DesktopVirtualization/hostpools/readme.md index 1f33c2530d..447172008a 100644 --- a/arm/Microsoft.DesktopVirtualization/hostpools/readme.md +++ b/arm/Microsoft.DesktopVirtualization/hostpools/readme.md @@ -16,13 +16,13 @@ This module deploys an Azure virtual desktop host pool. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a registration token. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customRdpProperty` | string | `audiocapturemode:i:1;audiomode:i:0;drivestoredirect:s:;redirectclipboard:i:1;redirectcomports:i:1;redirectprinters:i:1;redirectsmartcards:i:1;screen mode id:i:2;` | | Optional. Host Pool RDP properties | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `hostpoolDescription` | string | | | Optional. The description of the Host Pool to be created. | | `hostpoolFriendlyName` | string | | | Optional. The friendly name of the Host Pool to be created. | | `hostpoolType` | string | `Pooled` | `[Personal, Pooled]` | Optional. Set this parameter to Personal if you would like to enable Persistent Desktop experience. Defaults to Pooled. | @@ -35,11 +35,11 @@ This module deploys an Azure virtual desktop host pool. | `personalDesktopAssignmentType` | string | | `[Automatic, Direct, ]` | Optional. Set the type of assignment for a Personal Host Pool type | | `preferredAppGroupType` | string | `Desktop` | `[Desktop, None, RailApplications]` | Optional. The type of preferred application group type, default to Desktop Application Group | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `startVMOnConnect` | bool | | | Optional. Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs. | +| `startVMOnConnect` | bool | `False` | | Optional. Enable Start VM on connect to allow users to start the virtual machine from a deallocated state. Important: Custom RBAC role required to power manage VMs. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | | `tokenValidityLength` | string | `PT8H` | | Optional. Host Pool token validity length. Usage: 'PT8H' - valid for 8 hours; 'P5D' - valid for 5 days; 'P1Y' - valid for 1 year. When not provided, the token will be valid for 8 hours. | -| `validationEnviroment` | bool | | | Optional. Whether to use validation enviroment. When set to true, the Host Pool will be deployed in a validation 'ring' (environment) that receives all the new features (might be less stable). Ddefaults to false that stands for the stable, production-ready environment. | -| `validationEnvironment` | bool | | | Optional. Validation host pool allows you to test service changes before they are deployed to production. | +| `validationEnviroment` | bool | `False` | | Optional. Whether to use validation enviroment. When set to true, the Host Pool will be deployed in a validation 'ring' (environment) that receives all the new features (might be less stable). Ddefaults to false that stands for the stable, production-ready environment. | +| `validationEnvironment` | bool | `False` | | Optional. Validation host pool allows you to test service changes before they are deployed to production. | | `vmTemplate` | object | `{object}` | | Optional. The necessary information for adding more VMs to this Host Pool. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DesktopVirtualization/workspaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep b/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep index 9f153bdef8..ab53157a19 100644 --- a/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep +++ b/arm/Microsoft.DesktopVirtualization/workspaces/deploy.bicep @@ -41,8 +41,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalIds\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] @@ -70,9 +70,16 @@ var diagnosticsLogs = [for log in logsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.DesktopVirtualization/workspaces@2021-07-12' = { diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/readme.md b/arm/Microsoft.DesktopVirtualization/workspaces/readme.md index 3231c5e643..d8ed2fbfae 100644 --- a/arm/Microsoft.DesktopVirtualization/workspaces/readme.md +++ b/arm/Microsoft.DesktopVirtualization/workspaces/readme.md @@ -16,12 +16,12 @@ This module deploys an Azure virtual desktop workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `appGroupResourceIds` | array | `[]` | | Required. Resource IDs fo the existing Application groups this workspace will group together. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[Checkpoint, Error, Management, Feed]` | `[Checkpoint, Error, Management, Feed]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DocumentDB/databaseAccounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep index d552dcc6f7..247ec05a65 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep +++ b/arm/Microsoft.DocumentDB/databaseAccounts/deploy.bicep @@ -59,8 +59,8 @@ param sqlDatabases array = [] @description('Optional. MongoDB Databases configurations') param mongodbDatabases array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @allowed([ 'CanNotDelete' @@ -192,9 +192,16 @@ var databaseAccount_properties = !empty(sqlDatabases) ? { databaseAccountOfferType: databaseAccountOfferType }) -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-06-15' = { diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/.bicep/nested_cuaId.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/.bicep/nested_cuaId.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep index 20c9696c82..77283b9098 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep +++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep @@ -16,12 +16,19 @@ param indexes array @description('Required. ShardKey for the collection') param shardKey object -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-07-01-preview' existing = { diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md index 2bd2c4a27c..451e4d0420 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md +++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/readme.md @@ -12,8 +12,8 @@ This module deploys a collection within a MongoDB. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseAccountName` | string | | | Required. Name of the Cosmos DB database account. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `indexes` | array | | | Required. Indexes for the collection | | `mongodbDatabaseName` | string | | | Required. Name of the mongodb database | | `name` | string | | | Required. Name of the collection | diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep index 6324c00cd8..fed49e6bcb 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep +++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep @@ -13,12 +13,19 @@ param collections array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-07-01-preview' existing = { diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md index add1e582c9..15e0b75158 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md +++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/readme.md @@ -14,8 +14,8 @@ This module deploys a MongoDB within a CosmosDB account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `collections` | _[collections](collections/readme.md)_ array | `[]` | | Optional. Collections in the mongodb database | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseAccountName` | string | | | Required. Name of the Cosmos DB database account. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the mongodb database | | `tags` | object | `{object}` | | Optional. Tags of the resource. | | `throughput` | int | `400` | | Optional. Name of the mongodb database | diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/readme.md b/arm/Microsoft.DocumentDB/databaseAccounts/readme.md index 85029f7eec..f0852e3675 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/readme.md +++ b/arm/Microsoft.DocumentDB/databaseAccounts/readme.md @@ -20,7 +20,6 @@ This module deploys a DocumentDB database account and its child resources. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `automaticFailover` | bool | `True` | | Optional. Enable automatic failover for regions | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseAccountOfferType` | string | `Standard` | `[Standard]` | Optional. The offer type for the Cosmos DB database account. | | `defaultConsistencyLevel` | string | `Session` | `[Eventual, ConsistentPrefix, Session, BoundedStaleness, Strong]` | Optional. The default consistency level of the Cosmos DB account. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | @@ -28,6 +27,7 @@ This module deploys a DocumentDB database account and its child resources. | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `locations` | array | | | Required. Locations enabled for the Cosmos DB account. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -40,7 +40,7 @@ This module deploys a DocumentDB database account and its child resources. | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalIds' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `serverVersion` | string | `4.0` | `[3.2, 3.6, 4.0]` | Optional. Specifies the MongoDB server version to use. | | `sqlDatabases` | _[sqlDatabases](sqlDatabases/readme.md)_ array | `[]` | | Optional. SQL Databases configurations | -| `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 Database Account resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/.bicep/nested_cuaId.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/.bicep/nested_cuaId.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep index ed9016c511..e2b05d0f15 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep +++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep @@ -24,12 +24,19 @@ param paths array = [] ]) param kind string = 'Hash' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-07-01-preview' existing = { diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md index 766b01ceef..e0d058af14 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md +++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/readme.md @@ -10,8 +10,8 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseAccountName` | string | | | Required. Name of the Database Account | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `kind` | string | `Hash` | `[Hash, MultiHash, Range]` | Optional. Indicates the kind of algorithm used for partitioning | | `name` | string | | | Required. Name of the container. | | `paths` | array | `[]` | | Optional. List of paths using which data within the container can be partitioned | diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep index 3f8fb488e9..29d0eb2124 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep +++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep @@ -13,12 +13,19 @@ param throughput int = 400 @description('Optional. Tags of the SQL database resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-07-01-preview' existing = { diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md index 1812f895f3..0a9740539d 100644 --- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md +++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/readme.md @@ -12,8 +12,8 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `containers` | _[containers](containers/readme.md)_ array | `[]` | | Optional. Array of containers to deploy in the SQL database. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseAccountName` | string | | | Required. ID of the Cosmos DB database account. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the SQL database | | `tags` | object | `{object}` | | Optional. Tags of the SQL database resource. | | `throughput` | int | `400` | | Optional. Request units per second | diff --git a/arm/Microsoft.EventGrid/systemTopics/deploy.bicep b/arm/Microsoft.EventGrid/systemTopics/deploy.bicep index 53996c3bff..fc0c338ad1 100644 --- a/arm/Microsoft.EventGrid/systemTopics/deploy.bicep +++ b/arm/Microsoft.EventGrid/systemTopics/deploy.bicep @@ -50,8 +50,8 @@ param userAssignedIdentities object = {} @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var identityType = systemAssignedIdentity ? (!empty(userAssignedIdentities) ? 'SystemAssigned,UserAssigned' : 'SystemAssigned') : (!empty(userAssignedIdentities) ? 'UserAssigned' : 'None') @@ -95,9 +95,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { diff --git a/arm/Microsoft.EventGrid/systemTopics/readme.md b/arm/Microsoft.EventGrid/systemTopics/readme.md index 6a42a7441f..61924f3f98 100644 --- a/arm/Microsoft.EventGrid/systemTopics/readme.md +++ b/arm/Microsoft.EventGrid/systemTopics/readme.md @@ -17,12 +17,12 @@ This module deploys an event grid topic. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[DeliveryFailures]` | `[DeliveryFailures]` | Optional. The name of logs that will be streamed. | @@ -31,7 +31,7 @@ This module deploys an event grid topic. | `privateEndpoints` | array | `[]` | | Optional. Configuration Details for private endpoints. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `source` | string | | | Required. Source for the system topic. | -| `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 resource. | | `topicType` | string | | | Required. TopicType for the system topic. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.EventGrid/topics/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventGrid/topics/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventGrid/topics/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventGrid/topics/deploy.bicep b/arm/Microsoft.EventGrid/topics/deploy.bicep index 5b9a811825..c201494967 100644 --- a/arm/Microsoft.EventGrid/topics/deploy.bicep +++ b/arm/Microsoft.EventGrid/topics/deploy.bicep @@ -44,8 +44,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -84,9 +84,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource eventGrid 'Microsoft.EventGrid/topics@2020-06-01' = { diff --git a/arm/Microsoft.EventGrid/topics/readme.md b/arm/Microsoft.EventGrid/topics/readme.md index a05d651eb6..21b576943d 100644 --- a/arm/Microsoft.EventGrid/topics/readme.md +++ b/arm/Microsoft.EventGrid/topics/readme.md @@ -17,12 +17,12 @@ This module deploys an event grid topic. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `inboundIpRules` | array | `[]` | | Optional. Array of IPs to whitelist. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.EventHub/namespaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/authorizationRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/authorizationRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep b/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep index c020ab271f..a375bfefcd 100644 --- a/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/authorizationRules/deploy.bicep @@ -12,12 +12,19 @@ param name string ]) param rights array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md b/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md index fd85ebfbea..c45865ae29 100644 --- a/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md +++ b/arm/Microsoft.EventHub/namespaces/authorizationRules/readme.md @@ -12,7 +12,7 @@ This module deploys an EventHub Namespace Authorization Rule | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the authorization rule | | `namespaceName` | string | | | Required. The name of the event hub namespace | | `rights` | array | `[]` | `[Listen, Manage, Send]` | Optional. The rights associated with the rule. | diff --git a/arm/Microsoft.EventHub/namespaces/deploy.bicep b/arm/Microsoft.EventHub/namespaces/deploy.bicep index e46a037f4b..ff007894bf 100644 --- a/arm/Microsoft.EventHub/namespaces/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/deploy.bicep @@ -86,8 +86,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules.') param baseTime string = utcNow('u') @@ -167,9 +167,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource eventHubNamespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' = { diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep index 1cf2a69174..309056cba1 100644 --- a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/deploy.bicep @@ -7,12 +7,19 @@ param name string @description('Optional. Resource ID of the Primary/Secondary event hub namespace name, which is part of GEO DR pairing') param partnerNamespaceId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md index da2b069976..1fa8451fe8 100644 --- a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md +++ b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/readme.md @@ -12,7 +12,7 @@ This module deploys an EventHub Namespace Disaster Recovery Config | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the disaster recovery config | | `namespaceName` | string | | | Required. The name of the event hub namespace | | `partnerNamespaceId` | string | | | Optional. Resource ID of the Primary/Secondary event hub namespace name, which is part of GEO DR pairing | diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep index dfb7faa1c9..6c6de03ab3 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/deploy.bicep @@ -15,12 +15,19 @@ param name string ]) param rights array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md index aaa24b3bb8..70b9b58291 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/readme.md @@ -12,7 +12,7 @@ This module deploys an EventHub Namespace EventHubs Authorization Rule | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `eventHubName` | string | | | Required. The name of the event hub namespace event hub | | `name` | string | | | Required. The name of the authorization rule | | `namespaceName` | string | | | Required. The name of the event hub namespace | diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep index 90d9958a28..971bfd30ae 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/deploy.bicep @@ -10,12 +10,19 @@ param name string @description('Optional. User Metadata is a placeholder to store user-defined string data with maximum length 1024. e.g. it can be used to store descriptive data, such as list of teams and their contact information also user-defined configuration settings can be stored.') param userMetadata string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md index e5f2311d74..98edc1b68f 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/readme.md @@ -12,7 +12,7 @@ This module deploys an EventHub Namespace EventHubs Consumer Group | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `eventHubName` | string | | | Required. The name of the event hub namespace event hub | | `name` | string | | | Required. The name of the consumer group | | `namespaceName` | string | | | Required. The name of the event hub namespace | diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep b/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep index d12aa34963..75bed75c91 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/deploy.bicep @@ -93,8 +93,8 @@ param captureDescriptionSizeLimitInBytes int = 314572800 @description('Optional. A value that indicates whether to Skip Empty Archives') param captureDescriptionSkipEmptyArchives bool = false -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var eventHubPropertiesSimple = { messageRetentionInDays: messageRetentionInDays @@ -122,9 +122,16 @@ var eventHubPropertiesWithCapture = { } } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.EventHub/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md b/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md index 63f6b5580d..ac3fb3737e 100644 --- a/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md +++ b/arm/Microsoft.EventHub/namespaces/eventhubs/readme.md @@ -21,13 +21,13 @@ This module deploys an Event Hub. | `captureDescriptionDestinationBlobContainer` | string | | | Optional. Blob container Name | | `captureDescriptionDestinationName` | string | `EventHubArchive.AzureBlockBlob` | | Optional. Name for capture destination | | `captureDescriptionDestinationStorageAccountResourceId` | string | | | Optional. Resource ID of the storage account to be used to create the blobs | -| `captureDescriptionEnabled` | bool | | | Optional. A value that indicates whether capture description is enabled. | +| `captureDescriptionEnabled` | bool | `False` | | Optional. A value that indicates whether capture description is enabled. | | `captureDescriptionEncoding` | string | `Avro` | `[Avro, AvroDeflate]` | Optional. Enumerates the possible values for the encoding format of capture description. Note: "AvroDeflate" will be deprecated in New API Version | | `captureDescriptionIntervalInSeconds` | int | `300` | | Optional. The time window allows you to set the frequency with which the capture to Azure Blobs will happen | | `captureDescriptionSizeLimitInBytes` | int | `314572800` | | Optional. The size window defines the amount of data built up in your Event Hub before an capture operation | -| `captureDescriptionSkipEmptyArchives` | bool | | | Optional. A value that indicates whether to Skip Empty Archives | +| `captureDescriptionSkipEmptyArchives` | bool | `False` | | Optional. A value that indicates whether to Skip Empty Archives | | `consumerGroups` | _[consumerGroups](consumerGroups/readme.md)_ array | `[System.Collections.Hashtable]` | | Optional. The consumer groups to create in this event hub instance | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `messageRetentionInDays` | int | `1` | | Optional. Number of days to retain the events for this Event Hub, value should be 1 to 7 days | | `name` | string | | | Required. The name of the event hub | diff --git a/arm/Microsoft.EventHub/namespaces/readme.md b/arm/Microsoft.EventHub/namespaces/readme.md index 78a37340c1..674166725c 100644 --- a/arm/Microsoft.EventHub/namespaces/readme.md +++ b/arm/Microsoft.EventHub/namespaces/readme.md @@ -24,15 +24,15 @@ This module deploys an event hub namespace. | :-- | :-- | :-- | :-- | :-- | | `authorizationRules` | _[authorizationRules](authorizationRules/readme.md)_ array | `[System.Collections.Hashtable]` | | Optional. Authorization Rules for the Event Hub namespace | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `disasterRecoveryConfig` | object | `{object}` | | Optional. The disaster recovery config for this namespace | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `eventHubs` | _[eventHubs](eventHubs/readme.md)_ array | `[]` | | Optional. The event hubs to deploy into this namespace | -| `isAutoInflateEnabled` | bool | | | Optional. Switch to enable the Auto Inflate feature of Event Hub. | +| `isAutoInflateEnabled` | bool | `False` | | Optional. Switch to enable the Auto Inflate feature of Event Hub. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[ArchiveLogs, OperationalLogs, KafkaCoordinatorLogs, KafkaUserErrorLogs, EventHubVNetConnectionEvent, CustomerManagedKeyUserLogs, AutoScaleLogs]` | `[ArchiveLogs, OperationalLogs, KafkaCoordinatorLogs, KafkaUserErrorLogs, EventHubVNetConnectionEvent, CustomerManagedKeyUserLogs, AutoScaleLogs]` | Optional. The name of logs that will be streamed. | @@ -40,15 +40,15 @@ This module deploys an event hub namespace. | `metricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. | | `name` | string | | | Optional. The name of the event hub namespace. If no name is provided, then unique name will be created. | | `networkAcls` | object | `{object}` | | Optional. Service endpoint object information | -| `privateEndpoints` | array | `[]` | | Optional. Configuration Details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible.| +| `privateEndpoints` | array | `[]` | | Optional. Configuration Details for private endpoints.For security reasons, it is recommended to use private endpoints whenever possible. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `skuCapacity` | int | `1` | | Optional. Event Hub plan scale-out capacity of the resource | | `skuName` | string | `Standard` | `[Basic, Standard]` | Optional. event hub plan SKU name | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | | `vNetId` | string | | | Optional. Virtual Network ID to lock down the Event Hub. | -| `zoneRedundant` | bool | | | Optional. Switch to make the Event Hub Namespace zone redundant. | +| `zoneRedundant` | bool | `False` | | Optional. Switch to make the Event Hub Namespace zone redundant. | ### Parameter Usage: `privateEndpoints` @@ -157,6 +157,6 @@ You can specify multiple user assigned identities to a resource by providing add - [Namespaces/Eventhubs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.EventHub/2021-06-01-preview/namespaces/eventhubs) - [Namespaces/Eventhubs/Authorizationrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.EventHub/2021-06-01-preview/namespaces/eventhubs/authorizationRules) - [Namespaces/Eventhubs/Consumergroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.EventHub/2021-06-01-preview/namespaces/eventhubs/consumergroups) -- [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints) +- [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) diff --git a/arm/Microsoft.HealthBot/healthBots/.bicep/nested_cuaId.bicep b/arm/Microsoft.HealthBot/healthBots/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.HealthBot/healthBots/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.HealthBot/healthBots/deploy.bicep b/arm/Microsoft.HealthBot/healthBots/deploy.bicep index 143837e801..759af6e52c 100644 --- a/arm/Microsoft.HealthBot/healthBots/deploy.bicep +++ b/arm/Microsoft.HealthBot/healthBots/deploy.bicep @@ -21,12 +21,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource azureHealthBot 'Microsoft.HealthBot/healthBots@2020-12-08' = { diff --git a/arm/Microsoft.HealthBot/healthBots/readme.md b/arm/Microsoft.HealthBot/healthBots/readme.md index f6896105bf..2fe8a0ffc0 100644 --- a/arm/Microsoft.HealthBot/healthBots/readme.md +++ b/arm/Microsoft.HealthBot/healthBots/readme.md @@ -14,7 +14,7 @@ This module deploys an Azure Health Bot. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the resource | diff --git a/arm/Microsoft.Insights/actionGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/actionGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/actionGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/actionGroups/deploy.bicep b/arm/Microsoft.Insights/actionGroups/deploy.bicep index 010a09821b..cfb9e863ff 100644 --- a/arm/Microsoft.Insights/actionGroups/deploy.bicep +++ b/arm/Microsoft.Insights/actionGroups/deploy.bicep @@ -43,15 +43,22 @@ param armRoleReceivers array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Location for all resources.') param location string = 'global' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource actionGroup 'microsoft.insights/actionGroups@2019-06-01' = { diff --git a/arm/Microsoft.Insights/actionGroups/readme.md b/arm/Microsoft.Insights/actionGroups/readme.md index 4cbad20879..0b927b352d 100644 --- a/arm/Microsoft.Insights/actionGroups/readme.md +++ b/arm/Microsoft.Insights/actionGroups/readme.md @@ -17,9 +17,9 @@ This module deploys an Action Group. | `automationRunbookReceivers` | array | `[]` | | Optional. The list of AutomationRunbook receivers that are part of this action group. | | `azureAppPushReceivers` | array | `[]` | | Optional. The list of AzureAppPush receivers that are part of this action group. | | `azureFunctionReceivers` | array | `[]` | | Optional. The list of function receivers that are part of this action group. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `emailReceivers` | array | `[]` | | Optional. The list of email receivers that are part of this action group. | | `enabled` | bool | `True` | | Optional. Indicates whether this action group is enabled. If an action group is not enabled, then none of its receivers will receive communications. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `groupShortName` | string | | | Required. The short name of the action group. | | `itsmReceivers` | array | `[]` | | Optional. The list of ITSM receivers that are part of this action group. | | `location` | string | `global` | | Optional. Location for all resources. | diff --git a/arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/activityLogAlerts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep index 9fdbed41e5..80d0cd389c 100644 --- a/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep +++ b/arm/Microsoft.Insights/activityLogAlerts/deploy.bicep @@ -27,17 +27,24 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var actionGroups = [for action in actions: { actionGroupId: contains(action, 'actionGroupId') ? action.actionGroupId : action webhookProperties: contains(action, 'webhookProperties') ? action.webhookProperties : null }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { diff --git a/arm/Microsoft.Insights/activityLogAlerts/readme.md b/arm/Microsoft.Insights/activityLogAlerts/readme.md index a996e325b5..c000bbaf09 100644 --- a/arm/Microsoft.Insights/activityLogAlerts/readme.md +++ b/arm/Microsoft.Insights/activityLogAlerts/readme.md @@ -16,8 +16,8 @@ This module deploys an Alert based on Activity Log. | `actions` | array | `[]` | | Optional. The list of actions to take when alert triggers. | | `alertDescription` | string | | | Optional. Description of the alert. | | `conditions` | array | | | Required. The condition that will cause this alert to activate. Array of objects | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enabled` | bool | `True` | | Optional. Indicates whether this alert is enabled. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `global` | | Optional. Location for all resources. | | `name` | string | | | Required. The name of the alert. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | diff --git a/arm/Microsoft.Insights/components/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/components/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/components/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/components/deploy.bicep b/arm/Microsoft.Insights/components/deploy.bicep index bf087644c8..076b332de3 100644 --- a/arm/Microsoft.Insights/components/deploy.bicep +++ b/arm/Microsoft.Insights/components/deploy.bicep @@ -37,12 +37,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appInsights 'Microsoft.Insights/components@2020-02-02' = { diff --git a/arm/Microsoft.Insights/components/readme.md b/arm/Microsoft.Insights/components/readme.md index 97acdfc377..44552c3129 100644 --- a/arm/Microsoft.Insights/components/readme.md +++ b/arm/Microsoft.Insights/components/readme.md @@ -11,16 +11,16 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `publicNetworkAccessForIngestion` | string | `Enabled` | `[Enabled, Disabled]` | Optional. The network access type for accessing Application Insights ingestion. - Enabled or Disabled | -| `publicNetworkAccessForQuery` | string | `Enabled` | `[Enabled, Disabled]` | Optional. The network access type for accessing Application Insights query. - Enabled or Disabled | | `appInsightsType` | string | `web` | `[web, other]` | Optional. Application type | -| `workspaceResourceId` | string | | | Required. Resource ID of the log analytics workspace which the data will be ingested to. This property is required to create an application with this API version. Applications from older versions will not have this property. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `kind` | string | | | Optional. The kind of application that this component refers to, used to customize UI. This value is a freeform string, values should typically be one of the following: web, ios, other, store, java, phone. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources | | `name` | string | | | Required. Name of the Application Insights | +| `publicNetworkAccessForIngestion` | string | `Enabled` | `[Enabled, Disabled]` | Optional. The network access type for accessing Application Insights ingestion. - Enabled or Disabled | +| `publicNetworkAccessForQuery` | string | `Enabled` | `[Enabled, Disabled]` | Optional. The network access type for accessing Application Insights query. - Enabled or Disabled | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | +| `workspaceResourceId` | string | | | Required. Resource ID of the log analytics workspace which the data will be ingested to. This property is required to create an application with this API version. Applications from older versions will not have this property. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.Insights/metricAlerts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/metricAlerts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/metricAlerts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/metricAlerts/deploy.bicep b/arm/Microsoft.Insights/metricAlerts/deploy.bicep index 091a04e707..aa04c60846 100644 --- a/arm/Microsoft.Insights/metricAlerts/deploy.bicep +++ b/arm/Microsoft.Insights/metricAlerts/deploy.bicep @@ -77,17 +77,24 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var actionGroups = [for action in actions: { actionGroupId: contains(action, 'actionGroupId') ? action.actionGroupId : action webHookProperties: contains(action, 'webHookProperties') ? action.webHookProperties : null }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { diff --git a/arm/Microsoft.Insights/metricAlerts/readme.md b/arm/Microsoft.Insights/metricAlerts/readme.md index e8f7b4c2b4..cb71ba018f 100644 --- a/arm/Microsoft.Insights/metricAlerts/readme.md +++ b/arm/Microsoft.Insights/metricAlerts/readme.md @@ -18,8 +18,8 @@ This module deploys an alert based on metrics. | `alertDescription` | string | | | Optional. Description of the alert. | | `autoMitigate` | bool | `True` | | Optional. The flag that indicates whether the alert should be auto resolved or not. | | `criterias` | array | | | Required. Criterias to trigger the alert. Array of 'Microsoft.Azure.Monitor.SingleResourceMultipleMetricCriteria' or 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' objects | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enabled` | bool | `True` | | Optional. Indicates whether this alert is enabled. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `evaluationFrequency` | string | `PT5M` | `[PT1M, PT5M, PT15M, PT30M, PT1H]` | Optional. how often the metric alert is evaluated represented in ISO 8601 duration format. | | `location` | string | `global` | | Optional. Location for all resources. | | `name` | string | | | Required. The name of the alert. | diff --git a/arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/privateLinkScopes/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep index b07aa6c908..ec7a3d20cf 100644 --- a/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep +++ b/arm/Microsoft.Insights/privateLinkScopes/deploy.bicep @@ -25,12 +25,19 @@ param privateEndpoints array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { diff --git a/arm/Microsoft.Insights/privateLinkScopes/readme.md b/arm/Microsoft.Insights/privateLinkScopes/readme.md index 6d16bbd4e9..8112e19c6c 100644 --- a/arm/Microsoft.Insights/privateLinkScopes/readme.md +++ b/arm/Microsoft.Insights/privateLinkScopes/readme.md @@ -17,7 +17,7 @@ This module deploys an Azure Monitor Private Link Scope. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `global` | | Optional. The location of the private link scope. Should be global. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the private link scope. | @@ -112,7 +112,7 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Template references - [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](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) - [Privatelinkscopes](https://docs.microsoft.com/en-us/azure/templates/microsoft.insights/2019-10-17-preview/privateLinkScopes) - [Privatelinkscopes/Scopedresources](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-07-01-preview/privateLinkScopes/scopedResources) diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep index edfe4ddec1..977b762b25 100644 --- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep +++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/deploy.bicep @@ -9,12 +9,19 @@ param privateLinkScopeName string @description('Required. The resource ID of the scoped Azure monitor resource.') param linkedResourceId string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateLinkScope 'microsoft.insights/privateLinkScopes@2021-07-01-preview' existing = { diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md index dda21bef8b..9ce633485a 100644 --- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md +++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/readme.md @@ -12,7 +12,7 @@ This module deploys Insights PrivateLinkScopes ScopedResources. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `linkedResourceId` | string | | | Required. The resource ID of the scoped Azure monitor resource. | | `name` | string | | | Required. Name of the private link scoped resource. | | `privateLinkScopeName` | string | | | Required. Name of the parent private link scope. | diff --git a/arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Insights/scheduledQueryRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep index 6922ff77e8..07e2b768f3 100644 --- a/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep +++ b/arm/Microsoft.Insights/scheduledQueryRules/deploy.bicep @@ -63,12 +63,19 @@ param suppressForMinutes string = '' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource queryRule 'Microsoft.Insights/scheduledQueryRules@2021-02-01-preview' = { diff --git a/arm/Microsoft.Insights/scheduledQueryRules/readme.md b/arm/Microsoft.Insights/scheduledQueryRules/readme.md index d7d16e2873..10fba30774 100644 --- a/arm/Microsoft.Insights/scheduledQueryRules/readme.md +++ b/arm/Microsoft.Insights/scheduledQueryRules/readme.md @@ -17,8 +17,8 @@ This module deploys a scheduled query rule. | `alertDescription` | string | | | Optional. The description of the scheduled query rule. | | `autoMitigate` | bool | `True` | | Optional. The flag that indicates whether the alert should be automatically resolved or not. Relevant only for rules of the kind LogAlert. | | `criterias` | object | `{object}` | | Optional. The rule criteria that defines the conditions of the scheduled query rule. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enabled` | bool | `True` | | Optional. The flag which indicates whether this scheduled query rule is enabled. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `evaluationFrequency` | string | | | Optional. How often the scheduled query rule is evaluated represented in ISO 8601 duration format. Relevant and required only for rules of the kind LogAlert. | | `kind` | string | `LogAlert` | `[LogAlert, LogToMetric]` | Optional. Indicates the type of scheduled query rule. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -27,7 +27,7 @@ This module deploys a scheduled query rule. | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `scopes` | array | `[]` | | Required. The list of resource IDs that this scheduled query rule is scoped to. | | `severity` | int | `3` | `[0, 1, 2, 3, 4]` | Optional. Severity of the alert. Should be an integer between [0-4]. Value of 0 is severest. Relevant and required only for rules of the kind LogAlert. | -| `skipQueryValidation` | bool | | | Optional. The flag which indicates whether the provided query should be validated or not. Relevant only for rules of the kind LogAlert. | +| `skipQueryValidation` | bool | `False` | | Optional. The flag which indicates whether the provided query should be validated or not. Relevant only for rules of the kind LogAlert. | | `suppressForMinutes` | string | | | Optional. Mute actions for the chosen period of time (in ISO 8601 duration format) after the alert is fired. If set, autoMitigate must be disabled.Relevant only for rules of the kind LogAlert. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | | `targetResourceTypes` | array | `[]` | | Optional. List of resource type of the target resource(s) on which the alert is created/updated. For example if the scope is a resource group and targetResourceTypes is Microsoft.Compute/virtualMachines, then a different alert will be fired for each virtual machine in the resource group which meet the alert criteria. Relevant only for rules of the kind LogAlert | diff --git a/arm/Microsoft.KeyVault/vaults/.bicep/nested_cuaId.bicep b/arm/Microsoft.KeyVault/vaults/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.KeyVault/vaults/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.KeyVault/vaults/accessPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.KeyVault/vaults/accessPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep b/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep index fa3db9a840..97654c373a 100644 --- a/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep +++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep @@ -7,8 +7,8 @@ param name string = 'add' @description('Optional. An array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault\'s tenant ID.') param accessPolicies array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var formattedAccessPolicies = [for accessPolicy in accessPolicies: { applicationId: contains(accessPolicy, 'applicationId') ? accessPolicy.applicationId : '' @@ -17,9 +17,16 @@ var formattedAccessPolicies = [for accessPolicy in accessPolicies: { tenantId: contains(accessPolicy, 'tenantId') ? accessPolicy.tenantId : tenant().tenantId }] -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource keyVault 'Microsoft.KeyVault/vaults@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md index 57066308e7..95742c5287 100644 --- a/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md +++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/readme.md @@ -13,7 +13,7 @@ This module deploys key vault access policies. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `accessPolicies` | array | `[]` | | Optional. An array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `keyVaultName` | string | | | Required. The name of the key vault | | `name` | string | `add` | | Optional. The access policy deployment | diff --git a/arm/Microsoft.KeyVault/vaults/deploy.bicep b/arm/Microsoft.KeyVault/vaults/deploy.bicep index 700f78f8d8..03c3953efe 100644 --- a/arm/Microsoft.KeyVault/vaults/deploy.bicep +++ b/arm/Microsoft.KeyVault/vaults/deploy.bicep @@ -98,8 +98,8 @@ param privateEndpoints array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules.') param baseTime string = utcNow('u') @@ -162,9 +162,16 @@ var formattedAccessPolicies = [for accessPolicy in accessPolicies: { var secretList = !empty(secrets) ? secrets.secureList : [] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource keyVault 'Microsoft.KeyVault/vaults@2019-09-01' = { diff --git a/arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_cuaId.bicep b/arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.KeyVault/vaults/keys/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep index eb07e8dd66..07869cf660 100644 --- a/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep +++ b/arm/Microsoft.KeyVault/vaults/keys/deploy.bicep @@ -52,12 +52,19 @@ param kty string = 'EC' @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource keyVault 'Microsoft.KeyVault/vaults@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.KeyVault/vaults/keys/readme.md b/arm/Microsoft.KeyVault/vaults/keys/readme.md index 1c24f0ee89..a7176647ac 100644 --- a/arm/Microsoft.KeyVault/vaults/keys/readme.md +++ b/arm/Microsoft.KeyVault/vaults/keys/readme.md @@ -16,8 +16,8 @@ This module deploys a key vault key. | `attributesEnabled` | bool | `True` | | Optional. Determines whether the object is enabled. | | `attributesExp` | int | `-1` | | Optional. Expiry date in seconds since 1970-01-01T00:00:00Z. For security reasons, it is recommended to set an expiration date whenever possible. | | `attributesNbf` | int | `-1` | | Optional. Not before date in seconds since 1970-01-01T00:00:00Z. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `curveName` | string | `P-256` | `[P-256, P-256K, P-384, P-521]` | Optional. The elliptic curve name. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `keyOps` | array | `[]` | `[decrypt, encrypt, import, sign, unwrapKey, verify, wrapKey]` | Optional. Array of JsonWebKeyOperation | | `keySize` | int | `-1` | | Optional. The key size in bits. For example: 2048, 3072, or 4096 for RSA. | | `keyVaultName` | string | | | Required. The name of the key vault | diff --git a/arm/Microsoft.KeyVault/vaults/readme.md b/arm/Microsoft.KeyVault/vaults/readme.md index 8a4b0cb4fb..cdfb95c881 100644 --- a/arm/Microsoft.KeyVault/vaults/readme.md +++ b/arm/Microsoft.KeyVault/vaults/readme.md @@ -23,14 +23,14 @@ This module deploys a key vault and its child resources. | `accessPolicies` | _[accessPolicies](accessPolicies/readme.md)_ array | `[]` | | Optional. Array of access policies object | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules. | | `createMode` | string | `default` | | Optional. The vault's create mode to indicate whether the vault need to be recovered or not. - recover or default. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | -| `enablePurgeProtection` | bool | | | Optional. Provide 'true' to enable Key Vault's purge protection feature. | -| `enableRbacAuthorization` | bool | | | Optional. Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enablePurgeProtection` | bool | `False` | | Optional. Provide 'true' to enable Key Vault's purge protection feature. | +| `enableRbacAuthorization` | bool | `False` | | Optional. Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC. | | `enableSoftDelete` | bool | `True` | | Optional. Switch to enable/disable Key Vault's soft delete feature. | | `enableVaultForDeployment` | bool | `True` | `[True, False]` | Optional. Specifies if the vault is enabled for deployment by script or compute | | `enableVaultForDiskEncryption` | bool | `True` | `[True, False]` | Optional. Specifies if the azure platform has access to the vault for enabling disk encryption scenarios. | @@ -44,7 +44,7 @@ This module deploys a key vault and its child resources. | `networkAcls` | object | `{object}` | | Optional. Service endpoint object information. For security reasons, it is recommended to set the DefaultAction Deny | | `privateEndpoints` | array | `[]` | | Optional. Configuration Details for private endpoints. For security reasons, it is recommended to use private endpoints whenever possible | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `secrets` | _[secrets](secrets/readme.md)_ object | `[]` | | Optional. All secrets to create | +| `secrets` | secureObject | `{object}` | | Optional. All secrets to create | | `softDeleteRetentionInDays` | int | `90` | | Optional. softDelete data retention days. It accepts >=7 and <=90. | | `tags` | object | `{object}` | | Optional. Resource tags. | | `vaultSku` | string | `premium` | `[premium, standard]` | Optional. Specifies the SKU for the vault | diff --git a/arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_cuaId.bicep b/arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.KeyVault/vaults/secrets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep index 8b9cac8c1b..d0fb9101b1 100644 --- a/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep +++ b/arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep @@ -24,15 +24,22 @@ param contentType string = '' @secure() param value string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource keyVault 'Microsoft.KeyVault/vaults@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.KeyVault/vaults/secrets/readme.md b/arm/Microsoft.KeyVault/vaults/secrets/readme.md index ff4a955c90..b62706ada9 100644 --- a/arm/Microsoft.KeyVault/vaults/secrets/readme.md +++ b/arm/Microsoft.KeyVault/vaults/secrets/readme.md @@ -17,7 +17,7 @@ This module deploys a key vault secret. | `attributesExp` | int | `-1` | | Optional. Expiry date in seconds since 1970-01-01T00:00:00Z. For security reasons, it is recommended to set an expiration date whenever possible. | | `attributesNbf` | int | `-1` | | Optional. Not before date in seconds since 1970-01-01T00:00:00Z. | | `contentType` | secureString | | | Optional. The content type of the secret. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `keyVaultName` | string | | | Required. The name of the key vault | | `name` | string | | | Required. The name of the secret | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | diff --git a/arm/Microsoft.Logic/workflows/.bicep/nested_cuaId.bicep b/arm/Microsoft.Logic/workflows/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Logic/workflows/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Logic/workflows/deploy.bicep b/arm/Microsoft.Logic/workflows/deploy.bicep index bf21c125f5..c17acd3f4e 100644 --- a/arm/Microsoft.Logic/workflows/deploy.bicep +++ b/arm/Microsoft.Logic/workflows/deploy.bicep @@ -10,8 +10,8 @@ param connectorEndpointsConfiguration object = {} @description('Optional. The access control configuration for accessing workflow run contents.') param contentsAccessControlConfiguration object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Parameters for the definition template.') param definitionParameters object = {} @@ -142,9 +142,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource logicApp 'Microsoft.Logic/workflows@2019-05-01' = { diff --git a/arm/Microsoft.Logic/workflows/readme.md b/arm/Microsoft.Logic/workflows/readme.md index 59db820620..8a448ceeba 100644 --- a/arm/Microsoft.Logic/workflows/readme.md +++ b/arm/Microsoft.Logic/workflows/readme.md @@ -18,13 +18,13 @@ This module deploys a Logic App resource. | `actionsAccessControlConfiguration` | object | `{object}` | | Optional. The access control configuration for workflow actions. | | `connectorEndpointsConfiguration` | object | `{object}` | | Optional. The endpoints configuration: Access endpoint and outgoing IP addresses for the connector. | | `contentsAccessControlConfiguration` | object | `{object}` | | Optional. The access control configuration for accessing workflow run contents. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `definitionParameters` | object | `{object}` | | Optional. Parameters for the definition template. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `integrationAccount` | object | `{object}` | | Optional. The integration account. | | `integrationServiceEnvironment` | object | `{object}` | | Optional. The integration service environment. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -35,7 +35,7 @@ This module deploys a Logic App resource. | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `sku` | object | `{object}` | | Optional. Sku of Logic App. Only to be set when integrating with ISE. | | `state` | string | `Enabled` | `[NotSpecified, Completed, Enabled, Disabled, Deleted, Suspended]` | Optional. The state. - NotSpecified, Completed, Enabled, Disabled, Deleted, Suspended. | -| `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 resource. | | `triggersAccessControlConfiguration` | object | `{object}` | | Optional. The access control configuration for invoking workflow triggers. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.MachineLearningServices/workspaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep b/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep index e3be568b33..d3c2c2420d 100644 --- a/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep +++ b/arm/Microsoft.MachineLearningServices/workspaces/deploy.bicep @@ -49,8 +49,8 @@ param privateEndpoints array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') @minValue(0) @@ -118,9 +118,16 @@ var identity = identityType != 'None' ? { type: identityType } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.MachineLearningServices/workspaces@2021-04-01' = { diff --git a/arm/Microsoft.MachineLearningServices/workspaces/readme.md b/arm/Microsoft.MachineLearningServices/workspaces/readme.md index 9d6c8348d9..bf786fba9c 100644 --- a/arm/Microsoft.MachineLearningServices/workspaces/readme.md +++ b/arm/Microsoft.MachineLearningServices/workspaces/readme.md @@ -17,18 +17,18 @@ This module deploys a Machine Learning Services Workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `allowPublicAccessWhenBehindVnet` | bool | | | Optional. The flag to indicate whether to allow public access when behind VNet. | +| `allowPublicAccessWhenBehindVnet` | bool | `False` | | Optional. The flag to indicate whether to allow public access when behind VNet. | | `associatedApplicationInsightsResourceId` | string | | | Required. The resource ID of the associated Application Insights. | | `associatedContainerRegistryResourceId` | string | | | Optional. The resource ID of the associated Container Registry. | | `associatedKeyVaultResourceId` | string | | | Required. The resource ID of the associated Key Vault. | | `associatedStorageAccountResourceId` | string | | | Required. The resource ID of the associated Storage Account. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | -| `hbiWorkspace` | bool | | | Optional. The flag to signal HBI data in the workspace and reduce diagnostic data collected by the service. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `hbiWorkspace` | bool | `False` | | Optional. The flag to signal HBI data in the workspace and reduce diagnostic data collected by the service. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[AmlComputeClusterEvent, AmlComputeClusterNodeEvent, AmlComputeJobEvent, AmlComputeCpuGpuUtilization, AmlRunStatusChangedEvent]` | `[AmlComputeClusterEvent, AmlComputeClusterNodeEvent, AmlComputeJobEvent, AmlComputeCpuGpuUtilization, AmlRunStatusChangedEvent]` | Optional. The name of logs that will be streamed. | @@ -37,7 +37,7 @@ This module deploys a Machine Learning Services Workspace. | `privateEndpoints` | array | `[]` | | Optional. Configuration Details for private endpoints. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `sku` | string | | `[Basic, Enterprise]` | Required. Specifies the sku, also referred as 'edition' of the Azure Machine Learning workspace. | -| `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. Resource tags. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_cuaId.bicep b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep index 1ca5887958..7b089e8711 100644 --- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep +++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/deploy.bicep @@ -18,12 +18,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource userMsi 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md index 72a336d18b..cc0b71659f 100644 --- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md +++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/readme.md @@ -14,7 +14,7 @@ This module deploys a user assigned identity. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | `[guid(resourceGroup().id)]` | | Optional. Name of the User Assigned Identity. | diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep index eccdce1f0b..3073a8c38f 100644 --- a/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep +++ b/arm/Microsoft.ManagedServices/registrationDefinitions/deploy.bicep @@ -15,8 +15,23 @@ param authorizations array @description('Optional. Specify the name of the Resource Group to delegate access to. If not provided, delegation will be done on the targeted subscription.') param resourceGroupName string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + var registrationId = empty(resourceGroupName) ? guid(managedByTenantId, subscription().tenantId, subscription().subscriptionId) : guid(managedByTenantId, subscription().tenantId, subscription().subscriptionId, resourceGroupName) +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource registrationDefinition 'Microsoft.ManagedServices/registrationDefinitions@2019-09-01' = { name: registrationId properties: { diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md index 54e148c0f4..d9a18ec165 100644 --- a/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md +++ b/arm/Microsoft.ManagedServices/registrationDefinitions/readme.md @@ -18,6 +18,7 @@ remote/managing tenant. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `authorizations` | array | | | Required. Specify an array of objects, containing object of Azure Active Directory principalId, a Azure roleDefinitionId, and an optional principalIdDisplayName. The roleDefinition specified is granted to the principalId in the provider's Active Directory and the principalIdDisplayName is visible to customers. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedByTenantId` | string | | | Required. Specify the tenant ID of the tenant which homes the principals you are delegating permissions to. | | `name` | string | | | Required. Specify a unique name for your offer/registration. i.e ' - - ' | | `registrationDescription` | string | | | Required. Description of the offer/registration. i.e. 'Managed by ' | @@ -59,8 +60,8 @@ remote/managing tenant. | Output Name | Type | Description | | :-- | :-- | :-- | -| `name` | string | The name of the registration definition | | `assignmentResourceId` | string | The registration assignment resource ID | +| `name` | string | The name of the registration definition | | `resourceId` | string | The resource ID of the registration definition | | `subscriptionName` | string | The subscription the registration definition was deployed into | diff --git a/arm/Microsoft.Management/managementGroups/deploy.bicep b/arm/Microsoft.Management/managementGroups/deploy.bicep index b85783a471..3780447a5d 100644 --- a/arm/Microsoft.Management/managementGroups/deploy.bicep +++ b/arm/Microsoft.Management/managementGroups/deploy.bicep @@ -12,6 +12,21 @@ param parentId string = '' @description('Optional. Array of role assignment objects to define RBAC on this resource.') param roleAssignments array = [] +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource managementGroup 'Microsoft.Management/managementGroups@2021-04-01' = { name: name scope: tenant() diff --git a/arm/Microsoft.Management/managementGroups/readme.md b/arm/Microsoft.Management/managementGroups/readme.md index 66d0c227ac..1546176641 100644 --- a/arm/Microsoft.Management/managementGroups/readme.md +++ b/arm/Microsoft.Management/managementGroups/readme.md @@ -19,6 +19,7 @@ This module has some known **limitations**: | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `displayName` | string | | | Optional. The friendly name of the management group. If no value is passed then this field will be set to the group ID. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The group ID of the Management group | | `parentId` | string | | | Optional. The management group parent ID. Defaults to current scope. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects to define RBAC on this resource. | diff --git a/arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.NetApp/netAppAccounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_cuaId.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep index 46672a9690..8980de2d7b 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep @@ -38,12 +38,19 @@ param coolAccess bool = false @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2021-04-01' existing = { diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md index ed5ccd45ef..365559a2c7 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md @@ -14,8 +14,8 @@ This template deploys capacity pools in an Azure NetApp Files. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `coolAccess` | bool | | | Optional. If enabled (true) the pool can contain cool Access enabled volumes. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `coolAccess` | bool | `False` | | Optional. If enabled (true) the pool can contain cool Access enabled volumes. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location of the pool volume. | | `name` | string | | | Required. The name of the capacity pool. | | `netAppAccountName` | string | | | Required. The name of the NetApp account. | diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_cuaId.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep index 05778776ec..7eecbd9fc4 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep @@ -37,12 +37,19 @@ param exportPolicyRules array = [] @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2021-04-01' existing = { diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md index 003d143607..97ca600a1a 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md @@ -15,7 +15,7 @@ This template deploys volumes in a capacity pool of an Azure NetApp files. | :-- | :-- | :-- | :-- | :-- | | `capacityPoolName` | string | | | Required. The name of the capacity pool. | | `creationToken` | string | `[parameters('name')]` | | Optional. A unique file path for the volume. This is the name of the volume export. A volume is mounted using the export path. File path must start with an alphabetical character and be unique within the subscription. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `exportPolicyRules` | array | `[]` | | Optional. Export policy rules. | | `location` | string | `[resourceGroup().location]` | | Optional. Location of the pool volume. | | `name` | string | | | Required. The name of the pool volume. | diff --git a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep index e54dd923cb..c655ec9f8a 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep @@ -40,8 +40,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags for all resources.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var activeDirectoryConnectionProperties = [ { @@ -54,9 +54,16 @@ var activeDirectoryConnectionProperties = [ } ] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2021-04-01' = { diff --git a/arm/Microsoft.NetApp/netAppAccounts/readme.md b/arm/Microsoft.NetApp/netAppAccounts/readme.md index 59cbc245f7..7a7f6927cc 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/readme.md @@ -17,12 +17,12 @@ This template deploys Azure NetApp Files. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `capacityPools` | _[capacityPools](capacityPools/readme.md)_ array | `[]` | | Optional. Capacity pools to create. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `dnsServers` | string | | | Optional. Required if domainName is specified. Comma separated list of DNS server IP addresses (IPv4 only) required for the Active Directory (AD) domain join and SMB authentication operations to succeed. | | `domainJoinOU` | string | | | Optional. Used only if domainName is specified. LDAP Path for the Organization Unit (OU) where SMB Server machine accounts will be created (i.e. 'OU=SecondLevel,OU=FirstLevel'). | | `domainJoinPassword` | secureString | | | Optional. Required if domainName is specified. Password of the user specified in domainJoinUser parameter | | `domainJoinUser` | string | | | Optional. Required if domainName is specified. Username of Active Directory domain administrator, with permissions to create SMB server machine account in the AD domain. | | `domainName` | string | | | Optional. Fully Qualified Active Directory DNS Domain Name (e.g. 'contoso.com') | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. The name of the NetApp account. | diff --git a/arm/Microsoft.Network/applicationGateways/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/applicationGateways/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/applicationGateways/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/applicationGateways/deploy.bicep b/arm/Microsoft.Network/applicationGateways/deploy.bicep index b8c7ca2933..bbeec1ea1a 100644 --- a/arm/Microsoft.Network/applicationGateways/deploy.bicep +++ b/arm/Microsoft.Network/applicationGateways/deploy.bicep @@ -246,12 +246,19 @@ param roleAssignments array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource applicationGateway 'Microsoft.Network/applicationGateways@2021-05-01' = { diff --git a/arm/Microsoft.Network/applicationGateways/readme.md b/arm/Microsoft.Network/applicationGateways/readme.md index b8b279b20f..df42c5dc97 100644 --- a/arm/Microsoft.Network/applicationGateways/readme.md +++ b/arm/Microsoft.Network/applicationGateways/readme.md @@ -21,17 +21,17 @@ This module deploys Network ApplicationGateways. | `backendAddressPools` | array | `[]` | | Optional. Backend address pool of the application gateway resource. | | `backendHttpSettingsCollection` | array | `[]` | | Optional. Backend http settings of the application gateway resource. | | `capacity` | int | `2` | | Optional. The number of Application instances to be configured. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customErrorConfigurations` | array | `[]` | | Optional. Custom error configurations of the application gateway resource. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. For security reasons, it is recommended to set diagnostic settings to send data to either storage account, log analytics workspace or event hub | -| `enableFips` | bool | | | Optional. Whether FIPS is enabled on the application gateway resource. | -| `enableHttp2` | bool | | | Optional. Whether HTTP2 is enabled on the application gateway resource. | -| `enableRequestBuffering` | bool | | | Optional. Enable request buffering. | -| `enableResponseBuffering` | bool | | | Optional. Enable response buffering. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableFips` | bool | `False` | | Optional. Whether FIPS is enabled on the application gateway resource. | +| `enableHttp2` | bool | `False` | | Optional. Whether HTTP2 is enabled on the application gateway resource. | +| `enableRequestBuffering` | bool | `False` | | Optional. Enable request buffering. | +| `enableResponseBuffering` | bool | `False` | | Optional. Enable response buffering. | | `firewallPolicyId` | string | | | Optional. The resource Id of an associated firewall policy. | | `frontendIPConfigurations` | array | `[]` | | Optional. Frontend IP addresses of the application gateway resource. | | `frontendPorts` | array | `[]` | | Optional. Frontend ports of the application gateway resource. | diff --git a/arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/applicationSecurityGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep index 5e4b2b6465..a619f388da 100644 --- a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep @@ -18,12 +18,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource applicationSecurityGroup 'Microsoft.Network/applicationSecurityGroups@2021-05-01' = { diff --git a/arm/Microsoft.Network/applicationSecurityGroups/readme.md b/arm/Microsoft.Network/applicationSecurityGroups/readme.md index 88e3fa2c1f..8bcaffd07b 100644 --- a/arm/Microsoft.Network/applicationSecurityGroups/readme.md +++ b/arm/Microsoft.Network/applicationSecurityGroups/readme.md @@ -14,7 +14,7 @@ This module deploys an application security group. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the Application Security Group. | diff --git a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/azureFirewalls/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/azureFirewalls/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/azureFirewalls/deploy.bicep b/arm/Microsoft.Network/azureFirewalls/deploy.bicep index 3388f582cf..464c58edd7 100644 --- a/arm/Microsoft.Network/azureFirewalls/deploy.bicep +++ b/arm/Microsoft.Network/azureFirewalls/deploy.bicep @@ -79,8 +79,8 @@ param roleAssignments array = [] @description('Optional. Tags of the Azure Firewall resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of firewall logs that will be streamed.') @allowed([ @@ -133,9 +133,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource azureFirewall 'Microsoft.Network/azureFirewalls@2021-05-01' = { diff --git a/arm/Microsoft.Network/azureFirewalls/readme.md b/arm/Microsoft.Network/azureFirewalls/readme.md index 3abb12c497..da3c956a94 100644 --- a/arm/Microsoft.Network/azureFirewalls/readme.md +++ b/arm/Microsoft.Network/azureFirewalls/readme.md @@ -18,12 +18,12 @@ This module deploys a firewall. | `applicationRuleCollections` | array | `[]` | | Optional. Collection of application rule collections used by Azure Firewall. | | `azureSkuName` | string | `AZFW_VNet` | `[AZFW_VNet, AZFW_Hub]` | Optional. Name of an Azure Firewall SKU. | | `azureSkuTier` | string | `Standard` | `[Standard, Premium]` | Optional. Tier of an Azure Firewall. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Diagnostic Storage Account resource identifier | | `diagnosticWorkspaceId` | string | | | Optional. Log Analytics workspace resource identifier | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `firewallPolicyId` | string | | | Optional. Resource ID of the Firewall Policy that should be attached. | | `ipConfigurations` | array | | | Required. List of IP Configurations. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | diff --git a/arm/Microsoft.Network/bastionHosts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/bastionHosts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/bastionHosts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/bastionHosts/deploy.bicep b/arm/Microsoft.Network/bastionHosts/deploy.bicep index 5d1c0fc0d1..cc3da0bd08 100644 --- a/arm/Microsoft.Network/bastionHosts/deploy.bicep +++ b/arm/Microsoft.Network/bastionHosts/deploy.bicep @@ -54,8 +54,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Optional. The name of bastion logs that will be streamed.') @allowed([ @@ -76,9 +76,16 @@ var diagnosticsLogs = [for log in logsToEnable: { var scaleUnits_var = skuType == 'Basic' ? 2 : scaleUnits -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource publicIPAddressExisting 'Microsoft.Network/publicIPAddresses@2021-05-01' existing = if (!empty(publicIPAddressId)) { diff --git a/arm/Microsoft.Network/bastionHosts/readme.md b/arm/Microsoft.Network/bastionHosts/readme.md index 8fadb1f285..4d9be98a0d 100644 --- a/arm/Microsoft.Network/bastionHosts/readme.md +++ b/arm/Microsoft.Network/bastionHosts/readme.md @@ -16,12 +16,12 @@ This module deploys a bastion host. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[BastionAuditLogs]` | `[BastionAuditLogs]` | Optional. Optional. The name of bastion logs that will be streamed. | diff --git a/arm/Microsoft.Network/connections/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/connections/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/connections/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/connections/deploy.bicep b/arm/Microsoft.Network/connections/deploy.bicep index 59ebbd3f96..976966a4bf 100644 --- a/arm/Microsoft.Network/connections/deploy.bicep +++ b/arm/Microsoft.Network/connections/deploy.bicep @@ -60,8 +60,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var localVirtualNetworkGatewayId = az.resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworkGateways', localVirtualNetworkGatewayName) var remoteEntitySubscriptionId_var = (empty(remoteEntitySubscriptionId) ? subscription().subscriptionId : remoteEntitySubscriptionId) @@ -88,9 +88,16 @@ var customIPSecPolicy_var = [ } ] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource connection 'Microsoft.Network/connections@2021-05-01' = { diff --git a/arm/Microsoft.Network/connections/readme.md b/arm/Microsoft.Network/connections/readme.md index 7ee278fe57..d989c62efb 100644 --- a/arm/Microsoft.Network/connections/readme.md +++ b/arm/Microsoft.Network/connections/readme.md @@ -13,9 +13,9 @@ This template deploys a virtual network gateway connection. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `customIPSecPolicy` | object | `{object}` | | Optional. The IPSec Policies to be considered by this connection | -| `enableBgp` | bool | | | Optional. Value to specify if BGP is enabled or not | +| `enableBgp` | bool | `False` | | Optional. Value to specify if BGP is enabled or not | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `localVirtualNetworkGatewayName` | string | | | Required. Specifies the local Virtual Network Gateway name | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -25,7 +25,7 @@ This template deploys a virtual network gateway connection. | `remoteEntitySubscriptionId` | string | | | Optional. Remote Virtual Network Gateway/ExpressRoute Subscription ID | | `routingWeight` | string | | | Optional. The weight added to routes learned from this BGP speaker. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `usePolicyBasedTrafficSelectors` | bool | | | Optional. Enable policy-based traffic selectors | +| `usePolicyBasedTrafficSelectors` | bool | `False` | | Optional. Enable policy-based traffic selectors | | `virtualNetworkGatewayConnectionType` | string | `Ipsec` | `[Ipsec, VNet2VNet, ExpressRoute, VPNClient]` | Optional. Gateway connection type. | | `vpnSharedKey` | string | | | Optional. Specifies a VPN shared key. The same value has to be specified on both Virtual Network Gateways | diff --git a/arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/ddosProtectionPlans/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep index bd1c9d3323..bd059b6bbd 100644 --- a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep +++ b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep @@ -19,12 +19,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource ddosProtectionPlan 'Microsoft.Network/ddosProtectionPlans@2021-05-01' = { diff --git a/arm/Microsoft.Network/ddosProtectionPlans/readme.md b/arm/Microsoft.Network/ddosProtectionPlans/readme.md index 097028aa8c..3e8f4410df 100644 --- a/arm/Microsoft.Network/ddosProtectionPlans/readme.md +++ b/arm/Microsoft.Network/ddosProtectionPlans/readme.md @@ -14,7 +14,7 @@ This template deploys a DDoS protection plan. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the DDoS protection plan to assign the VNET to. | diff --git a/arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/expressRouteCircuits/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep index 725d93d243..d26ea75968 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep +++ b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep @@ -88,8 +88,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -140,9 +140,16 @@ var peeringConfiguration = [ } ] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource expressRouteCircuits 'Microsoft.Network/expressRouteCircuits@2021-05-01' = { diff --git a/arm/Microsoft.Network/expressRouteCircuits/readme.md b/arm/Microsoft.Network/expressRouteCircuits/readme.md index 3017157c35..f75fa921d1 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/readme.md +++ b/arm/Microsoft.Network/expressRouteCircuits/readme.md @@ -16,19 +16,19 @@ This template deploys an express route circuit. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `bandwidthInMbps` | int | | | Required. This is the bandwidth in Mbps of the circuit being created. It must exactly match one of the available bandwidth offers List ExpressRoute Service Providers API call. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[PeeringRouteLog]` | `[PeeringRouteLog]` | Optional. The name of logs that will be streamed. | | `metricsToEnable` | array | `[AllMetrics]` | `[AllMetrics]` | Optional. The name of metrics that will be streamed. | | `name` | string | | | Required. This is the name of the ExpressRoute circuit | -| `peerASN` | int | | | Optional. The autonomous system number of the customer/connectivity provider. | -| `peering` | bool | | `[True, False]` | Optional. Enabled BGP peering type for the Circuit. | +| `peerASN` | int | `0` | | Optional. The autonomous system number of the customer/connectivity provider. | +| `peering` | bool | `False` | `[True, False]` | Optional. Enabled BGP peering type for the Circuit. | | `peeringLocation` | string | | | Required. This is the name of the peering location and not the ARM resource location. It must exactly match one of the available peering locations from List ExpressRoute Service Providers API call. | | `peeringType` | string | `AzurePrivatePeering` | `[AzurePrivatePeering, MicrosoftPeering]` | Optional. BGP peering type for the Circuit. Choose from AzurePrivatePeering, AzurePublicPeering or MicrosoftPeering. | | `primaryPeerAddressPrefix` | string | | | Optional. A /30 subnet used to configure IP addresses for interfaces on Link1. | @@ -39,7 +39,7 @@ This template deploys an express route circuit. | `skuFamily` | string | `MeteredData` | `[MeteredData, UnlimitedData]` | Required. Chosen SKU family of ExpressRoute circuit. Choose from MeteredData or UnlimitedData SKU families. | | `skuTier` | string | `Standard` | `[Local, Standard, Premium]` | Required. Chosen SKU Tier of ExpressRoute circuit. Choose from Local, Premium or Standard SKU tiers. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `vlanId` | int | | | Optional. Specifies the identifier that is used to identify the customer. | +| `vlanId` | int | `0` | | Optional. Specifies the identifier that is used to identify the customer. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.Network/firewallPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/firewallPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/firewallPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/firewallPolicies/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/deploy.bicep index 8edc965248..9c7216a75e 100644 --- a/arm/Microsoft.Network/firewallPolicies/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/deploy.bicep @@ -78,8 +78,8 @@ param keyVaultSecretId string = '' @description('Optional. Name of the CA certificate.') param certificateName string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Rule collection groups.') param ruleCollectionGroups array = [] @@ -94,9 +94,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' = { diff --git a/arm/Microsoft.Network/firewallPolicies/readme.md b/arm/Microsoft.Network/firewallPolicies/readme.md index 2e30425fc5..043ef44445 100644 --- a/arm/Microsoft.Network/firewallPolicies/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/readme.md @@ -17,8 +17,8 @@ This module deploys Network Firewall Policies. | `basePolicyResourceId` | string | | | Optional. Resource ID of the base policy. | | `bypassTrafficSettings` | array | `[]` | | Optional. List of rules for traffic to bypass. | | `certificateName` | string | | | Optional. Name of the CA certificate. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `defaultWorkspaceId` | string | | | Optional. Default Log Analytics Resource ID for Firewall Policy Insights. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableProxy` | bool | `False` | | Optional. Enable DNS Proxy on Firewalls attached to the Firewall Policy. | | `fqdns` | array | `[]` | | Optional. List of FQDNs for the ThreatIntel Allowlist. | | `insightsIsEnabled` | bool | `False` | | Optional. A flag to indicate if the insights are enabled on the policy. | diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep index 72f1ebdfb3..bdf4650cc1 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep @@ -10,12 +10,19 @@ param priority int @description('Optional. Group of Firewall Policy rule collections.') param ruleCollections array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md index ad4cb4dafe..75b2cb7813 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md @@ -12,7 +12,7 @@ This module deploys Network Firewall Policies Rule Collection Groups. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `firewallPolicyName` | string | | | Required. Name of the Firewall Policy. | | `name` | string | | | Required. The name of the rule collection group to deploy | | `priority` | int | | | Required. Priority of the Firewall Policy Rule Collection Group resource. | diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/firewallPolicies/ruleGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep index afd5fc5e12..44709271d4 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep @@ -10,12 +10,19 @@ param priority int @description('Optional. Group of Firewall rules.') param rules array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource firewallPolicy 'Microsoft.Network/firewallPolicies@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md b/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md index a4fe36d022..6252c6bc2d 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md @@ -12,7 +12,7 @@ This module deploys Network FirewallPolicies Rule Groups. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `firewallPolicyName` | string | | | Required. Name of the Firewall Policy. | | `name` | string | | | Required. The name of the rule group to deploy | | `priority` | int | | | Required. Priority of the Firewall Policy Rule Group resource. | diff --git a/arm/Microsoft.Network/ipGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/ipGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/ipGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/arm/Microsoft.Network/ipGroups/deploy.bicep index 3938200362..11d8a4cf74 100644 --- a/arm/Microsoft.Network/ipGroups/deploy.bicep +++ b/arm/Microsoft.Network/ipGroups/deploy.bicep @@ -22,12 +22,19 @@ param roleAssignments array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource ipGroup 'Microsoft.Network/ipGroups@2021-05-01' = { diff --git a/arm/Microsoft.Network/ipGroups/readme.md b/arm/Microsoft.Network/ipGroups/readme.md index 1a6d257e42..f25fbcf9d0 100644 --- a/arm/Microsoft.Network/ipGroups/readme.md +++ b/arm/Microsoft.Network/ipGroups/readme.md @@ -14,7 +14,7 @@ This module deploys an IP group. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `ipAddresses` | array | `[]` | | Optional. IpAddresses/IpAddressPrefixes in the IpGroups resource. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.Network/loadBalancers/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/loadBalancers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/loadBalancers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/loadBalancers/backendAddressPools/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep b/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep index 85b118de6b..fa6d17707f 100644 --- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep @@ -10,12 +10,19 @@ param loadBalancerBackendAddresses array = [] @description('Optional. An array of gateway load balancer tunnel interfaces.') param tunnelInterfaces array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource loadBalancer 'Microsoft.Network/loadBalancers@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md index b7930145a7..49c5a45bfb 100644 --- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md +++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md @@ -12,7 +12,7 @@ This module deploys load balancer backend address pools. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `loadBalancerBackendAddresses` | array | `[]` | | Optional. An array of backend addresses. | | `loadBalancerName` | string | | | Required. The name of the parent load balancer | | `name` | string | | | Required. The name of the backend address pool | diff --git a/arm/Microsoft.Network/loadBalancers/deploy.bicep b/arm/Microsoft.Network/loadBalancers/deploy.bicep index 940d9e9e61..d7b69c3768 100644 --- a/arm/Microsoft.Network/loadBalancers/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/deploy.bicep @@ -55,8 +55,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules.') param inboundNatRules array = [] @@ -159,9 +159,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource loadBalancer 'Microsoft.Network/loadBalancers@2021-05-01' = { diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/loadBalancers/inboundNatRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep b/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep index 6c7da8f4fa..1722a0f576 100644 --- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep @@ -47,12 +47,19 @@ param idleTimeoutInMinutes int = 4 ]) param protocol string = 'Tcp' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource loadBalancer 'Microsoft.Network/loadBalancers@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md index 644da6d40b..64d59dfca2 100644 --- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md +++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md @@ -14,9 +14,9 @@ This module deploys load balancers inbound NAT rules. | :-- | :-- | :-- | :-- | :-- | | `backendAddressPoolName` | string | | | Optional. Name of the backend address pool | | `backendPort` | int | `[parameters('frontendPort')]` | | Optional. The port used for the internal endpoint. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `enableFloatingIP` | bool | | | Optional. Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint. | -| `enableTcpReset` | bool | | | Optional. Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableFloatingIP` | bool | `False` | | Optional. Configures a virtual machine's endpoint for the floating IP capability required to configure a SQL AlwaysOn Availability Group. This setting is required when using the SQL AlwaysOn Availability Groups in SQL server. This setting can't be changed after you create the endpoint. | +| `enableTcpReset` | bool | `False` | | Optional. Receive bidirectional TCP Reset on TCP flow idle timeout or unexpected connection termination. This element is only used when the protocol is set to TCP. | | `frontendIPConfigurationName` | string | | | Required. The name of the frontend IP address to set for the inbound NAT rule | | `frontendPort` | int | | | Required. The port for the external endpoint. Port numbers for each rule must be unique within the Load Balancer. | | `frontendPortRangeEnd` | int | `-1` | | Optional. The port range end for the external endpoint. This property is used together with BackendAddressPool and FrontendPortRangeStart. Individual inbound NAT rule port mappings will be created for each backend address from BackendAddressPool. | diff --git a/arm/Microsoft.Network/loadBalancers/readme.md b/arm/Microsoft.Network/loadBalancers/readme.md index 5261b6180b..e35431c3c8 100644 --- a/arm/Microsoft.Network/loadBalancers/readme.md +++ b/arm/Microsoft.Network/loadBalancers/readme.md @@ -18,12 +18,12 @@ This module deploys a load balancer. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `backendAddressPools` | _[backendAddressPools](backendAddressPools/readme.md)_ array | `[]` | | Optional. Collection of backend address pools used by a load balancer. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `frontendIPConfigurations` | array | | | Required. Array of objects containing all frontend IP configurations | | `inboundNatRules` | _[inboundNatRules](inboundNatRules/readme.md)_ array | `[]` | | Optional. Collection of inbound NAT Rules used by a load balancer. Defining inbound NAT rules on your load balancer is mutually exclusive with defining an inbound NAT pool. Inbound NAT pools are referenced from virtual machine scale sets. NICs that are associated with individual virtual machines cannot reference an Inbound NAT pool. They have to reference individual inbound NAT rules. | | `loadBalancerSku` | string | `Standard` | `[Basic, Standard]` | Optional. Name of a load balancer SKU. | diff --git a/arm/Microsoft.Network/localNetworkGateways/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/localNetworkGateways/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/localNetworkGateways/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep index 71af3d56ee..be95422029 100644 --- a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep @@ -34,8 +34,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. FQDN of local network gateway.') param fqdn string = '' @@ -46,9 +46,16 @@ var bgpSettings = { peerWeight: !empty(localPeerWeight) ? localPeerWeight : '0' } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource localNetworkGateway 'Microsoft.Network/localNetworkGateways@2021-08-01' = { diff --git a/arm/Microsoft.Network/localNetworkGateways/readme.md b/arm/Microsoft.Network/localNetworkGateways/readme.md index 211fcdac83..e79124acdd 100644 --- a/arm/Microsoft.Network/localNetworkGateways/readme.md +++ b/arm/Microsoft.Network/localNetworkGateways/readme.md @@ -14,7 +14,7 @@ This module deploys a local network gateway. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `fqdn` | string | | | Optional. FQDN of local network gateway. | | `localAddressPrefixes` | array | | | Required. List of the local (on-premises) IP address ranges | | `localAsn` | string | | | Optional. The BGP speaker's ASN. Not providing this value will automatically disable BGP on this Local Network Gateway resource. | diff --git a/arm/Microsoft.Network/natGateways/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/natGateways/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/natGateways/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/natGateways/deploy.bicep b/arm/Microsoft.Network/natGateways/deploy.bicep index aa50000191..8826fc3d9f 100644 --- a/arm/Microsoft.Network/natGateways/deploy.bicep +++ b/arm/Microsoft.Network/natGateways/deploy.bicep @@ -59,8 +59,8 @@ param roleAssignments array = [] @description('Optional. Tags for the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -118,9 +118,16 @@ var natGatewayProperties = { publicIpAddresses: natGatewayPropertyPublicIPAddresses } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } // PUBLIC IP diff --git a/arm/Microsoft.Network/natGateways/readme.md b/arm/Microsoft.Network/natGateways/readme.md index c96317f119..07db305adf 100644 --- a/arm/Microsoft.Network/natGateways/readme.md +++ b/arm/Microsoft.Network/natGateways/readme.md @@ -16,12 +16,12 @@ This module deploys a NAT gateway. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `idleTimeoutInMinutes` | int | `5` | | Optional. The idle timeout of the nat gateway. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -30,7 +30,7 @@ This module deploys a NAT gateway. | `name` | string | | | Required. Name of the Azure Bastion resource | | `natGatewayDomainNameLabel` | string | | | Optional. DNS name of the Public IP resource. A region specific suffix will be appended to it, e.g.: your-DNS-name.westeurope.cloudapp.azure.com | | `natGatewayPipName` | string | | | Optional. Specifies the name of the Public IP used by the NAT Gateway. If it's not provided, a '-pip' suffix will be appended to the Bastion's name. | -| `natGatewayPublicIpAddress` | bool | | | Optional. Use to have a new Public IP Address created for the NAT Gateway. | +| `natGatewayPublicIpAddress` | bool | `False` | | Optional. Use to have a new Public IP Address created for the NAT Gateway. | | `natGatewayPublicIPPrefixId` | string | | | Optional. Resource ID of the Public IP Prefix object. This is only needed if you want your Public IPs created in a PIP Prefix. | | `publicIpAddresses` | array | `[]` | | Optional. Existing Public IP Address resource names to use for the NAT Gateway. | | `publicIpPrefixes` | array | `[]` | | Optional. Existing Public IP Prefixes resource names to use for the NAT Gateway. | diff --git a/arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/networkSecurityGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep index 92ef624221..246443d734 100644 --- a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep @@ -38,8 +38,8 @@ param roleAssignments array = [] @description('Optional. Tags of the NSG resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -60,9 +60,16 @@ var diagnosticsLogs = [for log in logsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2021-05-01' = { diff --git a/arm/Microsoft.Network/networkSecurityGroups/readme.md b/arm/Microsoft.Network/networkSecurityGroups/readme.md index 93c865c621..13785cfd48 100644 --- a/arm/Microsoft.Network/networkSecurityGroups/readme.md +++ b/arm/Microsoft.Network/networkSecurityGroups/readme.md @@ -15,12 +15,12 @@ This template deploys a network security group (NSG) with optional security rule | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[NetworkSecurityGroupEvent, NetworkSecurityGroupRuleCounter]` | `[NetworkSecurityGroupEvent, NetworkSecurityGroupRuleCounter]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.Network/networkWatchers/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/networkWatchers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/networkWatchers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/networkWatchers/connectionMonitors/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep b/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep index 542cca57f7..348b98e5bb 100644 --- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep @@ -22,8 +22,8 @@ param testGroups array = [] @description('Optional. Specify the Log Analytics Workspace Resource ID') param workspaceResourceId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var outputs = !empty(workspaceResourceId) ? [ { @@ -34,9 +34,16 @@ var outputs = !empty(workspaceResourceId) ? [ } ] : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md index 4bcf93a958..80b90fbe32 100644 --- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md +++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md @@ -12,7 +12,7 @@ This template deploys Connection Monitors. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `endpoints` | array | `[]` | | Optional. List of connection monitor endpoints. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | | | Optional. Name of the resource. | diff --git a/arm/Microsoft.Network/networkWatchers/deploy.bicep b/arm/Microsoft.Network/networkWatchers/deploy.bicep index 9d6ab97fac..f42b070456 100644 --- a/arm/Microsoft.Network/networkWatchers/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/deploy.bicep @@ -25,12 +25,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' = { diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/networkWatchers/flowLogs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/networkWatchers/flowLogs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep b/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep index f022078b1c..9ee3570fcf 100644 --- a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep @@ -41,8 +41,8 @@ param trafficAnalyticsInterval int = 60 @maxValue(365) param retentionInDays int = 365 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var flowAnalyticsConfiguration = !empty(workspaceResourceId) && enabled == true ? { networkWatcherFlowAnalyticsConfiguration: { @@ -56,9 +56,16 @@ var flowAnalyticsConfiguration = !empty(workspaceResourceId) && enabled == true } } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource networkWatcher 'Microsoft.Network/networkWatchers@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md b/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md index 607b3c5e79..0ffa396986 100644 --- a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md +++ b/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md @@ -13,8 +13,8 @@ This module controls the Network Security Group Flow Logs and analytics settings | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enabled` | bool | `True` | | Optional. If the flow log should be enabled | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `formatVersion` | int | `2` | `[1, 2]` | Optional. The flow log format version | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `name` | string | `[format('{0}-{1}-flowlog', last(split(parameters('targetResourceId'), '/')), split(parameters('targetResourceId'), '/')[4])]` | | Optional. Name of the resource. | diff --git a/arm/Microsoft.Network/networkWatchers/readme.md b/arm/Microsoft.Network/networkWatchers/readme.md index 243e9131e1..f1ef6dc545 100644 --- a/arm/Microsoft.Network/networkWatchers/readme.md +++ b/arm/Microsoft.Network/networkWatchers/readme.md @@ -17,7 +17,7 @@ This template deploys a network watcher. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `connectionMonitors` | _[connectionMonitors](connectionMonitors/readme.md)_ array | `[]` | | Optional. Array that contains the Connection Monitors | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `flowLogs` | _[flowLogs](flowLogs/readme.md)_ array | `[]` | | Optional. Array that contains the Flow Logs | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.Network/privateDnsZones/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/privateDnsZones/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/privateDnsZones/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep index bdcc533fa9..59ead85aec 100644 --- a/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/A/deploy.bicep @@ -13,12 +13,19 @@ param metadata object = {} @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/A/readme.md b/arm/Microsoft.Network/privateDnsZones/A/readme.md index fb21996ec7..4d60a5a21c 100644 --- a/arm/Microsoft.Network/privateDnsZones/A/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/A/readme.md @@ -13,7 +13,7 @@ This module deploys a Private DNS Zone A record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `aRecords` | array | `[]` | | Optional. The list of A records in the record set. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the A record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep index 2dcdded77a..1dd9efb231 100644 --- a/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/AAAA/deploy.bicep @@ -13,12 +13,19 @@ param metadata object = {} @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md b/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md index e3ea4acdfd..c35c2cdec2 100644 --- a/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/AAAA/readme.md @@ -13,7 +13,7 @@ This module deploys a Private DNS Zone AAAA record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `aaaaRecords` | array | `[]` | | Optional. The list of AAAA records in the record set. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the AAAA record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep index 6db29db0e5..680f8d9ab6 100644 --- a/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/CNAME/deploy.bicep @@ -13,12 +13,19 @@ param metadata object = {} @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md b/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md index fab186d037..4d26eb61d7 100644 --- a/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/CNAME/readme.md @@ -13,7 +13,7 @@ This module deploys a Private DNS Zone CNAME record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `cnameRecord` | object | `{object}` | | Optional. A CNAME record. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the CNAME record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep index 10af9edcac..49357b388d 100644 --- a/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/MX/deploy.bicep @@ -13,12 +13,19 @@ param mxRecords array = [] @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/MX/readme.md b/arm/Microsoft.Network/privateDnsZones/MX/readme.md index 596f3bb661..88dafad5ed 100644 --- a/arm/Microsoft.Network/privateDnsZones/MX/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/MX/readme.md @@ -12,7 +12,7 @@ This module deploys a Private DNS Zone MX record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `mxRecords` | array | `[]` | | Optional. The list of MX records in the record set. | | `name` | string | | | Required. The name of the MX record. | diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep index 88e0007273..e7b066524e 100644 --- a/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/PTR/deploy.bicep @@ -13,12 +13,19 @@ param ptrRecords array = [] @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/PTR/readme.md b/arm/Microsoft.Network/privateDnsZones/PTR/readme.md index feaa6aa507..2cb7b17e4e 100644 --- a/arm/Microsoft.Network/privateDnsZones/PTR/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/PTR/readme.md @@ -12,7 +12,7 @@ This module deploys a Private DNS Zone PTR record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the PTR record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep index 87b9ac03ff..45079fc464 100644 --- a/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/SOA/deploy.bicep @@ -13,12 +13,19 @@ param soaRecord object = {} @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/SOA/readme.md b/arm/Microsoft.Network/privateDnsZones/SOA/readme.md index 7d98455d02..10a01ea0fb 100644 --- a/arm/Microsoft.Network/privateDnsZones/SOA/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/SOA/readme.md @@ -12,7 +12,7 @@ This module deploys a Private DNS Zone SOA record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the SOA record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep index 43df0e1758..ace6ab941e 100644 --- a/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/SRV/deploy.bicep @@ -13,12 +13,19 @@ param srvRecords array = [] @description('Optional. The TTL (time-to-live) of the records in the record set.') param ttl int = 3600 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/SRV/readme.md b/arm/Microsoft.Network/privateDnsZones/SRV/readme.md index bab6c335db..961d30b245 100644 --- a/arm/Microsoft.Network/privateDnsZones/SRV/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/SRV/readme.md @@ -12,7 +12,7 @@ This module deploys a Private DNS Zone TXT record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the SRV record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep index c246034c82..23d7bf3dae 100644 --- a/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/TXT/deploy.bicep @@ -13,12 +13,19 @@ param ttl int = 3600 @description('Optional. The list of TXT records in the record set.') param txtRecords array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/TXT/readme.md b/arm/Microsoft.Network/privateDnsZones/TXT/readme.md index 65a8ebc4cc..adf2036d25 100644 --- a/arm/Microsoft.Network/privateDnsZones/TXT/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/TXT/readme.md @@ -12,7 +12,7 @@ This module deploys a Private DNS Zone TXT record. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Optional. The metadata attached to the record set. | | `name` | string | | | Required. The name of the TXT record. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/deploy.bicep index ee1cd06280..f99ef3384b 100644 --- a/arm/Microsoft.Network/privateDnsZones/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/deploy.bicep @@ -45,12 +45,19 @@ param tags object = {} @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' = { diff --git a/arm/Microsoft.Network/privateDnsZones/readme.md b/arm/Microsoft.Network/privateDnsZones/readme.md index 34a4318cde..1afd611afe 100644 --- a/arm/Microsoft.Network/privateDnsZones/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/readme.md @@ -23,20 +23,20 @@ This template deploys a private DNS zone. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `a` | _[A](A/readme.md)_ array | `[]` | | Optional. Array of A records. | -| `aaaa` | _[AAAA](AAAA/readme.md)_ array | `[]` | | Optional. Array of AAAA records. | -| `cname` | _[CNAME](CNAME/readme.md)_ array | `[]` | | Optional. Array of CNAME records. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `a` | _[a](a/readme.md)_ array | `[]` | | Optional. Array of A records. | +| `aaaa` | _[aaaa](aaaa/readme.md)_ array | `[]` | | Optional. Array of AAAA records. | +| `cname` | _[cname](cname/readme.md)_ array | `[]` | | Optional. Array of CNAME records. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `global` | | Optional. The location of the PrivateDNSZone. Should be global. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | -| `mx` | _[MX](MX/readme.md)_ array | `[]` | | Optional. Array of MX records. | +| `mx` | _[mx](mx/readme.md)_ array | `[]` | | Optional. Array of MX records. | | `name` | string | | | Required. Private DNS zone name. | -| `ptr` | _[PTR](PTR/readme.md)_ array | `[]` | | Optional. Array of PTR records. | +| `ptr` | _[ptr](ptr/readme.md)_ array | `[]` | | Optional. Array of PTR records. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `soa` | _[SOA](SOA/readme.md)_ array | `[]` | | Optional. Array of SOA records. | -| `srv` | _[SRV](SRV/readme.md)_ array | `[]` | | Optional. Array of SRV records. | +| `soa` | _[soa](soa/readme.md)_ array | `[]` | | Optional. Array of SOA records. | +| `srv` | _[srv](srv/readme.md)_ array | `[]` | | Optional. Array of SRV records. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `txt` | _[TXT](TXT/readme.md)_ array | `[]` | | Optional. Array of TXT records. | +| `txt` | _[txt](txt/readme.md)_ array | `[]` | | Optional. Array of TXT records. | | `virtualNetworkLinks` | _[virtualNetworkLinks](virtualNetworkLinks/readme.md)_ array | `[]` | | Optional. Array of custom objects describing vNet links of the DNS zone. Each object should contain properties 'vnetResourceId' and 'registrationEnabled'. The 'vnetResourceId' is a resource ID of a vNet to link, 'registrationEnabled' (bool) enables automatic DNS registration in the zone for the linked vNet. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep index 220355de95..5a1a5990b2 100644 --- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep @@ -16,12 +16,19 @@ param registrationEnabled bool = false @description('Required. Link to another virtual network resource ID.') param virtualNetworkResourceId string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = { diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md index da5b3a590f..05a38f356a 100644 --- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md @@ -12,11 +12,11 @@ This module deploys private dns zone virtual network links. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `global` | | Optional. The location of the PrivateDNSZone. Should be global. | | `name` | string | `[format('{0}-vnetlink', last(split(parameters('virtualNetworkResourceId'), '/')))]` | | Optional. The name of the virtual network link. | | `privateDnsZoneName` | string | | | Required. Private DNS zone name. | -| `registrationEnabled` | bool | | | Optional. Is auto-registration of virtual machine records in the virtual network in the Private DNS zone enabled? | +| `registrationEnabled` | bool | `False` | | Optional. Is auto-registration of virtual machine records in the virtual network in the Private DNS zone enabled? | | `tags` | object | `{object}` | | Optional. Tags of the resource. | | `virtualNetworkResourceId` | string | | | Required. Link to another virtual network resource ID. | diff --git a/arm/Microsoft.Network/privateEndpoints/deploy.bicep b/arm/Microsoft.Network/privateEndpoints/deploy.bicep index 1f506a7575..1b604aef54 100644 --- a/arm/Microsoft.Network/privateEndpoints/deploy.bicep +++ b/arm/Microsoft.Network/privateEndpoints/deploy.bicep @@ -30,12 +30,19 @@ param roleAssignments array = [] @description('Optional. Tags to be applied on all resources/resource groups in this deployment.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_pid.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource privateEndpoint 'Microsoft.Network/privateEndpoints@2021-05-01' = { diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep index 94a0b29c93..04ea26d87a 100644 --- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep +++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep @@ -7,12 +7,19 @@ param privateDNSResourceIds array @description('Optional. The name of the private DNS Zone Group') param name string = 'default' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } var privateDnsZoneConfigs = [for privateDNSResourceId in privateDNSResourceIds: { diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md index feb0058065..38cee8be88 100644 --- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md +++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md @@ -12,7 +12,7 @@ This module deploys a private endpoint private DNS zone group | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `default` | | Optional. The name of the private DNS Zone Group | | `privateDNSResourceIds` | array | | | Required. List of private DNS resource IDs | | `privateEndpointName` | string | | | Required. The name of the private endpoint | @@ -27,4 +27,4 @@ This module deploys a private endpoint private DNS zone group ## Template references -- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints/privateDnsZoneGroups) +- [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/privateEndpoints/privateDnsZoneGroups) diff --git a/arm/Microsoft.Network/privateEndpoints/readme.md b/arm/Microsoft.Network/privateEndpoints/readme.md index 45c3930cda..e819ba740f 100644 --- a/arm/Microsoft.Network/privateEndpoints/readme.md +++ b/arm/Microsoft.Network/privateEndpoints/readme.md @@ -25,7 +25,7 @@ The following resources are required to be able to deploy this resource: | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `groupId` | array | | | Required. Subtype(s) of the connection to be created. The allowed values depend on the type serviceResourceId refers to. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all Resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -86,6 +86,6 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Template references - [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) diff --git a/arm/Microsoft.Network/publicIPAddresses/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/publicIPAddresses/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/publicIPAddresses/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep index b7ccd8bbd9..c76308058a 100644 --- a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep +++ b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep @@ -66,8 +66,8 @@ param location string = resourceGroup().location @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Tags of the resource.') param tags object = {} @@ -115,9 +115,16 @@ var publicIPPrefix = { id: publicIPPrefixResourceId } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2021-05-01' = { diff --git a/arm/Microsoft.Network/publicIPAddresses/readme.md b/arm/Microsoft.Network/publicIPAddresses/readme.md index 3c0e2eae8c..0dd5ad3f0c 100644 --- a/arm/Microsoft.Network/publicIPAddresses/readme.md +++ b/arm/Microsoft.Network/publicIPAddresses/readme.md @@ -13,12 +13,12 @@ | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | `[DDoSProtectionNotifications, DDoSMitigationFlowLogs, DDoSMitigationReports]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/publicIPPrefixes/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep index 64120a2eba..6b136128dd 100644 --- a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep +++ b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep @@ -24,12 +24,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource publicIpPrefix 'Microsoft.Network/publicIPPrefixes@2021-05-01' = { diff --git a/arm/Microsoft.Network/publicIPPrefixes/readme.md b/arm/Microsoft.Network/publicIPPrefixes/readme.md index ce588d4cb1..3b8899323c 100644 --- a/arm/Microsoft.Network/publicIPPrefixes/readme.md +++ b/arm/Microsoft.Network/publicIPPrefixes/readme.md @@ -14,7 +14,7 @@ This template deploys a public IP prefix. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the Public IP Prefix | diff --git a/arm/Microsoft.Network/routeTables/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/routeTables/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/routeTables/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/routeTables/deploy.bicep b/arm/Microsoft.Network/routeTables/deploy.bicep index 6712b2a980..4de75ae39d 100644 --- a/arm/Microsoft.Network/routeTables/deploy.bicep +++ b/arm/Microsoft.Network/routeTables/deploy.bicep @@ -24,12 +24,19 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource routeTable 'Microsoft.Network/routeTables@2021-05-01' = { diff --git a/arm/Microsoft.Network/routeTables/readme.md b/arm/Microsoft.Network/routeTables/readme.md index f880cc1afd..7486f15087 100644 --- a/arm/Microsoft.Network/routeTables/readme.md +++ b/arm/Microsoft.Network/routeTables/readme.md @@ -14,8 +14,8 @@ This module deploys a user defined route table. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | -| `disableBgpRoutePropagation` | bool | | | Optional. Switch to disable BGP route propagation. | +| `disableBgpRoutePropagation` | bool | `False` | | Optional. Switch to disable BGP route propagation. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name given for the hub route table. | diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/trafficmanagerprofiles/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep index f74ba3d9f6..b9d6d91738 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep +++ b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep @@ -77,8 +77,8 @@ param roleAssignments array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -115,9 +115,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource trafficManagerProfile 'Microsoft.Network/trafficmanagerprofiles@2018-08-01' = { diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md b/arm/Microsoft.Network/trafficmanagerprofiles/readme.md index d0d27ac79f..978a5868a0 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md +++ b/arm/Microsoft.Network/trafficmanagerprofiles/readme.md @@ -15,12 +15,12 @@ This module deploys a traffic manager profile. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `endpoints` | array | `[]` | | Optional. The list of endpoints in the Traffic Manager profile. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[ProbeHealthStatusEvents]` | `[ProbeHealthStatusEvents]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.Network/virtualHubs/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualHubs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualHubs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualHubs/deploy.bicep b/arm/Microsoft.Network/virtualHubs/deploy.bicep index 424312cf64..38ec51f86e 100644 --- a/arm/Microsoft.Network/virtualHubs/deploy.bicep +++ b/arm/Microsoft.Network/virtualHubs/deploy.bicep @@ -76,12 +76,19 @@ param hubVirtualNetworkConnections array = [] @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualHub 'Microsoft.Network/virtualHubs@2021-05-01' = { diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualHubs/hubRouteTables/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualHubs/hubRouteTables/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep b/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep index 321da33b5b..221a76f44f 100644 --- a/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep +++ b/arm/Microsoft.Network/virtualHubs/hubRouteTables/deploy.bicep @@ -10,12 +10,19 @@ param labels array = [] @description('Optional. List of all routes.') param routes array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualHub 'Microsoft.Network/virtualHubs@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md b/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md index 3898449310..b9fd9f581f 100644 --- a/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md +++ b/arm/Microsoft.Network/virtualHubs/hubRouteTables/readme.md @@ -12,7 +12,7 @@ This module deploys virtual hub route tables. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `labels` | array | `[]` | | Optional. List of labels associated with this route table. | | `name` | string | | | Required. The route table name. | | `routes` | array | `[]` | | Optional. List of all routes. | diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep b/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep index b45de46b7e..02d97d7e70 100644 --- a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep +++ b/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/deploy.bicep @@ -13,12 +13,19 @@ param remoteVirtualNetworkId string @description('Optional. Routing Configuration indicating the associated and propagated route tables for this connection.') param routingConfiguration object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualHub 'Microsoft.Network/virtualHubs@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md b/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md index 80463970d5..8308aac364 100644 --- a/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md +++ b/arm/Microsoft.Network/virtualHubs/hubVirtualNetworkConnections/readme.md @@ -12,7 +12,7 @@ This module deploys virtual hub virtual network connections. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableInternetSecurity` | bool | `True` | | Optional. Enable internet security. | | `name` | string | | | Required. The connection name. | | `remoteVirtualNetworkId` | string | | | Required. Resource ID of the virtual network to link to | diff --git a/arm/Microsoft.Network/virtualHubs/readme.md b/arm/Microsoft.Network/virtualHubs/readme.md index d37af7b81a..75e39b5f12 100644 --- a/arm/Microsoft.Network/virtualHubs/readme.md +++ b/arm/Microsoft.Network/virtualHubs/readme.md @@ -18,7 +18,7 @@ This module deploys a virtual hub. | `addressPrefix` | string | | | Required. Address-prefix for this VirtualHub. | | `allowBranchToBranchTraffic` | bool | `True` | | Optional. Flag to control transit for VirtualRouter hub. | | `azureFirewallId` | string | | | Optional. Resource ID of the Azure Firewall to link to | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `expressRouteGatewayId` | string | | | Optional. Resource ID of the Express Route Gateway to link to | | `hubRouteTables` | _[hubRouteTables](hubRouteTables/readme.md)_ array | `[]` | | Optional. Route tables to create for the virtual hub. | | `hubVirtualNetworkConnections` | _[hubVirtualNetworkConnections](hubVirtualNetworkConnections/readme.md)_ array | `[]` | | Optional. Virtual network connections to create for the virtual hub. | diff --git a/arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualNetworkGateways/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep index 149119bae2..19d20d754e 100644 --- a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep @@ -100,8 +100,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -270,9 +270,16 @@ var vpnClientConfiguration = { vpnClientRevokedCertificates: !empty(clientRevokedCertThumbprint) ? vpmClientRevokedCertificates : null } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } // Public IPs diff --git a/arm/Microsoft.Network/virtualNetworkGateways/readme.md b/arm/Microsoft.Network/virtualNetworkGateways/readme.md index 2475088103..7b2d2a420d 100644 --- a/arm/Microsoft.Network/virtualNetworkGateways/readme.md +++ b/arm/Microsoft.Network/virtualNetworkGateways/readme.md @@ -20,7 +20,6 @@ This module deploys a virtual network gateway. | `asn` | int | `65815` | | Optional. ASN value | | `clientRevokedCertThumbprint` | string | | | Optional. Thumbprint of the revoked certificate. This would revoke VPN client certificates matching this thumbprint from connecting to the VNet. | | `clientRootCertData` | string | | | Optional. Client root certificate data used to authenticate VPN clients. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | @@ -28,6 +27,7 @@ This module deploys a virtual network gateway. | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `domainNameLabel` | array | `[]` | | Optional. DNS name(s) of the Public IP resource(s). If you enabled active-active configuration, you need to provide 2 DNS names, if you want to use this feature. A region specific suffix will be appended to it, e.g.: your-DNS-name.westeurope.cloudapp.azure.com | | `enableBgp` | bool | `True` | | Optional. Value to specify if BGP is enabled or not | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `gatewayPipName` | array | `[]` | | Optional. Specifies the name of the Public IP used by the Virtual Network Gateway. If it's not provided, a '-pip' suffix will be appended to the gateway's name. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.Network/virtualNetworks/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualNetworks/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualNetworks/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/deploy.bicep index 057330810a..9768463cfd 100644 --- a/arm/Microsoft.Network/virtualNetworks/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/deploy.bicep @@ -50,8 +50,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -95,9 +95,16 @@ var ddosProtectionPlan = { id: ddosProtectionPlanId } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' = { diff --git a/arm/Microsoft.Network/virtualNetworks/readme.md b/arm/Microsoft.Network/virtualNetworks/readme.md index d5a3d5ba0c..e023ba31e4 100644 --- a/arm/Microsoft.Network/virtualNetworks/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/readme.md @@ -18,7 +18,6 @@ This template deploys a virtual network (vNet). | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `addressPrefixes` | array | | | Required. An Array of 1 or more IP Address Prefixes for the Virtual Network. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `ddosProtectionPlanId` | string | | | Optional. Resource ID of the DDoS protection plan to assign the VNET to. If it's left blank, DDoS protection will not be configured. If it's provided, the VNET created by this template will be attached to the referenced DDoS protection plan. The DDoS protection plan can exist in the same or in a different subscription. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | @@ -26,6 +25,7 @@ This template deploys a virtual network (vNet). | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `dnsServers` | array | `[]` | | Optional. DNS Servers associated to the Virtual Network. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[VMProtectionAlerts]` | `[VMProtectionAlerts]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualNetworks/subnets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep index 9466a0a063..8f9fbd7c32 100644 --- a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep @@ -58,12 +58,19 @@ var formattedServiceEndpoints = [for serviceEndpoint in serviceEndpoints: { service: serviceEndpoint }] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md b/arm/Microsoft.Network/virtualNetworks/subnets/readme.md index 7e783a3e6e..a2d1f38a48 100644 --- a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/subnets/readme.md @@ -15,8 +15,8 @@ This module deploys a virtual network subnet. | `addressPrefix` | string | | | Required. The address prefix for the subnet. | | `addressPrefixes` | array | `[]` | | Optional. List of address prefixes for the subnet. | | `applicationGatewayIpConfigurations` | array | `[]` | | Optional. Application gateway IP configurations of virtual network resource. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `delegations` | array | `[]` | | Optional. The delegations to enable on the subnet | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `ipAllocations` | array | `[]` | | Optional. Array of IpAllocation which reference this subnet | | `name` | string | | | Optional. The Name of the subnet resource. | | `natGatewayName` | string | | | Optional. The name of the NAT Gateway to use for the subnet | diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep index 7d482b78f1..8dfa90b89b 100644 --- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep @@ -22,12 +22,19 @@ param doNotVerifyRemoteGateways bool = true @description('Optional. If remote gateways can be used on this virtual network. If the flag is set to true, and allowGatewayTransit on remote peering is also true, virtual network will use gateways of remote virtual network for transit. Only one peering can have this flag set to true. This flag cannot be set if virtual network already has a gateway. Default is false') param useRemoteGateways bool = false -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md index 7f6731486a..3f357ec321 100644 --- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md @@ -22,8 +22,8 @@ The following resources are required to be able to deploy this resource. | `allowForwardedTraffic` | bool | `True` | | Optional. Whether the forwarded traffic from the VMs in the local virtual network will be allowed/disallowed in remote virtual network. Default is true | | `allowGatewayTransit` | bool | `False` | | Optional. If gateway links can be used in remote virtual networking to link to this virtual network. Default is false | | `allowVirtualNetworkAccess` | bool | `True` | | Optional. Whether the VMs in the local virtual network space would be able to access the VMs in remote virtual network space. Default is true | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `doNotVerifyRemoteGateways` | bool | `True` | | Optional. If we need to verify the provisioning state of the remote gateway. Default is true | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `localVnetName` | string | | | Required. The Name of the Virtual Network to add the peering to. | | `name` | string | `[format('{0}-{1}', parameters('localVnetName'), last(split(parameters('remoteVirtualNetworkId'), '/')))]` | | Optional. The Name of Vnet Peering resource. If not provided, default value will be localVnetName-remoteVnetName | | `remoteVirtualNetworkId` | string | | | Required. The Resource ID of the VNet that is this Local VNet is being peered to. Should be in the format of a Resource ID | diff --git a/arm/Microsoft.Network/virtualWans/.bicep/nested_cuaId.bicep b/arm/Microsoft.Network/virtualWans/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Network/virtualWans/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Network/virtualWans/deploy.bicep b/arm/Microsoft.Network/virtualWans/deploy.bicep index 0274ec10a8..8beeef9f8e 100644 --- a/arm/Microsoft.Network/virtualWans/deploy.bicep +++ b/arm/Microsoft.Network/virtualWans/deploy.bicep @@ -26,8 +26,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @allowed([ 'CanNotDelete' @@ -37,9 +37,16 @@ param cuaId string = '' @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource virtualWan 'Microsoft.Network/virtualWans@2021-05-01' = { diff --git a/arm/Microsoft.Network/virtualWans/readme.md b/arm/Microsoft.Network/virtualWans/readme.md index 4973b3273d..3d3760d22b 100644 --- a/arm/Microsoft.Network/virtualWans/readme.md +++ b/arm/Microsoft.Network/virtualWans/readme.md @@ -16,8 +16,8 @@ This template deploys a virtual WAN. | :-- | :-- | :-- | :-- | :-- | | `allowBranchToBranchTraffic` | bool | `False` | | Optional. True if branch to branch traffic is allowed. | | `allowVnetToVnetTraffic` | bool | `False` | | Optional. True if VNET to VNET traffic is allowed. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `disableVpnEncryption` | bool | `False` | | Optional. VPN encryption to be disabled or not. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location where all resources will be created. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Name of the Virtual WAN. | diff --git a/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep b/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep index 58548c3f68..6464b6440c 100644 --- a/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep +++ b/arm/Microsoft.Network/vpnGateways/connections/deploy.bicep @@ -50,12 +50,19 @@ param sharedKey string = '' @description('Optional. Reference to a VPN site to link to') param remoteVpnSiteResourceId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource vpnGateway 'Microsoft.Network/vpnGateways@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/vpnGateways/connections/readme.md b/arm/Microsoft.Network/vpnGateways/connections/readme.md index 407b36df3d..52ecef6a91 100644 --- a/arm/Microsoft.Network/vpnGateways/connections/readme.md +++ b/arm/Microsoft.Network/vpnGateways/connections/readme.md @@ -13,18 +13,18 @@ This module deploys VPN Gateways Connections. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `connectionBandwidth` | int | `10` | | Optional. Expected bandwidth in MBPS. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enableBgp` | bool | `False` | | Optional. Enable BGP flag. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableInternetSecurity` | bool | `False` | | Optional. Enable internet security. | | `enableRateLimiting` | bool | `False` | | Optional. Enable rate limiting. | -| `ipsecPolicies` | array | `[]` | | Optional. The IPSec Policies to be considered by this connection. | +| `ipsecPolicies` | array | `[]` | | Optional. The IPSec policies to be considered by this connection. | | `name` | string | | | Required. The name of the VPN connection. | | `remoteVpnSiteResourceId` | string | | | Optional. Reference to a VPN site to link to | -| `routingConfiguration` | object | `{object}` | | Optional. Routing Configuration indicating the associated and propagated route tables for this connection. | +| `routingConfiguration` | object | `{object}` | | Optional. Routing configuration indicating the associated and propagated route tables for this connection. | | `routingWeight` | int | `0` | | Optional. Routing weight for VPN connection. | | `sharedKey` | string | | | Optional. SharedKey for the VPN connection. | -| `trafficSelectorPolicies` | array | `[]` | | Optional. The Traffic Selector Policies to be considered by this connection. | -| `useLocalAzureIpAddress` | bool | `False` | | Optional. Use local azure IP to initiate connection. | +| `trafficSelectorPolicies` | array | `[]` | | Optional. The traffic selector policies to be considered by this connection. | +| `useLocalAzureIpAddress` | bool | `False` | | Optional. Use local Azure IP to initiate connection. | | `usePolicyBasedTrafficSelectors` | bool | `False` | | Optional. Enable policy-based traffic selectors. | | `vpnConnectionProtocolType` | string | `IKEv2` | `[IKEv1, IKEv2]` | Optional. Gateway connection protocol. | | `vpnGatewayName` | string | | | Required. The name of the VPN gateway this VPN connection is associated with. | diff --git a/arm/Microsoft.Network/vpnGateways/deploy.bicep b/arm/Microsoft.Network/vpnGateways/deploy.bicep index c37730bc8e..3c2b47efa3 100644 --- a/arm/Microsoft.Network/vpnGateways/deploy.bicep +++ b/arm/Microsoft.Network/vpnGateways/deploy.bicep @@ -36,12 +36,19 @@ param tags object = {} @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource vpnGateway 'Microsoft.Network/vpnGateways@2021-05-01' = { diff --git a/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep b/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep index 678d803487..05c117ae5c 100644 --- a/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep +++ b/arm/Microsoft.Network/vpnGateways/natRules/deploy.bicep @@ -29,12 +29,19 @@ param mode string = '' ]) param type string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource vpnGateway 'Microsoft.Network/vpnGateways@2021-05-01' existing = { diff --git a/arm/Microsoft.Network/vpnGateways/natRules/readme.md b/arm/Microsoft.Network/vpnGateways/natRules/readme.md index fb244edbdb..e70577652a 100644 --- a/arm/Microsoft.Network/vpnGateways/natRules/readme.md +++ b/arm/Microsoft.Network/vpnGateways/natRules/readme.md @@ -12,11 +12,11 @@ This module deploys VPN Gateways NATRules | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `externalMappings` | array | `[]` | | Optional. An address prefix range of destination IPs on the outside network that source IPs will be mapped to. In other words, your post-NAT address prefix range. | | `internalMappings` | array | `[]` | | Optional. An address prefix range of source IPs on the inside network that will be mapped to a set of external IPs. In other words, your pre-NAT address prefix range. | | `ipConfigurationId` | string | | | Optional. A NAT rule must be configured to a specific VPN Gateway instance. This is applicable to Dynamic NAT only. Static NAT rules are automatically applied to both VPN Gateway instances. | -| `mode` | string | | `[, EgressSnat, IngressSnat]` | Optional. The type of NAT rule for VPN NAT. IngressSnat mode (also known as Ingress Source NAT) is applicable to traffic entering the Azure hub's Site-to-site VPN gateway. EgressSnat mode (also known as Egress Source NAT) is applicable to traffic leaving the Azure hub's Site-to-site VPN gateway. | +| `mode` | string | | `[, EgressSnat, IngressSnat]` | Optional. The type of NAT rule for VPN NAT. IngressSnat mode (also known as Ingress Source NAT) is applicable to traffic entering the Azure hub's site-to-site VPN gateway. EgressSnat mode (also known as Egress Source NAT) is applicable to traffic leaving the Azure hub's Site-to-site VPN gateway. | | `name` | string | | | Required. The name of the NAT rule. | | `type` | string | | `[, Dynamic, Static]` | Optional. The type of NAT rule for VPN NAT. Static one-to-one NAT establishes a one-to-one relationship between an internal address and an external address while Dynamic NAT assigns an IP and port based on availability. | | `vpnGatewayName` | string | | | Required. The name of the VPN gateway this NAT rule is associated with. | diff --git a/arm/Microsoft.Network/vpnGateways/readme.md b/arm/Microsoft.Network/vpnGateways/readme.md index 8f65404f74..fe67662b9a 100644 --- a/arm/Microsoft.Network/vpnGateways/readme.md +++ b/arm/Microsoft.Network/vpnGateways/readme.md @@ -17,8 +17,8 @@ This module deploys VPN Gateways. | :-- | :-- | :-- | :-- | :-- | | `bgpSettings` | object | `{object}` | | Optional. BGP settings details. | | `connections` | _[connections](connections/readme.md)_ array | `[]` | | Optional. The connections to create in the VPN gateway | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `enableBgpRouteTranslationForNat` | bool | `False` | | Optional. Enable BGP routes translation for NAT on this VPN gateway. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `isRoutingPreferenceInternet` | bool | `False` | | Optional. Enable routing preference property for the public IP interface of the VPN gateway. | | `location` | string | `[resourceGroup().location]` | | Optional. Location where all resources will be created. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.Network/vpnSites/deploy.bicep b/arm/Microsoft.Network/vpnSites/deploy.bicep index 23acdfc14a..56f75ae95e 100644 --- a/arm/Microsoft.Network/vpnSites/deploy.bicep +++ b/arm/Microsoft.Network/vpnSites/deploy.bicep @@ -28,8 +28,8 @@ param isSecuritySite bool = false @description('Optional. The Office365 breakout policy.') param o365Policy object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. List of all VPN site links.') param vpnSiteLinks array = [] @@ -45,9 +45,16 @@ param lock string = 'NotSpecified' @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource vpnSite 'Microsoft.Network/vpnSites@2021-05-01' = { diff --git a/arm/Microsoft.Network/vpnSites/readme.md b/arm/Microsoft.Network/vpnSites/readme.md index 21ee34e16d..633454b463 100644 --- a/arm/Microsoft.Network/vpnSites/readme.md +++ b/arm/Microsoft.Network/vpnSites/readme.md @@ -15,8 +15,8 @@ This module deploys a VPN Site. | :-- | :-- | :-- | :-- | :-- | | `addressPrefixes` | array | `[]` | | Optional. An array of IP address ranges that can be used by subnets of the virtual network. Must be provided if no bgpProperties or VPNSiteLinks are configured. | | `bgpProperties` | object | `{object}` | | Optional. BGP settings details. Must be provided if no addressPrefixes or VPNSiteLinks are configured. Note: This is a deprecated property, please use the corresponding VpnSiteLinks property instead. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `deviceProperties` | object | `{object}` | | Optional. List of properties of the device. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `ipAddress` | string | | | Optional. The IP-address for the VPN-site. Note: This is a deprecated property, please use the corresponding VpnSiteLinks property instead. | | `isSecuritySite` | bool | `False` | | Optional. IsSecuritySite flag | | `location` | string | `[resourceGroup().location]` | | Optional. Location where all resources will be created. | diff --git a/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.OperationalInsights/workspaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/.bicep/nested_cuaId.bicep b/arm/Microsoft.OperationalInsights/workspaces/dataSources/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.OperationalInsights/workspaces/dataSources/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep index 53af52a5d1..b977d44299 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/dataSources/deploy.bicep @@ -53,12 +53,19 @@ param syslogName string = '' @description('Optional. Severities to configure when kind is LinuxSyslog.') param syslogSeverities array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' existing = { diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md b/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md index a78f48fe29..425c87a22a 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/dataSources/readme.md @@ -13,7 +13,7 @@ This template deploys a data source for a Log Analytics workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `counterName` | string | | | Optional. Counter name to configure when kind is WindowsPerformanceCounter. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `eventLogName` | string | | | Optional. Windows event log name to configure when kind is WindowsEvent. | | `eventTypes` | array | `[]` | | Optional. Windows event types to configure when kind is WindowsEvent. | | `instanceName` | string | `*` | | Optional. Name of the instance to configure when kind is WindowsPerformanceCounter or LinuxPerformanceObject. | diff --git a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep index baed42457d..e016b03c34 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/deploy.bicep @@ -85,8 +85,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -125,9 +125,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { var logAnalyticsSearchVersion = 1 -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' = { diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/.bicep/nested_cuaId.bicep b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep index b54dab3c79..257cc9ea5d 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/deploy.bicep @@ -13,12 +13,19 @@ param writeAccessResourceId string = '' @description('Optional. Tags to configure in the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' existing = { diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md index 4f6fa05831..1952ccd0a6 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/readme.md @@ -12,7 +12,7 @@ This template deploys a linked service for a Log Analytics workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logAnalyticsWorkspaceName` | string | | | Required. Name of the Log Analytics workspace | | `name` | string | | | Required. Name of the link | | `resourceId` | string | | | Required. The resource ID of the resource that will be linked to the workspace. This should be used for linking resources which require read access. | diff --git a/arm/Microsoft.OperationalInsights/workspaces/readme.md b/arm/Microsoft.OperationalInsights/workspaces/readme.md index 0856da74c4..e7c2384c87 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/readme.md @@ -20,7 +20,6 @@ This template deploys a log analytics workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `dailyQuotaGb` | int | `-1` | | Optional. The workspace daily quota for ingestion. | | `dataRetention` | int | `365` | | Optional. Number of days data will be retained for | | `dataSources` | _[dataSources](dataSources/readme.md)_ array | `[]` | | Optional. LAW data sources to configure. | @@ -29,6 +28,7 @@ This template deploys a log analytics workspace. | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of a log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `gallerySolutions` | array | `[]` | | Optional. LAW gallerySolutions from the gallery. | | `linkedServices` | _[linkedServices](linkedServices/readme.md)_ array | `[]` | | Optional. List of services to be linked. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -43,7 +43,7 @@ This template deploys a log analytics workspace. | `serviceTier` | string | `PerGB2018` | `[Free, Standalone, PerNode, PerGB2018]` | Optional. Service Tier: PerGB2018, Free, Standalone, PerGB or PerNode | | `storageInsightsConfigs` | array | `[]` | | Optional. List of storage accounts to be read by the workspace. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `useResourcePermissions` | bool | | | Optional. Set to 'true' to use resource or workspace permissions and 'false' (or leave empty) to require workspace permissions. | +| `useResourcePermissions` | bool | `False` | | Optional. Set to 'true' to use resource or workspace permissions and 'false' (or leave empty) to require workspace permissions. | ### Parameter Usage: `gallerySolutions` diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/.bicep/nested_cuaId.bicep b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep index cf3e1f9158..9c64f8246e 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/deploy.bicep @@ -25,12 +25,19 @@ param functionParameters string = '' @description('Optional. The version number of the query language.') param version int = 2 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource workspace 'Microsoft.OperationalInsights/workspaces@2021-06-01' existing = { diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md index f3769ba879..c2c6d2d5f3 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/readme.md @@ -13,8 +13,8 @@ This template deploys a saved search for a Log Analytics workspace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `category` | string | | | Required. Query category. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `displayName` | string | | | Required. Display name for the search. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `functionAlias` | string | | | Optional. The function alias if query serves as a function.. | | `functionParameters` | string | | | Optional. The optional function parameters if query serves as a function. Value should be in the following format: "param-name1:type1 = default_value1, param-name2:type2 = default_value2". For more examples and proper syntax please refer to /azure/kusto/query/functions/user-defined-functions. | | `logAnalyticsWorkspaceName` | string | | | Required. Name of the Log Analytics workspace | diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/.bicep/nested_cuaId.bicep b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep index 6890c6e3f7..b86b20582c 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep +++ b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/deploy.bicep @@ -16,12 +16,19 @@ param tables array = [] @description('Optional. Tags to configure in the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md index d8d521b108..004d58db10 100644 --- a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md +++ b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/readme.md @@ -13,7 +13,7 @@ This template deploys a storage insights configuration for a Log Analytics works | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `containers` | array | `[]` | | Optional. The names of the blob containers that the workspace should read. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logAnalyticsWorkspaceName` | string | | | Required. Name of the Log Analytics workspace. | | `name` | string | `[format('{0}-stinsconfig', last(split(parameters('storageAccountId'), '/')))]` | | Optional. The name of the storage insights config | | `storageAccountId` | string | | | Required. The Azure Resource Manager ID of the storage account resource. | diff --git a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_cuaId.bicep b/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.RecoveryServices/vaults/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/.bicep/nested_cuaId.bicep b/arm/Microsoft.RecoveryServices/vaults/backupConfig/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep index 2553c64437..e8a4cb2651 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/deploy.bicep @@ -46,12 +46,19 @@ param storageType string = 'GeoRedundant' ]) param storageTypeState string = 'Locked' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md b/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md index 778bd4199e..58c4c7f801 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/readme.md @@ -12,7 +12,7 @@ This module deploys recovery services vault backup config. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enhancedSecurityState` | string | `Enabled` | `[Disabled, Enabled]` | Optional. Enable this setting to protect hybrid backups against accidental deletes and add additional layer of authentication for critical operations. | | `name` | string | `vaultconfig` | | Optional. Name of the Azure Recovery Service Vault Backup Policy | | `recoveryVaultName` | string | | | Required. Name of the Azure Recovery Service Vault | diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep index 71042ec9f9..6abbc8be30 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/deploy.bicep @@ -7,12 +7,19 @@ param name string @description('Required. Configuration of the Azure Recovery Service Vault Backup Policy') param backupPolicyProperties object -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' - -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md index df867a4bcb..f93d460a27 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/readme.md @@ -13,7 +13,7 @@ This module deploys a Backup Policy for a Recovery Services Vault | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `backupPolicyProperties` | object | | | Required. Configuration of the Azure Recovery Service Vault Backup Policy | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the Azure Recovery Service Vault Backup Policy | | `recoveryVaultName` | string | | | Required. Name of the Azure Recovery Service Vault | diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/.bicep/nested_cuaId.bicep b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep index c4c89c2007..5b8d42ef31 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/deploy.bicep @@ -16,12 +16,19 @@ param storageModelType string = 'GeoRedundant' @description('Optional. Opt in details of Cross Region Restore feature') param crossRegionRestoreFlag bool = true -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' existing = { diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md index e4502785b6..3dd979d8d2 100644 --- a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/readme.md @@ -12,7 +12,7 @@ This module deploys the Backup Storage Configuration for the Recovery Service Va | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `crossRegionRestoreFlag` | bool | `True` | | Optional. Opt in details of Cross Region Restore feature | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `vaultstorageconfig` | | Optional. The name of the backup storage config | | `recoveryVaultName` | string | | | Required. Name of the Azure Recovery Service Vault | | `storageModelType` | string | `GeoRedundant` | `[GeoRedundant, LocallyRedundant, ReadAccessGeoZoneRedundant, ZoneRedundant]` | Optional. Change Vault Storage Type (Works if vault has not registered any backup instance) | diff --git a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/deploy.bicep index 558f71c246..96fab3dd06 100644 --- a/arm/Microsoft.RecoveryServices/vaults/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/deploy.bicep @@ -4,8 +4,8 @@ param name string @description('Optional. The storage configuration for the Azure Recovery Service Vault') param backupStorageConfig object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Location for all resources.') param location string = resourceGroup().location @@ -125,9 +125,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource rsv 'Microsoft.RecoveryServices/vaults@2021-12-01' = { diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/.bicep/nested_cuaId.bicep b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep index d8dfad71f8..2264fe36fa 100644 --- a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep +++ b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep @@ -40,12 +40,19 @@ param friendlyName string = '' ]) param containerType string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource protectionContainer 'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers@2021-08-01' = { diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md index b07c221765..c5bbd4902c 100644 --- a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/readme.md @@ -14,7 +14,7 @@ This module deploys a Protection Container for a Recovery Services Vault | :-- | :-- | :-- | :-- | :-- | | `backupManagementType` | string | | `[AzureBackupServer, AzureIaasVM, AzureSql, AzureStorage, AzureWorkload, DPM, DefaultBackup, Invalid, MAB, ]` | Optional. Backup management type to execute the current Protection Container job. | | `containerType` | string | | `[AzureBackupServerContainer, AzureSqlContainer, GenericContainer, Microsoft.ClassicCompute/virtualMachines, Microsoft.Compute/virtualMachines, SQLAGWorkLoadContainer, StorageContainer, VMAppContainer, Windows, ]` | Optional. Type of the container | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `friendlyName` | string | | | Optional. Friendly name of the Protection Container | | `name` | string | | | Required. Name of the Azure Recovery Service Vault Protection Container | | `recoveryVaultName` | string | | | Required. Name of the Azure Recovery Service Vault | diff --git a/arm/Microsoft.RecoveryServices/vaults/readme.md b/arm/Microsoft.RecoveryServices/vaults/readme.md index 94bdb73010..fe3a841da1 100644 --- a/arm/Microsoft.RecoveryServices/vaults/readme.md +++ b/arm/Microsoft.RecoveryServices/vaults/readme.md @@ -22,12 +22,12 @@ This module deploys a recovery service vault. | `backupConfig` | _[backupConfig](backupConfig/readme.md)_ object | `{object}` | | Optional. The backup configuration. | | `backupPolicies` | _[backupPolicies](backupPolicies/readme.md)_ array | `[]` | | Optional. List of all backup policies. | | `backupStorageConfig` | _[backupStorageConfig](backupStorageConfig/readme.md)_ object | `{object}` | | Optional. The storage configuration for the Azure Recovery Service Vault | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[AzureBackupReport, CoreAzureBackup, AddonAzureBackupJobs, AddonAzureBackupAlerts, AddonAzureBackupPolicy, AddonAzureBackupStorage, AddonAzureBackupProtectedInstance, AzureSiteRecoveryJobs, AzureSiteRecoveryEvents, AzureSiteRecoveryReplicatedItems, AzureSiteRecoveryReplicationStats, AzureSiteRecoveryRecoveryPoints, AzureSiteRecoveryReplicationDataUploadRate, AzureSiteRecoveryProtectedDiskDataChurn]` | `[AzureBackupReport, CoreAzureBackup, AddonAzureBackupJobs, AddonAzureBackupAlerts, AddonAzureBackupPolicy, AddonAzureBackupStorage, AddonAzureBackupProtectedInstance, AzureSiteRecoveryJobs, AzureSiteRecoveryEvents, AzureSiteRecoveryReplicatedItems, AzureSiteRecoveryReplicationStats, AzureSiteRecoveryRecoveryPoints, AzureSiteRecoveryReplicationDataUploadRate, AzureSiteRecoveryProtectedDiskDataChurn]` | Optional. The name of logs that will be streamed. | @@ -35,7 +35,7 @@ This module deploys a recovery service vault. | `name` | string | | | Required. Name of the Azure Recovery Service Vault | | `protectionContainers` | _[protectionContainers](protectionContainers/readme.md)_ array | `[]` | | Optional. List of all protection containers. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | -| `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 Recovery Service Vault resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | diff --git a/arm/Microsoft.Resources/deploymentScripts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Resources/deploymentScripts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Resources/deploymentScripts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep b/arm/Microsoft.Resources/deploymentScripts/deploy.bicep index e63c756f60..b82f2758d2 100644 --- a/arm/Microsoft.Resources/deploymentScripts/deploy.bicep +++ b/arm/Microsoft.Resources/deploymentScripts/deploy.bicep @@ -69,8 +69,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var containerSettings = { containerGroupName: containerGroupName @@ -83,9 +83,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = { diff --git a/arm/Microsoft.Resources/deploymentScripts/readme.md b/arm/Microsoft.Resources/deploymentScripts/readme.md index c1cf19768e..6c2ed9f9ac 100644 --- a/arm/Microsoft.Resources/deploymentScripts/readme.md +++ b/arm/Microsoft.Resources/deploymentScripts/readme.md @@ -19,7 +19,7 @@ This module deploys a deployment script. | `baseTime` | string | `[utcNow('yyyy-MM-dd-HH-mm-ss')]` | | Generated. Do not provide a value! This date value is used to make sure the script run every time the template is deployed. | | `cleanupPreference` | string | `Always` | `[Always, OnSuccess, OnExpiration]` | Optional. The clean up preference when the script execution gets in a terminal state. Specify the preference on when to delete the deployment script resources. The default value is Always, which means the deployment script resources are deleted despite the terminal state (Succeeded, Failed, canceled). | | `containerGroupName` | string | | | Optional. Container group name, if not specified then the name will get auto-generated. Not specifying a 'containerGroupName' indicates the system to generate a unique name which might end up flagging an Azure Policy as non-compliant. Use 'containerGroupName' when you have an Azure Policy that expects a specific naming convention or when you want to fully control the name. 'containerGroupName' property must be between 1 and 63 characters long, must contain only lowercase letters, numbers, and dashes and it cannot start or end with a dash and consecutive dashes are not allowed. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `environmentVariables` | array | `[]` | | Optional. The environment variables to pass over to the script. Must have a 'name' and a 'value' or a 'secretValue' property. | | `kind` | string | `AzurePowerShell` | `[AzurePowerShell, AzureCLI]` | Optional. Type of the script. AzurePowerShell, AzureCLI. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -27,7 +27,7 @@ This module deploys a deployment script. | `name` | string | | | Required. Display name of the script to be run. | | `primaryScriptUri` | string | | | Optional. Uri for the external script. This is the entry point for the external script. To run an internal script, use the scriptContent instead. | | `retentionInterval` | string | `P1D` | | Optional. Interval for which the service retains the script resource after it reaches a terminal state. Resource will be deleted when this duration expires. Duration is based on ISO 8601 pattern (for example P7D means one week). | -| `runOnce` | bool | | | Optional. When set to false, script will run every time the template is deployed. When set to true, the script will only run once. | +| `runOnce` | bool | `False` | | Optional. When set to false, script will run every time the template is deployed. When set to true, the script will only run once. | | `scriptContent` | string | | | Optional. Script body. Max length: 32000 characters. To run an external script, use primaryScriptURI instead. | | `supportingScriptUris` | array | `[]` | | Optional. List of supporting files for the external script (defined in primaryScriptUri). Does not work with internal scripts (code defined in scriptContent). | | `tags` | object | `{object}` | | Optional. Tags of the resource. | diff --git a/arm/Microsoft.Resources/resourceGroups/deploy.bicep b/arm/Microsoft.Resources/resourceGroups/deploy.bicep index 0327349f79..f0b9ae6704 100644 --- a/arm/Microsoft.Resources/resourceGroups/deploy.bicep +++ b/arm/Microsoft.Resources/resourceGroups/deploy.bicep @@ -20,6 +20,21 @@ param roleAssignments array = [] @description('Optional. Tags of the storage account resource.') param tags object = {} +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource resourceGroup 'Microsoft.Resources/resourceGroups@2019-05-01' = { location: location name: name diff --git a/arm/Microsoft.Resources/resourceGroups/readme.md b/arm/Microsoft.Resources/resourceGroups/readme.md index a823c64167..117b331056 100644 --- a/arm/Microsoft.Resources/resourceGroups/readme.md +++ b/arm/Microsoft.Resources/resourceGroups/readme.md @@ -14,6 +14,7 @@ This module deploys a resource group. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[deployment().location]` | | Optional. Location of the Resource Group. It uses the deployment's location when not provided. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. The name of the Resource Group | diff --git a/arm/Microsoft.Resources/tags/readme.md b/arm/Microsoft.Resources/tags/readme.md index 6d74aff75b..c93ce02f7f 100644 --- a/arm/Microsoft.Resources/tags/readme.md +++ b/arm/Microsoft.Resources/tags/readme.md @@ -12,7 +12,7 @@ This module deploys Resources Tags on a subscription or resource group scope. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `onlyUpdate` | bool | | | Optional. Instead of overwriting the existing tags, combine them with the new tags | +| `onlyUpdate` | bool | `False` | | Optional. Instead of overwriting the existing tags, combine them with the new tags | | `resourceGroupName` | string | | | Optional. Name of the Resource Group to assign the tags to. If no Resource Group name is provided, and Subscription ID is provided, the module deploys at subscription level, therefore assigns the provided tags to the subscription. | | `subscriptionId` | string | `[subscription().id]` | | Optional. Subscription ID of the subscription to assign the tags to. If no Resource Group name is provided, the module deploys at subscription level, therefore assigns the provided tags to the subscription. | | `tags` | object | `{object}` | | Optional. Tags for the resource group. If not provided, removes existing tags | diff --git a/arm/Microsoft.Resources/tags/resourceGroups/readme.md b/arm/Microsoft.Resources/tags/resourceGroups/readme.md index de64be520d..9dc9742cee 100644 --- a/arm/Microsoft.Resources/tags/resourceGroups/readme.md +++ b/arm/Microsoft.Resources/tags/resourceGroups/readme.md @@ -13,7 +13,7 @@ This module deploys Resources Tags on a resource group scope. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `name` | string | `default` | | Optional. The name of the tags resource. | -| `onlyUpdate` | bool | | | Optional. Instead of overwriting the existing tags, combine them with the new tags | +| `onlyUpdate` | bool | `False` | | Optional. Instead of overwriting the existing tags, combine them with the new tags | | `tags` | object | `{object}` | | Optional. Tags for the resource group. If not provided, removes existing tags | ### Parameter Usage: `tags` diff --git a/arm/Microsoft.Resources/tags/subscriptions/readme.md b/arm/Microsoft.Resources/tags/subscriptions/readme.md index fe75bc2b3c..596f28dece 100644 --- a/arm/Microsoft.Resources/tags/subscriptions/readme.md +++ b/arm/Microsoft.Resources/tags/subscriptions/readme.md @@ -13,7 +13,7 @@ This module deploys Resources Tags on a subscription scope. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `name` | string | `default` | | Optional. The name of the tags resource. | -| `onlyUpdate` | bool | | | Optional. Instead of overwriting the existing tags, combine them with the new tags | +| `onlyUpdate` | bool | `False` | | Optional. Instead of overwriting the existing tags, combine them with the new tags | | `tags` | object | `{object}` | | Optional. Tags for the resource group. If not provided, removes existing tags | ### Parameter Usage: `tags` diff --git a/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep b/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep index 84b1ff1b98..b377d5e7cd 100644 --- a/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep +++ b/arm/Microsoft.Security/azureSecurityCenter/deploy.bicep @@ -6,6 +6,9 @@ param workspaceId string @description('Required. All the VMs in this scope will send their security data to the mentioned workspace unless overridden by a setting with more specific scope.') param scope string +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + @description('Optional. Describes what kind of security agent provisioning action to take. - On or Off') @allowed([ 'On' @@ -99,6 +102,18 @@ param openSourceRelationalDatabasesTier string = 'Free' @description('Optional. Security contact data') param securityContactProperties object = {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource autoProvisioningSettings 'Microsoft.Security/autoProvisioningSettings@2017-08-01-preview' = { name: 'default' properties: { diff --git a/arm/Microsoft.Security/azureSecurityCenter/readme.md b/arm/Microsoft.Security/azureSecurityCenter/readme.md index 26e8936353..461b212b5f 100644 --- a/arm/Microsoft.Security/azureSecurityCenter/readme.md +++ b/arm/Microsoft.Security/azureSecurityCenter/readme.md @@ -23,6 +23,7 @@ This template enables Azure security center - Standard tier by default, could be | `containerRegistryPricingTier` | string | `Free` | `[Free, Standard]` | Optional. The pricing tier value for ContainerRegistry. Azure Security Center is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features. - Free or Standard | | `deviceSecurityGroupProperties` | object | `{object}` | | Optional. Device Security group data | | `dnsPricingTier` | string | `Free` | `[Free, Standard]` | Optional. The pricing tier value for DNS. Azure Security Center is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features. - Free or Standard | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `ioTSecuritySolutionProperties` | object | `{object}` | | Optional. Security Solution data | | `keyVaultsPricingTier` | string | `Free` | `[Free, Standard]` | Optional. The pricing tier value for KeyVaults. Azure Security Center is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features. - Free or Standard | | `kubernetesServicePricingTier` | string | `Free` | `[Free, Standard]` | Optional. The pricing tier value for KubernetesService. Azure Security Center is provided in two pricing tiers: free and standard, with the standard tier available with a trial period. The standard tier offers advanced security capabilities, while the free tier offers basic security features. - Free or Standard | diff --git a/arm/Microsoft.ServiceBus/namespaces/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep index 7df7ce3311..13db67e79b 100644 --- a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/deploy.bicep @@ -14,12 +14,19 @@ param name string ]) param rights array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md index 391219c3f0..65e045d0f7 100644 --- a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/readme.md @@ -12,7 +12,7 @@ This module deploys authorization rules for a service bus namespace | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the authorization rule | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Queue. | | `rights` | array | `[]` | `[Listen, Manage, Send]` | Optional. The rights associated with the rule. | diff --git a/arm/Microsoft.ServiceBus/namespaces/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/deploy.bicep index 85d095fc1f..791feaceb2 100644 --- a/arm/Microsoft.ServiceBus/namespaces/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/deploy.bicep @@ -80,8 +80,8 @@ param privateEndpoints array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules.') param baseTime string = utcNow('u') @@ -138,9 +138,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource serviceBusNamespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' = { diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep index bc8478a0a3..3290733e46 100644 --- a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/deploy.bicep @@ -12,12 +12,19 @@ param alternateName string = '' @description('Optional. Resource ID of the Primary/Secondary event hub namespace name, which is part of GEO DR pairing') param partnerNamespaceResourceID string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md index 7d8cd5c02d..6cd4edb596 100644 --- a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/readme.md @@ -13,7 +13,7 @@ This module deploys a disaster recovery config for a service bus Namespace | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `alternateName` | string | | | Optional. Primary/Secondary eventhub namespace name, which is part of GEO DR pairing | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `default` | | Optional. The name of the disaster recovery config | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Queue. | | `partnerNamespaceResourceID` | string | | | Optional. Resource ID of the Primary/Secondary event hub namespace name, which is part of GEO DR pairing | diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep index 9acb32dada..1658d3baaa 100644 --- a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/deploy.bicep @@ -19,12 +19,19 @@ param filterName string @description('Required. IP Mask') param ipMask string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md index e45eaa35c9..e43e083574 100644 --- a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/readme.md @@ -13,7 +13,7 @@ This module deploys IP filter rules for a service bus namespace | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `action` | string | | `[Accept]` | Required. The IP Filter Action | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `filterName` | string | | | Required. IP Filter name | | `ipMask` | string | | | Required. IP Mask | | `name` | string | `[parameters('filterName')]` | | Optional. The name of the ip filter rule | diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep index e17e03e700..e082ad8cf9 100644 --- a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/deploy.bicep @@ -12,12 +12,19 @@ param postMigrationName string @description('Required. Existing premium Namespace resource ID which has no entities, will be used for migration') param targetNamespaceResourceId string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md index ab319b323c..c0bc7a8075 100644 --- a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/readme.md @@ -12,7 +12,7 @@ This module deploys a migration configuration for a service bus namespace | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `$default` | | Optional. The name of the migration configuration | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Queue. | | `postMigrationName` | string | | | Required. Name to access Standard Namespace after migration | diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/queues/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep index 2b7831e8b3..6b0bc01b83 100644 --- a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/deploy.bicep @@ -15,12 +15,19 @@ param queueName string ]) param rights array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md index 6a777d4c95..d203d282cd 100644 --- a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/readme.md @@ -12,7 +12,7 @@ This module deploys an authorization rule for a service bus namespace queue. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the service bus namepace queue | | `namespaceName` | string | | | Required. The name of the parent service bus namespace | | `queueName` | string | | | Required. The name of the parent service bus namespace queue | diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep index e7c66ed6c3..7ffbd0180f 100644 --- a/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/queues/deploy.bicep @@ -80,12 +80,19 @@ param lock string = 'NotSpecified' @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/readme.md b/arm/Microsoft.ServiceBus/namespaces/queues/readme.md index 9ed183384b..f22e46953d 100644 --- a/arm/Microsoft.ServiceBus/namespaces/queues/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/queues/readme.md @@ -16,21 +16,21 @@ This module deploys a queue for a service bus namespace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `authorizationRules` | _[authorizationRules](authorizationRules/readme.md)_ array | `[System.Collections.Hashtable]` | | Optional. Authorization Rules for the Service Bus Queue | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `deadLetteringOnMessageExpiration` | bool | `True` | | Optional. A value that indicates whether this queue has dead letter support when a message expires. | | `defaultMessageTimeToLive` | string | `P14D` | | Optional. ISO 8601 default message timespan to live value. This is the duration after which the message expires, starting from when the message is sent to Service Bus. This is the default value used when TimeToLive is not set on a message itself. | | `duplicateDetectionHistoryTimeWindow` | string | `PT10M` | | Optional. ISO 8601 timeSpan structure that defines the duration of the duplicate detection history. The default value is 10 minutes. | | `enableBatchedOperations` | bool | `True` | | Optional. Value that indicates whether server-side batched operations are enabled. | -| `enableExpress` | bool | | | Optional. A value that indicates whether Express Entities are enabled. An express queue holds a message in memory temporarily before writing it to persistent storage. | -| `enablePartitioning` | bool | | | Optional. A value that indicates whether the queue is to be partitioned across multiple message brokers. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableExpress` | bool | `False` | | Optional. A value that indicates whether Express Entities are enabled. An express queue holds a message in memory temporarily before writing it to persistent storage. | +| `enablePartitioning` | bool | `False` | | Optional. A value that indicates whether the queue is to be partitioned across multiple message brokers. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `lockDuration` | string | `PT1M` | | Optional. ISO 8601 timespan duration of a peek-lock; that is, the amount of time that the message is locked for other receivers. The maximum value for LockDuration is 5 minutes; the default value is 1 minute. | | `maxDeliveryCount` | int | `10` | | Optional. The maximum delivery count. A message is automatically deadlettered after this number of deliveries. default value is 10. | | `maxSizeInMegabytes` | int | `1024` | | Optional. The maximum size of the queue in megabytes, which is the size of memory allocated for the queue. Default is 1024. | | `name` | string | | | Required. Name of the Service Bus Queue. | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Queue. | -| `requiresDuplicateDetection` | bool | | | Optional. A value indicating if this queue requires duplicate detection. | -| `requiresSession` | bool | | | Optional. A value that indicates whether the queue supports the concept of sessions. | +| `requiresDuplicateDetection` | bool | `False` | | Optional. A value indicating if this queue requires duplicate detection. | +| `requiresSession` | bool | `False` | | Optional. A value that indicates whether the queue supports the concept of sessions. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `status` | string | `Active` | `[Active, Disabled, Restoring, SendDisabled, ReceiveDisabled, Creating, Deleting, Renaming, Unknown]` | Optional. Enumerates the possible values for the status of a messaging entity. - Active, Disabled, Restoring, SendDisabled, ReceiveDisabled, Creating, Deleting, Renaming, Unknown | diff --git a/arm/Microsoft.ServiceBus/namespaces/readme.md b/arm/Microsoft.ServiceBus/namespaces/readme.md index db74d5b38c..64a987287a 100644 --- a/arm/Microsoft.ServiceBus/namespaces/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/readme.md @@ -28,13 +28,13 @@ This module deploys a service bus namespace resource. | :-- | :-- | :-- | :-- | :-- | | `authorizationRules` | _[authorizationRules](authorizationRules/readme.md)_ array | `[System.Collections.Hashtable]` | | Optional. Authorization Rules for the Service Bus namespace | | `baseTime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `disasterRecoveryConfigs` | _[disasterRecoveryConfigs](disasterRecoveryConfigs/readme.md)_ object | `{object}` | | Optional. The disaster recovery configuration. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `ipFilterRules` | _[ipFilterRules](ipFilterRules/readme.md)_ array | `[]` | | Optional. IP Filter Rules for the Service Bus namespace | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | @@ -46,12 +46,12 @@ This module deploys a service bus namespace resource. | `queues` | _[queues](queues/readme.md)_ array | `[]` | | Optional. The queues to create in the service bus namespace | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `skuName` | string | `Basic` | `[Basic, Standard, Premium]` | Required. Name of this SKU. - Basic, Standard, Premium | -| `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 resource. | | `topics` | _[topics](topics/readme.md)_ array | `[]` | | Optional. The topics to create in the service bus namespace | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | | `virtualNetworkRules` | _[virtualNetworkRules](virtualNetworkRules/readme.md)_ array | `[]` | | Optional. vNet Rules SubnetIds for the Service Bus namespace. | -| `zoneRedundant` | bool | | | Optional. Enabling this property creates a Premium Service Bus Namespace in regions supported availability zones. | +| `zoneRedundant` | bool | `False` | | Optional. Enabling this property creates a Premium Service Bus Namespace in regions supported availability zones. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/topics/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep index 1c018d575e..1b99a34517 100644 --- a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/deploy.bicep @@ -15,12 +15,19 @@ param topicName string ]) param rights array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md b/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md index d949fb6505..a5569e516e 100644 --- a/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/topics/authorizationRules/readme.md @@ -12,7 +12,7 @@ This module deploys an authorization rule for a service bus namespace topic. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the service bus namespace topic | | `namespaceName` | string | | | Required. The name of the parent service bus namespace | | `rights` | array | `[]` | `[Listen, Manage, Send]` | Optional. The rights associated with the rule. | diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep index e16fbc08cd..5631e61355 100644 --- a/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/topics/deploy.bicep @@ -77,12 +77,19 @@ param lock string = 'NotSpecified' @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/topics/readme.md b/arm/Microsoft.ServiceBus/namespaces/topics/readme.md index 4034a43c65..9c68b3ce49 100644 --- a/arm/Microsoft.ServiceBus/namespaces/topics/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/topics/readme.md @@ -17,21 +17,21 @@ This module deploys a topic for a service bus namespace. | :-- | :-- | :-- | :-- | :-- | | `authorizationRules` | _[authorizationRules](authorizationRules/readme.md)_ array | `[System.Collections.Hashtable]` | | Optional. Authorization Rules for the Service Bus Topic | | `autoDeleteOnIdle` | string | `PT5M` | | Optional. ISO 8601 timespan idle interval after which the topic is automatically deleted. The minimum duration is 5 minutes. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `defaultMessageTimeToLive` | string | `P14D` | | Optional. ISO 8601 default message timespan to live value. This is the duration after which the message expires, starting from when the message is sent to Service Bus. This is the default value used when TimeToLive is not set on a message itself. | | `duplicateDetectionHistoryTimeWindow` | string | `PT10M` | | Optional. ISO 8601 timeSpan structure that defines the duration of the duplicate detection history. The default value is 10 minutes. | | `enableBatchedOperations` | bool | `True` | | Optional. Value that indicates whether server-side batched operations are enabled. | -| `enableExpress` | bool | | | Optional. A value that indicates whether Express Entities are enabled. An express topic holds a message in memory temporarily before writing it to persistent storage. | -| `enablePartitioning` | bool | | | Optional. A value that indicates whether the topic is to be partitioned across multiple message brokers. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `enableExpress` | bool | `False` | | Optional. A value that indicates whether Express Entities are enabled. An express topic holds a message in memory temporarily before writing it to persistent storage. | +| `enablePartitioning` | bool | `False` | | Optional. A value that indicates whether the topic is to be partitioned across multiple message brokers. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `maxMessageSizeInKilobytes` | int | `1024` | | Optional. Maximum size (in KB) of the message payload that can be accepted by the topic. This property is only used in Premium today and default is 1024. | | `maxSizeInMegabytes` | int | `1024` | | Optional. The maximum size of the topic in megabytes, which is the size of memory allocated for the topic. Default is 1024. | | `name` | string | | | Required. Name of the Service Bus Topic. | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Topic. | -| `requiresDuplicateDetection` | bool | | | Optional. A value indicating if this topic requires duplicate detection. | +| `requiresDuplicateDetection` | bool | `False` | | Optional. A value indicating if this topic requires duplicate detection. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `status` | string | `Active` | `[Active, Disabled, Restoring, SendDisabled, ReceiveDisabled, Creating, Deleting, Renaming, Unknown]` | Optional. Enumerates the possible values for the status of a messaging entity. - Active, Disabled, Restoring, SendDisabled, ReceiveDisabled, Creating, Deleting, Renaming, Unknown | -| `supportOrdering` | bool | | | Optional. Value that indicates whether the topic supports ordering. | +| `supportOrdering` | bool | `False` | | Optional. Value that indicates whether the topic supports ordering. | ### Parameter Usage: `roleAssignments` diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep index 1d45c326da..40efd723e5 100644 --- a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep +++ b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/deploy.bicep @@ -9,12 +9,19 @@ param name string = '${namespaceName}-vnr' @description('Required. Resource ID of Virtual Network Subnet') param virtualNetworkSubnetId string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource namespace 'Microsoft.ServiceBus/namespaces@2021-06-01-preview' existing = { diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md index 5a561f17bb..b7bbd3b8b4 100644 --- a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md +++ b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/readme.md @@ -12,7 +12,7 @@ This module deploys a virtual network rule for a service bus namespace. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `[format('{0}-vnr', parameters('namespaceName'))]` | | Optional. The name of the virtual network rule | | `namespaceName` | string | | | Required. Name of the parent Service Bus Namespace for the Service Bus Queue. | | `virtualNetworkSubnetId` | string | | | Required. Resource ID of Virtual Network Subnet | diff --git a/arm/Microsoft.ServiceFabric/clusters/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceFabric/clusters/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/.bicep/nested_cuaId.bicep b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep index dbc0d3b70a..9e56b88bd4 100644 --- a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep +++ b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/deploy.bicep @@ -7,12 +7,19 @@ param name string = 'defaultApplicationType' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' - -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource serviceFabricCluster 'Microsoft.ServiceFabric/clusters@2021-06-01' existing = { diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md index 796bec35ef..cb67669e21 100644 --- a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md +++ b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/readme.md @@ -12,7 +12,7 @@ This module deploys a ServiceFabric cluster application type. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `defaultApplicationType` | | Optional. Application type name. | | `serviceFabricClusterName` | string | | | Required. Name of the Service Fabric cluster. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | diff --git a/arm/Microsoft.ServiceFabric/clusters/deploy.bicep b/arm/Microsoft.ServiceFabric/clusters/deploy.bicep index affb81075a..896a16aca5 100644 --- a/arm/Microsoft.ServiceFabric/clusters/deploy.bicep +++ b/arm/Microsoft.ServiceFabric/clusters/deploy.bicep @@ -15,8 +15,8 @@ param tags object = {} @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @allowed([ 'BackupRestoreService' @@ -202,9 +202,16 @@ var upgradeDescription_var = union({ } } : {}) -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } // Service Fabric cluster resource diff --git a/arm/Microsoft.ServiceFabric/clusters/readme.md b/arm/Microsoft.ServiceFabric/clusters/readme.md index e42c19b19f..8478d22eac 100644 --- a/arm/Microsoft.ServiceFabric/clusters/readme.md +++ b/arm/Microsoft.ServiceFabric/clusters/readme.md @@ -23,11 +23,11 @@ This module deploys a service fabric cluster. | `clientCertificateCommonNames` | array | `[]` | | Optional. The list of client certificates referenced by common name that are allowed to manage the cluster. | | `clientCertificateThumbprints` | array | `[]` | | Optional. The list of client certificates referenced by thumbprint that are allowed to manage the cluster. | | `clusterCodeVersion` | string | | | Optional. The Service Fabric runtime version of the cluster. This property can only by set the user when upgradeMode is set to "Manual". To get list of available Service Fabric versions for new clusters use ClusterVersion API. To get the list of available version for existing clusters use availableClusterVersions. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticsStorageAccountConfig` | object | `{object}` | | Optional. The storage account information for storing Service Fabric diagnostic logs. | -| `eventStoreServiceEnabled` | bool | | | Optional. Indicates if the event store service is enabled. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `eventStoreServiceEnabled` | bool | `False` | | Optional. Indicates if the event store service is enabled. | | `fabricSettings` | array | `[]` | | Optional. The list of custom fabric settings to configure the cluster. | -| `infrastructureServiceManager` | bool | | | Optional. Indicates if infrastructure service manager is enabled. | +| `infrastructureServiceManager` | bool | `False` | | Optional. Indicates if infrastructure service manager is enabled. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `managementEndpoint` | string | | | Required. The http management endpoint of the cluster. | @@ -48,7 +48,7 @@ This module deploys a service fabric cluster. | `upgradeWave` | string | `Wave0` | `[Wave0, Wave1, Wave2]` | Optional. Indicates when new cluster runtime version upgrades will be applied after they are released. By default is Wave0. | | `vmImage` | string | | | Optional. The VM image VMSS has been configured with. Generic names such as Windows or Linux can be used | | `vmssZonalUpgradeMode` | string | `Hierarchical` | `[Hierarchical, Parallel]` | Optional. This property defines the upgrade mode for the virtual machine scale set, it is mandatory if a node type with multiple Availability Zones is added. | -| `waveUpgradePaused` | bool | | | Optional. Boolean to pause automatic runtime version upgrades to the cluster. | +| `waveUpgradePaused` | bool | `False` | | Optional. Boolean to pause automatic runtime version upgrades to the cluster. | ### Parameter Usage: `notifications` diff --git a/arm/Microsoft.Sql/managedInstances/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/administrators/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/administrators/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/administrators/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep b/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep index abb6be4a2e..50e79f8ed6 100644 --- a/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/administrators/deploy.bicep @@ -13,12 +13,19 @@ param name string = 'ActiveDirectory' @description('Optional. Tenant ID of the managed instance administrator.') param tenantId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/administrators/readme.md b/arm/Microsoft.Sql/managedInstances/administrators/readme.md index af24ba2f4c..ff7c1e613b 100644 --- a/arm/Microsoft.Sql/managedInstances/administrators/readme.md +++ b/arm/Microsoft.Sql/managedInstances/administrators/readme.md @@ -12,7 +12,7 @@ This module deploys an administrator for the SQL managed instance | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `login` | string | | | Required. Login name of the managed instance administrator. | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | `ActiveDirectory` | | Optional. The name of the managed instance administrator | diff --git a/arm/Microsoft.Sql/managedInstances/databases/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/databases/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/databases/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep index b7065f2cbf..fe8d57289a 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/deploy.bicep @@ -19,12 +19,19 @@ param monthlyRetention string = 'P1Y' @description('Optional. The yearly retention policy for an LTR backup in an ISO 8601 format.') param yearlyRetention string = 'P5Y' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md index be4a6eb1fd..de59f1856a 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md +++ b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/readme.md @@ -12,8 +12,8 @@ This module deploys a backup long-term retention policies for SQL Managed Instan | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseName` | string | | | Required. The name of the managed instance database | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the managed instance. | | `monthlyRetention` | string | `P1Y` | | Optional. The monthly retention policy for an LTR backup in an ISO 8601 format. | | `name` | string | | | Required. The name of the Long Term Retention backup policy. For example "default". | diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep index bafa3edcb3..aeb359a9ee 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/deploy.bicep @@ -10,12 +10,19 @@ param managedInstanceName string @description('Optional. The backup retention period in days. This is how many days Point-in-Time Restore will be supported.') param retentionDays int = 35 -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md index 7f499715ae..2df89527ff 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md +++ b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/readme.md @@ -13,8 +13,8 @@ This module deploys a backup short-term retention policies for SQL Managed Insta | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databaseName` | string | | | Required. The name of the SQL managed instance database | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | | | Required. The name of the Short Term Retention backup policy. For example "default". | | `retentionDays` | int | `35` | | Optional. The backup retention period in days. This is how many days Point-in-Time Restore will be supported. | diff --git a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep b/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep index a8bc1ddfeb..6bcee241c5 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/databases/deploy.bicep @@ -78,8 +78,8 @@ param backupLongTermRetentionPoliciesObj object = {} @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -104,9 +104,16 @@ var diagnosticsLogs = [for log in logsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/databases/readme.md b/arm/Microsoft.Sql/managedInstances/databases/readme.md index c4801c7067..d778555e52 100644 --- a/arm/Microsoft.Sql/managedInstances/databases/readme.md +++ b/arm/Microsoft.Sql/managedInstances/databases/readme.md @@ -25,12 +25,12 @@ The SQL Managed Instance Database is deployed on a SQL Managed Instance. | `catalogCollation` | string | `SQL_Latin1_General_CP1_CI_AS` | | Optional. Collation of the managed instance. | | `collation` | string | `SQL_Latin1_General_CP1_CI_AS` | | Optional. Collation of the managed instance database. | | `createMode` | string | `Default` | `[Default, RestoreExternalBackup, PointInTimeRestore, Recovery, RestoreLongTermRetentionBackup]` | Optional. Managed database create mode. PointInTimeRestore: Create a database by restoring a point in time backup of an existing database. SourceDatabaseName, SourceManagedInstanceName and PointInTime must be specified. RestoreExternalBackup: Create a database by restoring from external backup files. Collation, StorageContainerUri and StorageContainerSasToken must be specified. Recovery: Creates a database by restoring a geo-replicated backup. RecoverableDatabaseId must be specified as the recoverable database resource ID to restore. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `logsToEnable` | array | `[SQLInsights, QueryStoreRuntimeStatistics, QueryStoreWaitStatistics, Errors]` | `[SQLInsights, QueryStoreRuntimeStatistics, QueryStoreWaitStatistics, Errors]` | Optional. The name of logs that will be streamed. | diff --git a/arm/Microsoft.Sql/managedInstances/deploy.bicep b/arm/Microsoft.Sql/managedInstances/deploy.bicep index acdd6b818d..acb42011a2 100644 --- a/arm/Microsoft.Sql/managedInstances/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/deploy.bicep @@ -113,8 +113,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Enables system assigned managed identity on the resource.') param systemAssignedIdentity bool = false @@ -196,9 +196,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' = { diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/encryptionProtector/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/encryptionProtector/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep b/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep index d78337e1e8..d22b475984 100644 --- a/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/encryptionProtector/deploy.bicep @@ -17,12 +17,19 @@ param serverKeyType string = 'ServiceManaged' @description('Optional. Key auto rotation opt-in flag') param autoRotationEnabled bool = false -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md b/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md index 155c071480..339507a132 100644 --- a/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md +++ b/arm/Microsoft.Sql/managedInstances/encryptionProtector/readme.md @@ -13,7 +13,7 @@ This module deploys an encryption protector for a SQL managed instance. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `autoRotationEnabled` | bool | `False` | | Optional. Key auto rotation opt-in flag | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | `current` | | Required. The name of the encryptionProtector | | `serverKeyName` | string | | | Required. The name of the SQL managed instance key. | diff --git a/arm/Microsoft.Sql/managedInstances/keys/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/keys/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/keys/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep b/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep index 09a06b1c32..6249ba56ae 100644 --- a/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/keys/deploy.bicep @@ -14,8 +14,8 @@ param serverKeyType string = 'ServiceManaged' @description('Optional. The URI of the key. If the ServerKeyType is AzureKeyVault, then either the URI or the keyVaultName/keyName combination is required.') param uri string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var splittedKeyUri = split(uri, '/') @@ -23,9 +23,16 @@ var splittedKeyUri = split(uri, '/') // MUST match the pattern '__' var serverKeyName = empty(uri) ? 'ServiceManaged' : '${split(splittedKeyUri[2], '.')[0]}_${splittedKeyUri[4]}_${splittedKeyUri[5]}' -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/keys/readme.md b/arm/Microsoft.Sql/managedInstances/keys/readme.md index d8b5e81efd..689b8a209a 100644 --- a/arm/Microsoft.Sql/managedInstances/keys/readme.md +++ b/arm/Microsoft.Sql/managedInstances/keys/readme.md @@ -12,7 +12,7 @@ This module deploys a key for a SQL managed instance. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | | | Optional. The name of the key. Must follow the [__] pattern | | `serverKeyType` | string | `ServiceManaged` | `[AzureKeyVault, ServiceManaged]` | Optional. The encryption protector type like "ServiceManaged", "AzureKeyVault" | diff --git a/arm/Microsoft.Sql/managedInstances/readme.md b/arm/Microsoft.Sql/managedInstances/readme.md index 399de9fd67..5d06c5928c 100644 --- a/arm/Microsoft.Sql/managedInstances/readme.md +++ b/arm/Microsoft.Sql/managedInstances/readme.md @@ -39,7 +39,6 @@ SQL MI allows for Azure AD Authentication via an [Azure AD Admin](https://docs.m | `administratorLoginPassword` | secureString | | | Required. The password given to the admin user. | | `administratorsObj` | _[administrators](administrators/readme.md)_ object | `{object}` | | Optional. The administrator configuration | | `collation` | string | `SQL_Latin1_General_CP1_CI_AS` | | Optional. Collation of the managed instance. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databases` | _[databases](databases/readme.md)_ array | `[]` | | Optional. Databases to create in this server. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | @@ -47,6 +46,7 @@ SQL MI allows for Azure AD Authentication via an [Azure AD Admin](https://docs.m | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `dnsZonePartner` | string | | | Optional. The resource ID of another managed instance whose DNS zone this managed instance will share after creation. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `encryptionProtectorObj` | _[encryptionProtector](encryptionProtector/readme.md)_ object | `{object}` | | Optional. The encryption protection configuration | | `hardwareFamily` | string | `Gen5` | | Optional. If the service has different generations of hardware, for the same SKU, then that can be captured here. | | `instancePoolResourceId` | string | | | Optional. The resource ID of the instance pool this managed server belongs to. | diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep index c1e0a92d8f..f38e1c4488 100644 --- a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/deploy.bicep @@ -14,12 +14,19 @@ param state string = 'Disabled' @description('Optional. Specifies that the schedule scan notification will be is sent to the subscription administrators.') param emailAccountAdmins bool = false -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md index 282e4a3fd5..bccacd1c2a 100644 --- a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md +++ b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/readme.md @@ -12,8 +12,8 @@ This module deploys a security alert policy for a SQL managed instance. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `emailAccountAdmins` | bool | `False` | | Optional. Specifies that the schedule scan notification will be is sent to the subscription administrators. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | | | Required. The name of the security alert policy | | `state` | string | `Disabled` | `[Enabled, Disabled]` | Optional. Enables advanced data security features, like recuring vulnerability assesment scans and ATP. If enabled, storage account must be provided. | diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep index f044ac3f30..45c211f29e 100644 --- a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep +++ b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/deploy.bicep @@ -16,12 +16,19 @@ param recurringScansEmails array = [] @description('Optional. A blob storage to hold the scan results.') param vulnerabilityAssessmentsStorageAccountId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId './.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource managedInstance 'Microsoft.Sql/managedInstances@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md index a349bc7853..c7b85606f2 100644 --- a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md +++ b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/readme.md @@ -12,7 +12,7 @@ This module deploys a vulnerability assessment for a SQL managed instance. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `managedInstanceName` | string | | | Required. Name of the SQL managed instance. | | `name` | string | | | Required. The name of the vulnerability assessment | | `recurringScansEmails` | array | `[]` | | Optional. Specifies an array of email addresses to which the scan notification is sent. | diff --git a/arm/Microsoft.Sql/servers/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/servers/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/servers/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/servers/databases/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/servers/databases/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/servers/databases/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/servers/databases/deploy.bicep b/arm/Microsoft.Sql/servers/databases/deploy.bicep index 09d7c6acc9..73ed46e20f 100644 --- a/arm/Microsoft.Sql/servers/databases/deploy.bicep +++ b/arm/Microsoft.Sql/servers/databases/deploy.bicep @@ -47,8 +47,8 @@ param tags object = {} @description('Optional. Location for all resources.') param location string = resourceGroup().location -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely.') @minValue(0) @@ -133,9 +133,16 @@ param isLedgerOn bool = false @description('Optional. Maintenance configuration ID assigned to the database. This configuration defines the period when the maintenance updates will occur.') param maintenanceConfigurationId string = '' -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource server 'Microsoft.Sql/servers@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/servers/databases/readme.md b/arm/Microsoft.Sql/servers/databases/readme.md index 9110cd7e13..03913d18e9 100644 --- a/arm/Microsoft.Sql/servers/databases/readme.md +++ b/arm/Microsoft.Sql/servers/databases/readme.md @@ -15,14 +15,14 @@ This module deploys an Azure SQL Server. | :-- | :-- | :-- | :-- | :-- | | `autoPauseDelay` | string | | | Optional. Time in minutes after which database is automatically paused. | | `collation` | string | | | Optional. The collation of the database. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | -| `highAvailabilityReplicaCount` | int | | | Optional. The number of readonly secondary replicas associated with the database. | -| `isLedgerOn` | bool | | | Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | +| `highAvailabilityReplicaCount` | int | `0` | | Optional. The number of readonly secondary replicas associated with the database. | +| `isLedgerOn` | bool | `False` | | Optional. Whether or not this database is a ledger database, which means all tables in the database are ledger tables. Note: the value of this property cannot be changed after the database has been created. | | `licenseType` | string | | | Optional. The license type to apply for this database. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `logsToEnable` | array | `[SQLInsights, AutomaticTuning, QueryStoreRuntimeStatistics, QueryStoreWaitStatistics, Errors, DatabaseWaitStatistics, Timouts, Blocks, Deadlocks]` | `[SQLInsights, AutomaticTuning, QueryStoreRuntimeStatistics, QueryStoreWaitStatistics, Errors, DatabaseWaitStatistics, Timouts, Blocks, Deadlocks]` | Optional. The name of logs that will be streamed. | @@ -38,7 +38,7 @@ This module deploys an Azure SQL Server. | `skuName` | string | | | Required. The name of the SKU. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | | `tier` | string | | | Optional. The tier or edition of the particular SKU. | -| `zoneRedundant` | bool | | | Optional. Whether or not this database is zone redundant. | +| `zoneRedundant` | bool | `False` | | Optional. Whether or not this database is zone redundant. | ### Parameter Usage: `tags` diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep index 001d30464c..5fa7f27c38 100644 --- a/arm/Microsoft.Sql/servers/deploy.bicep +++ b/arm/Microsoft.Sql/servers/deploy.bicep @@ -31,8 +31,8 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The databases to create in the server') param databases array = [] @@ -53,9 +53,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource server 'Microsoft.Sql/servers@2021-05-01-preview' = { diff --git a/arm/Microsoft.Sql/servers/firewallRules/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/servers/firewallRules/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/servers/firewallRules/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep b/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep index e56973fb1a..6702cb522a 100644 --- a/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep +++ b/arm/Microsoft.Sql/servers/firewallRules/deploy.bicep @@ -10,12 +10,19 @@ param startIpAddress string = '0.0.0.0' @description('Required. The Name of SQL Server') param serverName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource server 'Microsoft.Sql/servers@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/servers/firewallRules/readme.md b/arm/Microsoft.Sql/servers/firewallRules/readme.md index 862650690a..b3b05aa779 100644 --- a/arm/Microsoft.Sql/servers/firewallRules/readme.md +++ b/arm/Microsoft.Sql/servers/firewallRules/readme.md @@ -12,7 +12,7 @@ This module deploys an SQL Server Firewall rule. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `endIpAddress` | string | `0.0.0.0` | | Optional. The end IP address of the firewall rule. Must be IPv4 format. Must be greater than or equal to startIpAddress. Use value '0.0.0.0' for all Azure-internal IP addresses. | | `name` | string | | | Required. The name of the Server Firewall Rule. | | `serverName` | string | | | Required. The Name of SQL Server | diff --git a/arm/Microsoft.Sql/servers/readme.md b/arm/Microsoft.Sql/servers/readme.md index ff928a6e30..3823cd778a 100644 --- a/arm/Microsoft.Sql/servers/readme.md +++ b/arm/Microsoft.Sql/servers/readme.md @@ -21,8 +21,8 @@ This module deploys a SQL server. | `administratorLogin` | string | | | Optional. Administrator username for the server. Required if no `administrators` object for AAD authentication is provided. | | `administratorLoginPassword` | secureString | | | Optional. The administrator login password. Required if no `administrators` object for AAD authentication is provided. | | `administrators` | object | `{object}` | | Optional. The Azure Active Directory (AAD) administrator authentication. Required if no `administratorLogin` & `administratorLoginPassword` is provided. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `databases` | _[databases](databases/readme.md)_ array | `[]` | | Optional. The databases to create in the server | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `firewallRules` | _[firewallRules](firewallRules/readme.md)_ array | `[]` | | Optional. The firewall rules to create in the server | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Sql/servers/securityAlertPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Sql/servers/securityAlertPolicies/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep b/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep index 81d2ef6d46..f126189ebc 100644 --- a/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep +++ b/arm/Microsoft.Sql/servers/securityAlertPolicies/deploy.bicep @@ -30,12 +30,19 @@ param storageEndpoint string = '' @description('Required. The Name of SQL Server') param serverName string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource server 'Microsoft.Sql/servers@2021-05-01-preview' existing = { diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md b/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md index a2fb1b5f77..89af70e53c 100644 --- a/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md +++ b/arm/Microsoft.Sql/servers/securityAlertPolicies/readme.md @@ -12,12 +12,12 @@ This module deploys an SQL Server Security Alert Policy. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `disabledAlerts` | array | `[]` | | Optional. Specifies an array of alerts that are disabled. Allowed values are: Sql_Injection, Sql_Injection_Vulnerability, Access_Anomaly, Data_Exfiltration, Unsafe_Action, Brute_Force. | -| `emailAccountAdmins` | bool | | | Optional. Specifies that the alert is sent to the account administrators. | +| `emailAccountAdmins` | bool | `False` | | Optional. Specifies that the alert is sent to the account administrators. | | `emailAddresses` | array | `[]` | | Optional. Specifies an array of email addresses to which the alert is sent. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. The name of the Security Alert Policy. | -| `retentionDays` | int | | | Optional. Specifies the number of days to keep in the Threat Detection audit logs. | +| `retentionDays` | int | `0` | | Optional. Specifies the number of days to keep in the Threat Detection audit logs. | | `serverName` | string | | | Required. The Name of SQL Server | | `state` | string | `Disabled` | `[Disabled, Enabled]` | Optional. Specifies the state of the policy, whether it is enabled or disabled or a policy has not been applied yet on the specific database. | | `storageAccountAccessKey` | secureString | | | Optional. Specifies the identifier key of the Threat Detection audit storage account.. | diff --git a/arm/Microsoft.Storage/storageAccounts/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Storage/storageAccounts/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep index a23c168293..ecfabce80b 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/deploy.bicep @@ -25,12 +25,19 @@ param immutabilityPolicyProperties object = {} @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep index 0137bc945c..a7c87d2553 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/deploy.bicep @@ -17,12 +17,19 @@ param immutabilityPeriodSinceCreationInDays int = 365 @description('Optional. This property can only be changed for unlocked time-based retention policies. When enabled, new blocks can be written to an append blob while maintaining immutability protection and compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy API') param allowProtectedAppendWrites bool = true -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md index e4780fd50f..4c163530da 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/readme.md @@ -15,7 +15,7 @@ This module deployes an Immutability Policy for a blob container | `allowProtectedAppendWrites` | bool | `True` | | Optional. This property can only be changed for unlocked time-based retention policies. When enabled, new blocks can be written to an append blob while maintaining immutability protection and compliance. Only new blocks can be added and any existing blocks cannot be modified or deleted. This property cannot be changed with ExtendImmutabilityPolicy API | | `blobServicesName` | string | `default` | | Optional. Name of the blob service. | | `containerName` | string | | | Required. Name of the container to apply the policy to | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `immutabilityPeriodSinceCreationInDays` | int | `365` | | Optional. The immutability period for the blobs in the container since the policy creation, in days. | | `name` | string | `default` | | Optional. Name of the immutable policy. | | `storageAccountName` | string | | | Required. Name of the Storage Account. | diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md index 431d6d7106..28823a9bb2 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/readme.md @@ -15,7 +15,7 @@ This module deployes a blob container | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `blobServicesName` | string | `default` | | Optional. Name of the blob service. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `immutabilityPolicyName` | string | `default` | | Optional. Name of the immutable policy. | | `immutabilityPolicyProperties` | object | `{object}` | | Optional. Configure immutability policy. | | `name` | string | | | Required. The name of the storage container to deploy | diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep index 898c8252ca..02098b9f9f 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/deploy.bicep @@ -34,8 +34,8 @@ param diagnosticEventHubAuthorizationRuleId string = '' @description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') param diagnosticEventHubName string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -76,9 +76,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md b/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md index fabfe84131..7379e03497 100644 --- a/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/blobServices/readme.md @@ -16,9 +16,8 @@ This module can be used to deploy a blob service into a storage account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `automaticSnapshotPolicyEnabled` | bool | | | Optional. Automatic Snapshot is enabled if set to true. | +| `automaticSnapshotPolicyEnabled` | bool | `False` | | Optional. Automatic Snapshot is enabled if set to true. | | `containers` | _[containers](containers/readme.md)_ array | `[]` | | Optional. Blob containers to create. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `deleteRetentionPolicy` | bool | `True` | | Optional. Indicates whether DeleteRetentionPolicy is enabled for the Blob service. | | `deleteRetentionPolicyDays` | int | `7` | | Optional. Indicates the number of days that the deleted blob should be retained. The minimum specified value can be 1 and the maximum value can be 365. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | @@ -26,6 +25,7 @@ This module can be used to deploy a blob service into a storage account. | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of a log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logsToEnable` | array | `[StorageRead, StorageWrite, StorageDelete]` | `[StorageRead, StorageWrite, StorageDelete]` | Optional. The name of logs that will be streamed. | | `metricsToEnable` | array | `[Transaction]` | `[Transaction]` | Optional. The name of metrics that will be streamed. | | `name` | string | `default` | | Optional. The name of the blob service | @@ -45,4 +45,4 @@ This module can be used to deploy a blob service into a storage account. - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Storageaccounts/Blobservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-06-01/storageAccounts/blobServices) - [Storageaccounts/Blobservices/Containers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/blobServices/containers) -- [Storageaccounts/Blobservices/Containers/Immutabilitypolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/blobServices/containers/immutabilityPolicies) +- [Storageaccounts/Blobservices/Containers/Immutabilitypolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies) diff --git a/arm/Microsoft.Storage/storageAccounts/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/deploy.bicep index 854dcc7b97..59b9289a0f 100644 --- a/arm/Microsoft.Storage/storageAccounts/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/deploy.bicep @@ -116,8 +116,8 @@ param lock string = 'NotSpecified' @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules.') param basetime string = utcNow('u') @@ -168,9 +168,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-08-01' = { diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/fileServices/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep index 1bb501d4c4..a9fa25753b 100644 --- a/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/fileServices/deploy.bicep @@ -34,8 +34,8 @@ param diagnosticEventHubName string = '' @description('Optional. File shares to create.') param shares array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -76,9 +76,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md b/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md index a0b2e57761..027e68385c 100644 --- a/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/fileServices/readme.md @@ -9,18 +9,18 @@ This module can be used to deploy a file share service into a storage account. | `Microsoft.Authorization/roleAssignments` | 2021-04-01-preview | | `Microsoft.Insights/diagnosticSettings` | 2021-05-01-preview | | `Microsoft.Storage/storageAccounts/fileServices` | 2021-04-01 | -| `Microsoft.Storage/storageAccounts/fileServices/shares` | 2019-06-01 | +| `Microsoft.Storage/storageAccounts/fileServices/shares` | 2021-08-01 | ## Parameters | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of a log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logsToEnable` | array | `[StorageRead, StorageWrite, StorageDelete]` | `[StorageRead, StorageWrite, StorageDelete]` | Optional. The name of logs that will be streamed. | | `metricsToEnable` | array | `[Transaction]` | `[Transaction]` | Optional. The name of metrics that will be streamed. | | `name` | string | `default` | | Optional. The name of the file service | @@ -42,4 +42,4 @@ This module can be used to deploy a file share service into a storage account. - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Storageaccounts/Fileservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-04-01/storageAccounts/fileServices) -- [Storageaccounts/Fileservices/Shares](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/fileServices/shares) +- [Storageaccounts/Fileservices/Shares](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-08-01/storageAccounts/fileServices/shares) diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep index 2c59b7a933..14a8a2d172 100644 --- a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/deploy.bicep @@ -29,12 +29,19 @@ param rootSquash string = 'NoRootSquash' @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md index 9037718da9..f19d8c9ef9 100644 --- a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/readme.md @@ -13,7 +13,7 @@ This module deploys a storage account file share. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enabledProtocols` | string | `SMB` | `[NFS, SMB]` | Optional. The authentication protocol that is used for the file share. Can only be specified when creating a share. | | `fileServicesName` | string | `default` | | Optional. The name of the file service | | `name` | string | | | Required. The name of the file share to create | diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/managementPolicies/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep index 739e341aa0..5d2c4dbe5f 100644 --- a/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/deploy.bicep @@ -8,12 +8,19 @@ param name string = 'default' @description('Required. The Storage Account ManagementPolicies Rules') param rules array -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md b/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md index a7b9d4a67b..ba1f178285 100644 --- a/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/readme.md @@ -12,7 +12,7 @@ This module can be used to deploy a management policies into a storage account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | `default` | | Optional. The name of the storage container to deploy | | `rules` | array | | | Required. The Storage Account ManagementPolicies Rules | | `storageAccountName` | string | | | Required. Name of the Storage Account. | diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/queueServices/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep index 4566df0eca..bb4f514912 100644 --- a/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/queueServices/deploy.bicep @@ -25,8 +25,8 @@ param diagnosticEventHubAuthorizationRuleId string = '' @description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') param diagnosticEventHubName string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -67,9 +67,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep index a0b866575a..d7bbb19d65 100644 --- a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/deploy.bicep @@ -14,12 +14,19 @@ param metadata object = {} @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md index e1988be29c..4df3bc39d8 100644 --- a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/readme.md @@ -13,7 +13,7 @@ This module deployes a storage account queue | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `metadata` | object | `{object}` | | Required. A name-value pair that represents queue metadata. | | `name` | string | | | Required. The name of the storage queue to deploy | | `queueServicesName` | string | `default` | | Optional. The name of the queue service | diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md b/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md index 7b87611be7..f1cca45244 100644 --- a/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/queueServices/readme.md @@ -15,12 +15,12 @@ This module can be used to deploy a file share service into a storage account. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of a log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logsToEnable` | array | `[StorageRead, StorageWrite, StorageDelete]` | `[StorageRead, StorageWrite, StorageDelete]` | Optional. The name of logs that will be streamed. | | `metricsToEnable` | array | `[Transaction]` | `[Transaction]` | Optional. The name of metrics that will be streamed. | | `name` | string | `default` | | Optional. The name of the queue service | diff --git a/arm/Microsoft.Storage/storageAccounts/readme.md b/arm/Microsoft.Storage/storageAccounts/readme.md index 57f8ab849f..74f816cf51 100644 --- a/arm/Microsoft.Storage/storageAccounts/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/readme.md @@ -16,7 +16,7 @@ This module is used to deploy a storage account, with the ability to deploy 1 or | `Microsoft.Storage/storageAccounts/blobServices/containers` | 2019-06-01 | | `Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies` | 2019-06-01 | | `Microsoft.Storage/storageAccounts/fileServices` | 2021-04-01 | -| `Microsoft.Storage/storageAccounts/fileServices/shares` | 2019-06-01 | +| `Microsoft.Storage/storageAccounts/fileServices/shares` | 2021-08-01 | | `Microsoft.Storage/storageAccounts/managementPolicies` | 2019-06-01 | | `Microsoft.Storage/storageAccounts/queueServices` | 2021-04-01 | | `Microsoft.Storage/storageAccounts/queueServices/queues` | 2019-06-01 | @@ -31,12 +31,12 @@ This module is used to deploy a storage account, with the ability to deploy 1 or | `azureFilesIdentityBasedAuthentication` | object | `{object}` | | Optional. Provides the identity based authentication settings for Azure Files. | | `basetime` | string | `[utcNow('u')]` | | Generated. Do not provide a value! This date value is used to generate a SAS token to access the modules. | | `blobServices` | _[blobServices](blobServices/readme.md)_ object | `{object}` | | Optional. Blob service and containers to deploy | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `enableHierarchicalNamespace` | bool | `False` | | Optional. If true, enables Hierarchical Namespace for the storage account | | `fileServices` | _[fileServices](fileServices/readme.md)_ object | `{object}` | | Optional. File service and shares to deploy | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -188,12 +188,12 @@ The hierarchical namespace of the storage account (see parameter `enableHierarch - [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-02-01/privateEndpoints/privateDnsZoneGroups) - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) -- [Storageaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-08-01/storageAccounts) +- [Storageaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/storageAccounts) - [Storageaccounts/Blobservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-06-01/storageAccounts/blobServices) - [Storageaccounts/Blobservices/Containers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/blobServices/containers) - [Storageaccounts/Blobservices/Containers/Immutabilitypolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/blobServices/containers/immutabilityPolicies) - [Storageaccounts/Fileservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-04-01/storageAccounts/fileServices) -- [Storageaccounts/Fileservices/Shares](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/fileServices/shares) +- [Storageaccounts/Fileservices/Shares](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-08-01/storageAccounts/fileServices/shares) - [Storageaccounts/Managementpolicies](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/managementPolicies) - [Storageaccounts/Queueservices](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2021-04-01/storageAccounts/queueServices) - [Storageaccounts/Queueservices/Queues](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Storage/2019-06-01/storageAccounts/queueServices/queues) diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep index fb535f7691..342640c4fe 100644 --- a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep @@ -25,8 +25,8 @@ param diagnosticEventHubAuthorizationRuleId string = '' @description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.') param diagnosticEventHubName string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -67,9 +67,16 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md b/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md index b1945d05f6..42e7822a59 100644 --- a/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/tableServices/readme.md @@ -14,12 +14,12 @@ This module deploys a storage account table service | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of a log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `logsToEnable` | array | `[StorageRead, StorageWrite, StorageDelete]` | `[StorageRead, StorageWrite, StorageDelete]` | Optional. The name of logs that will be streamed. | | `metricsToEnable` | array | `[Transaction]` | `[Transaction]` | Optional. The name of metrics that will be streamed. | | `name` | string | `default` | | Optional. The name of the table service | diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/.bicep/nested_cuaId.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep index 1f81be35c9..04a702ed56 100644 --- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep +++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep @@ -8,12 +8,19 @@ param tableServicesName string = 'default' @description('Required. Name of the table.') param name string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' - -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = { diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md index 9c0e3e0401..1cb681bf63 100644 --- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md +++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/readme.md @@ -12,7 +12,7 @@ This module deploys a storage account table | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `name` | string | | | Required. Name of the table. | | `storageAccountName` | string | | | Required. Name of the Storage Account. | | `tableServicesName` | string | `default` | | Optional. The name of the table service | diff --git a/arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_cuaId.bicep b/arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Synapse/privateLinkHubs/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep b/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep index 2b44faff0a..49d666d752 100644 --- a/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep +++ b/arm/Microsoft.Synapse/privateLinkHubs/deploy.bicep @@ -15,12 +15,27 @@ param tags object = {} @description('Optional. Specify the type of lock.') param lock string = 'NotSpecified' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true + @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] @description('Optional. Configuration Details for private endpoints.') param privateEndpoints array = [] +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } +} + resource privateLinkHub 'Microsoft.Synapse/privateLinkHubs@2021-06-01' = { name: name location: location diff --git a/arm/Microsoft.Synapse/privateLinkHubs/readme.md b/arm/Microsoft.Synapse/privateLinkHubs/readme.md index e4b6ab0306..2e23a6ce85 100644 --- a/arm/Microsoft.Synapse/privateLinkHubs/readme.md +++ b/arm/Microsoft.Synapse/privateLinkHubs/readme.md @@ -16,6 +16,7 @@ This module deploys Synapse PrivateLinkHubs. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. The geo-location where the resource lives. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. The name of the Private Link Hub. | @@ -109,7 +110,7 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Template references - [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) - [Privatelinkhubs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Synapse/2021-06-01/privateLinkHubs) - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_cuaId.bicep b/arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.VirtualMachineImages/imageTemplates/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep b/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep index 84dd37173e..f4960f6e5d 100644 --- a/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep +++ b/arm/Microsoft.VirtualMachineImages/imageTemplates/deploy.bicep @@ -56,8 +56,8 @@ param tags object = {} @description('Generated. Do not provide a value! This date value is used to generate a unique image template name.') param baseTime string = utcNow('yyyy-MM-dd-HH-mm-ss') -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'') param roleAssignments array = [] @@ -120,9 +120,16 @@ var vnetConfig = { subnetId: subnetId } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource imageTemplate 'Microsoft.VirtualMachineImages/imageTemplates@2020-02-14' = { diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md b/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md index 7b7897d5a3..95d53e071a 100644 --- a/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md +++ b/arm/Microsoft.VirtualMachineImages/imageTemplates/readme.md @@ -15,9 +15,9 @@ This module deploys an image template that can be consumed by the Azure Image Bu | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `baseTime` | string | `[utcNow('yyyy-MM-dd-HH-mm-ss')]` | | Generated. Do not provide a value! This date value is used to generate a unique image template name. | -| `buildTimeoutInMinutes` | int | | | Optional. Image build timeout in minutes. Allowed values: 0-960. 0 means the default 240 minutes | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `buildTimeoutInMinutes` | int | `0` | | Optional. Image build timeout in minutes. Allowed values: 0-960. 0 means the default 240 minutes | | `customizationSteps` | array | | | Required. Customization steps to be run when building the VM image. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `imageReplicationRegions` | array | `[]` | | Optional. List of the regions the image produced by this solution should be stored in the Shared Image Gallery. When left empty, the deployment's location will be taken as a default value. | | `imageSource` | object | | | Required. Image source definition in object format. | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | @@ -118,6 +118,6 @@ Tag names and tag values can be provided as needed. A tag can be left without a ## Template references -- [Define resources with Bicep and ARM templates](https://docs.microsoft.com/en-us/azure/templates) +- [Imagetemplates](https://docs.microsoft.com/en-us/azure/templates/Microsoft.VirtualMachineImages/2020-02-14/imageTemplates) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Web/connections/.bicep/nested_cuaId.bicep b/arm/Microsoft.Web/connections/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Web/connections/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Web/connections/deploy.bicep b/arm/Microsoft.Web/connections/deploy.bicep index 2f9aac136b..133ffbaaac 100644 --- a/arm/Microsoft.Web/connections/deploy.bicep +++ b/arm/Microsoft.Web/connections/deploy.bicep @@ -10,8 +10,8 @@ param connectionKind string @description('Required. Connection name for connection. Example: \'azureblob\' when using blobs. It can change depending on the resource.') param name string -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Customized parameter values for specific connections.') param customParameterValues object = {} @@ -52,9 +52,16 @@ param tags object = {} @description('Optional. Links to test the API connection.') param testLinks array = [] -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource connection 'Microsoft.Web/connections@2016-06-01' = { diff --git a/arm/Microsoft.Web/connections/readme.md b/arm/Microsoft.Web/connections/readme.md index 9293893017..f49e8f2f5c 100644 --- a/arm/Microsoft.Web/connections/readme.md +++ b/arm/Microsoft.Web/connections/readme.md @@ -17,9 +17,9 @@ This module deploys an Azure API connection. | `alternativeParameterValues` | object | `{object}` | | Optional. Alternative parameter values. | | `connectionApi` | object | `{object}` | | Optional. Specific values for some API connections. | | `connectionKind` | string | | | Required. Connection Kind. Example: 'V1' when using blobs. It can change depending on the resource. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `customParameterValues` | object | `{object}` | | Optional. Customized parameter values for specific connections. | | `displayName` | string | | | Required. Display name connection. Example: 'blobconnection' when using blobs. It can change depending on the resource. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location of the deployment. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `name` | string | | | Required. Connection name for connection. Example: 'azureblob' when using blobs. It can change depending on the resource. | diff --git a/arm/Microsoft.Web/hostingEnvironments/.bicep/nested_cuaId.bicep b/arm/Microsoft.Web/hostingEnvironments/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Web/hostingEnvironments/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep b/arm/Microsoft.Web/hostingEnvironments/deploy.bicep index a72da47c36..16d7807033 100644 --- a/arm/Microsoft.Web/hostingEnvironments/deploy.bicep +++ b/arm/Microsoft.Web/hostingEnvironments/deploy.bicep @@ -101,8 +101,8 @@ param roleAssignments array = [] @description('Optional. Resource tags.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. The name of logs that will be streamed.') @allowed([ @@ -123,9 +123,16 @@ var diagnosticsLogs = [for log in logsToEnable: { var vnetResourceId = split(subnetResourceId, '/') -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appServiceEnvironment 'Microsoft.Web/hostingEnvironments@2021-02-01' = { diff --git a/arm/Microsoft.Web/hostingEnvironments/readme.md b/arm/Microsoft.Web/hostingEnvironments/readme.md index fc7b8ee967..84959dd1b5 100644 --- a/arm/Microsoft.Web/hostingEnvironments/readme.md +++ b/arm/Microsoft.Web/hostingEnvironments/readme.md @@ -17,16 +17,16 @@ This module deploys an app service environment. | :-- | :-- | :-- | :-- | :-- | | `apiManagementAccountId` | string | | | Optional. API Management Account associated with the App Service Environment. | | `clusterSettings` | array | `[]` | | Optional. Custom settings for changing the behavior of the App Service Environment | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of the diagnostic log analytics workspace. | | `dnsSuffix` | string | | | Optional. DNS suffix of the App Service Environment. | -| `dynamicCacheEnabled` | bool | | | Optional. True/false indicating whether the App Service Environment is suspended. The environment can be suspended e.g. when the management endpoint is no longer available(most likely because NSG blocked the incoming traffic). | +| `dynamicCacheEnabled` | bool | `False` | | Optional. True/false indicating whether the App Service Environment is suspended. The environment can be suspended e.g. when the management endpoint is no longer available(most likely because NSG blocked the incoming traffic). | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `frontEndScaleFactor` | int | `15` | | Optional. Scale factor for frontends. | -| `hasLinuxWorkers` | bool | | | Optional. Flag that displays whether an ASE has linux workers or not | +| `hasLinuxWorkers` | bool | `False` | | Optional. Flag that displays whether an ASE has linux workers or not | | `internalLoadBalancingMode` | string | `None` | `[None, Web, Publishing]` | Optional. Specifies which endpoints to serve internally in the Virtual Network for the App Service Environment. - None, Web, Publishing, Web,Publishing | | `ipsslAddressCount` | int | `2` | | Optional. Number of IP SSL addresses reserved for the App Service Environment. | | `kind` | string | `ASEV2` | | Optional. Kind of resource. | @@ -39,7 +39,7 @@ This module deploys an app service environment. | `networkAccessControlList` | array | `[]` | | Optional. Access control list for controlling traffic to the App Service Environment.. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `subnetResourceId` | string | | | Required. ResourceId for the sub net | -| `suspended` | bool | | | Optional. true if the App Service Environment is suspended; otherwise, false. The environment can be suspended, e.g. when the management endpoint is no longer available (most likely because NSG blocked the incoming traffic). | +| `suspended` | bool | `False` | | Optional. true if the App Service Environment is suspended; otherwise, false. The environment can be suspended, e.g. when the management endpoint is no longer available (most likely because NSG blocked the incoming traffic). | | `tags` | object | `{object}` | | Optional. Resource tags. | | `userWhitelistedIpRanges` | array | `[]` | | Optional. User added ip ranges to whitelist on ASE db - string | | `workerPools` | array | `[]` | | Optional. Description of worker pools with worker size IDs, VM sizes, and number of workers in each pool.. | diff --git a/arm/Microsoft.Web/serverfarms/.bicep/nested_cuaId.bicep b/arm/Microsoft.Web/serverfarms/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Web/serverfarms/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Web/serverfarms/deploy.bicep b/arm/Microsoft.Web/serverfarms/deploy.bicep index a1a995852d..38f5588d63 100644 --- a/arm/Microsoft.Web/serverfarms/deploy.bicep +++ b/arm/Microsoft.Web/serverfarms/deploy.bicep @@ -53,16 +53,23 @@ param roleAssignments array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true var hostingEnvironmentProfile = { id: appServiceEnvironmentId } -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appServicePlan 'Microsoft.Web/serverfarms@2021-02-01' = { diff --git a/arm/Microsoft.Web/serverfarms/readme.md b/arm/Microsoft.Web/serverfarms/readme.md index 784b15dcdf..62c985b2a0 100644 --- a/arm/Microsoft.Web/serverfarms/readme.md +++ b/arm/Microsoft.Web/serverfarms/readme.md @@ -15,18 +15,18 @@ This module deploys an app service plan. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | | `appServiceEnvironmentId` | string | | | Optional. The Resource ID of the App Service Environment to use for the App Service Plan. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[resourceGroup().location]` | | Optional. Location for all resources. | | `lock` | string | `NotSpecified` | `[CanNotDelete, NotSpecified, ReadOnly]` | Optional. Specify the type of lock. | | `maximumElasticWorkerCount` | int | `1` | | Optional. Maximum number of total workers allowed for this ElasticScaleEnabled App Service Plan. | | `name` | string | | | Required. The name of the app service plan to deploy. | -| `perSiteScaling` | bool | | | Optional. If true, apps assigned to this App Service plan can be scaled independently. If false, apps assigned to this App Service plan will scale to all instances of the plan. | +| `perSiteScaling` | bool | `False` | | Optional. If true, apps assigned to this App Service plan can be scaled independently. If false, apps assigned to this App Service plan will scale to all instances of the plan. | | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11' | | `serverOS` | string | `Windows` | `[Windows, Linux]` | Optional. Kind of server OS. | | `sku` | object | | | Required. Defines the name, tier, size, family and capacity of the App Service Plan. | | `tags` | object | `{object}` | | Optional. Tags of the resource. | -| `targetWorkerCount` | int | | | Optional. Scaling worker count. | -| `targetWorkerSize` | int | | `[0, 1, 2]` | Optional. The instance size of the hosting plan (small, medium, or large). | +| `targetWorkerCount` | int | `0` | | Optional. Scaling worker count. | +| `targetWorkerSize` | int | `0` | `[0, 1, 2]` | Optional. The instance size of the hosting plan (small, medium, or large). | | `workerTierName` | string | | | Optional. Target worker tier assigned to the App Service plan. | ### Parameter Usage: `sku` diff --git a/arm/Microsoft.Web/sites/.bicep/nested_cuaId.bicep b/arm/Microsoft.Web/sites/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/arm/Microsoft.Web/sites/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/arm/Microsoft.Web/sites/config/.bicep/nested_cuaId.bicep b/arm/Microsoft.Web/sites/config/.bicep/nested_cuaId.bicep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/arm/Microsoft.Web/sites/config/deploy.bicep b/arm/Microsoft.Web/sites/config/deploy.bicep index 5f04f840aa..d6fb05fd3b 100644 --- a/arm/Microsoft.Web/sites/config/deploy.bicep +++ b/arm/Microsoft.Web/sites/config/deploy.bicep @@ -27,12 +27,19 @@ param functionsExtensionVersion string = '~3' @description('Optional. Resource ID of the app insight to leverage for this resource.') param appInsightId string = '' -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appInsight 'microsoft.insights/components@2020-02-02' existing = if (!empty(appInsightId)) { diff --git a/arm/Microsoft.Web/sites/config/readme.md b/arm/Microsoft.Web/sites/config/readme.md index 6123166197..96b09f08ed 100644 --- a/arm/Microsoft.Web/sites/config/readme.md +++ b/arm/Microsoft.Web/sites/config/readme.md @@ -14,7 +14,7 @@ This module deploys a site config resource. | :-- | :-- | :-- | :-- | :-- | | `appInsightId` | string | | | Optional. Resource ID of the app insight to leverage for this resource. | | `appName` | string | | | Required. Name of the site parent resource. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `functionsExtensionVersion` | string | `~3` | | Optional. Version of the function extension. | | `functionsWorkerRuntime` | string | | `[dotnet, node, python, java, powershell, ]` | Optional. Runtime of the function worker. | | `name` | string | | `[appsettings]` | Required. Name of the site config. | diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep index 3f56a501a5..729bfb155e 100644 --- a/arm/Microsoft.Web/sites/deploy.bicep +++ b/arm/Microsoft.Web/sites/deploy.bicep @@ -72,8 +72,8 @@ param privateEndpoints array = [] @description('Optional. Tags of the resource.') param tags object = {} -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered.') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'.') param roleAssignments array = [] @@ -148,9 +148,16 @@ var identity = identityType != 'None' ? { userAssignedIdentities: !empty(userAssignedIdentities) ? userAssignedIdentities : null } : null -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } resource appServicePlanExisting 'Microsoft.Web/serverfarms@2021-02-01' existing = if (!empty(appServicePlanId)) { diff --git a/arm/Microsoft.Web/sites/readme.md b/arm/Microsoft.Web/sites/readme.md index 65c3de17d6..abd76a4b0e 100644 --- a/arm/Microsoft.Web/sites/readme.md +++ b/arm/Microsoft.Web/sites/readme.md @@ -26,12 +26,12 @@ This module deploys a web or function app. | `appServicePlanId` | string | | | Optional. The resource ID of the app service plan to use for the site. If not provided, the appServicePlanObject is used to create a new plan. | | `appServicePlanObject` | object | `{object}` | | Optional. Required if no appServicePlanId is provided to deploy a new app service plan. | | `clientAffinityEnabled` | bool | `True` | | Optional. If client affinity is enabled. | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered. | | `diagnosticEventHubAuthorizationRuleId` | string | | | Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to. | | `diagnosticEventHubName` | string | | | Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category. | | `diagnosticLogsRetentionInDays` | int | `365` | | Optional. Specifies the number of days that logs will be kept for; a value of 0 will retain data indefinitely. | | `diagnosticStorageAccountId` | string | | | Optional. Resource ID of the diagnostic storage account. | | `diagnosticWorkspaceId` | string | | | Optional. Resource ID of log analytics workspace. | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `functionsExtensionVersion` | string | `~3` | | Optional. Version if the function extension. | | `functionsWorkerRuntime` | string | | `[dotnet, node, python, java, powershell, ]` | Optional. Runtime of the function worker. | | `httpsOnly` | bool | `True` | | Optional. Configures a site to accept only HTTPS requests. Issues redirect for HTTP requests. | @@ -45,7 +45,7 @@ This module deploys a web or function app. | `roleAssignments` | array | `[]` | | Optional. Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | | `siteConfig` | object | `{object}` | | Optional. Configuration of the app. | | `storageAccountId` | string | | | Optional. Required if functionapp kind. The resource ID of the storage account to manage triggers and logging function executions. | -| `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 resource. | | `userAssignedIdentities` | object | `{object}` | | Optional. The ID(s) to assign to the resource. | @@ -188,8 +188,8 @@ You can specify multiple user assigned identities to a resource by providing add - [Components](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2020-02-02/components) - [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) - [Serverfarms](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Web/2021-02-01/serverfarms) - [Sites](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Web/2020-12-01/sites) diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_cuaId.bicep b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_cuaId.bicep deleted file mode 100644 index 575a2fac79..0000000000 --- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ -targetScope = 'managementGroup' diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep index 4411343e9e..e9139f12a1 100644 --- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep +++ b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/.bicep/nested_rbac.bicep @@ -291,14 +291,13 @@ var builtInRoleNames = { 'Azure Maps Contributor': '/providers/Microsoft.Authorization/roleDefinitions/dba33070-676a-4fb0-87fa-064dc56ff7fb' } -module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignments/.bicep/nested_rbac_mg.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) { +module roleAssignments_mg '../../../../arm/Microsoft.Authorization/roleAssignments/managementGroup/deploy.bicep' = [for principalId in principalIds: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) { name: 'roleAssignments_mg-${guid(deployment().name, location, principalId)}' scope: managementGroup(managementGroupId) params: { managementGroupId: managementGroupId roleDefinitionIdOrName: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName principalId: principalId - location: location } }] @@ -309,20 +308,18 @@ module roleAssignments_sub '../../../../arm/Microsoft.Authorization/roleAssignme subscriptionId: subscriptionId roleDefinitionIdOrName: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName principalId: principalId - location: location } }] -module roleAssignments_rg '../../../../arm/Microsoft.Authorization/roleAssignments/.bicep/nested_rbac_rg.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) { +module roleAssignments_rg '../../../../arm/Microsoft.Authorization/roleAssignments/resourceGroup/deploy.bicep' = [for principalId in principalIds: if (empty(managementGroupId) && !empty(resourceGroupName) && !empty(subscriptionId)) { name: 'roleAssignments_rg-${guid(deployment().name, location, principalId)}' scope: resourceGroup(subscriptionId, resourceGroupName) params: { subscriptionId: subscriptionId roleDefinitionIdOrName: contains(builtInRoleNames, roleDefinitionIdOrName) ? builtInRoleNames[roleDefinitionIdOrName] : roleDefinitionIdOrName principalId: principalId - location: location } }] @description('The scope of the role assignments') -output roleAssignmentScope string = !empty(managementGroupId) ? roleAssignments_mg[0].outputs.roleAssignmentScope : (!empty(resourceGroupName) ? roleAssignments_rg[0].outputs.roleAssignmentScope : roleAssignments_sub[0].outputs.roleAssignmentScope) +output roleAssignmentScope string = !empty(managementGroupId) ? roleAssignments_mg[0].outputs.scope : (!empty(resourceGroupName) ? roleAssignments_rg[0].outputs.scope : roleAssignments_sub[0].outputs.scope) diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/deploy.bicep b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/deploy.bicep index f47e003ca6..8ba692ae2f 100644 --- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/deploy.bicep +++ b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/deploy.bicep @@ -15,12 +15,19 @@ param managementGroupId string = '' @description('Optional. Location for all resources.') param location string = deployment().location -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } module nested_rbac_mg '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: if (!empty(managementGroupId) && empty(subscriptionId) && empty(resourceGroupName)) { diff --git a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/readme.md b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/readme.md index 1e22dcab83..1cb703de7e 100644 --- a/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/readme.md +++ b/constructs/Microsoft.Authorization/roleAssignments-multiRolesMultiPrincipals/readme.md @@ -12,7 +12,7 @@ This module deploys Role Assignments. | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `location` | string | `[deployment().location]` | | Optional. Location for all resources. | | `managementGroupId` | string | | | Optional. Group ID of the Management Group to assign the RBAC role to. If no Subscription is provided, the module deploys at management group level, therefore assigns the provided RBAC role to the management group. | | `resourceGroupName` | string | | | Optional. Name of the Resource Group to assign the RBAC role to. If no Resource Group name is provided, and Subscription ID is provided, the module deploys at subscription level, therefore assigns the provided RBAC role to the subscription. | @@ -24,13 +24,6 @@ This module deploys Role Assignments. ```json "roleAssignments": { "value": [ - { - "roleDefinitionIdOrName": "Desktop Virtualization User", - "principalIds": [ - "12345678-1234-1234-1234-123456789012", // object 1 - "78945612-1234-1234-1234-123456789012" // object 2 - ] - }, { "roleDefinitionIdOrName": "Reader", "principalIds": [ @@ -39,7 +32,7 @@ This module deploys Role Assignments. ] }, { - "roleDefinitionIdOrName": "/subscriptions/78945612-1234-1234-1234-123456789012/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", + "roleDefinitionIdOrName": "/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11", "principalIds": [ "12345678-1234-1234-1234-123456789012" // object 1 ] @@ -89,8 +82,8 @@ To deploy resource to a Resource Group, provide the `subscriptionId` and `resour | Output Name | Type | Description | | :-- | :-- | :-- | -| `roleAssignments` | array | The scope of the deployed role assignments | -| `roleAssignmentScope` | string | The names of the deployed role assignments | +| `roleAssignments` | array | The names of the deployed role assignments | +| `roleAssignmentScope` | string | The scope of the deployed role assignments | ## Considerations @@ -102,4 +95,4 @@ This module can be deployed both at management group, subscription or resource g ## Template references -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/microsoft.authorization/2020-04-01-preview/roleassignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/.bicep/nested_cuaId.bicep b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/.bicep/nested_cuaId.bicep deleted file mode 100644 index 8b13789179..0000000000 --- a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/.bicep/nested_cuaId.bicep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep index 0761c7e8ff..18fb9619e7 100644 --- a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep +++ b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/deploy.bicep @@ -4,12 +4,19 @@ param localVnetName string @description('Optional. Optional. The list of remote networks to peering peer with, including the configuration.') param peeringConfigurations array = [] -@description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') -param cuaId string = '' +@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).') +param enableDefaultTelemetry bool = true -module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { - name: 'pid-${cuaId}' - params: {} +resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { + name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}' + properties: { + mode: 'Incremental' + template: { + '$schema': 'https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + resources: [] + } + } } module virtualNetworkPeering '../../../../arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep' = [for peeringConfiguration in peeringConfigurations: { diff --git a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/readme.md b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/readme.md index 8ec790d00b..6c17c565cf 100644 --- a/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/readme.md +++ b/constructs/Microsoft.Network/virtualNetwork/virtualNetworkPeerings-multiRemoteVnets/readme.md @@ -6,13 +6,13 @@ This template deploys Virtual Network Peering. | Resource Type | API Version | | :-- | :-- | -| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-02-01 | +| `Microsoft.Network/virtualNetworks/virtualNetworkPeerings` | 2021-05-01 | ## Parameters | Parameter Name | Type | Default Value | Possible Values | Description | | :-- | :-- | :-- | :-- | :-- | -| `cuaId` | string | | | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered | +| `enableDefaultTelemetry` | bool | `True` | | Optional. Enable telemetry via the Customer Usage Attribution ID (GUID). | | `localVnetName` | string | | | Required. The Name of the Virtual Network to add the peering to. | | `peeringConfigurations` | array | `[]` | | Optional. Optional. The list of remote networks to peering peer with, including the configuration. | @@ -39,10 +39,10 @@ Array containing multiple objects for different VNETs to peer with. | Output Name | Type | Description | | :-- | :-- | :-- | -| `localVirtualNetworkPeeringResourceIds` | array | The names of the deployed virtual network peerings | -| `virtualNetworkPeeringNames` | array | The resource IDs of the deployed virtual network peerings | +| `localVirtualNetworkPeeringResourceIds` | array | The resource IDs of the deployed virtual network peerings | +| `virtualNetworkPeeringNames` | array | The names of the deployed virtual network peerings | | `virtualNetworkPeeringResourceGroup` | string | The resource group of the deployed virtual network peerings | ## Template references -- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/virtualNetworks/virtualNetworkPeerings) +- [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/virtualNetworks/virtualNetworkPeerings) diff --git a/docs/wiki/ModulesDesign.md b/docs/wiki/ModulesDesign.md index f59ae9f338..c5f7b641d7 100644 --- a/docs/wiki/ModulesDesign.md +++ b/docs/wiki/ModulesDesign.md @@ -87,8 +87,6 @@ param databases array = [] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: {}] ``` -Each module should come with a `.bicep` folder with a least the `nested_cuaId.bicep` file in it - ## Naming Use the following naming standard for module files and folders: @@ -114,7 +112,6 @@ Use the following naming standard for module files and folders: >└─ sites > ├─ .bicep > | ├─ nested_components.bicep - > | ├─ nested_cuaId.bicep > | ├─ nested_privateEndpoint.bicep > | ├─ nested_rbac.bicep > | └─ nested_serverfarms.bicep diff --git a/docs/wiki/The library - Module design.md b/docs/wiki/The library - Module design.md index efaaeb6daf..e6782e2a31 100644 --- a/docs/wiki/The library - Module design.md +++ b/docs/wiki/The library - Module design.md @@ -85,8 +85,6 @@ param databases array = [] module server_databases 'databases/deploy.bicep' = [for (database, index) in databases: {}] ``` -Each module should come with a `.bicep` folder with a least the `nested_cuaId.bicep` file in it - ## Naming Use the following naming standard for module files and folders: @@ -112,7 +110,6 @@ Use the following naming standard for module files and folders: >└─ sites > ├─ .bicep > | ├─ nested_components.bicep - > | ├─ nested_cuaId.bicep > | ├─ nested_privateEndpoint.bicep > | ├─ nested_rbac.bicep > | └─ nested_serverfarms.bicep diff --git a/settings.json b/settings.json index b3b82ad280..a25371a5d3 100644 --- a/settings.json +++ b/settings.json @@ -11,5 +11,6 @@ } } ] - } + }, + "enableDefaultTelemetry": true } diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 index 875d670ea1..28bdd6774f 100644 --- a/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 +++ b/utilities/pipelines/resourcePublish/Get-ModulesToPublish.ps1 @@ -79,7 +79,7 @@ This function will search the current directory and all parent directories for a Mandatory. Path to the folder/file that should be searched .EXAMPLE -Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_cuaId.bicep" +Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_rbac.bicep" Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables