Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@danycontre
danycontre committed Sep 19, 2023
1 parent 60af872 commit 041412b
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 5 deletions.
10 changes: 10 additions & 0 deletions carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,7 @@ module vm_aadJoinExtension 'extensions/deploy.bicep' = if (extensionAadJoinConfi
params: {
virtualMachineName: vm.name
name: 'AADLogin'
location: location
publisher: 'Microsoft.Azure.ActiveDirectory'
type: osType == 'Windows' ? 'AADLoginForWindows' : 'AADSSHLoginforLinux'
typeHandlerVersion: contains(extensionAadJoinConfig, 'typeHandlerVersion') ? extensionAadJoinConfig.typeHandlerVersion : '1.0'
Expand All @@ -539,6 +540,7 @@ module vm_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJoi
params: {
virtualMachineName: vm.name
name: 'DomainJoin'
location: location
publisher: 'Microsoft.Compute'
type: 'JsonADDomainExtension'
typeHandlerVersion: contains(extensionDomainJoinConfig, 'typeHandlerVersion') ? extensionDomainJoinConfig.typeHandlerVersion : '1.3'
Expand All @@ -557,6 +559,7 @@ module vm_microsoftAntiMalwareExtension 'extensions/deploy.bicep' = if (extensio
params: {
virtualMachineName: vm.name
name: 'MicrosoftAntiMalware'
location: location
publisher: 'Microsoft.Azure.Security'
type: 'IaaSAntimalware'
typeHandlerVersion: contains(extensionAntiMalwareConfig, 'typeHandlerVersion') ? extensionAntiMalwareConfig.typeHandlerVersion : '1.3'
Expand All @@ -577,6 +580,7 @@ module vm_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (exte
params: {
virtualMachineName: vm.name
name: 'MicrosoftMonitoringAgent'
location: location
publisher: 'Microsoft.EnterpriseCloud.Monitoring'
type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux'
typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7')
Expand All @@ -597,6 +601,7 @@ module vm_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDepe
params: {
virtualMachineName: vm.name
name: 'DependencyAgent'
location: location
publisher: 'Microsoft.Azure.Monitoring.DependencyAgent'
type: osType == 'Windows' ? 'DependencyAgentWindows' : 'DependencyAgentLinux'
typeHandlerVersion: contains(extensionDependencyAgentConfig, 'typeHandlerVersion') ? extensionDependencyAgentConfig.typeHandlerVersion : '9.5'
Expand All @@ -611,6 +616,7 @@ module vm_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extension
params: {
virtualMachineName: vm.name
name: 'NetworkWatcherAgent'
location: location
publisher: 'Microsoft.Azure.NetworkWatcher'
type: osType == 'Windows' ? 'NetworkWatcherAgentWindows' : 'NetworkWatcherAgentLinux'
typeHandlerVersion: contains(extensionNetworkWatcherAgentConfig, 'typeHandlerVersion') ? extensionNetworkWatcherAgentConfig.typeHandlerVersion : '1.4'
Expand All @@ -625,6 +631,7 @@ module vm_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (ext
params: {
virtualMachineName: vm.name
name: 'DesiredStateConfiguration'
location: location
publisher: 'Microsoft.Powershell'
type: 'DSC'
typeHandlerVersion: contains(extensionDSCConfig, 'typeHandlerVersion') ? extensionDSCConfig.typeHandlerVersion : '2.77'
Expand All @@ -641,6 +648,7 @@ module vm_customScriptExtension 'extensions/deploy.bicep' = if (extensionCustomS
params: {
virtualMachineName: vm.name
name: 'CustomScriptExtension'
location: location
publisher: osType == 'Windows' ? 'Microsoft.Compute' : 'Microsoft.Azure.Extensions'
type: osType == 'Windows' ? 'CustomScriptExtension' : 'CustomScript'
typeHandlerVersion: contains(extensionCustomScriptConfig, 'typeHandlerVersion') ? extensionCustomScriptConfig.typeHandlerVersion : (osType == 'Windows' ? '1.10' : '2.1')
Expand All @@ -662,6 +670,7 @@ module vm_azureDiskEncryptionExtension 'extensions/deploy.bicep' = if (extension
params: {
virtualMachineName: vm.name
name: 'AzureDiskEncryption'
location: location
publisher: 'Microsoft.Azure.Security'
type: osType == 'Windows' ? 'AzureDiskEncryption' : 'AzureDiskEncryptionForLinux'
typeHandlerVersion: contains(extensionAzureDiskEncryptionConfig, 'typeHandlerVersion') ? extensionAzureDiskEncryptionConfig.typeHandlerVersion : (osType == 'Windows' ? '2.2' : '1.1')
Expand All @@ -681,6 +690,7 @@ module vm_backup '../../Microsoft.RecoveryServices/vaults/protectionContainers/p
name: '${uniqueString(deployment().name, location)}-VM-Backup'
params: {
name: 'vm;iaasvmcontainerv2;${resourceGroup().name};${vm.name}'
location: location
policyId: az.resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', backupVaultName, backupPolicyName)
protectedItemType: 'Microsoft.Compute/virtualMachines'
protectionContainerName: 'iaasvmcontainer;iaasvmcontainerv2;${resourceGroup().name};${vm.name}'
Expand Down
70 changes: 65 additions & 5 deletions workload/arm/deploy-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "17199024280522508418"
"templateHash": "18069407191382665045"
},
"name": "AVD Accelerator - Baseline Deployment",
"description": "AVD Accelerator - Deployment Baseline"
Expand Down Expand Up @@ -29421,7 +29421,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "11482310091325103089"
"templateHash": "2907237861517290313"
}
},
"parameters": {
Expand Down Expand Up @@ -29702,7 +29702,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "7668761013193612810"
"templateHash": "547922033158170612"
}
},
"parameters": {
Expand Down Expand Up @@ -31746,6 +31746,9 @@
"name": {
"value": "AADLogin"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.ActiveDirectory"
},
Expand Down Expand Up @@ -31937,6 +31940,9 @@
"name": {
"value": "DomainJoin"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Compute"
},
Expand Down Expand Up @@ -32140,6 +32146,9 @@
"name": {
"value": "MicrosoftAntiMalware"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Security"
},
Expand Down Expand Up @@ -32338,6 +32347,9 @@
"name": {
"value": "MicrosoftMonitoringAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.EnterpriseCloud.Monitoring"
},
Expand Down Expand Up @@ -32541,6 +32553,9 @@
"name": {
"value": "DependencyAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Monitoring.DependencyAgent"
},
Expand Down Expand Up @@ -32734,6 +32749,9 @@
"name": {
"value": "NetworkWatcherAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.NetworkWatcher"
},
Expand Down Expand Up @@ -32927,6 +32945,9 @@
"name": {
"value": "DesiredStateConfiguration"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Powershell"
},
Expand Down Expand Up @@ -33124,6 +33145,9 @@
"name": {
"value": "CustomScriptExtension"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'Microsoft.Compute'), createObject('value', 'Microsoft.Azure.Extensions'))]",
"type": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'CustomScriptExtension'), createObject('value', 'CustomScript'))]",
"typeHandlerVersion": "[if(contains(parameters('extensionCustomScriptConfig'), 'typeHandlerVersion'), createObject('value', parameters('extensionCustomScriptConfig').typeHandlerVersion), if(equals(parameters('osType'), 'Windows'), createObject('value', '1.10'), createObject('value', '2.1')))]",
Expand Down Expand Up @@ -33330,6 +33354,9 @@
"name": {
"value": "AzureDiskEncryption"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Security"
},
Expand Down Expand Up @@ -33527,6 +33554,9 @@
"name": {
"value": "[format('vm;iaasvmcontainerv2;{0};{1}', resourceGroup().name, parameters('name'))]"
},
"location": {
"value": "[parameters('location')]"
},
"policyId": {
"value": "[resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', parameters('backupVaultName'), parameters('backupPolicyName'))]"
},
Expand Down Expand Up @@ -43205,7 +43235,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "12382067254059662962"
"templateHash": "5800190286840239570"
}
},
"parameters": {
Expand Down Expand Up @@ -43602,7 +43632,7 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "7668761013193612810"
"templateHash": "547922033158170612"
}
},
"parameters": {
Expand Down Expand Up @@ -45646,6 +45676,9 @@
"name": {
"value": "AADLogin"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.ActiveDirectory"
},
Expand Down Expand Up @@ -45837,6 +45870,9 @@
"name": {
"value": "DomainJoin"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Compute"
},
Expand Down Expand Up @@ -46040,6 +46076,9 @@
"name": {
"value": "MicrosoftAntiMalware"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Security"
},
Expand Down Expand Up @@ -46238,6 +46277,9 @@
"name": {
"value": "MicrosoftMonitoringAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.EnterpriseCloud.Monitoring"
},
Expand Down Expand Up @@ -46441,6 +46483,9 @@
"name": {
"value": "DependencyAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Monitoring.DependencyAgent"
},
Expand Down Expand Up @@ -46634,6 +46679,9 @@
"name": {
"value": "NetworkWatcherAgent"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.NetworkWatcher"
},
Expand Down Expand Up @@ -46827,6 +46875,9 @@
"name": {
"value": "DesiredStateConfiguration"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Powershell"
},
Expand Down Expand Up @@ -47024,6 +47075,9 @@
"name": {
"value": "CustomScriptExtension"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'Microsoft.Compute'), createObject('value', 'Microsoft.Azure.Extensions'))]",
"type": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'CustomScriptExtension'), createObject('value', 'CustomScript'))]",
"typeHandlerVersion": "[if(contains(parameters('extensionCustomScriptConfig'), 'typeHandlerVersion'), createObject('value', parameters('extensionCustomScriptConfig').typeHandlerVersion), if(equals(parameters('osType'), 'Windows'), createObject('value', '1.10'), createObject('value', '2.1')))]",
Expand Down Expand Up @@ -47230,6 +47284,9 @@
"name": {
"value": "AzureDiskEncryption"
},
"location": {
"value": "[parameters('location')]"
},
"publisher": {
"value": "Microsoft.Azure.Security"
},
Expand Down Expand Up @@ -47427,6 +47484,9 @@
"name": {
"value": "[format('vm;iaasvmcontainerv2;{0};{1}', resourceGroup().name, parameters('name'))]"
},
"location": {
"value": "[parameters('location')]"
},
"policyId": {
"value": "[resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', parameters('backupVaultName'), parameters('backupPolicyName'))]"
},
Expand Down

0 comments on commit 041412b

Please sign in to comment.