Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8e12b17
inital avm push
TravisHilbert May 12, 2025
6c8a3f9
Templet updated. Changed True to False
TravisHilbert May 14, 2025
4239477
Param Updates
TravisHilbert May 15, 2025
62c55f4
Add Bicep parameters for infrastructure deployment configuration
alguadam May 16, 2025
7254785
Merge pull request #213 from microsoft/AVM_WAF_Integration-alguadam
TravisHilbert May 16, 2025
bdf6603
param changes
TravisHilbert May 19, 2025
4f5b1e2
Merge branch 'main' into AVM_WAF_Integration-alguadam
alguadam May 20, 2025
519d99a
- Changing solution prefix parameter to optional, default value is a …
alguadam May 20, 2025
ad8c639
Merge branch 'AVM_WAF_Integration-alguadam' into AVMWAF_Integration
alguadam May 22, 2025
4242f56
refactor: update the naming conventions for all resources and added A…
Abdul-Microsoft May 23, 2025
6152da1
fix: update default value for AzureOpenAILocation parameter to 'swede…
Abdul-Microsoft May 23, 2025
b514ddb
refactor: standardize parameter naming for Azure OpenAI location and …
Abdul-Microsoft May 23, 2025
388b874
Merge pull request #229 from microsoft/PSL-AVM-NamingConventionChanges
alguadam May 23, 2025
24ae670
Readme adds for WAF and Capcity param fixes
TravisHilbert May 23, 2025
76c7a71
Merge branch 'AVM_WAF_Integration' of https://github.com/microsoft/Mu…
TravisHilbert May 23, 2025
6f478bd
readme edits
TravisHilbert May 23, 2025
3570255
Added more WAF notes
TravisHilbert May 23, 2025
1041aa0
Update Deployment Guide to clarify WAF and sandbox deployment options
alguadam May 26, 2025
9af5523
Merge branch 'main' into AVM_WAF_Integration
alguadam May 26, 2025
4e078e8
Moved unused bicep files to 'old' folder
alguadam May 26, 2025
a373676
Remove enableTelemetry parameter from main.waf-aligned.bicepparam
alguadam May 26, 2025
1eefe9c
Fix typo in AI Foundry configuration: corrected 'modelCapcity' to 'mo…
alguadam May 27, 2025
1f6ee95
Add Disclaimer message in task approval response
NirajC-Microsoft May 29, 2025
4f40340
Merge pull request #233 from microsoft/18419--PSL--BUG
Roopan-Microsoft May 29, 2025
3656087
Merge branch 'main' into AVM_WAF_Integration
alguadam May 29, 2025
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
27 changes: 26 additions & 1 deletion documentation/DeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ To deploy this solution accelerator, ensure you have access to an [Azure subscri

Check the [Azure Products by Region](https://azure.microsoft.com/en-us/explore/global-infrastructure/products-by-region/?products=all&regions=all) page and select a **region** where the following services are available:

- [Azure OpenAI Service](https://learn.microsoft.com/en-us/azure/ai-services/openai/)
- [Azure AI Foundry](https://learn.microsoft.com/en-us/azure/ai-foundry/)
- [Azure Container Apps](https://learn.microsoft.com/en-us/azure/container-apps/)
- [Azure Container Registry](https://learn.microsoft.com/en-us/azure/container-registry/)
- [Azure Cosmos DB](https://learn.microsoft.com/en-us/azure/cosmos-db/)
Expand All @@ -28,6 +28,31 @@ This will allow the scripts to run for the current session without permanently c

## Deployment Options & Steps

### Sandbox or WAF Aligned Deployment Options

The [`infra`](../infra) folder of the Multi Agent Solution Accelerator contains the [`main.bicep`](../infra/main.bicep) Bicep script, which defines all Azure infrastructure components for this solution.

By default, the `azd up` command uses the [`main.bicepparam`](../infra/main.bicepparam) file to deploy the solution. This file is pre-configured for a **sandbox environment** — ideal for development and proof-of-concept scenarios, with minimal security and cost controls for rapid iteration.

For **production deployments**, the repository also provides [`main.waf-aligned.bicepparam`](../infra/main.waf-aligned.bicepparam), which applies a [Well-Architected Framework (WAF) aligned](https://learn.microsoft.com/en-us/azure/well-architected/) configuration. This option enables additional Azure best practices for reliability, security, cost optimization, operational excellence, and performance efficiency, such as:

- Enhanced network security (e.g., Network protection with private endpoints)
- Stricter access controls and managed identities
- Logging, monitoring, and diagnostics enabled by default
- Resource tagging and cost management recommendations

**How to choose your deployment configuration:**
- Use the default [`main.bicepparam`](../infra/main.bicepparam) for a sandbox/dev environment.
- For a WAF-aligned, production-ready deployment, copy the contents of [`main.waf-aligned.bicepparam`](../infra/main.waf-aligned.bicepparam) into `main.bicepparam` before running `azd up`.

> [!TIP]
> Always review and adjust parameter values (such as region, capacity, and security settings) to match your organization’s requirements before deploying. For production, ensure you have sufficient quota and follow the principle of least privilege for all identities and role assignments.

> [!IMPORTANT]
> The WAF-aligned configuration is under active development. More Azure Well-Architected recommendations will be added in future updates.

### Deployment Steps

Pick from the options below to see step-by-step instructions for GitHub Codespaces, VS Code Dev Containers, Local Environments, and Bicep deployments.

| [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) | [![Open in Dev Containers](https://img.shields.io/static/v1?style=for-the-badge&label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/microsoft/Multi-Agent-Custom-Automation-Engine-Solution-Accelerator) |
Expand Down
9 changes: 9 additions & 0 deletions infra/bicepconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"experimentalFeaturesEnabled": {
"extensibility": true
},
"extensions": {
"graphV1": "br:mcr.microsoft.com/bicep/extensions/microsoftgraph/v1.0:0.2.0-preview" // ,
// "graphBeta": "br:mcr.microsoft.com/bicep/extensions/microsoftgraph/beta:0.2.0-preview"
}
}
Loading
Loading