Skip to content

Commit 93a0206

Browse files
authored
Use AVM for log analytics and application insights. (#1817)
* Use AVM for log analytics and application insights. * Use previous setting for resource/workspace permissions
1 parent ea19e14 commit 93a0206

File tree

3 files changed

+18
-72
lines changed

3 files changed

+18
-72
lines changed

infra/core/monitor/applicationinsights.bicep

Lines changed: 0 additions & 37 deletions
This file was deleted.

infra/core/monitor/loganalytics.bicep

Lines changed: 0 additions & 28 deletions
This file was deleted.

infra/core/monitor/monitoring.bicep

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,33 +7,44 @@ param tags object = {}
77
@allowed([ 'Enabled', 'Disabled' ])
88
param publicNetworkAccess string = 'Enabled'
99

10-
module logAnalytics 'loganalytics.bicep' = {
10+
module logAnalytics 'br/public:avm/res/operational-insights/workspace:0.4.0' = {
1111
name: 'loganalytics'
1212
params: {
1313
name: logAnalyticsName
1414
location: location
1515
tags: tags
16+
skuName: 'PerGB2018'
17+
dataRetention: 30
1618
publicNetworkAccessForIngestion: publicNetworkAccess
1719
publicNetworkAccessForQuery: publicNetworkAccess
20+
useResourcePermissions: true
1821
}
1922
}
2023

21-
module applicationInsights 'applicationinsights.bicep' = {
24+
module applicationInsights 'br/public:avm/res/insights/component:0.3.1' = {
2225
name: 'applicationinsights'
2326
params: {
2427
name: applicationInsightsName
2528
location: location
2629
tags: tags
27-
dashboardName: applicationInsightsDashboardName
28-
logAnalyticsWorkspaceId: logAnalytics.outputs.id
30+
workspaceResourceId: logAnalytics.outputs.resourceId
2931
publicNetworkAccessForIngestion: publicNetworkAccess
3032
publicNetworkAccessForQuery: publicNetworkAccess
3133
}
3234
}
3335

36+
module applicationInsightsDashboard 'applicationinsights-dashboard.bicep' = if (!empty(applicationInsightsDashboardName)) {
37+
name: 'application-insights-dashboard'
38+
params: {
39+
name: applicationInsightsDashboardName
40+
location: location
41+
applicationInsightsName: applicationInsights.name
42+
}
43+
}
44+
3445
output applicationInsightsConnectionString string = applicationInsights.outputs.connectionString
46+
output applicationInsightsId string = applicationInsights.outputs.resourceId
3547
output applicationInsightsInstrumentationKey string = applicationInsights.outputs.instrumentationKey
3648
output applicationInsightsName string = applicationInsights.outputs.name
37-
output applicationInsightsId string = applicationInsights.outputs.id
38-
output logAnalyticsWorkspaceId string = logAnalytics.outputs.id
39-
output logAnalyticsWorkspaceName string = logAnalytics.outputs.name
49+
output logAnalyticsWorkspaceId string = logAnalytics.outputs.resourceId
50+
output logAnalyticsWorkspaceName string = logAnalytics.outputs.name

0 commit comments

Comments
 (0)