Skip to content

Commit 8948c30

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
Merge pull request #390 from microsoft/dev
fix: merging dev to main
2 parents 20ec1ce + 0bbd905 commit 8948c30

26 files changed

Lines changed: 363 additions & 560 deletions

‎docs/CustomizingAzdParameters.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ By default this template will use the environment name as the prefix to prevent
1717
| `AZURE_ENV_MODEL_CAPACITY` | integer | `150` | Set the Model Capacity (choose a number based on available GPT model capacity in your subscription). |
1818
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Set this if you want to reuse an existing Log Analytics Workspace instead of creating a new one. |
1919
| `AZURE_ENV_IMAGETAG` | string | `latest` | Set the Image tag Like (allowed values: latest, dev, hotfix) |
20-
| `AZURE_ENV_JUMPBOX_SIZE` | string | `Standard_DS2_v2` | Specifies the size of the Jumpbox Virtual Machine. Set a custom value if `enablePrivateNetworking` is `true`. |
20+
| `AZURE_ENV_VM_SIZE` | string | `Standard_D2s_v5` | Specifies the size of the Jumpbox Virtual Machine (e.g., `Standard_D2s_v5`, `Standard_D2s_v4`). Set a custom value if `enablePrivateNetworking` is `true`. |
2121
| `AZURE_ENV_JUMPBOX_ADMIN_USERNAME` | string | `JumpboxAdminUser` | Specifies the administrator username for the Jumpbox Virtual Machine. |
2222
| `AZURE_ENV_JUMPBOX_ADMIN_PASSWORD` | string | `JumpboxAdminP@ssw0rd1234!` | Specifies the administrator password for the Jumpbox Virtual Machine. |
2323
| `AZURE_ENV_COSMOS_SECONDARY_LOCATION` | string | *(not set by default)* | Specifies the secondary region for Cosmos DB. Required if `enableRedundancy` is `true`. |

‎docs/DeploymentGuide.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,11 @@ Copy the contents from the production configuration file to your main parameters
202202

203203
> **Note:** This section only applies if you selected **Production** deployment type in section 3.1. VMs are not deployed in the default Development/Testing configuration.
204204

205-
By default, random GUIDs are generated for VM credentials. To set custom credentials:
205+
By default, hard-coded fallback values are used for VM credentials (`JumpboxAdminUser` / `JumpboxAdminP@ssw0rd1234!`). To set custom credentials:
206206

207207
```shell
208-
azd env set AZURE_ENV_VM_ADMIN_USERNAME <your-username>
209-
azd env set AZURE_ENV_VM_ADMIN_PASSWORD <your-password>
208+
azd env set AZURE_ENV_JUMPBOX_ADMIN_USERNAME <your-username>
209+
azd env set AZURE_ENV_JUMPBOX_ADMIN_PASSWORD <your-password>
210210
```
211211

212212
### 3.3 Advanced Configuration (Optional)

‎docs/TroubleShootingSteps.md‎

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

‎infra/main.bicep‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.7.0' = if (en
285285
name: 'appi-${solutionSuffix}'
286286
location: location
287287
workspaceResourceId: logAnalyticsWorkspaceResourceId
288-
diagnosticSettings: [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
289288
tags: allTags
290289
enableTelemetry: enableTelemetry
291290
retentionInDays: 365
@@ -637,9 +636,9 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (e
637636
enableTelemetry: enableTelemetry
638637
computerName: take(virtualMachineResourceName, 15)
639638
osType: 'Windows'
640-
vmSize: vmSize ?? 'Standard_D2s_v3'
641-
adminUsername: vmAdminUsername ?? 'JumpboxAdminUser'
642-
adminPassword: vmAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
639+
vmSize: !empty(vmSize) ? vmSize : 'Standard_D2s_v5'
640+
adminUsername: !empty(vmAdminUsername) ? vmAdminUsername : 'JumpboxAdminUser'
641+
adminPassword: !empty(vmAdminPassword) ? vmAdminPassword : 'JumpboxAdminP@ssw0rd1234!'
643642
managedIdentities: {
644643
systemAssigned: true
645644
}

‎infra/main.json‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.41.2.15936",
9-
"templateHash": "9733680305260753032"
9+
"templateHash": "3093757051086668797"
1010
},
1111
"name": "Modernize Your Code Solution Accelerator",
12-
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \n"
12+
"description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
1313
},
1414
"parameters": {
1515
"solutionName": {
@@ -3919,13 +3919,6 @@
39193919
"value": "[parameters('location')]"
39203920
},
39213921
"workspaceResourceId": "[if(variables('useExistingLogAnalytics'), createObject('value', parameters('existingLogAnalyticsWorkspaceId')), createObject('value', reference('logAnalyticsWorkspace').outputs.resourceId.value))]",
3922-
"diagnosticSettings": {
3923-
"value": [
3924-
{
3925-
"workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value)]"
3926-
}
3927-
]
3928-
},
39293922
"tags": {
39303923
"value": "[variables('allTags')]"
39313924
},
@@ -12903,10 +12896,10 @@
1290312896
"dependsOn": [
1290412897
"applicationInsights",
1290512898
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
12906-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]",
12907-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
1290812899
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
1290912900
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]",
12901+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
12902+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]",
1291012903
"dataCollectionEndpoint",
1291112904
"logAnalyticsWorkspace",
1291212905
"virtualNetwork"
@@ -16624,15 +16617,9 @@
1662416617
"osType": {
1662516618
"value": "Windows"
1662616619
},
16627-
"vmSize": {
16628-
"value": "[coalesce(parameters('vmSize'), 'Standard_D2s_v3')]"
16629-
},
16630-
"adminUsername": {
16631-
"value": "[coalesce(parameters('vmAdminUsername'), 'JumpboxAdminUser')]"
16632-
},
16633-
"adminPassword": {
16634-
"value": "[coalesce(parameters('vmAdminPassword'), 'JumpboxAdminP@ssw0rd1234!')]"
16635-
},
16620+
"vmSize": "[if(not(empty(parameters('vmSize'))), createObject('value', parameters('vmSize')), createObject('value', 'Standard_D2s_v5'))]",
16621+
"adminUsername": "[if(not(empty(parameters('vmAdminUsername'))), createObject('value', parameters('vmAdminUsername')), createObject('value', 'JumpboxAdminUser'))]",
16622+
"adminPassword": "[if(not(empty(parameters('vmAdminPassword'))), createObject('value', parameters('vmAdminPassword')), createObject('value', 'JumpboxAdminP@ssw0rd1234!'))]",
1663616623
"managedIdentities": {
1663716624
"value": {
1663816625
"systemAssigned": true
@@ -31929,9 +31916,9 @@
3192931916
},
3193031917
"dependsOn": [
3193131918
"aiServices",
31932-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
31933-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
3193431919
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
31920+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
31921+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
3193531922
"virtualNetwork"
3193631923
]
3193731924
},
@@ -40182,8 +40169,8 @@
4018240169
},
4018340170
"dependsOn": [
4018440171
"appIdentity",
40185-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
4018640172
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageFile)]",
40173+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
4018740174
"logAnalyticsWorkspace",
4018840175
"virtualNetwork"
4018940176
]

‎infra/main.parameters.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,6 @@
3838
"azureAiServiceLocation": {
3939
"value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
4040
},
41-
"vmSize": {
42-
"value": "${AZURE_ENV_JUMPBOX_SIZE}"
43-
},
44-
"vmAdminUsername": {
45-
"value": "${AZURE_ENV_JUMPBOX_ADMIN_USERNAME}"
46-
},
47-
"vmAdminPassword": {
48-
"value": "${AZURE_ENV_JUMPBOX_ADMIN_PASSWORD}"
49-
},
5041
"backendExists": {
5142
"value": "${SERVICE_BACKEND_RESOURCE_EXISTS=false}"
5243
},

‎infra/main.waf.parameters.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
"azureAiServiceLocation": {
3939
"value": "${AZURE_ENV_AI_SERVICE_LOCATION}"
4040
},
41-
"vmSize": {
42-
"value": "${AZURE_ENV_JUMPBOX_SIZE}"
43-
},
4441
"vmAdminUsername": {
4542
"value": "${AZURE_ENV_JUMPBOX_ADMIN_USERNAME}"
4643
},
4744
"vmAdminPassword": {
4845
"value": "${AZURE_ENV_JUMPBOX_ADMIN_PASSWORD}"
4946
},
47+
"vmSize": {
48+
"value": "${AZURE_ENV_VM_SIZE}"
49+
},
5050
"backendExists": {
5151
"value": "${SERVICE_BACKEND_RESOURCE_EXISTS=false}"
5252
},

‎infra/main_custom.bicep‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ module applicationInsights 'br/public:avm/res/insights/component:0.7.0' = if (en
288288
name: 'appi-${solutionSuffix}'
289289
location: location
290290
workspaceResourceId: logAnalyticsWorkspaceResourceId
291-
diagnosticSettings: [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
292291
tags: allTags
293292
enableTelemetry: enableTelemetry
294293
retentionInDays: 365
@@ -566,9 +565,9 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.20.0' = if (e
566565
enableTelemetry: enableTelemetry
567566
computerName: take(virtualMachineResourceName, 15)
568567
osType: 'Windows'
569-
vmSize: vmSize ?? 'Standard_D2s_v3'
570-
adminUsername: vmAdminUsername ?? 'JumpboxAdminUser'
571-
adminPassword: vmAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
568+
vmSize: !empty(vmSize) ? vmSize : 'Standard_D2s_v5'
569+
adminUsername: !empty(vmAdminUsername) ? vmAdminUsername : 'JumpboxAdminUser'
570+
adminPassword: !empty(vmAdminPassword) ? vmAdminPassword : 'JumpboxAdminP@ssw0rd1234!'
572571
managedIdentities: {
573572
systemAssigned: true
574573
}

‎infra/modules/virtualNetwork.bicep‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,12 @@ param resourceSuffix string
170170

171171
// VM Size Notes:
172172
// 1 B-series VMs (like Standard_B2ms) do not support accelerated networking.
173-
// 2 Pick a VM size that does support accelerated networking (the usual jump-box candidates):
174-
// Standard_DS2_v2 (2 vCPU, 7 GiB RAM, Premium SSD) // The most broadly available (it’s a legacy SKU supported in virtually every region).
175-
// Standard_D2s_v3 (2 vCPU, 8 GiB RAM, Premium SSD) // next most common
176-
// Standard_D2s_v4 (2 vCPU, 8 GiB RAM, Premium SSD) // Newest, so fewer regions available
173+
// 2 Pick a VM size that supports accelerated networking + Premium SSD (the usual jump-box candidates):
174+
// Standard_D2s_v5 (2 vCPU, 8 GiB RAM, Premium SSD/v2/Ultra) // DEFAULT - current-gen Intel, broad regional availability.
175+
// Standard_D2as_v5 (2 vCPU, 8 GiB RAM, Premium SSD/Ultra) // AMD alternative, typically ~15% cheaper.
176+
// Standard_D2s_v4 (2 vCPU, 8 GiB RAM, Premium SSD) // Previous gen, also broadly available.
177+
// Standard_DS2_v2 (2 vCPU, 7 GiB RAM, Premium SSD) // Legacy SKU, being retired from some regions - avoid for new deployments.
178+
// 3 A-series (Av2) is NOT suitable: no Premium SSD support, no accelerated networking.
177179

178180
// Subnet Classless Inter-Domain Routing (CIDR) Sizing Reference Table (Best Practices)
179181
// | CIDR | # of Addresses | # of /24s | Notes |

‎infra/samples/network-subnet-design.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ import { jumpBoxConfigurationType } from 'network/jumpbox.bicep'
110110
@description('Optional. Configuration for the Jumpbox VM. Leave null to omit Jumpbox creation.')
111111
param jumpboxConfiguration jumpBoxConfigurationType = {
112112
name: 'vm-jumpbox-${resourcesName}'
113-
size: 'Standard_D2s_v3' // Default size, can be overridden
113+
size: 'Standard_D2s_v5' // Default size, can be overridden
114114
username: vmAdminUsername
115115
password: vmAdminPassword
116116
subnet: {

0 commit comments

Comments
 (0)