Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 18 additions & 11 deletions content-gen/docs/AZD_DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,28 @@ azd env set embeddingDeploymentCapacity 50
azd env set azureOpenaiAPIVersion 2024-12-01-preview
```

### 4. Enable Optional Features (WAF Pillars)
### 4. Choose Deployment Configuration

```bash
# Enable private networking (VNet integration)
azd env set enablePrivateNetworking true
The [`infra`](../infra) folder contains the [`main.bicep`](../infra/main.bicep) Bicep script, which defines all Azure infrastructure components for this solution.

# Enable monitoring (Log Analytics + App Insights)
azd env set enableMonitoring true
By default, the `azd up` command uses the [`main.parameters.json`](../infra/main.parameters.json) file to deploy the solution. This file is pre-configured for a **sandbox environment**.

# Enable scalability (auto-scaling, higher SKUs)
azd env set enableScalability true
For **production deployments**, the repository also provides [`main.waf.parameters.json`](../infra/main.waf.parameters.json), which applies a [Well-Architected Framework (WAF) aligned](https://learn.microsoft.com/en-us/azure/well-architected/) configuration. This can be used for Production scenarios.

# Enable redundancy (zone redundancy, geo-replication)
azd env set enableRedundancy true
```
**How to choose your deployment configuration:**

* **To use sandbox/dev environment** — Use the default `main.parameters.json` file.

* **To use production configuration:**

Before running `azd up`, copy the contents from the production configuration file to your main parameters file:

1. Navigate to the `infra` folder in your project.
2. Open `main.waf.parameters.json` in a text editor (like Notepad, VS Code, etc.).
3. Select all content (Ctrl+A) and copy it (Ctrl+C).
4. Open `main.parameters.json` in the same text editor.
5. Select all existing content (Ctrl+A) and paste the copied content (Ctrl+V).
6. Save the file (Ctrl+S).

### 5. Deploy

Expand Down
2 changes: 1 addition & 1 deletion content-gen/docs/DEPLOYMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Depending on your subscription quota and capacity, you can adjust quota settings

### Deploying with AZD

Once you've opened the project in [Codespaces](#github-codespaces), [Dev Containers](#vs-code-dev-containers), or [locally](#local-environment), you can deploy it to Azure by following the steps in the [AZD Deployment Guide](AZD_DEPLOYMENT.md)
Once you've opened the project in [Codespaces](#github-codespaces), [Dev Containers](#vs-code-dev-containers), or [locally](#local-environment), you can deploy it to Azure by following the steps in the [AZD Deployment Guide](AZD_DEPLOYMENT.md).

## Post Deployment Steps

Expand Down
12 changes: 0 additions & 12 deletions content-gen/infra/main.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@
},
"imageTag": {
"value": "${imageTag=latest}"
},
"enablePrivateNetworking": {
"value": "${enablePrivateNetworking}"
},
"enableMonitoring": {
"value": "${enableMonitoring}"
},
"enableScalability": {
"value": "${enableScalability}"
},
"enableRedundancy": {
"value": "${enableRedundancy}"
}
}
}
69 changes: 69 additions & 0 deletions content-gen/infra/main.waf.parameters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"solutionName": {
"value": "${AZURE_ENV_NAME}"
},
"location": {
"value": "${AZURE_LOCATION}"
},
"gptModelName": {
"value": "${gptModelName}"
},
"gptModelVersion": {
"value": "${gptModelVersion}"
},
"gptModelDeploymentType": {
"value": "${gptModelDeploymentType}"
},
"gptModelCapacity": {
"value": "${gptModelCapacity}"
},
"imageModelChoice": {
"value": "${imageModelChoice}"
},
"dalleModelCapacity": {
"value": "${dalleModelCapacity}"
},
"embeddingModel": {
"value": "${embeddingModel}"
},
"embeddingDeploymentCapacity": {
"value": "${embeddingDeploymentCapacity}"
},
"azureOpenaiAPIVersion": {
"value": "${azureOpenaiAPIVersion}"
},
"azureAiServiceLocation": {
"value": "${azureAiServiceLocation}"
},
"existingLogAnalyticsWorkspaceId": {
"value": "${existingLogAnalyticsWorkspaceId}"
},
"azureExistingAIProjectResourceId": {
"value": "${azureExistingAIProjectResourceId}"
},
"acrName": {
"value": "${acrName}"
},
"imageTag": {
"value": "${imageTag=latest}"
},
"enableMonitoring": {
"value": true
},
"enablePrivateNetworking": {
"value": true
},
"enableScalability": {
"value": true
},
"virtualMachineAdminUsername": {
"value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
},
"virtualMachineAdminPassword": {
"value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
}
}
}