Skip to content

fix: telemetry error fix #327

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
Parent: fix: Merging dev chnages for v2 version
merged 6 commits into from
Jul 16, 2025
Merged

fix: telemetry error fix #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e1aea6
Fix zone availability issue in public IP and make solutionPrefix as u…
Abdul-Microsoft Jul 15, 2025
9a7d049
fix: update parameter name from solutionPrefix to environmentName in …
Abdul-Microsoft Jul 15, 2025
b7e20ed
feat: add workflow_dispatch trigger and generate unique solution pref…
Abdul-Microsoft Jul 15, 2025
c523824
feat: add workflow_dispatch trigger for manual deployment
Abdul-Microsoft Jul 15, 2025
246c689
removed the deploy-waf testing code
Abdul-Microsoft Jul 15, 2025
9add3a7
fix: change storage account type from Premium_ZRS to Standard_LRS for…
Abdul-Microsoft Jul 16, 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
10 changes: 10 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 @@ -92,6 +92,15 @@ jobs:
echo "Resource group already exists."
fi

- name: Generate Unique Solution Prefix
id: generate_solution_prefix
run: |
COMMON_PART="macae"
TIMESTAMP=$(date +%s)
UPDATED_TIMESTAMP=$(echo $TIMESTAMP | tail -c 6)
UNIQUE_SOLUTION_PREFIX="${COMMON_PART}${UPDATED_TIMESTAMP}"
echo "SOLUTION_PREFIX=${UNIQUE_SOLUTION_PREFIX}" >> $GITHUB_ENV

- name: Deploy Bicep Template
id: deploy
run: |
Expand All @@ -100,6 +109,7 @@ jobs:
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file infra/main.bicep \
--parameters \
environmentName=${{ env.SOLUTION_PREFIX }} \
useWafAlignedArchitecture=true \
aiDeploymentsLocation='${{ env.AZURE_LOCATION }}' \
gptModelCapacity=5 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file infra/main.bicep \
--parameters \
solutionPrefix=${{ env.SOLUTION_PREFIX }} \
environmentName=${{ env.SOLUTION_PREFIX }} \
solutionLocation="${{ env.AZURE_LOCATION }}" \
modelDeploymentType="GlobalStandard" \
gptModelName="gpt-4o" \
Expand Down
10 changes: 6 additions & 4 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ param useWafAlignedArchitecture bool
@description('Use this parameter to use an existing AI project resource ID')
param existingFoundryProjectResourceId string = ''

@description('Optional. The prefix to add in the default names given to all deployed Azure resources.')
@maxLength(19)
param solutionPrefix string = 'macae${uniqueString(deployer().objectId, deployer().tenantId, subscription().subscriptionId, resourceGroup().id)}'
@description('Required. Name of the environment to deploy the solution into.')
param environmentName string

@description('Required. Location for all Resources except AI Foundry.')
param solutionLocation string = resourceGroup().location
Expand Down Expand Up @@ -48,6 +47,8 @@ param gptModelCapacity int = 150
@description('Set the image tag for the container images used in the solution. Default is "latest".')
param imageTag string = 'latest'

param solutionPrefix string = 'macae-${padLeft(take(toLower(uniqueString(subscription().id, environmentName, resourceGroup().location)), 12), 12, '0')}'

@description('Optional. The tags to apply to all deployed Azure resources.')
param tags object = {
app: solutionPrefix
Expand Down Expand Up @@ -616,6 +617,7 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.6.1' = if (virtualN
virtualNetworkResourceId: bastionConfiguration.?virtualNetworkResourceId ?? virtualNetwork.?outputs.?resourceId
publicIPAddressObject: {
name: bastionConfiguration.?publicIpResourceName ?? 'pip-bas${solutionPrefix}'
zones: []
}
disableCopyPaste: false
enableFileCopy: false
Expand Down Expand Up @@ -662,7 +664,7 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.13.0' = if (v
name: 'osdisk-${virtualMachineResourceName}'
createOption: 'FromImage'
managedDisk: {
storageAccountType: 'Premium_ZRS'
storageAccountType: 'Standard_LRS'
}
diskSizeGB: 128
caching: 'ReadWrite'
Expand Down
2 changes: 1 addition & 1 deletion infra/main.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
]
},
"solutionPrefix": {
"environmentName": {
"value": "${AZURE_ENV_NAME}"
},
"solutionLocation": {
Expand Down
Loading