Skip to content

New prompt addition - post release Pri 2. #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

New prompt addition - post release Pri 2. #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9761576
new final prompt to restrict further action
marktayl1 Sep 22, 2025
2a9a826
Merge branch 'macae-v3-dev-v2-vip' of https://github.com/microsoft/Mu…
marktayl1 Sep 22, 2025
f262621
Merge pull request #418 from microsoft/macae-v3-dev-v2-vip
Roopan-Microsoft Sep 22, 2025
f2bd8ad
turn off code interpreter on all agents, reuse existing foundry agent…
marktayl1 Sep 22, 2025
9ef6f01
enabled the public access for search service
Dhruvkumar-Microsoft Sep 23, 2025
ff1de98
added the comments
Dhruvkumar-Microsoft Sep 23, 2025
407b9cb
Merge pull request #522 from microsoft/psl-searchserviceissue
Roopan-Microsoft Sep 23, 2025
1a73806
Merge pull request #521 from microsoft/dev-v3
Roopan-Microsoft Sep 23, 2025
314070a
Update Created by tag logic
NirajC-Microsoft Sep 23, 2025
4339834
update createdby tag logic in main_custom.bicep
NirajC-Microsoft Sep 23, 2025
22f2114
Merge pull request #526 from microsoft/psl-Createbytag-v3
Roopan-Microsoft Sep 23, 2025
0dcc144
added the exp foundry project variables
Dhruvkumar-Microsoft Sep 23, 2025
0411a63
added new 'type' tag
VishalS-Microsoft Sep 23, 2025
c4ae122
added new 'type' tag in main_custom.bicep file
VishalS-Microsoft Sep 23, 2025
015b55a
Merge pull request #528 from microsoft/psl-searchserviceissue
Roopan-Microsoft Sep 23, 2025
b127dcc
Merge pull request #527 from microsoft/dev-v3
Roopan-Microsoft Sep 23, 2025
6a56b26
Merge pull request #529 from microsoft/CI-Pipeline-macae-v3
Roopan-Microsoft Sep 23, 2025
5b0a62d
added log analytics workspace for exp in key vault
Dhruvkumar-Microsoft Sep 23, 2025
dae3a10
Merge pull request #530 from microsoft/psl-searchserviceissue
Roopan-Microsoft Sep 23, 2025
8c9a95f
Merge pull request #531 from microsoft/dev-v3
Roopan-Microsoft Sep 23, 2025
2fb2567
Merge branch 'main' of https://github.com/microsoft/Multi-Agent-Custo…
marktayl1 Sep 23, 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
5 changes: 5 additions & 0 deletions .github/workflows/deploy-waf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ 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 +122,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
View file
Open in desktop
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 @@ -139,6 +142,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: 1 addition & 1 deletion data/agent_teams/marketing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"use_reasoning": false,
"index_name": "",
"index_foundry_name": "",
"coding_tools": true
"coding_tools": false
},
{
"input_key": "",
Expand Down
2 changes: 1 addition & 1 deletion data/agent_teams/retail.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"use_reasoning": false,
"index_name": "macae-index",
"index_foundry_name": "",
"coding_tools": true
"coding_tools": false
},
{
"input_key": "",
Expand Down
55 changes: 32 additions & 23 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,16 @@ var allTags = union(
},
tags
)
@description('Optional created by user name')
param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0]
@description('Tag, Created by user name')
param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId

resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
name: 'default'
properties: {
tags: {
...allTags
TemplateName: 'MACAE'
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
CreatedBy: createdBy
}
}
Expand Down Expand Up @@ -1559,11 +1560,11 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
}
{
name: 'AZURE_AI_SUBSCRIPTION_ID'
value: subscription().subscriptionId
value: aiFoundryAiServicesSubscriptionId
}
{
name: 'AZURE_AI_RESOURCE_GROUP'
value: resourceGroup().name
value: aiFoundryAiServicesResourceGroupName
}
{
name: 'AZURE_AI_PROJECT_NAME'
Expand Down Expand Up @@ -1921,7 +1922,11 @@ module searchService 'br/public:avm/res/search/search-service:0.11.1' = {
managedIdentities: {
systemAssigned: true
}
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'

// Enabled the Public access because other services are not able to connect with search search AVM module when public access is disabled

// publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
publicNetworkAccess: 'Enabled'
networkRuleSet: {
bypass: 'AzureServices'
}
Expand Down Expand Up @@ -1951,23 +1956,27 @@ module searchService 'br/public:avm/res/search/search-service:0.11.1' = {
principalType: 'ServicePrincipal'
}
]
privateEndpoints: enablePrivateNetworking
? [
{
name: 'pep-search-${solutionSuffix}'
customNetworkInterfaceName: 'nic-search-${solutionSuffix}'
privateDnsZoneGroup: {
privateDnsZoneGroupConfigs: [
{
privateDnsZoneResourceId: avmPrivateDnsZones[dnsZoneIndex.search]!.outputs.resourceId
}
]
}
subnetResourceId: virtualNetwork!.outputs.subnetResourceIds[0]
service: 'searchService'
}
]
: []

//Removing the Private endpoints as we are facing the issue with connecting to search service while comminicating with agents

privateEndpoints:[]
// privateEndpoints: enablePrivateNetworking
// ? [
// {
// name: 'pep-search-${solutionSuffix}'
// customNetworkInterfaceName: 'nic-search-${solutionSuffix}'
// privateDnsZoneGroup: {
// privateDnsZoneGroupConfigs: [
// {
// privateDnsZoneResourceId: avmPrivateDnsZones[dnsZoneIndex.search]!.outputs.resourceId
// }
// ]
// }
// subnetResourceId: virtualNetwork!.outputs.subnetResourceIds[0]
// service: 'searchService'
// }
// ]
// : []
}
}

Expand Down Expand Up @@ -2012,7 +2021,7 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
enableSoftDelete: true
softDeleteRetentionInDays: 7
diagnosticSettings: enableMonitoring
? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }]
? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
: []
// WAF aligned configuration for Private Networking
privateEndpoints: enablePrivateNetworking
Expand Down
55 changes: 32 additions & 23 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,16 @@ var allTags = union(
},
tags
)
@description('Optional created by user name')
param createdBy string = empty(deployer().userPrincipalName) ? '' : split(deployer().userPrincipalName, '@')[0]
@description('Tag, Created by user name')
param createdBy string = contains(deployer(), 'userPrincipalName')? split(deployer().userPrincipalName, '@')[0]: deployer().objectId

resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
name: 'default'
properties: {
tags: {
...allTags
TemplateName: 'MACAE'
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
CreatedBy: createdBy
}
}
Expand Down Expand Up @@ -1591,11 +1592,11 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
}
{
name: 'AZURE_AI_SUBSCRIPTION_ID'
value: subscription().subscriptionId
value: aiFoundryAiServicesSubscriptionId
}
{
name: 'AZURE_AI_RESOURCE_GROUP'
value: resourceGroup().name
value: aiFoundryAiServicesResourceGroupName
}
{
name: 'AZURE_AI_PROJECT_NAME'
Expand Down Expand Up @@ -1962,7 +1963,11 @@ module searchService 'br/public:avm/res/search/search-service:0.11.1' = {
managedIdentities: {
systemAssigned: true
}
publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'

// Enabled the Public access because other services are not able to connect with search search AVM module when public access is disabled

// publicNetworkAccess: enablePrivateNetworking ? 'Disabled' : 'Enabled'
publicNetworkAccess: 'Enabled'
networkRuleSet: {
bypass: 'AzureServices'
}
Expand Down Expand Up @@ -1992,23 +1997,27 @@ module searchService 'br/public:avm/res/search/search-service:0.11.1' = {
principalType: 'ServicePrincipal'
}
]
privateEndpoints: enablePrivateNetworking
? [
{
name: 'pep-search-${solutionSuffix}'
customNetworkInterfaceName: 'nic-search-${solutionSuffix}'
privateDnsZoneGroup: {
privateDnsZoneGroupConfigs: [
{
privateDnsZoneResourceId: avmPrivateDnsZones[dnsZoneIndex.search]!.outputs.resourceId
}
]
}
subnetResourceId: virtualNetwork!.outputs.subnetResourceIds[0]
service: 'searchService'
}
]
: []
privateEndpoints:[]

// Removing the Private endpoints as we are facing the issue with connecting to search service while comminicating with agents

// privateEndpoints: enablePrivateNetworking
// ? [
// {
// name: 'pep-search-${solutionSuffix}'
// customNetworkInterfaceName: 'nic-search-${solutionSuffix}'
// privateDnsZoneGroup: {
// privateDnsZoneGroupConfigs: [
// {
// privateDnsZoneResourceId: avmPrivateDnsZones[dnsZoneIndex.search]!.outputs.resourceId
// }
// ]
// }
// subnetResourceId: virtualNetwork!.outputs.subnetResourceIds[0]
// service: 'searchService'
// }
// ]
// : []
}
}

Expand Down Expand Up @@ -2053,7 +2062,7 @@ module keyvault 'br/public:avm/res/key-vault/vault:0.12.1' = {
enableSoftDelete: true
softDeleteRetentionInDays: 7
diagnosticSettings: enableMonitoring
? [{ workspaceResourceId: logAnalyticsWorkspace!.outputs.resourceId }]
? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
: []
// WAF aligned configuration for Private Networking
privateEndpoints: enablePrivateNetworking
Expand Down
Loading
Loading