Skip to content

fix: Dev to main MACAE V3 #691

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

Merged
Roopan-Microsoft merged 10 commits into from
Dec 8, 2025
Merged

fix: Dev to main MACAE V3 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e468ea
refactor: make virtual machine admin username and password optional w…
Harsh-Microsoft Dec 2, 2025
17903e1
remove extra spacing
Harsh-Microsoft Dec 2, 2025
0591b31
Merge pull request #674 from microsoft/hb-psl-bug-27372
Roopan-Microsoft Dec 2, 2025
3598c37
updated the echo to print to work with vscode web terminnal
Dhruvkumar-Microsoft Dec 2, 2025
7ff85b1
Merge pull request #675 from microsoft/psl-bug-27380
Roopan-Microsoft Dec 3, 2025
01f5be4
logging issue fix
AjitPadhi-Microsoft Dec 4, 2025
065ed1b
updated custom bicep
AjitPadhi-Microsoft Dec 4, 2025
b93e6bc
reverted code changes
AjitPadhi-Microsoft Dec 5, 2025
d4ca30e
fixed lint issue
AjitPadhi-Microsoft Dec 5, 2025
cf3f076
Merge pull request #683 from microsoft/logging-fix
Roopan-Microsoft Dec 5, 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
34 changes: 15 additions & 19 deletions azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,28 +40,24 @@ hooks:
Yellow='\033[1;33m'
NC='\033[0m'

echo ""
echo "${Yellow}==============================================================="
echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
echo "${Yellow}===============================================================${NC}"
echo ""
printf "\n"
printf "${Yellow}===============================================================\n"
printf "${Green} POST-DEPLOYMENT STEPS (Bash)\n"
printf "${Yellow}===============================================================${NC}\n\n"

echo " STEP 1: Upload Team Configurations to Cosmos DB"
echo " 👉 Run the following command in Bash:"
echo " ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
echo ""
printf " STEP 1: Upload Team Configurations to Cosmos DB\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/upload_team_config.sh${NC}\n\n"

echo " STEP 2: Index Sample Data into Azure Search"
echo " 👉 Run the following command in Bash:"
echo " ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
echo ""
printf " STEP 2: Index Sample Data into Azure Search\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/process_sample_data.sh${NC}\n\n"

echo "💡 Alternatively, you can run above BOTH steps together using:"
echo " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
echo ""
printf "💡 Alternatively, you can run above BOTH steps together using:\n"
printf " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}\n\n"

echo "🌐 Access your deployed Frontend application at:"
echo " ${Blue}https://$webSiteDefaultHostname${NC}"
echo ""
printf "🌐 Access your deployed Frontend application at:\n"
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"

shell: sh
interactive: true
33 changes: 14 additions & 19 deletions azure_custom.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,23 @@ hooks:
Yellow='\033[1;33m'
NC='\033[0m'

echo ""
echo "${Yellow}==============================================================="
echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
echo "${Yellow}===============================================================${NC}"
echo ""
printf "\n"
printf "${Yellow}===============================================================\n"
printf "${Green} POST-DEPLOYMENT STEPS (Bash)\n"
printf "${Yellow}===============================================================${NC}\n\n"

echo " STEP 1: Upload Team Configurations to Cosmos DB"
echo " 👉 Run the following command in Bash:"
echo " ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
echo ""
printf " STEP 1: Upload Team Configurations to Cosmos DB\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/upload_team_config.sh${NC}\n\n"

echo " STEP 2: Index Sample Data into Azure Search"
echo " 👉 Run the following command in Bash:"
echo " ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
echo ""
printf " STEP 2: Index Sample Data into Azure Search\n"
printf " 👉 Run the following command in Bash:\n"
printf " ${Blue}bash infra/scripts/process_sample_data.sh${NC}\n\n"

echo "💡 Alternatively, you can run above BOTH steps together using:"
echo " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
echo ""
printf "💡 Alternatively, you can run above BOTH steps together using:\n"
printf " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}\n\n"

echo "🌐 Access your deployed Frontend application at:"
echo " ${Blue}https://$webSiteDefaultHostname${NC}"
echo ""
printf "🌐 Access your deployed Frontend application at:\n"
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"
shell: sh
interactive: true
24 changes: 16 additions & 8 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ param enablePrivateNetworking bool = false

@secure()
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
param virtualMachineAdminUsername string = take(newGuid(), 20)
param virtualMachineAdminUsername string?

@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
@secure()
param virtualMachineAdminPassword string = newGuid()
param virtualMachineAdminPassword string?

// These parameters are changed for testing - please reset as part of publication

Expand Down Expand Up @@ -608,8 +608,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
computerName: take(virtualMachineResourceName, 15)
osType: 'Windows'
vmSize: virtualMachineSize
adminUsername: virtualMachineAdminUsername
adminPassword: virtualMachineAdminPassword
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
patchMode: 'AutomaticByPlatform'
bypassPlatformSafetyChecksOnUserSchedule: true
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId
Expand Down Expand Up @@ -1339,8 +1339,19 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
name: 'AZURE_AI_MODEL_DEPLOYMENT_NAME'
value: aiFoundryAiServicesModelDeployment.name
}
{
name: 'AZURE_BASIC_LOGGING_LEVEL'
value: 'INFO'
}
{
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
value: 'WARNING'
}
{
name: 'AZURE_LOGGING_PACKAGES'
value: ''
}
]

}
]
secrets: [
Expand Down Expand Up @@ -1500,9 +1511,6 @@ module webSite 'modules/web-sites.bicep' = {
WEBSITES_CONTAINER_START_TIME_LIMIT: '1800' // 30 minutes, adjust as needed
BACKEND_API_URL: 'https://${containerApp.outputs.fqdn}'
AUTH_ENABLED: 'false'
AZURE_BASIC_LOGGING_LEVEL: 'INFO'
AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
AZURE_LOGGING_PACKAGES: ''
}
// WAF aligned configuration for Monitoring
applicationInsightResourceId: enableMonitoring ? applicationInsights!.outputs.resourceId : null
Expand Down
24 changes: 16 additions & 8 deletions infra/main_custom.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,11 @@ param enablePrivateNetworking bool = false

@secure()
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
param virtualMachineAdminUsername string = take(newGuid(), 20)
param virtualMachineAdminUsername string?

@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
@secure()
param virtualMachineAdminPassword string = newGuid()

param virtualMachineAdminPassword string?
// These parameters are changed for testing - please reset as part of publication

@description('Optional. The Container Registry hostname where the docker images for the backend are located.')
Expand Down Expand Up @@ -923,8 +922,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
computerName: take(virtualMachineResourceName, 15)
osType: 'Windows'
vmSize: virtualMachineSize
adminUsername: virtualMachineAdminUsername
adminPassword: virtualMachineAdminPassword
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
patchMode: 'AutomaticByPlatform'
bypassPlatformSafetyChecksOnUserSchedule: true
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId
Expand Down Expand Up @@ -1687,6 +1686,18 @@ module containerApp 'br/public:avm/res/app/container-app:0.18.1' = {
name: 'AZURE_AI_MODEL_DEPLOYMENT_NAME'
value: aiFoundryAiServicesModelDeployment.name
}
{
name: 'AZURE_BASIC_LOGGING_LEVEL'
value: 'INFO'
}
{
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
value: 'WARNING'
}
{
name: 'AZURE_LOGGING_PACKAGES'
value: ''
}
]
}
]
Expand Down Expand Up @@ -1856,9 +1867,6 @@ module webSite 'modules/web-sites.bicep' = {
//WEBSITES_CONTAINER_START_TIME_LIMIT: '1800' // 30 minutes, adjust as needed
BACKEND_API_URL: 'https://${containerApp.outputs.fqdn}'
AUTH_ENABLED: 'false'
AZURE_BASIC_LOGGING_LEVEL: 'INFO'
AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
AZURE_LOGGING_PACKAGES: ''
ENABLE_ORYX_BUILD: 'True'
}
// WAF aligned configuration for Monitoring
Expand Down
1 change: 0 additions & 1 deletion src/backend/common/utils/utils_kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

from v3.config.agent_registry import agent_registry

logging.basicConfig(level=logging.INFO)

# Cache for agent instances by session
agent_instances: Dict[str, Dict[str, Any]] = {}
Expand Down
Loading