From 2c8efd0748388be526553f81f9c3a1210385ecd9 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Tue, 5 Sep 2023 17:01:41 +0200 Subject: [PATCH 01/11] update --- .ps-rule/min-suppress.Rule.yaml | 1 + modules/compute/virtual-machine/main.bicep | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.ps-rule/min-suppress.Rule.yaml b/.ps-rule/min-suppress.Rule.yaml index 80611ec02c..116e992898 100644 --- a/.ps-rule/min-suppress.Rule.yaml +++ b/.ps-rule/min-suppress.Rule.yaml @@ -8,6 +8,7 @@ spec: rule: - Azure.Resource.UseTags - Azure.KeyVault.Logs + - Azure.VM.AMA - Azure.Policy.ExemptionDescriptors - Azure.Policy.Descriptors - Azure.Policy.AssignmentDescriptors diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 3cd09f6b51..7a7313f25c 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -567,13 +567,13 @@ resource vm_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021 scope: az.resourceGroup(split(monitoringWorkspaceId, '/')[2], split(monitoringWorkspaceId, '/')[4]) } -module vm_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { - name: '${uniqueString(deployment().name, location)}-VM-MicrosoftMonitoringAgent' +module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { + name: '${uniqueString(deployment().name, location)}-VM-azureMonitorAgentExtension' params: { virtualMachineName: vm.name - name: 'MicrosoftMonitoringAgent' - publisher: 'Microsoft.EnterpriseCloud.Monitoring' - type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux' + name: 'AzureMonitorAgent' + publisher: 'Microsoft.Azure.Monitor' + type: osType == 'Windows' ? 'AzureMonitorWindowsAgent' : 'AzureMonitorLinuxAgent' typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7') autoUpgradeMinorVersion: contains(extensionMonitoringAgentConfig, 'autoUpgradeMinorVersion') ? extensionMonitoringAgentConfig.autoUpgradeMinorVersion : true enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false @@ -674,7 +674,7 @@ module vm_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzu } dependsOn: [ vm_customScriptExtension - vm_microsoftMonitoringAgentExtension + vm_azureMonitorAgentExtension ] } @@ -693,7 +693,7 @@ module vm_backup '../../recovery-services/vault/backup-fabric/protection-contain dependsOn: [ vm_aadJoinExtension vm_domainJoinExtension - vm_microsoftMonitoringAgentExtension + vm_azureMonitorAgentExtension vm_microsoftAntiMalwareExtension vm_networkWatcherAgentExtension vm_dependencyAgentExtension From d4e3fb1f9f06712ab447146d06f529b888771f07 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Tue, 5 Sep 2023 22:05:52 +0200 Subject: [PATCH 02/11] removed userAssignedIdentity --- modules/compute/virtual-machine/.test/linux/main.test.bicep | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/compute/virtual-machine/.test/linux/main.test.bicep b/modules/compute/virtual-machine/.test/linux/main.test.bicep index 97752862a4..f4d93a2ab0 100644 --- a/modules/compute/virtual-machine/.test/linux/main.test.bicep +++ b/modules/compute/virtual-machine/.test/linux/main.test.bicep @@ -261,9 +261,9 @@ module testDeployment '../../main.bicep' = { } ] systemAssignedIdentity: true - userAssignedIdentities: { - '${nestedDependencies.outputs.managedIdentityResourceId}': {} - } + // userAssignedIdentities: { + // '${nestedDependencies.outputs.managedIdentityResourceId}': {} + // } tags: { 'hidden-title': 'This is visible in the resource name' Environment: 'Non-Prod' From 9f46381d600413bd56f44a883d45c19db637957c Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Tue, 5 Sep 2023 22:27:39 +0200 Subject: [PATCH 03/11] readme updated --- modules/compute/virtual-machine/README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/modules/compute/virtual-machine/README.md b/modules/compute/virtual-machine/README.md index d7747400aa..696c63df67 100644 --- a/modules/compute/virtual-machine/README.md +++ b/modules/compute/virtual-machine/README.md @@ -1243,9 +1243,6 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { 'hidden-title': 'This is visible in the resource name' Role: 'DeploymentValidation' } - userAssignedIdentities: { - '': {} - } } } ``` @@ -1532,11 +1529,6 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { "hidden-title": "This is visible in the resource name", "Role": "DeploymentValidation" } - }, - "userAssignedIdentities": { - "value": { - "": {} - } } } } From c771fa16e3bc5706fe236ede8b964883c53aa047 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Tue, 5 Sep 2023 22:58:44 +0200 Subject: [PATCH 04/11] upd --- .../compute/virtual-machine/.test/linux/main.test.bicep | 6 +++--- modules/compute/virtual-machine/README.md | 8 ++++++++ modules/compute/virtual-machine/main.bicep | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/compute/virtual-machine/.test/linux/main.test.bicep b/modules/compute/virtual-machine/.test/linux/main.test.bicep index f4d93a2ab0..97752862a4 100644 --- a/modules/compute/virtual-machine/.test/linux/main.test.bicep +++ b/modules/compute/virtual-machine/.test/linux/main.test.bicep @@ -261,9 +261,9 @@ module testDeployment '../../main.bicep' = { } ] systemAssignedIdentity: true - // userAssignedIdentities: { - // '${nestedDependencies.outputs.managedIdentityResourceId}': {} - // } + userAssignedIdentities: { + '${nestedDependencies.outputs.managedIdentityResourceId}': {} + } tags: { 'hidden-title': 'This is visible in the resource name' Environment: 'Non-Prod' diff --git a/modules/compute/virtual-machine/README.md b/modules/compute/virtual-machine/README.md index 696c63df67..d7747400aa 100644 --- a/modules/compute/virtual-machine/README.md +++ b/modules/compute/virtual-machine/README.md @@ -1243,6 +1243,9 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { 'hidden-title': 'This is visible in the resource name' Role: 'DeploymentValidation' } + userAssignedIdentities: { + '': {} + } } } ``` @@ -1529,6 +1532,11 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { "hidden-title": "This is visible in the resource name", "Role": "DeploymentValidation" } + }, + "userAssignedIdentities": { + "value": { + "": {} + } } } } diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 7a7313f25c..72f7663ac6 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -579,6 +579,7 @@ module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonit enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false settings: { workspaceId: !empty(monitoringWorkspaceId) ? vm_logAnalyticsWorkspace.properties.customerId : '' + GCS_AUTO_CONFIG: true } tags: contains(extensionMonitoringAgentConfig, 'tags') ? extensionMonitoringAgentConfig.tags : {} protectedSettings: { From 7652539f83d07d48975fb1a6be22a4f1886c6ada Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Wed, 6 Sep 2023 08:14:47 +0200 Subject: [PATCH 05/11] upd --- modules/compute/virtual-machine/main.bicep | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 72f7663ac6..7a7313f25c 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -579,7 +579,6 @@ module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonit enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false settings: { workspaceId: !empty(monitoringWorkspaceId) ? vm_logAnalyticsWorkspace.properties.customerId : '' - GCS_AUTO_CONFIG: true } tags: contains(extensionMonitoringAgentConfig, 'tags') ? extensionMonitoringAgentConfig.tags : {} protectedSettings: { From de7777521c1293946ab0354f7b1bc542c5fef4d3 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Wed, 6 Sep 2023 08:37:24 +0200 Subject: [PATCH 06/11] restored changes to original code --- modules/compute/virtual-machine/main.bicep | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 7a7313f25c..2bfbcf84c2 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -567,13 +567,13 @@ resource vm_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021 scope: az.resourceGroup(split(monitoringWorkspaceId, '/')[2], split(monitoringWorkspaceId, '/')[4]) } -module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { - name: '${uniqueString(deployment().name, location)}-VM-azureMonitorAgentExtension' +module vm_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { + name: '${uniqueString(deployment().name, location)}-VM-MicrosoftMonitoringAgent' params: { virtualMachineName: vm.name - name: 'AzureMonitorAgent' - publisher: 'Microsoft.Azure.Monitor' - type: osType == 'Windows' ? 'AzureMonitorWindowsAgent' : 'AzureMonitorLinuxAgent' + name: 'MicrosoftMonitoringAgent' + publisher: 'EnterpriseCloud.Monitoring' + type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux' typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7') autoUpgradeMinorVersion: contains(extensionMonitoringAgentConfig, 'autoUpgradeMinorVersion') ? extensionMonitoringAgentConfig.autoUpgradeMinorVersion : true enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false @@ -674,7 +674,7 @@ module vm_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzu } dependsOn: [ vm_customScriptExtension - vm_azureMonitorAgentExtension + vm_microsoftMonitoringAgentExtension ] } @@ -693,7 +693,7 @@ module vm_backup '../../recovery-services/vault/backup-fabric/protection-contain dependsOn: [ vm_aadJoinExtension vm_domainJoinExtension - vm_azureMonitorAgentExtension + vm_microsoftMonitoringAgentExtension vm_microsoftAntiMalwareExtension vm_networkWatcherAgentExtension vm_dependencyAgentExtension From 5e317b58f31c1427ee3c51506ab1ac9ee86e0368 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Wed, 6 Sep 2023 08:39:26 +0200 Subject: [PATCH 07/11] upd --- modules/compute/virtual-machine/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 2bfbcf84c2..3cd09f6b51 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -572,7 +572,7 @@ module vm_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensi params: { virtualMachineName: vm.name name: 'MicrosoftMonitoringAgent' - publisher: 'EnterpriseCloud.Monitoring' + publisher: 'Microsoft.EnterpriseCloud.Monitoring' type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux' typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7') autoUpgradeMinorVersion: contains(extensionMonitoringAgentConfig, 'autoUpgradeMinorVersion') ? extensionMonitoringAgentConfig.autoUpgradeMinorVersion : true From ebda62c112604f5a00af8d0df016fe4cdcfb1ce7 Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Thu, 7 Sep 2023 09:56:40 +0200 Subject: [PATCH 08/11] upd --- .../.test/linux.atmg/main.test.bicep | 3 +++ .../.test/windows.atmg/main.test.bicep | 3 +++ .../.test/windows.ssecmk/main.test.bicep | 3 +++ modules/compute/virtual-machine/main.bicep | 14 +++++++------- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep index a6b7cf6ddf..d725622a64 100644 --- a/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/.test/linux.atmg/main.test.bicep @@ -99,6 +99,9 @@ module testDeployment '../../main.bicep' = { osType: 'Linux' vmSize: 'Standard_DS2_v2' configurationProfile: '/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction' + extensionMonitoringAgentConfig: { + enabled: true + } disablePasswordAuthentication: true publicKeys: [ { diff --git a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep b/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep index 52c5e35db0..eafdd088e4 100644 --- a/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep +++ b/modules/compute/virtual-machine/.test/windows.atmg/main.test.bicep @@ -83,6 +83,9 @@ module testDeployment '../../main.bicep' = { vmSize: 'Standard_DS2_v2' adminPassword: password configurationProfile: '/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction' + extensionMonitoringAgentConfig: { + enabled: true + } tags: { 'hidden-title': 'This is visible in the resource name' Environment: 'Non-Prod' diff --git a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep index b829bbcf1c..7ebb62385e 100644 --- a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep @@ -101,6 +101,9 @@ module testDeployment '../../main.bicep' = { } } ] + extensionMonitoringAgentConfig: { + enabled: true + } tags: { 'hidden-title': 'This is visible in the resource name' Environment: 'Non-Prod' diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 3cd09f6b51..fe3abc59df 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -567,13 +567,13 @@ resource vm_logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2021 scope: az.resourceGroup(split(monitoringWorkspaceId, '/')[2], split(monitoringWorkspaceId, '/')[4]) } -module vm_microsoftMonitoringAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { - name: '${uniqueString(deployment().name, location)}-VM-MicrosoftMonitoringAgent' +module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonitoringAgentConfig.enabled) { + name: '${uniqueString(deployment().name, location)}-VM-AzureMonitorAgent' params: { virtualMachineName: vm.name - name: 'MicrosoftMonitoringAgent' - publisher: 'Microsoft.EnterpriseCloud.Monitoring' - type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux' + name: 'AzureMonitorAgent' + publisher: 'Microsoft.Azure.Monitor' + type: osType == 'Windows' ? 'AzureMonitorWindowsAgent' : 'AzureMonitorLinuxAgent' typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7') autoUpgradeMinorVersion: contains(extensionMonitoringAgentConfig, 'autoUpgradeMinorVersion') ? extensionMonitoringAgentConfig.autoUpgradeMinorVersion : true enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false @@ -674,7 +674,7 @@ module vm_azureDiskEncryptionExtension 'extension/main.bicep' = if (extensionAzu } dependsOn: [ vm_customScriptExtension - vm_microsoftMonitoringAgentExtension + vm_azureMonitorAgentExtension ] } @@ -693,7 +693,7 @@ module vm_backup '../../recovery-services/vault/backup-fabric/protection-contain dependsOn: [ vm_aadJoinExtension vm_domainJoinExtension - vm_microsoftMonitoringAgentExtension + vm_azureMonitorAgentExtension vm_microsoftAntiMalwareExtension vm_networkWatcherAgentExtension vm_dependencyAgentExtension From 9248d6999134ffac3da946785dcd2ec37f33853e Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Thu, 7 Sep 2023 10:15:13 +0200 Subject: [PATCH 09/11] upd --- modules/compute/virtual-machine/README.md | 24 +++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/compute/virtual-machine/README.md b/modules/compute/virtual-machine/README.md index d7747400aa..36302646cd 100644 --- a/modules/compute/virtual-machine/README.md +++ b/modules/compute/virtual-machine/README.md @@ -1599,6 +1599,9 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { configurationProfile: '/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction' disablePasswordAuthentication: true enableDefaultTelemetry: '' + extensionMonitoringAgentConfig: { + enabled: true + } location: '' name: 'cvmlinatmg' publicKeys: [ @@ -1690,6 +1693,11 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { "enableDefaultTelemetry": { "value": "" }, + "extensionMonitoringAgentConfig": { + "value": { + "enabled": true + } + }, "location": { "value": "" }, @@ -2443,6 +2451,9 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { adminPassword: '' configurationProfile: '/providers/Microsoft.Automanage/bestPractices/AzureBestPracticesProduction' enableDefaultTelemetry: '' + extensionMonitoringAgentConfig: { + enabled: true + } location: '' name: 'cvmwinatmg' tags: { @@ -2515,6 +2526,11 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { "enableDefaultTelemetry": { "value": "" }, + "extensionMonitoringAgentConfig": { + "value": { + "enabled": true + } + }, "location": { "value": "" }, @@ -2706,6 +2722,9 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { } ] enableDefaultTelemetry: '' + extensionMonitoringAgentConfig: { + enabled: true + } location: '' name: 'cvmwincmk' tags: { @@ -2791,6 +2810,11 @@ module virtualMachine './compute/virtual-machine/main.bicep' = { "enableDefaultTelemetry": { "value": "" }, + "extensionMonitoringAgentConfig": { + "value": { + "enabled": true + } + }, "location": { "value": "" }, From b8538543b9db07c632049ee12e9c96e3cbe77b8a Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Thu, 7 Sep 2023 11:54:09 +0200 Subject: [PATCH 10/11] upd with GCS_AUTO_CONFIG for linux vm --- modules/compute/virtual-machine/main.bicep | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index fe3abc59df..9f8e53b178 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -579,6 +579,7 @@ module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonit enableAutomaticUpgrade: contains(extensionMonitoringAgentConfig, 'enableAutomaticUpgrade') ? extensionMonitoringAgentConfig.enableAutomaticUpgrade : false settings: { workspaceId: !empty(monitoringWorkspaceId) ? vm_logAnalyticsWorkspace.properties.customerId : '' + GCS_AUTO_CONFIG: osType == 'Linux' ? true : null } tags: contains(extensionMonitoringAgentConfig, 'tags') ? extensionMonitoringAgentConfig.tags : {} protectedSettings: { @@ -588,6 +589,7 @@ module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonit } } + module vm_dependencyAgentExtension 'extension/main.bicep' = if (extensionDependencyAgentConfig.enabled) { name: '${uniqueString(deployment().name, location)}-VM-DependencyAgent' params: { From 27bf431b551369ce61d03946484a2c3ab8f5c68e Mon Sep 17 00:00:00 2001 From: Fabio Masciotra Date: Thu, 7 Sep 2023 12:38:21 +0200 Subject: [PATCH 11/11] upd --- .../virtual-machine/.test/windows.ssecmk/main.test.bicep | 6 +++--- modules/compute/virtual-machine/main.bicep | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep index 7ebb62385e..1287d4f44c 100644 --- a/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep +++ b/modules/compute/virtual-machine/.test/windows.ssecmk/main.test.bicep @@ -58,6 +58,9 @@ module testDeployment '../../main.bicep' = { name: '${uniqueString(deployment().name, location)}-test-${serviceShort}' params: { enableDefaultTelemetry: enableDefaultTelemetry + extensionMonitoringAgentConfig: { + enabled: true + } location: location name: '${namePrefix}${serviceShort}' adminUsername: 'VMAdministrator' @@ -101,9 +104,6 @@ module testDeployment '../../main.bicep' = { } } ] - extensionMonitoringAgentConfig: { - enabled: true - } tags: { 'hidden-title': 'This is visible in the resource name' Environment: 'Non-Prod' diff --git a/modules/compute/virtual-machine/main.bicep b/modules/compute/virtual-machine/main.bicep index 9f8e53b178..234aecbfb0 100644 --- a/modules/compute/virtual-machine/main.bicep +++ b/modules/compute/virtual-machine/main.bicep @@ -581,6 +581,7 @@ module vm_azureMonitorAgentExtension 'extension/main.bicep' = if (extensionMonit workspaceId: !empty(monitoringWorkspaceId) ? vm_logAnalyticsWorkspace.properties.customerId : '' GCS_AUTO_CONFIG: osType == 'Linux' ? true : null } + tags: contains(extensionMonitoringAgentConfig, 'tags') ? extensionMonitoringAgentConfig.tags : {} protectedSettings: { workspaceKey: !empty(monitoringWorkspaceId) ? vm_logAnalyticsWorkspace.listKeys().primarySharedKey : ''