Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/CustomizingAzdParameters.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ azd env set USE_LOCAL_BUILD 'false'

Set the Log Analytics Workspace Id if you need to reuse the existing workspace
```shell
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID '<Existing Log Analytics Workspace Id>'
azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID '/subscriptions/<subscription-id>/resourceGroups/<resource-group>/providers/Microsoft.OperationalInsights/workspaces/<existing-workspace-name>'
```
3 changes: 2 additions & 1 deletion infra/container_app/deploy_container_app_env.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ param location string

param logAnalyticsWorkspaceName string
param logAnalyticsWorkspaceResourceGroup string
param logAnalyticsWorkspaceSubscription string

resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = {
name: logAnalyticsWorkspaceName
scope: resourceGroup(logAnalyticsWorkspaceResourceGroup)
scope: resourceGroup(logAnalyticsWorkspaceSubscription, logAnalyticsWorkspaceResourceGroup)
}

resource containerRegistryReader 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
Expand Down
4 changes: 3 additions & 1 deletion infra/deploy_app_insights.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ param logAnalyticsWorkspaceName string
param existingLogAnalyticsWorkspaceId string = ''

var useExisting = !empty(existingLogAnalyticsWorkspaceId)
var existingLawSubscriptionId = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[2] : ''
var existingLawResourceGroup = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[4] : ''
var existingLawName = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[8] : ''

resource existingLogAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' existing = if (useExisting) {
name: existingLawName
scope: resourceGroup(existingLawResourceGroup)
scope: resourceGroup(existingLawSubscriptionId, existingLawResourceGroup)
}

resource logAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = if (!useExisting) {
Expand Down Expand Up @@ -48,4 +49,5 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' = {

output id string = applicationInsights.id
output logAnalyticsWorkspaceName string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalyticsWorkspace.name
output logAnalyticsWorkspaceSubscription string = useExisting ? existingLawSubscriptionId : split(subscription().id, '/')[2]
output logAnalyticsWorkspaceResourceGroup string = useExisting ? existingLawResourceGroup : resourceGroup().name
1 change: 1 addition & 0 deletions infra/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ module containerAppEnv './container_app/deploy_container_app_env.bicep' = {
location: secondaryLocation
logAnalyticsWorkspaceName: applicationInsights.outputs.logAnalyticsWorkspaceName
logAnalyticsWorkspaceResourceGroup: applicationInsights.outputs.logAnalyticsWorkspaceResourceGroup
logAnalyticsWorkspaceSubscription: applicationInsights.outputs.logAnalyticsWorkspaceSubscription
}
}

Expand Down
Loading