Skip to content

Commit 947c194

Browse files
committed
Using avm modules that allow monitoring to disable local auth
1 parent fe29236 commit 947c194

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

infra/main.bicep

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module api './app/api.bicep' = {
107107
name: functionAppName
108108
location: location
109109
tags: tags
110-
applicationInsightsName: monitoring.outputs.applicationInsightsName
110+
applicationInsightsName: monitoring.outputs.name
111111
appServicePlanId: appServicePlan.outputs.resourceId
112112
runtimeName: 'python'
113113
runtimeVersion: '3.12'
@@ -165,7 +165,7 @@ module rbac 'app/rbac.bicep' = {
165165
scope: rg
166166
params: {
167167
storageAccountName: storage.outputs.name
168-
appInsightsName: monitoring.outputs.applicationInsightsName
168+
appInsightsName: monitoring.outputs.name
169169
managedIdentityPrincipalId: apiUserAssignedIdentity.outputs.principalId
170170
userIdentityPrincipalId: principalId
171171
enableBlob: storageEndpointConfig.enableBlob
@@ -201,20 +201,32 @@ module storagePrivateEndpoint 'app/storage-PrivateEndpoint.bicep' = if (vnetEnab
201201
}
202202
}
203203

204-
// Monitor application with Azure Monitor
205-
module monitoring 'br/public:avm/ptn/azd/monitoring:0.1.0' = {
206-
name: 'monitoring'
204+
// Monitor application with Azure Monitor - Log Analytics and Application Insights
205+
module logAnalytics 'br/public:avm/res/operational-insights/workspace:0.7.0' = {
206+
name: '${uniqueString(deployment().name, location)}-loganalytics'
207207
scope: rg
208208
params: {
209-
applicationInsightsName: !empty(applicationInsightsName) ? applicationInsightsName : '${abbrs.insightsComponents}${resourceToken}'
210-
logAnalyticsName: !empty(logAnalyticsName) ? logAnalyticsName : '${abbrs.operationalInsightsWorkspaces}${resourceToken}'
209+
name: !empty(logAnalyticsName) ? logAnalyticsName : '${abbrs.operationalInsightsWorkspaces}${resourceToken}'
211210
location: location
212211
tags: tags
212+
dataRetention: 30
213+
}
214+
}
215+
216+
module monitoring 'br/public:avm/res/insights/component:0.4.1' = {
217+
name: '${uniqueString(deployment().name, location)}-appinsights'
218+
scope: rg
219+
params: {
220+
name: !empty(applicationInsightsName) ? applicationInsightsName : '${abbrs.insightsComponents}${resourceToken}'
221+
location: location
222+
tags: tags
223+
workspaceResourceId: logAnalytics.outputs.resourceId
224+
disableLocalAuth: true
213225
}
214226
}
215227

216228
// App outputs
217-
output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring.outputs.applicationInsightsConnectionString
229+
output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring.outputs.connectionString
218230
output AZURE_LOCATION string = location
219231
output AZURE_TENANT_ID string = tenant().tenantId
220232
output SERVICE_API_NAME string = api.outputs.SERVICE_API_NAME

0 commit comments

Comments
 (0)