Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ed09467
Remove Createdby Parameter from deploy.yml and change logic in bicep
NirajC-Microsoft Sep 22, 2025
c6962b5
Update deploy.yml to include createdBy parameter
NirajC-Microsoft Sep 22, 2025
83a661e
CI Pipeline Validate Deployment - MACAE
VishalS-Microsoft Sep 23, 2025
fd0ca46
removed my feature branch
VishalS-Microsoft Sep 23, 2025
28a6e0b
Add createdBy parameter with description
NirajC-Microsoft Sep 23, 2025
cb448da
Merge pull request #520 from microsoft/psl-removecreatetagfrompipeline
Roopan-Microsoft Sep 23, 2025
f602851
added new 'type' tag
VishalS-Microsoft Sep 23, 2025
e7f78a9
Merge pull request #523 from microsoft/CI-Pipeline-macae
Roopan-Microsoft Sep 23, 2025
a64e5c6
Updated README, azure.yml for minimum azd version 1.18.0
Vamshi-Microsoft Oct 1, 2025
9651a5a
Merge pull request #538 from microsoft/psl-azd-version-update
Prajwal-Microsoft Oct 1, 2025
7ebc4dc
update the network module
Prekshith-Microsoft Oct 14, 2025
0579bc6
updated
Prekshith-Microsoft Oct 14, 2025
4b7993f
Removed commented code
Prekshith-Microsoft Oct 14, 2025
489ff8d
Removed administration subnet
Prekshith-Microsoft Oct 15, 2025
d023557
Added admin and removed jumpbox
Prekshith-Microsoft Oct 15, 2025
4fcb021
Merge pull request #563 from microsoft/psl-macae-networkmodule
Prajwal-Microsoft Oct 15, 2025
e488b28
Add AZURE_DEV_COLLECT_TELEMETRY variable in azure-dev.yml file for ma…
NirajC-Microsoft Oct 17, 2025
862b23f
Merge pull request #567 from microsoft/psl-macae2-azuredev
Roopan-Microsoft Oct 17, 2025
6133fff
macae-v3-gp
Ritesh-Microsoft Oct 24, 2025
f4fc534
test: MACAE-v3-Golden path Script
Avijit-Microsoft Oct 24, 2025
3a6e6d8
Revert "test: MACAE-v3-Golden path Script"
Ritesh-Microsoft Oct 27, 2025
6203a74
Merge pull request #589 from microsoft/revert-585-dev
Roopan-Microsoft Oct 27, 2025
965e3c7
docs: add guidance for disabling Log Analytics workspace replication …
Abdul-Microsoft Nov 21, 2025
0ab669e
fix portal link
Dec 3, 2025
c39397b
Merge pull request #677 from microsoft/troubleshooting-updates
Prajwal-Microsoft Dec 3, 2025
cfb4855
fix: reduce default model capacity, add Bicep version guard, improve …
Roopan-Microsoft Apr 7, 2026
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
4 changes: 1 addition & 3 deletions .github/workflows/azure-dev.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Azure Template Validation
on:
push:
branches:
- main
workflow_dispatch:

permissions:
Expand All @@ -26,6 +23,7 @@ jobs:
AZURE_ENV_NAME: ${{ vars.AZURE_ENV_NAME }}
AZURE_LOCATION: ${{ vars.AZURE_LOCATION }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
AZURE_DEV_COLLECT_TELEMETRY: ${{ vars.AZURE_DEV_COLLECT_TELEMETRY }}

- name: print result
run: cat ${{ steps.validation.outputs.resultFile }}
4 changes: 4 additions & 0 deletions .github/workflows/deploy-waf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,9 @@ jobs:
id: deploy
run: |
set -e
# Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")

az deployment group create \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file infra/main.bicep \
Expand All @@ -118,6 +121,7 @@ jobs:
enablePrivateNetworking=true \
enableScalability=true \
createdBy="Pipeline" \
tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}"


- name: Send Notification on Failure
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ jobs:
IMAGE_TAG="latest"
fi

# Generate current timestamp in desired format: YYYY-MM-DDTHH:MM:SS.SSSSSSSZ
current_date=$(date -u +"%Y-%m-%dT%H:%M:%S.%7NZ")

az deployment group create \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file infra/main.bicep \
Expand All @@ -138,6 +141,7 @@ jobs:
azureAiServiceLocation='${{ env.AZURE_LOCATION }}' \
gptModelCapacity=150 \
createdBy="Pipeline" \
tags="{'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
--output json

- name: Extract Web App and API App URLs
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ Quick deploy
### How to install or deploy
Follow the quick deploy steps on the deployment guide to deploy this solution to your own Azure subscription.

> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).

[Click here to launch the deployment guide](./docs/DeploymentGuide.md)
<br/><br/>

Expand Down
3 changes: 2 additions & 1 deletion azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ name: multi-agent-custom-automation-engine-solution-accelerator
metadata:
template: multi-agent-custom-automation-engine-solution-accelerator@1.0
requiredVersions:
azd: ">=1.15.0 !=1.17.1"
azd: '>= 1.18.0'
bicep: '>= 0.33.0'
4 changes: 3 additions & 1 deletion docs/DeploymentGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ If you're not using one of the above options for opening the project, then you'l
1. Make sure the following tools are installed:

- [PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.5) <small>(v7.0+)</small> - available for Windows, macOS, and Linux.
- [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.15.0+)</small> - version
- [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.18.0+)</small> - version
- [Python 3.9+](https://www.python.org/downloads/)
- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
- [Git](https://git-scm.com/downloads)
Expand Down Expand Up @@ -249,6 +249,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
```shell
azd up
```
> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).

3. Provide an `azd` environment name (e.g., "macaeapp").
4. Select a subscription from your Azure account and choose a location that has quota for all the resources.
Expand All @@ -261,6 +262,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
6. When Deployment is complete, follow steps in [Set Up Authentication in Azure App Service](../docs/azure_app_service_auth_setup.md) to add app authentication to your web app running on Azure App Service

7. If you are done trying out the application, you can delete the resources by running `azd down`.
> **Note:** If you deployed with `enableRedundancy=true` and Log Analytics workspace replication is enabled, you must first disable replication before running `azd down` else resource group delete will fail. Follow the steps in [Handling Log Analytics Workspace Deletion with Replication Enabled](./LogAnalyticsReplicationDisable.md), wait until replication returns `false`, then run `azd down`.


### 🛠️ Troubleshooting
Expand Down
28 changes: 28 additions & 0 deletions docs/LogAnalyticsReplicationDisable.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 🛠 Handling Log Analytics Workspace Deletion with Replication Enabled

If redundancy (replication) is enabled for your Log Analytics workspace, you must disable it before deleting the workspace or resource group. Otherwise, deletion will fail.

## ✅ Steps to Disable Replication Before Deletion
Run the following Azure CLI command. Note: This operation may take about 5 minutes to complete.

```bash
az resource update --ids "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsName}" --set properties.replication.enabled=false
```

Replace:
- `{subscriptionId}` → Your Azure subscription ID
- `{resourceGroupName}` → The name of your resource group
- `{logAnalyticsName}` → The name of your Log Analytics workspace

Optional: Verify replication disabled (should output `false`):
```bash
az resource show --ids "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsName}" --query properties.replication.enabled -o tsv
```

## ✅ After Disabling Replication
You can safely delete:
- The Log Analytics workspace (manual)
- The resource group (manual), or
- All provisioned resources via `azd down`

Return to: [Deployment Guide](./DeploymentGuide.md)
2 changes: 1 addition & 1 deletion docs/TroubleShootingSteps.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Before deploying the resources, you may need to enable the **Bring Your Own Publ
## Option 1
### Steps

1. Go to [Azure Portal](https:/portal.azure.com/#home).
1. Go to [Azure Portal](https://portal.azure.com/#home).

2. Click on the **"Resource groups"** option available on the Azure portal home page.
![alt text](../docs/images/AzureHomePage.png)
Expand Down
Loading
Loading