@@ -107,7 +107,7 @@ module api './app/api.bicep' = {
107
107
name : functionAppName
108
108
location : location
109
109
tags : tags
110
- applicationInsightsName : monitoring .outputs .applicationInsightsName
110
+ applicationInsightsName : monitoring .outputs .name
111
111
appServicePlanId : appServicePlan .outputs .resourceId
112
112
runtimeName : 'python'
113
113
runtimeVersion : '3.12'
@@ -165,7 +165,7 @@ module rbac 'app/rbac.bicep' = {
165
165
scope : rg
166
166
params : {
167
167
storageAccountName : storage .outputs .name
168
- appInsightsName : monitoring .outputs .applicationInsightsName
168
+ appInsightsName : monitoring .outputs .name
169
169
managedIdentityPrincipalId : apiUserAssignedIdentity .outputs .principalId
170
170
userIdentityPrincipalId : principalId
171
171
enableBlob : storageEndpointConfig .enableBlob
@@ -201,20 +201,32 @@ module storagePrivateEndpoint 'app/storage-PrivateEndpoint.bicep' = if (vnetEnab
201
201
}
202
202
}
203
203
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 '
207
207
scope : rg
208
208
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 }'
211
210
location : location
212
211
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
213
225
}
214
226
}
215
227
216
228
// App outputs
217
- output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring .outputs .applicationInsightsConnectionString
229
+ output APPLICATIONINSIGHTS_CONNECTION_STRING string = monitoring .outputs .connectionString
218
230
output AZURE_LOCATION string = location
219
231
output AZURE_TENANT_ID string = tenant ().tenantId
220
232
output SERVICE_API_NAME string = api .outputs .SERVICE_API_NAME
0 commit comments