diff --git a/avm/res/app/managed-environment/README.md b/avm/res/app/managed-environment/README.md index 6e0e63bf70..c61db2e315 100644 --- a/avm/res/app/managed-environment/README.md +++ b/avm/res/app/managed-environment/README.md @@ -414,7 +414,7 @@ module managedEnvironment 'br/public:avm/res/app/managed-environment:' | [`daprAIInstrumentationKey`](#parameter-dapraiinstrumentationkey) | securestring | Azure Monitor instrumentation key used by Dapr to export Service to Service communication telemetry. | | [`dnsSuffix`](#parameter-dnssuffix) | string | DNS suffix for the environment domain. | | [`dockerBridgeCidr`](#parameter-dockerbridgecidr) | string | CIDR notation IP range assigned to the Docker bridge, network. It must not overlap with any other provided IP ranges and can only be used when the environment is deployed into a virtual network. If not provided, it will be set with a default value by the platform. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`infrastructureResourceGroupName`](#parameter-infrastructureresourcegroupname) | string | Name of the infrastructure resource group. If not provided, it will be set with a default value. | | [`internal`](#parameter-internal) | bool | Boolean indicating the environment only has an internal load balancer. These environments do not have a public static IP resource. If set to true, then "infrastructureSubnetId" must be provided. | | [`location`](#parameter-location) | string | Location for all Resources. | @@ -499,7 +499,7 @@ CIDR notation IP range assigned to the Docker bridge, network. It must not overl ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/app/managed-environment/main.bicep b/avm/res/app/managed-environment/main.bicep index ddfbc7ab75..9810f65087 100644 --- a/avm/res/app/managed-environment/main.bicep +++ b/avm/res/app/managed-environment/main.bicep @@ -20,7 +20,7 @@ param roleAssignments roleAssignmentType @description('Optional. Logs destination.') param logsDestination string = 'log-analytics' -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Optional. Application Insights connection string used by Dapr to export Service to Service communication telemetry.') diff --git a/avm/res/app/managed-environment/main.json b/avm/res/app/managed-environment/main.json index 5d2939d3f7..28af743a6d 100644 --- a/avm/res/app/managed-environment/main.json +++ b/avm/res/app/managed-environment/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "11804940606673954279" + "templateHash": "9283793843319359004" }, "name": "App ManagedEnvironments", "description": "This module deploys an App Managed Environment (also known as a Container App Environment).", @@ -149,7 +149,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "daprAIConnectionString": { diff --git a/avm/res/automation/automation-account/main.bicep b/avm/res/automation/automation-account/main.bicep index 600a95c7e7..e5eba3d587 100644 --- a/avm/res/automation/automation-account/main.bicep +++ b/avm/res/automation/automation-account/main.bicep @@ -358,7 +358,7 @@ module automationAccount_privateEndpoints 'br/public:avm/res/network/private-end ipConfigurations: privateEndpoint.?ipConfigurations applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds customNetworkInterfaceName: privateEndpoint.?customNetworkInterfaceName - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/automation/automation-account/main.json b/avm/res/automation/automation-account/main.json index 7a7c238aaa..06a49c3331 100644 --- a/avm/res/automation/automation-account/main.json +++ b/avm/res/automation/automation-account/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "1065779873787220643" + "templateHash": "16375809366957188835" }, "name": "Automation Accounts", "description": "This module deploys an Azure Automation Account.", @@ -2331,7 +2331,7 @@ "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'customNetworkInterfaceName')]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/data-factory/factory/main.bicep b/avm/res/data-factory/factory/main.bicep index 3425077de0..770b822c7d 100644 --- a/avm/res/data-factory/factory/main.bicep +++ b/avm/res/data-factory/factory/main.bicep @@ -247,7 +247,7 @@ module dataFactory_privateEndpoints 'br/public:avm/res/network/private-endpoint: subnetResourceId: privateEndpoint.subnetResourceId location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry privateDnsZoneGroupName: privateEndpoint.?privateDnsZoneGroupName privateDnsZoneResourceIds: privateEndpoint.?privateDnsZoneResourceIds roleAssignments: privateEndpoint.?roleAssignments diff --git a/avm/res/data-factory/factory/main.json b/avm/res/data-factory/factory/main.json index d6758d968e..419756e8af 100644 --- a/avm/res/data-factory/factory/main.json +++ b/avm/res/data-factory/factory/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "14926290851354607845" + "templateHash": "10051365519912587561" }, "name": "Data Factories", "description": "This module deploys a Data Factory.", @@ -1124,7 +1124,7 @@ "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'lock'), parameters('lock'))]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "privateDnsZoneGroupName": { "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'privateDnsZoneGroupName')]" diff --git a/avm/res/document-db/database-account/main.bicep b/avm/res/document-db/database-account/main.bicep index b757005adc..5b373585ea 100644 --- a/avm/res/document-db/database-account/main.bicep +++ b/avm/res/document-db/database-account/main.bicep @@ -336,7 +336,7 @@ module databaseAccount_privateEndpoints 'br/public:avm/res/network/private-endpo ] name: privateEndpoint.?name ?? 'pep-${last(split(databaseAccount.id, '/'))}-${privateEndpoint.?service ?? 'vault'}-${index}' subnetResourceId: privateEndpoint.subnetResourceId - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneGroupName: privateEndpoint.?privateDnsZoneGroupName diff --git a/avm/res/document-db/database-account/main.json b/avm/res/document-db/database-account/main.json index 396ab5fccb..eff3621136 100644 --- a/avm/res/document-db/database-account/main.json +++ b/avm/res/document-db/database-account/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "3443581640966383758" + "templateHash": "3077721667954326119" }, "name": "DocumentDB Database Accounts", "description": "This module deploys a DocumentDB Database Account.", @@ -1703,7 +1703,7 @@ "value": "[coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "location": { "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)]" diff --git a/avm/res/event-grid/domain/main.bicep b/avm/res/event-grid/domain/main.bicep index 7263e5ab48..b131b165d6 100644 --- a/avm/res/event-grid/domain/main.bicep +++ b/avm/res/event-grid/domain/main.bicep @@ -166,6 +166,7 @@ module domain_privateEndpoints 'br/public:avm-res-network-privateendpoint:0.1.1' ipConfigurations: privateEndpoint.?ipConfigurations applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds customNetworkInterfaceName: privateEndpoint.?customNetworkInterfaceName + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/event-grid/domain/main.json b/avm/res/event-grid/domain/main.json index c9a87cf993..6e8b189a34 100644 --- a/avm/res/event-grid/domain/main.json +++ b/avm/res/event-grid/domain/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "18169470087251927326" + "templateHash": "3680673253004786953" }, "name": "Event Grid Domains", "description": "This module deploys an Event Grid Domain.", @@ -769,6 +769,9 @@ }, "customNetworkInterfaceName": { "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'customNetworkInterfaceName')]" + }, + "enableTelemetry": { + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/event-grid/topic/main.bicep b/avm/res/event-grid/topic/main.bicep index 2dbb941d77..385407d1ca 100644 --- a/avm/res/event-grid/topic/main.bicep +++ b/avm/res/event-grid/topic/main.bicep @@ -168,6 +168,7 @@ module topic_privateEndpoints 'br/public:avm-res-network-privateendpoint:0.1.1' ipConfigurations: privateEndpoint.?ipConfigurations applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds customNetworkInterfaceName: privateEndpoint.?customNetworkInterfaceName + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/event-grid/topic/main.json b/avm/res/event-grid/topic/main.json index 6d81cc6bd5..32c40b6e1c 100644 --- a/avm/res/event-grid/topic/main.json +++ b/avm/res/event-grid/topic/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "7564463211521902515" + "templateHash": "6655586293612833663" }, "name": "Event Grid Topics", "description": "This module deploys an Event Grid Topic.", @@ -850,6 +850,9 @@ }, "customNetworkInterfaceName": { "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'customNetworkInterfaceName')]" + }, + "enableTelemetry": { + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/insights/activity-log-alert/main.bicep b/avm/res/insights/activity-log-alert/main.bicep index 90024ef687..231f56fca7 100644 --- a/avm/res/insights/activity-log-alert/main.bicep +++ b/avm/res/insights/activity-log-alert/main.bicep @@ -107,6 +107,7 @@ output resourceGroupName string = resourceGroup().name @description('The location the resource was deployed into.') output location string = activityLogAlert.location + // =============== // // Definitions // // =============== // diff --git a/avm/res/insights/scheduled-query-rule/main.bicep b/avm/res/insights/scheduled-query-rule/main.bicep index 00e52509e2..5c51cfacae 100644 --- a/avm/res/insights/scheduled-query-rule/main.bicep +++ b/avm/res/insights/scheduled-query-rule/main.bicep @@ -147,6 +147,7 @@ output resourceGroupName string = resourceGroup().name @description('The location the resource was deployed into.') output location string = queryRule.location + // =============== // // Definitions // // =============== // diff --git a/avm/res/key-vault/vault/main.bicep b/avm/res/key-vault/vault/main.bicep index 5064f37577..83c413e9ac 100644 --- a/avm/res/key-vault/vault/main.bicep +++ b/avm/res/key-vault/vault/main.bicep @@ -255,7 +255,7 @@ module keyVault_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.3 ] name: privateEndpoint.?name ?? 'pep-${last(split(keyVault.id, '/'))}-${privateEndpoint.?service ?? 'vault'}-${index}' subnetResourceId: privateEndpoint.subnetResourceId - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneGroupName: privateEndpoint.?privateDnsZoneGroupName diff --git a/avm/res/key-vault/vault/main.json b/avm/res/key-vault/vault/main.json index f6ac8c93a1..d2d99facc5 100644 --- a/avm/res/key-vault/vault/main.json +++ b/avm/res/key-vault/vault/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "12693147850879499677" + "templateHash": "15629192251973726626" }, "name": "Key Vaults", "description": "This module deploys a Key Vault.", @@ -1711,7 +1711,7 @@ "value": "[coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "location": { "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)]" diff --git a/avm/res/kubernetes-configuration/extension/main.bicep b/avm/res/kubernetes-configuration/extension/main.bicep index fe0210d154..741d911002 100644 --- a/avm/res/kubernetes-configuration/extension/main.bicep +++ b/avm/res/kubernetes-configuration/extension/main.bicep @@ -85,7 +85,7 @@ resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-03-01' = { module fluxConfiguration 'br/public:avm/res/kubernetes-configuration/flux-configuration:0.3.1' = [for (fluxConfiguration, index) in (fluxConfigurations ?? []): { name: '${uniqueString(deployment().name, location)}-ManagedCluster-FluxConfiguration${index}' params: { - enableTelemetry: enableTelemetry + enableTelemetry: fluxConfiguration.?enableTelemetry ?? enableTelemetry clusterName: managedCluster.name scope: fluxConfiguration.scope namespace: fluxConfiguration.namespace diff --git a/avm/res/kubernetes-configuration/extension/main.json b/avm/res/kubernetes-configuration/extension/main.json index 2688421f3a..4032440fcd 100644 --- a/avm/res/kubernetes-configuration/extension/main.json +++ b/avm/res/kubernetes-configuration/extension/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "4023387815378830224" + "templateHash": "513848117762125355" }, "name": "Kubernetes Configuration Extensions", "description": "This module deploys a Kubernetes Configuration Extension.", @@ -158,7 +158,7 @@ "mode": "Incremental", "parameters": { "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('fluxConfigurations'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "clusterName": { "value": "[parameters('clusterName')]" diff --git a/avm/res/managed-identity/user-assigned-identity/README.md b/avm/res/managed-identity/user-assigned-identity/README.md index b6a55aa231..0a984c1c2d 100644 --- a/avm/res/managed-identity/user-assigned-identity/README.md +++ b/avm/res/managed-identity/user-assigned-identity/README.md @@ -313,7 +313,7 @@ module userAssignedIdentity 'br/public:avm/res/managed-identity/user-assigned-id | Parameter | Type | Description | | :-- | :-- | :-- | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`federatedIdentityCredentials`](#parameter-federatedidentitycredentials) | array | The federated identity credentials list to indicate which token from the external IdP should be trusted by your application. Federated identity credentials are supported on applications only. A maximum of 20 federated identity credentials can be added per application object. | | [`location`](#parameter-location) | string | Location for all resources. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | @@ -329,7 +329,7 @@ Name of the User Assigned Identity. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/managed-identity/user-assigned-identity/main.bicep b/avm/res/managed-identity/user-assigned-identity/main.bicep index cef7bfe9b7..b90850a556 100644 --- a/avm/res/managed-identity/user-assigned-identity/main.bicep +++ b/avm/res/managed-identity/user-assigned-identity/main.bicep @@ -20,7 +20,7 @@ param roleAssignments roleAssignmentType @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true var builtInRoleNames = { diff --git a/avm/res/managed-identity/user-assigned-identity/main.json b/avm/res/managed-identity/user-assigned-identity/main.json index 0203b2c4d7..6e8d8756da 100644 --- a/avm/res/managed-identity/user-assigned-identity/main.json +++ b/avm/res/managed-identity/user-assigned-identity/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "15683940703120099390" + "templateHash": "10668131901602645193" }, "name": "User Assigned Identities", "description": "This module deploys a User Assigned Identity.", @@ -149,7 +149,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, diff --git a/avm/res/network/application-security-group/README.md b/avm/res/network/application-security-group/README.md index a8dc882546..8a5633789d 100644 --- a/avm/res/network/application-security-group/README.md +++ b/avm/res/network/application-security-group/README.md @@ -268,7 +268,7 @@ module applicationSecurityGroup 'br/public:avm/res/network/application-security- | Parameter | Type | Description | | :-- | :-- | :-- | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`location`](#parameter-location) | string | Location for all resources. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | | [`roleAssignments`](#parameter-roleassignments) | array | Array of role assignments to create. | @@ -283,7 +283,7 @@ Name of the Application Security Group. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/application-security-group/main.bicep b/avm/res/network/application-security-group/main.bicep index 5f74c6b139..9ba811ed6c 100644 --- a/avm/res/network/application-security-group/main.bicep +++ b/avm/res/network/application-security-group/main.bicep @@ -17,7 +17,7 @@ param roleAssignments roleAssignmentType @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true var builtInRoleNames = { diff --git a/avm/res/network/application-security-group/main.json b/avm/res/network/application-security-group/main.json index 8424e3afbf..bbe3bc4be7 100644 --- a/avm/res/network/application-security-group/main.json +++ b/avm/res/network/application-security-group/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "524766966442410510" + "templateHash": "8371839368094432897" }, "name": "Application Security Groups (ASG)", "description": "This module deploys an Application Security Group (ASG).", @@ -142,7 +142,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, diff --git a/avm/res/network/connection/README.md b/avm/res/network/connection/README.md index ba8369ad30..56c620a937 100644 --- a/avm/res/network/connection/README.md +++ b/avm/res/network/connection/README.md @@ -325,7 +325,7 @@ module connection 'br/public:avm/res/network/connection:' = { | [`dpdTimeoutSeconds`](#parameter-dpdtimeoutseconds) | int | The dead peer detection timeout of this connection in seconds. Setting the timeout to shorter periods will cause IKE to rekey more aggressively, causing the connection to appear to be disconnected in some instances. The general recommendation is to set the timeout between 30 to 45 seconds. | | [`enableBgp`](#parameter-enablebgp) | bool | Value to specify if BGP is enabled or not. | | [`enablePrivateLinkFastPath`](#parameter-enableprivatelinkfastpath) | bool | Bypass the ExpressRoute gateway when accessing private-links. ExpressRoute FastPath (expressRouteGatewayBypass) must be enabled. Only available when connection connectionType is Express Route. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`expressRouteGatewayBypass`](#parameter-expressroutegatewaybypass) | bool | Bypass ExpressRoute Gateway for data forwarding. Only available when connection connectionType is Express Route. | | [`localNetworkGateway2`](#parameter-localnetworkgateway2) | object | The local network gateway. Used for connection type [IPsec]. | | [`location`](#parameter-location) | string | Location for all resources. | @@ -454,7 +454,7 @@ Bypass the ExpressRoute gateway when accessing private-links. ExpressRoute FastP ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/connection/main.bicep b/avm/res/network/connection/main.bicep index d92c249591..576ef2253f 100644 --- a/avm/res/network/connection/main.bicep +++ b/avm/res/network/connection/main.bicep @@ -77,7 +77,7 @@ param lock lockType @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Required. The primary Virtual Network Gateway.') diff --git a/avm/res/network/connection/main.json b/avm/res/network/connection/main.json index 4eec698183..fd7cfc58f9 100644 --- a/avm/res/network/connection/main.json +++ b/avm/res/network/connection/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "4092234311498640607" + "templateHash": "14326202302024370679" }, "name": "Virtual Network Gateway Connections", "description": "This module deploys a Virtual Network Gateway Connection.", @@ -180,7 +180,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "virtualNetworkGateway1": { diff --git a/avm/res/network/ddos-protection-plan/README.md b/avm/res/network/ddos-protection-plan/README.md index 074fb37b57..56892605ef 100644 --- a/avm/res/network/ddos-protection-plan/README.md +++ b/avm/res/network/ddos-protection-plan/README.md @@ -268,7 +268,7 @@ module ddosProtectionPlan 'br/public:avm/res/network/ddos-protection-plan:' = { | Parameter | Type | Description | | :-- | :-- | :-- | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`inboundEndpoints`](#parameter-inboundendpoints) | array | Inbound Endpoints for Private DNS Resolver. | | [`location`](#parameter-location) | string | Location for all resources. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | @@ -365,7 +365,7 @@ ResourceId of the virtual network to attach the Private DNS Resolver to. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/dns-resolver/main.bicep b/avm/res/network/dns-resolver/main.bicep index 427254255f..e27e4d80ef 100644 --- a/avm/res/network/dns-resolver/main.bicep +++ b/avm/res/network/dns-resolver/main.bicep @@ -27,7 +27,7 @@ param outboundEndpoints array? @description('Optional. Inbound Endpoints for Private DNS Resolver.') param inboundEndpoints array? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true var builtInRoleNames = { diff --git a/avm/res/network/dns-resolver/main.json b/avm/res/network/dns-resolver/main.json index fde023447c..7c6662a841 100644 --- a/avm/res/network/dns-resolver/main.json +++ b/avm/res/network/dns-resolver/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "17067194662081664048" + "templateHash": "9938371933399319052" }, "name": "DNS Resolvers", "description": "This module deploys a DNS Resolver.", @@ -163,7 +163,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, diff --git a/avm/res/network/dns-zone/README.md b/avm/res/network/dns-zone/README.md index c2711a1cf4..ffdc48431b 100644 --- a/avm/res/network/dns-zone/README.md +++ b/avm/res/network/dns-zone/README.md @@ -736,7 +736,7 @@ module dnsZone 'br/public:avm/res/network/dns-zone:' = { | [`aaaa`](#parameter-aaaa) | array | Array of AAAA records. | | [`caa`](#parameter-caa) | array | Array of CAA records. | | [`cname`](#parameter-cname) | array | Array of CNAME records. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`location`](#parameter-location) | string | The location of the dnsZone. Should be global. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | | [`mx`](#parameter-mx) | array | Array of MX records. | @@ -785,7 +785,7 @@ Array of CNAME records. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/dns-zone/main.bicep b/avm/res/network/dns-zone/main.bicep index a559659d7a..6ecf1f7df9 100644 --- a/avm/res/network/dns-zone/main.bicep +++ b/avm/res/network/dns-zone/main.bicep @@ -49,7 +49,7 @@ param tags object? @description('Optional. The lock settings of the service.') param lock lockType -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true var builtInRoleNames = { diff --git a/avm/res/network/dns-zone/main.json b/avm/res/network/dns-zone/main.json index 0c47784ffd..33e2275916 100644 --- a/avm/res/network/dns-zone/main.json +++ b/avm/res/network/dns-zone/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "1913502883970188988" + "templateHash": "4876589289221431730" }, "name": "Public DNS Zones", "description": "This module deploys a Public DNS zone.", @@ -214,7 +214,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, diff --git a/avm/res/network/express-route-circuit/README.md b/avm/res/network/express-route-circuit/README.md index 39dc4657c0..439b024b4c 100644 --- a/avm/res/network/express-route-circuit/README.md +++ b/avm/res/network/express-route-circuit/README.md @@ -396,7 +396,7 @@ module expressRouteCircuit 'br/public:avm/res/network/express-route-circuit:' = { | :-- | :-- | :-- | | [`backendAddressPools`](#parameter-backendaddresspools) | array | Collection of backend address pools used by a load balancer. | | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`inboundNatRules`](#parameter-inboundnatrules) | array | 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. | | [`loadBalancingRules`](#parameter-loadbalancingrules) | array | Array of objects containing all load balancing rules. | | [`location`](#parameter-location) | string | Location for all resources. | @@ -1075,7 +1075,7 @@ Resource ID of the diagnostic log analytics workspace. For security reasons, it ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/load-balancer/main.bicep b/avm/res/network/load-balancer/main.bicep index 81c4be9738..ca93a97443 100644 --- a/avm/res/network/load-balancer/main.bicep +++ b/avm/res/network/load-balancer/main.bicep @@ -44,7 +44,7 @@ param roleAssignments roleAssignmentType @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry 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.') diff --git a/avm/res/network/load-balancer/main.json b/avm/res/network/load-balancer/main.json index 5afb5d7261..cda1cef236 100644 --- a/avm/res/network/load-balancer/main.json +++ b/avm/res/network/load-balancer/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "12106136869047165081" + "templateHash": "11386852556160593443" }, "name": "Load Balancers", "description": "This module deploys a Load Balancer.", @@ -267,7 +267,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "inboundNatRules": { diff --git a/avm/res/network/nat-gateway/README.md b/avm/res/network/nat-gateway/README.md index 4d02890492..4db79b86a5 100644 --- a/avm/res/network/nat-gateway/README.md +++ b/avm/res/network/nat-gateway/README.md @@ -707,8 +707,8 @@ This section gives you an overview of all local-referenced module files (i.e., o | Reference | Type | | :-- | :-- | -| `res/network/public-ip-prefix` | Local reference | | `br/public:avm/res/network/public-ip-address:0.2.1` | Remote reference | +| `br/public:avm/res/network/public-ip-prefix:0.1.0` | Remote reference | ## Data Collection diff --git a/avm/res/network/nat-gateway/main.bicep b/avm/res/network/nat-gateway/main.bicep index 536e51e716..a7e93a6b3f 100644 --- a/avm/res/network/nat-gateway/main.bicep +++ b/avm/res/network/nat-gateway/main.bicep @@ -72,14 +72,18 @@ module publicIPAddresses 'br/public:avm/res/network/public-ip-address:0.2.1' = [ location: location lock: publicIPAddressObject.?lock ?? lock diagnosticSettings: publicIPAddressObject.?diagnosticSettings - publicIPAddressVersion: contains(publicIPAddressObject, 'publicIPAddressVersion') ? publicIPAddressObject.publicIPAddressVersion : 'IPv4' + publicIPAddressVersion: publicIPAddressObject.?publicIPAddressVersion publicIPAllocationMethod: 'Static' - publicIpPrefixResourceId: contains(publicIPAddressObject, 'publicIPPrefixResourceId') ? publicIPAddressObject.publicIPPrefixResourceId : '' - roleAssignments: contains(publicIPAddressObject, 'roleAssignments') ? publicIPAddressObject.roleAssignments : [] - skuName: 'Standard' - skuTier: contains(publicIPAddressObject, 'skuTier') ? publicIPAddressObject.skuTier : 'Regional' + publicIpPrefixResourceId: publicIPAddressObject.?publicIPPrefixResourceId + roleAssignments: publicIPAddressObject.?roleAssignments + skuName: 'Standard' // Must be standard + skuTier: publicIPAddressObject.?skuTier tags: publicIPAddressObject.?tags ?? tags - zones: contains(publicIPAddressObject, 'zones') ? publicIPAddressObject.zones : [] + zones: publicIPAddressObject.?zones + enableTelemetry: publicIPAddressObject.?enableTelemetry ?? enableTelemetry + ddosSettings: publicIPAddressObject.?ddosSettings + dnsSettings: publicIPAddressObject.?dnsSettings + idleTimeoutInMinutes: publicIPAddressObject.?idleTimeoutInMinutes } }] @@ -91,7 +95,7 @@ module formattedPublicIpResourceIds 'modules/formatResourceId.bicep' = { } } -module publicIPPrefixes '../public-ip-prefix/main.bicep' = [for (publicIPPrefixObject, index) in (publicIPPrefixObjects ?? []): { +module publicIPPrefixes 'br/public:avm/res/network/public-ip-prefix:0.1.0' = [for (publicIPPrefixObject, index) in (publicIPPrefixObjects ?? []): { name: '${uniqueString(deployment().name, location)}-NatGw-Prefix-PIP-${index}' params: { name: contains(publicIPPrefixObject, 'name') ? publicIPPrefixObject.name : '${name}-pip' @@ -101,6 +105,7 @@ module publicIPPrefixes '../public-ip-prefix/main.bicep' = [for (publicIPPrefixO customIPPrefix: publicIPPrefixObject.?customIPPrefix roleAssignments: publicIPPrefixObject.?roleAssignments tags: publicIPPrefixObject.?tags ?? tags + enableTelemetry: publicIPPrefixObject.?enableTelemetry ?? enableTelemetry } }] module formattedPublicIpPrefixResourceIds 'modules/formatResourceId.bicep' = { diff --git a/avm/res/network/nat-gateway/main.json b/avm/res/network/nat-gateway/main.json index 2aad56ac9b..beffa56246 100644 --- a/avm/res/network/nat-gateway/main.json +++ b/avm/res/network/nat-gateway/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "6929390552163326762" + "templateHash": "6395864833059360250" }, "name": "NAT Gateways", "description": "This module deploys a NAT Gateway.", @@ -405,20 +405,42 @@ "diagnosticSettings": { "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'diagnosticSettings')]" }, - "publicIPAddressVersion": "[if(contains(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'publicIPAddressVersion'), createObject('value', coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()].publicIPAddressVersion), createObject('value', 'IPv4'))]", + "publicIPAddressVersion": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'publicIPAddressVersion')]" + }, "publicIPAllocationMethod": { "value": "Static" }, - "publicIpPrefixResourceId": "[if(contains(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'publicIPPrefixResourceId'), createObject('value', coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()].publicIPPrefixResourceId), createObject('value', ''))]", - "roleAssignments": "[if(contains(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'roleAssignments'), createObject('value', coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()].roleAssignments), createObject('value', createArray()))]", + "publicIpPrefixResourceId": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'publicIPPrefixResourceId')]" + }, + "roleAssignments": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'roleAssignments')]" + }, "skuName": { "value": "Standard" }, - "skuTier": "[if(contains(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'skuTier'), createObject('value', coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()].skuTier), createObject('value', 'Regional'))]", + "skuTier": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'skuTier')]" + }, "tags": { "value": "[coalesce(tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'tags'), parameters('tags'))]" }, - "zones": "[if(contains(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'zones'), createObject('value', coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()].zones), createObject('value', createArray()))]" + "zones": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'zones')]" + }, + "enableTelemetry": { + "value": "[coalesce(tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" + }, + "ddosSettings": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'ddosSettings')]" + }, + "dnsSettings": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'dnsSettings')]" + }, + "idleTimeoutInMinutes": { + "value": "[tryGet(coalesce(parameters('publicIPAddressObjects'), createArray())[copyIndex()], 'idleTimeoutInMinutes')]" + } }, "template": { "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#", @@ -1071,6 +1093,9 @@ }, "tags": { "value": "[coalesce(tryGet(coalesce(parameters('publicIPPrefixObjects'), createArray())[copyIndex()], 'tags'), parameters('tags'))]" + }, + "enableTelemetry": { + "value": "[coalesce(tryGet(coalesce(parameters('publicIPPrefixObjects'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { @@ -1080,8 +1105,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.24.24.22086", - "templateHash": "10236251134052848815" + "version": "0.23.1.45101", + "templateHash": "10775565777623704767" }, "name": "Public IP Prefixes", "description": "This module deploys a Public IP Prefix.", @@ -1155,7 +1180,7 @@ "type": "string", "nullable": true, "metadata": { - "description": "Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase \"foo_storage_container\"." + "description": "Optional. The conditions on the role assignment. This limits the resources it can be assigned to. e.g.: @Resource[Microsoft.Storage/storageAccounts/blobServices/containers:ContainerName] StringEqualsIgnoreCase \"foo_storage_container\"" } }, "conditionVersion": { @@ -1252,7 +1277,7 @@ "condition": "[parameters('enableTelemetry')]", "type": "Microsoft.Resources/deployments", "apiVersion": "2023-07-01", - "name": "[format('46d3xbcp.res.network-publicipprefix.{0}.{1}', replace('-..--..-', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]", + "name": "[format('46d3xbcp.res.network-publicipprefix.{0}.{1}', replace('0.1.0', '.', '-'), substring(uniqueString(deployment().name, parameters('location')), 0, 4))]", "properties": { "mode": "Incremental", "template": { diff --git a/avm/res/network/network-security-group/README.md b/avm/res/network/network-security-group/README.md index 2a0ace1fc6..3053f2c2a2 100644 --- a/avm/res/network/network-security-group/README.md +++ b/avm/res/network/network-security-group/README.md @@ -571,7 +571,7 @@ module networkSecurityGroup 'br/public:avm/res/network/network-security-group:' = { | [`a`](#parameter-a) | array | Array of A records. | | [`aaaa`](#parameter-aaaa) | array | Array of AAAA records. | | [`cname`](#parameter-cname) | array | Array of CNAME records. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`location`](#parameter-location) | string | The location of the PrivateDNSZone. Should be global. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | | [`mx`](#parameter-mx) | array | Array of MX records. | @@ -784,7 +784,7 @@ Array of CNAME records. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/private-dns-zone/main.bicep b/avm/res/network/private-dns-zone/main.bicep index 6bc5bd88e8..28881fb037 100644 --- a/avm/res/network/private-dns-zone/main.bicep +++ b/avm/res/network/private-dns-zone/main.bicep @@ -44,7 +44,7 @@ param tags object? @description('Optional. The lock settings of the service.') param lock lockType -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true var builtInRoleNames = { diff --git a/avm/res/network/private-dns-zone/main.json b/avm/res/network/private-dns-zone/main.json index 104d84e330..648def7b40 100644 --- a/avm/res/network/private-dns-zone/main.json +++ b/avm/res/network/private-dns-zone/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "1893992810108905317" + "templateHash": "13412685182351792582" }, "name": "Private DNS Zones", "description": "This module deploys a Private DNS zone.", @@ -205,7 +205,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, diff --git a/avm/res/network/vpn-gateway/README.md b/avm/res/network/vpn-gateway/README.md index 3a98bc7320..31e0f3e346 100644 --- a/avm/res/network/vpn-gateway/README.md +++ b/avm/res/network/vpn-gateway/README.md @@ -401,7 +401,7 @@ module vpnGateway 'br/public:avm/res/network/vpn-gateway:' = { | :-- | :-- | :-- | | [`bgpSettings`](#parameter-bgpsettings) | object | BGP settings details. | | [`enableBgpRouteTranslationForNat`](#parameter-enablebgproutetranslationfornat) | bool | Enable BGP routes translation for NAT on this VPN gateway. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`isRoutingPreferenceInternet`](#parameter-isroutingpreferenceinternet) | bool | Enable routing preference property for the public IP interface of the VPN gateway. | | [`location`](#parameter-location) | string | Location where all resources will be created. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | @@ -442,7 +442,7 @@ Enable BGP routes translation for NAT on this VPN gateway. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/vpn-gateway/main.bicep b/avm/res/network/vpn-gateway/main.bicep index 1b7b5f8f4d..9e5a665eeb 100644 --- a/avm/res/network/vpn-gateway/main.bicep +++ b/avm/res/network/vpn-gateway/main.bicep @@ -35,7 +35,7 @@ param tags object? @description('Optional. The lock settings of the service.') param lock lockType -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' = if (enableTelemetry) { diff --git a/avm/res/network/vpn-gateway/main.json b/avm/res/network/vpn-gateway/main.json index 8482c23f93..ddce924572 100644 --- a/avm/res/network/vpn-gateway/main.json +++ b/avm/res/network/vpn-gateway/main.json @@ -5,8 +5,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.23.1.45101", - "templateHash": "7269875381422514128" + "version": "0.24.24.22086", + "templateHash": "12935822983257775198" }, "name": "VPN Gateways", "description": "This module deploys a VPN Gateway.", @@ -118,7 +118,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } } }, @@ -230,8 +230,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.23.1.45101", - "templateHash": "6015512722948676501" + "version": "0.24.24.22086", + "templateHash": "12544565901642791038" }, "name": "VPN Gateway NAT Rules", "description": "This module deploys a VPN Gateway NAT Rule.", @@ -405,8 +405,8 @@ "metadata": { "_generator": { "name": "bicep", - "version": "0.23.1.45101", - "templateHash": "12494321080277868905" + "version": "0.24.24.22086", + "templateHash": "1538972740652771448" }, "name": "VPN Gateway VPN Connections", "description": "This module deploys a VPN Gateway VPN Connection.", diff --git a/avm/res/network/vpn-site/README.md b/avm/res/network/vpn-site/README.md index f34d2dc45c..6f1537dcee 100644 --- a/avm/res/network/vpn-site/README.md +++ b/avm/res/network/vpn-site/README.md @@ -474,7 +474,7 @@ module vpnSite 'br/public:avm/res/network/vpn-site:' = { | Parameter | Type | Description | | :-- | :-- | :-- | | [`deviceProperties`](#parameter-deviceproperties) | object | List of properties of the device. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`ipAddress`](#parameter-ipaddress) | string | The IP-address for the VPN-site. Note: This is a deprecated property, please use the corresponding VpnSiteLinks property instead. | | [`isSecuritySite`](#parameter-issecuritysite) | bool | IsSecuritySite flag. | | [`location`](#parameter-location) | string | Location where all resources will be created. | @@ -524,7 +524,7 @@ List of properties of the device. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/network/vpn-site/main.bicep b/avm/res/network/vpn-site/main.bicep index 8e56b34ffa..4b5c0354d6 100644 --- a/avm/res/network/vpn-site/main.bicep +++ b/avm/res/network/vpn-site/main.bicep @@ -32,7 +32,7 @@ param isSecuritySite bool = false @description('Optional. The Office365 breakout policy.') param o365Policy object = {} -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Optional. List of all VPN site links.') diff --git a/avm/res/network/vpn-site/main.json b/avm/res/network/vpn-site/main.json index ef4df48765..7be751e4a9 100644 --- a/avm/res/network/vpn-site/main.json +++ b/avm/res/network/vpn-site/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "11784891368374663074" + "templateHash": "2045795544331702359" }, "name": "VPN Sites", "description": "This module deploys a VPN Site.", @@ -178,7 +178,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "vpnSiteLinks": { diff --git a/avm/res/operational-insights/workspace/main.bicep b/avm/res/operational-insights/workspace/main.bicep index a582f8d667..8c8584e7d8 100644 --- a/avm/res/operational-insights/workspace/main.bicep +++ b/avm/res/operational-insights/workspace/main.bicep @@ -286,7 +286,7 @@ module logAnalyticsWorkspace_solutions 'br/public:avm/res/operations-management/ logAnalyticsWorkspaceName: logAnalyticsWorkspace.name product: contains(gallerySolution, 'product') ? gallerySolution.product : 'OMSGallery' publisher: contains(gallerySolution, 'publisher') ? gallerySolution.publisher : 'Microsoft' - enableTelemetry: enableTelemetry + enableTelemetry: gallerySolution.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/operational-insights/workspace/main.json b/avm/res/operational-insights/workspace/main.json index 310be637d4..aa1dd73b31 100644 --- a/avm/res/operational-insights/workspace/main.json +++ b/avm/res/operational-insights/workspace/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "7159205088586642629" + "templateHash": "17860197791351568468" }, "name": "Log Analytics Workspaces", "description": "This module deploys a Log Analytics Workspace.", @@ -1595,7 +1595,7 @@ "product": "[if(contains(parameters('gallerySolutions')[copyIndex()], 'product'), createObject('value', parameters('gallerySolutions')[copyIndex()].product), createObject('value', 'OMSGallery'))]", "publisher": "[if(contains(parameters('gallerySolutions')[copyIndex()], 'publisher'), createObject('value', parameters('gallerySolutions')[copyIndex()].publisher), createObject('value', 'Microsoft'))]", "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(parameters('gallerySolutions')[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/power-bi-dedicated/capacity/README.md b/avm/res/power-bi-dedicated/capacity/README.md index 97a8651ef8..179ce0d26c 100644 --- a/avm/res/power-bi-dedicated/capacity/README.md +++ b/avm/res/power-bi-dedicated/capacity/README.md @@ -326,7 +326,7 @@ module capacity 'br/public:avm/res/power-bi-dedicated/capacity:' = { | Parameter | Type | Description | | :-- | :-- | :-- | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`location`](#parameter-location) | string | Location for all Resources. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | | [`mode`](#parameter-mode) | string | Mode of the resource. | @@ -409,7 +409,7 @@ The tier of the SKU. ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/power-bi-dedicated/capacity/main.bicep b/avm/res/power-bi-dedicated/capacity/main.bicep index 1a3303ae65..0a007fd465 100644 --- a/avm/res/power-bi-dedicated/capacity/main.bicep +++ b/avm/res/power-bi-dedicated/capacity/main.bicep @@ -8,7 +8,7 @@ param name string @description('Optional. Location for all Resources.') param location string = resourceGroup().location -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Optional. Tags of the resource.') diff --git a/avm/res/power-bi-dedicated/capacity/main.json b/avm/res/power-bi-dedicated/capacity/main.json index 674cdc6777..62bbfd8d9a 100644 --- a/avm/res/power-bi-dedicated/capacity/main.json +++ b/avm/res/power-bi-dedicated/capacity/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "5924548870637712575" + "templateHash": "3414879311419661380" }, "name": "Power BI Dedicated Capacities", "description": "This module deploys a Power BI Dedicated Capacity.", @@ -161,7 +161,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "tags": { diff --git a/avm/res/search/search-service/main.bicep b/avm/res/search/search-service/main.bicep index eede0a598b..bb911f1f77 100644 --- a/avm/res/search/search-service/main.bicep +++ b/avm/res/search/search-service/main.bicep @@ -228,7 +228,7 @@ module searchService_privateEndpoints 'br/public:avm/res/network/private-endpoin ipConfigurations: privateEndpoint.?ipConfigurations applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds customNetworkInterfaceName: privateEndpoint.?customNetworkInterfaceName - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/search/search-service/main.json b/avm/res/search/search-service/main.json index e979c3366b..f065054412 100644 --- a/avm/res/search/search-service/main.json +++ b/avm/res/search/search-service/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "16337826938852608726" + "templateHash": "2340292260752527729" }, "name": "Search Services", "description": "This module deploys a Search Service.", @@ -737,7 +737,7 @@ "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'customNetworkInterfaceName')]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/service-bus/namespace/README.md b/avm/res/service-bus/namespace/README.md index bded6144b5..ce862310f6 100644 --- a/avm/res/service-bus/namespace/README.md +++ b/avm/res/service-bus/namespace/README.md @@ -1135,7 +1135,7 @@ module namespace 'br/public:avm/res/service-bus/namespace:' = { | [`diagnosticSettings`](#parameter-diagnosticsettings) | array | The diagnostic settings of the service. | | [`disableLocalAuth`](#parameter-disablelocalauth) | bool | This property disables SAS authentication for the Service Bus namespace. | | [`disasterRecoveryConfig`](#parameter-disasterrecoveryconfig) | object | The disaster recovery configuration. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`location`](#parameter-location) | string | Location for all resources. | | [`lock`](#parameter-lock) | object | The lock settings of the service. | | [`managedIdentities`](#parameter-managedidentities) | object | The managed identity definition for this resource. | @@ -1447,7 +1447,7 @@ Resource ID of the Primary/Secondary event hub namespace name, which is part of ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/service-bus/namespace/main.bicep b/avm/res/service-bus/namespace/main.bicep index 28a61be083..e5327bd08b 100644 --- a/avm/res/service-bus/namespace/main.bicep +++ b/avm/res/service-bus/namespace/main.bicep @@ -80,7 +80,7 @@ param disableLocalAuth bool = true @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Optional. The queues to create in the service bus namespace.') @@ -319,7 +319,7 @@ module serviceBusNamespace_privateEndpoints 'br/public:avm/res/network/private-e ] name: privateEndpoint.?name ?? 'pep-${last(split(serviceBusNamespace.id, '/'))}-${privateEndpoint.?service ?? 'vault'}-${index}' subnetResourceId: privateEndpoint.subnetResourceId - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneGroupName: privateEndpoint.?privateDnsZoneGroupName diff --git a/avm/res/service-bus/namespace/main.json b/avm/res/service-bus/namespace/main.json index 73cb43f0d6..5834100392 100644 --- a/avm/res/service-bus/namespace/main.json +++ b/avm/res/service-bus/namespace/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "996571599478917922" + "templateHash": "18066724538226124332" }, "name": "Service Bus Namespaces", "description": "This module deploys a Service Bus Namespace.", @@ -1204,7 +1204,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "queues": { @@ -3380,7 +3380,7 @@ "value": "[coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "location": { "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)]" diff --git a/avm/res/sql/server/main.bicep b/avm/res/sql/server/main.bicep index f590665f88..450f779843 100644 --- a/avm/res/sql/server/main.bicep +++ b/avm/res/sql/server/main.bicep @@ -261,7 +261,7 @@ module server_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.3.1 ipConfigurations: privateEndpoint.?ipConfigurations applicationSecurityGroupResourceIds: privateEndpoint.?applicationSecurityGroupResourceIds customNetworkInterfaceName: privateEndpoint.?customNetworkInterfaceName - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry } }] diff --git a/avm/res/sql/server/main.json b/avm/res/sql/server/main.json index 3eba8440c4..9d010c1c2f 100644 --- a/avm/res/sql/server/main.json +++ b/avm/res/sql/server/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "14875046246736417656" + "templateHash": "4549734270002695393" }, "name": "Azure SQL Servers", "description": "This module deploys an Azure SQL Server.", @@ -1613,7 +1613,7 @@ "value": "[tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'customNetworkInterfaceName')]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" } }, "template": { diff --git a/avm/res/web/static-site/README.md b/avm/res/web/static-site/README.md index a722465109..60963cece1 100644 --- a/avm/res/web/static-site/README.md +++ b/avm/res/web/static-site/README.md @@ -436,7 +436,7 @@ module staticSite 'br/public:avm/res/web/static-site:' = { | [`branch`](#parameter-branch) | string | The branch name of the GitHub repository. | | [`buildProperties`](#parameter-buildproperties) | object | Build properties for the static site. | | [`customDomains`](#parameter-customdomains) | array | The custom domains associated with this static site. The deployment will fail as long as the validation records are not present. | -| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable telemetry via a Globally Unique Identifier (GUID). | +| [`enableTelemetry`](#parameter-enabletelemetry) | bool | Enable/Disable usage telemetry for module. | | [`enterpriseGradeCdnStatus`](#parameter-enterprisegradecdnstatus) | string | State indicating the status of the enterprise grade CDN serving traffic to the static web app. | | [`functionAppSettings`](#parameter-functionappsettings) | object | Function app settings. | | [`linkedBackend`](#parameter-linkedbackend) | object | Object with "resourceId" and "location" of the a user defined function app. | @@ -500,7 +500,7 @@ The custom domains associated with this static site. The deployment will fail as ### Parameter: `enableTelemetry` -Enable telemetry via a Globally Unique Identifier (GUID). +Enable/Disable usage telemetry for module. - Required: No - Type: bool diff --git a/avm/res/web/static-site/main.bicep b/avm/res/web/static-site/main.bicep index 86d0308e35..bfb7aabc9d 100644 --- a/avm/res/web/static-site/main.bicep +++ b/avm/res/web/static-site/main.bicep @@ -67,7 +67,7 @@ param privateEndpoints privateEndpointType @description('Optional. Tags of the resource.') param tags object? -@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).') +@description('Optional. Enable/Disable usage telemetry for module.') param enableTelemetry bool = true @description('Optional. Array of role assignments to create.') @@ -217,7 +217,7 @@ module staticSite_privateEndpoints 'br/public:avm/res/network/private-endpoint:0 ] name: privateEndpoint.?name ?? 'pep-${last(split(staticSite.id, '/'))}-${privateEndpoint.?service ?? 'staticSites'}-${index}' subnetResourceId: privateEndpoint.subnetResourceId - enableTelemetry: enableTelemetry + enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry location: privateEndpoint.?location ?? reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location lock: privateEndpoint.?lock ?? lock privateDnsZoneGroupName: privateEndpoint.?privateDnsZoneGroupName diff --git a/avm/res/web/static-site/main.json b/avm/res/web/static-site/main.json index 414d493f8f..e4b0bf3513 100644 --- a/avm/res/web/static-site/main.json +++ b/avm/res/web/static-site/main.json @@ -6,7 +6,7 @@ "_generator": { "name": "bicep", "version": "0.24.24.22086", - "templateHash": "1837229798638976594" + "templateHash": "13880536558340319383" }, "name": "Static Web Apps", "description": "This module deploys a Static Web App.", @@ -432,7 +432,7 @@ "type": "bool", "defaultValue": true, "metadata": { - "description": "Optional. Enable telemetry via a Globally Unique Identifier (GUID)." + "description": "Optional. Enable/Disable usage telemetry for module." } }, "roleAssignments": { @@ -982,7 +982,7 @@ "value": "[coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId]" }, "enableTelemetry": { - "value": "[parameters('enableTelemetry')]" + "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]" }, "location": { "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)]"