fix: Bug fix for EXP changes (#1842)

Author: Prajwal-Microsoft

docs/re-use-resource-group.md

@@ -24,7 +24,7 @@ Replace `<rg-name>` with the name of your chosen Resource Group.
 If you want to specify the location, run:
 
 ```bash
-azd env set AZURE_RESOURCE_GROUP_LOCATION <location>
+azd env set AZURE_LOCATION <location>
 ```
 Replace `<location>` with the desired Azure region.
 

infra/app/workbook.bicep

@@ -5,7 +5,7 @@ param functionName string
 param websiteName string
 param adminWebsiteName string
 param eventGridSystemTopicName string
-param logAnalyticsName string
+param logAnalyticsResourceId string
 param azureOpenAIResourceName string
 param azureAISearchName string
 param storageAccountName string
@@ -36,8 +36,8 @@ var wookbookContentsEventGridReplaced = replace(
 )
 var wookbookContentsLogAnalyticsReplaced = replace(
   wookbookContentsEventGridReplaced,
-  '{log-analytics}',
-  logAnalyticsName
+  '{log-analytics-resource-id}',
+  logAnalyticsResourceId
 )
 var wookbookContentsOpenAIReplaced = replace(wookbookContentsLogAnalyticsReplaced, '{open-ai}', azureOpenAIResourceName)
 var wookbookContentsAISearchReplaced = replace(wookbookContentsOpenAIReplaced, '{ai-search}', azureAISearchName)

infra/core/monitor/loganalytics.bicep

@@ -3,7 +3,19 @@ param name string
 param location string = resourceGroup().location
 param tags object = {}
 
-resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2021-12-01-preview' = {
+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(existingLawSubscriptionId, existingLawResourceGroup)
+}
+
+resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2023-09-01' = if (!useExisting) {
   name: name
   location: location
   tags: tags
@@ -18,5 +30,5 @@ resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2021-12-01-previ
   })
 }
 
-output id string = logAnalytics.id
-output name string = logAnalytics.name
+output id string = useExisting ? existingLogAnalyticsWorkspace.id : logAnalytics.id
+output name string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalytics.name

infra/core/monitor/monitoring.bicep

@@ -4,13 +4,15 @@ param applicationInsightsName string
 param applicationInsightsDashboardName string = ''
 param location string = resourceGroup().location
 param tags object = {}
+param existingLogAnalyticsWorkspaceId string = ''
 
 module logAnalytics 'loganalytics.bicep' = {
   name: 'loganalytics'
   params: {
     name: logAnalyticsName
     location: location
     tags: tags
+    existingLogAnalyticsWorkspaceId: existingLogAnalyticsWorkspaceId
   }
 }
 
@@ -30,4 +32,4 @@ output applicationInsightsInstrumentationKey string = applicationInsights.output
 output applicationInsightsName string = applicationInsights.outputs.name
 output applicationInsightsId string = applicationInsights.outputs.id
 output logAnalyticsWorkspaceId string = logAnalytics.outputs.id
-output logAnalyticsWorkspaceName string = logAnalytics.outputs.name
+output logAnalyticsWorkspaceName string = logAnalytics.outputs.name

infra/main.bicep

@@ -8,9 +8,19 @@ var abbrs = loadJsonContent('./abbreviations.json')
 
 param resourceToken string = toLower(uniqueString(subscription().id, environmentName, location))
 
-@description('Location for all resources.')
+@description('Location for all resources, if you are using existing resource group provide the location of the resorce group.')
+@metadata({azd: {
+    type: 'location'
+  }
+})
 param location string
 
+@description('The resource group name which would be created or reused if existing')
+param rgName string = 'rg-${environmentName}'
+
+@description('Optional: Existing Log Analytics Workspace Resource ID')
+param existingLogAnalyticsWorkspaceId string = ''
+
 @description('Name of App Service plan')
 param hostingPlanName string = 'asp-${resourceToken}'
 
@@ -311,12 +321,14 @@ param recognizedLanguages string = 'en-US,fr-FR,de-DE,it-IT'
 @description('Azure Machine Learning Name')
 param azureMachineLearningName string = 'mlw-${resourceToken}'
 
+@description('Resource ID of existing Log Analytics workspace. If not provided, a new one will be created.')
+param existingLogAnalyticsResourceId string = ''
+
 var blobContainerName = 'documents'
 var queueName = 'doc-processing'
 var clientKey = '${uniqueString(guid(subscription().id, deployment().name))}${newGuidString}'
 var eventGridSystemTopicName = 'doc-processing'
 var tags = { 'azd-env-name': environmentName }
-var rgName = 'rg-${environmentName}'
 var keyVaultName = '${abbrs.security.keyVault}${resourceToken}'
 var baseUrl = 'https://raw.githubusercontent.com/Azure-Samples/chat-with-your-data-solution-accelerator/main/'
 
@@ -1019,6 +1031,7 @@ module monitoring './core/monitor/monitoring.bicep' = {
     }
     logAnalyticsName: logAnalyticsName
     applicationInsightsDashboardName: 'dash-${applicationInsightsName}'
+    existingLogAnalyticsWorkspaceId: existingLogAnalyticsWorkspaceId
   }
 }
 
@@ -1035,7 +1048,7 @@ module workbook './app/workbook.bicep' = {
       ? adminweb_docker.outputs.WEBSITE_ADMIN_NAME
       : adminweb.outputs.WEBSITE_ADMIN_NAME
     eventGridSystemTopicName: eventgrid.outputs.name
-    logAnalyticsName: monitoring.outputs.logAnalyticsWorkspaceName
+    logAnalyticsResourceId: monitoring.outputs.logAnalyticsWorkspaceId
     azureOpenAIResourceName: openai.outputs.name
     azureAISearchName: databaseType == 'CosmosDB' ? search.outputs.name : ''
     storageAccountName: storage.outputs.name

infra/main.bicepparam

@@ -79,3 +79,6 @@ param azureAISearchName = searchServiceName == '' ? 'search-${resourceToken}' :
 param azureSearchIndex = readEnvironmentVariable('AZURE_SEARCH_INDEX', 'index-${resourceToken}')
 param azureOpenAIResourceName = readEnvironmentVariable('AZURE_OPENAI_RESOURCE', 'openai-${resourceToken}')
 param storageAccountName = readEnvironmentVariable('AZURE_BLOB_ACCOUNT_NAME', 'str${resourceToken}')
+
+param rgName = readEnvironmentVariable('AZURE_RESOURCE_GROUP', 'rg-${environmentName}')
+param existingLogAnalyticsWorkspaceId = readEnvironmentVariable('AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID', '')