Skip to content

[Fixes] Disable referenced modules telemetry for a few modules missing the functionality #2664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eriqua merged 2 commits into from
Feb 7, 2023
Merged

[Fixes] Disable referenced modules telemetry for a few modules missing the functionality #2664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b46792
add enableReferencedModulesTelemetry
eriqua Feb 7, 2023
65f5193
Merge branch 'main' into users/erikag/telemetry-fix
eriqua Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions modules/Microsoft.CDN/profiles/endpoints/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ param endpointProperties object
@description('Optional. Endpoint tags.')
param tags object = {}

resource profile 'Microsoft.Cdn/profiles@2021-06-01' existing = {
name: profileName
}

@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true

var enableReferencedModulesTelemetry = false

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}'
properties: {
Expand All @@ -32,6 +30,10 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}
}

resource profile 'Microsoft.Cdn/profiles@2021-06-01' existing = {
name: profileName
}

resource endpoint 'microsoft.cdn/profiles/endpoints@2021-06-01' = {
parent: profile
name: name
Expand All @@ -55,8 +57,8 @@ module endpoint_origins 'origins/deploy.bicep' = [for origin in endpointProperti
originHostHeader: contains(origin.properties, 'originHostHeader') ? origin.properties.originHostHeader : ''
privateLinkAlias: contains(origin.properties, 'privateLinkAlias') ? origin.properties.privateLinkAlias : ''
privateLinkLocation: contains(origin.properties, 'privateLinkLocation') ? origin.properties.privateLinkLocation : ''
privateLinkResourceId: contains(origin.properties, 'privateLinkResourceId') ? origin.properties.privateLinkResourceId : ''
enableDefaultTelemetry: enableDefaultTelemetry
privateLinkResourceId: contains(origin.properties, 'privateLinkResourceId') ? origin.properties.privateLinkResourceId : ''
enableDefaultTelemetry: enableReferencedModulesTelemetry
}
}]

Expand Down
4 changes: 3 additions & 1 deletion modules/Microsoft.Network/bastionHosts/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ var ipConfigurations = [
}
]

var enableReferencedModulesTelemetry = false

// ----------------------------------------------------------------------------

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
Expand Down Expand Up @@ -168,7 +170,7 @@ module publicIPAddress '../publicIPAddresses/deploy.bicep' = if (empty(azureBast
diagnosticWorkspaceId: diagnosticWorkspaceId
diagnosticEventHubAuthorizationRuleId: diagnosticEventHubAuthorizationRuleId
diagnosticEventHubName: diagnosticEventHubName
enableDefaultTelemetry: enableDefaultTelemetry
enableDefaultTelemetry: enableReferencedModulesTelemetry
location: location
lock: lock
publicIPAddressVersion: contains(publicIPAddressObject, 'publicIPAddressVersion') ? publicIPAddressObject.publicIPAddressVersion : 'IPv4'
Expand Down
6 changes: 4 additions & 2 deletions modules/Microsoft.Network/virtualNetworkGateways/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,8 @@ var vpnClientConfiguration = !empty(clientRootCertData) ? {
]
} : null

var enableReferencedModulesTelemetry = false

// ================//
// Deployments //
// ================//
Expand All @@ -310,7 +312,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
@batchSize(1)
module publicIPAddress '../publicIPAddresses/deploy.bicep' = [for (virtualGatewayPublicIpName, index) in virtualGatewayPipNameVar: {
name: virtualGatewayPublicIpName
params :{
params: {
name: virtualGatewayPublicIpName
diagnosticLogCategoriesToEnable: publicIpdiagnosticLogCategoriesToEnable
diagnosticMetricsToEnable: diagnosticMetricsToEnable
Expand All @@ -320,7 +322,7 @@ module publicIPAddress '../publicIPAddresses/deploy.bicep' = [for (virtualGatewa
diagnosticEventHubAuthorizationRuleId: diagnosticEventHubAuthorizationRuleId
diagnosticEventHubName: diagnosticEventHubName
domainNameLabel: length(virtualGatewayPipNameVar) == length(domainNameLabel) ? domainNameLabel[index] : ''
enableDefaultTelemetry: enableDefaultTelemetry
enableDefaultTelemetry: enableReferencedModulesTelemetry
location: location
lock: lock
publicIPAllocationMethod: gatewayPipAllocationMethod
Expand Down
4 changes: 3 additions & 1 deletion modules/Microsoft.RecoveryServices/vaults/protectionContainers/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ param containerType string = ''
@description('Optional. Enable telemetry via a Globally Unique Identifier (GUID).')
param enableDefaultTelemetry bool = true

var enableReferencedModulesTelemetry = false

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}'
properties: {
Expand Down Expand Up @@ -81,7 +83,7 @@ module protectionContainer_protectedItems 'protectedItems/deploy.bicep' = [for (
recoveryVaultName: recoveryVaultName
sourceResourceId: protectedItem.sourceResourceId
location: location
enableDefaultTelemetry: enableDefaultTelemetry
enableDefaultTelemetry: enableReferencedModulesTelemetry
}
dependsOn: [
protectionContainer
Expand Down