@@ -57,7 +57,7 @@ param resourceGroupName string = ''
5757param storageAccountName string = ''
5858param vNetName string = ''
5959@description ('Id of the user identity to be used for testing and debugging. This is not required in production. Leave empty if not needed.' )
60- param principalId string = ''
60+ param principalId string = deployer (). objectId
6161
6262var abbrs = loadJsonContent ('./abbreviations.json' )
6363var resourceToken = toLower (uniqueString (subscription ().id , environmentName , location ))
@@ -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.11.1 ' = {
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.6.0' = {
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
218230output AZURE_LOCATION string = location
219231output AZURE_TENANT_ID string = tenant ().tenantId
220232output SERVICE_API_NAME string = api .outputs .SERVICE_API_NAME
0 commit comments