Skip to content

Commit 4cae18f

Browse files
Kanchan-MicrosoftKanchan-Microsoft
authored
Merge branch 'microsoft:main' into main
2 parents 0f2a3c2 + c50dc67 commit 4cae18f

3 files changed

Lines changed: 106 additions & 29 deletions

File tree

‎docs/TroubleShootingSteps.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Before deploying the resources, you may need to enable the **Bring Your Own Publ
5454
## Option 1
5555
### Steps
5656

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

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

‎infra/main.bicep‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,18 @@ module avmContainerApp 'br/public:avm/res/app/container-app:0.19.0' = {
934934
name: 'APP_ENV'
935935
value: 'prod'
936936
}
937+
{
938+
name: 'APP_LOGGING_LEVEL'
939+
value: 'INFO'
940+
}
941+
{
942+
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
943+
value: 'WARNING'
944+
}
945+
{
946+
name: 'AZURE_LOGGING_PACKAGES'
947+
value: ''
948+
}
937949
]
938950
}
939951
]
@@ -982,6 +994,18 @@ module avmContainerApp_API 'br/public:avm/res/app/container-app:0.19.0' = {
982994
name: 'APP_ENV'
983995
value: 'prod'
984996
}
997+
{
998+
name: 'APP_LOGGING_LEVEL'
999+
value: 'INFO'
1000+
}
1001+
{
1002+
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
1003+
value: 'WARNING'
1004+
}
1005+
{
1006+
name: 'AZURE_LOGGING_PACKAGES'
1007+
value: ''
1008+
}
9851009
]
9861010
probes: [
9871011
// Liveness Probe - Checks if the app is still running
@@ -1270,18 +1294,6 @@ module avmAppConfig 'br/public:avm/res/app-configuration/configuration-store:0.9
12701294
name: 'APP_CPS_PROCESSES'
12711295
value: 'cps-processes'
12721296
}
1273-
{
1274-
name: 'APP_LOGGING_LEVEL'
1275-
value: 'INFO'
1276-
}
1277-
{
1278-
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
1279-
value: 'WARNING'
1280-
}
1281-
{
1282-
name: 'AZURE_LOGGING_PACKAGES'
1283-
value: ''
1284-
}
12851297
{
12861298
name: 'APP_MESSAGE_QUEUE_EXTRACT'
12871299
value: 'content-pipeline-extract-queue'
@@ -1390,6 +1402,18 @@ module avmContainerApp_update 'br/public:avm/res/app/container-app:0.19.0' = {
13901402
name: 'APP_ENV'
13911403
value: 'prod'
13921404
}
1405+
{
1406+
name: 'APP_LOGGING_LEVEL'
1407+
value: 'INFO'
1408+
}
1409+
{
1410+
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
1411+
value: 'WARNING'
1412+
}
1413+
{
1414+
name: 'AZURE_LOGGING_PACKAGES'
1415+
value: ''
1416+
}
13931417
]
13941418
}
13951419
]
@@ -1449,6 +1473,18 @@ module avmContainerApp_API_update 'br/public:avm/res/app/container-app:0.19.0' =
14491473
name: 'APP_ENV'
14501474
value: 'prod'
14511475
}
1476+
{
1477+
name: 'APP_LOGGING_LEVEL'
1478+
value: 'INFO'
1479+
}
1480+
{
1481+
name: 'AZURE_PACKAGE_LOGGING_LEVEL'
1482+
value: 'WARNING'
1483+
}
1484+
{
1485+
name: 'AZURE_LOGGING_PACKAGES'
1486+
value: ''
1487+
}
14521488
]
14531489
probes: [
14541490
// Liveness Probe - Checks if the app is still running

‎infra/main.json‎

Lines changed: 57 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.37.4.10188",
9-
"templateHash": "17737076781026161010"
9+
"templateHash": "11428630106677040832"
1010
},
1111
"name": "Content Processing Solution Accelerator",
1212
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
@@ -35231,6 +35231,11 @@
3523135231
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
3523235232
"roleDefinitionIdOrName": "Cognitive Services OpenAI User",
3523335233
"principalType": "ServicePrincipal"
35234+
},
35235+
{
35236+
"principalId": "[reference('avmContainerApp').outputs.systemAssignedMIPrincipalId.value]",
35237+
"roleDefinitionIdOrName": "Azure AI Developer",
35238+
"principalType": "ServicePrincipal"
3523435239
}
3523535240
]
3523635241
},
@@ -40908,10 +40913,10 @@
4090840913
"dependsOn": [
4090940914
"avmContainerApp",
4091040915
"avmManagedIdentity",
40911-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
40916+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4091240917
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
40918+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
4091340919
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
40914-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
4091540920
"logAnalyticsWorkspace",
4091640921
"virtualNetwork"
4091740922
]
@@ -43513,8 +43518,8 @@
4351343518
"dependsOn": [
4351443519
"avmContainerApp",
4351543520
"avmManagedIdentity",
43516-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4351743521
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
43522+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
4351843523
"virtualNetwork"
4351943524
]
4352043525
},
@@ -44999,6 +45004,18 @@
4499945004
{
4500045005
"name": "APP_ENV",
4500145006
"value": "prod"
45007+
},
45008+
{
45009+
"name": "APP_LOGGING_LEVEL",
45010+
"value": "INFO"
45011+
},
45012+
{
45013+
"name": "AZURE_PACKAGE_LOGGING_LEVEL",
45014+
"value": "WARNING"
45015+
},
45016+
{
45017+
"name": "AZURE_LOGGING_PACKAGES",
45018+
"value": ""
4500245019
}
4500345020
]
4500445021
}
@@ -46599,6 +46616,18 @@
4659946616
{
4660046617
"name": "APP_ENV",
4660146618
"value": "prod"
46619+
},
46620+
{
46621+
"name": "APP_LOGGING_LEVEL",
46622+
"value": "INFO"
46623+
},
46624+
{
46625+
"name": "AZURE_PACKAGE_LOGGING_LEVEL",
46626+
"value": "WARNING"
46627+
},
46628+
{
46629+
"name": "AZURE_LOGGING_PACKAGES",
46630+
"value": ""
4660246631
}
4660346632
],
4660446633
"probes": [
@@ -55856,18 +55885,6 @@
5585655885
"name": "APP_CPS_PROCESSES",
5585755886
"value": "cps-processes"
5585855887
},
55859-
{
55860-
"name": "APP_LOGGING_LEVEL",
55861-
"value": "INFO"
55862-
},
55863-
{
55864-
"name": "AZURE_PACKAGE_LOGGING_LEVEL",
55865-
"value": "WARNING"
55866-
},
55867-
{
55868-
"name": "AZURE_LOGGING_PACKAGES",
55869-
"value": ""
55870-
},
5587155888
{
5587255889
"name": "APP_MESSAGE_QUEUE_EXTRACT",
5587355890
"value": "content-pipeline-extract-queue"
@@ -60404,6 +60421,18 @@
6040460421
{
6040560422
"name": "APP_ENV",
6040660423
"value": "prod"
60424+
},
60425+
{
60426+
"name": "APP_LOGGING_LEVEL",
60427+
"value": "INFO"
60428+
},
60429+
{
60430+
"name": "AZURE_PACKAGE_LOGGING_LEVEL",
60431+
"value": "WARNING"
60432+
},
60433+
{
60434+
"name": "AZURE_LOGGING_PACKAGES",
60435+
"value": ""
6040760436
}
6040860437
]
6040960438
}
@@ -62003,6 +62032,18 @@
6200362032
{
6200462033
"name": "APP_ENV",
6200562034
"value": "prod"
62035+
},
62036+
{
62037+
"name": "APP_LOGGING_LEVEL",
62038+
"value": "INFO"
62039+
},
62040+
{
62041+
"name": "AZURE_PACKAGE_LOGGING_LEVEL",
62042+
"value": "WARNING"
62043+
},
62044+
{
62045+
"name": "AZURE_LOGGING_PACKAGES",
62046+
"value": ""
6200662047
}
6200762048
],
6200862049
"probes": [

0 commit comments

Comments
 (0)