Merge pull request #473 from microsoft/dev

fix: To reuse Log Analytics across subscriptions

Author: Prajwal-Microsoft

documents/CustomizingAzdParameters.md

@@ -49,5 +49,5 @@ azd env set AZURE_OPENAI_EMBEDDING_MODEL_CAPACITY 80
 
 Set the Log Analytics Workspace Id if you need to reuse the existing workspace which is already existing
 ```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/<workspace-name>'
 ```

infra/deploy_ai_foundry.bicep

@@ -78,6 +78,7 @@ var aiModelDeployments = [
 var containerRegistryNameCleaned = replace(containerRegistryName, '-', '')
 
 var useExisting = !empty(existingLogAnalyticsWorkspaceId)
+var existingLawSubscription = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[2] : ''
 var existingLawResourceGroup = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[4] : ''
 var existingLawName = useExisting ? split(existingLogAnalyticsWorkspaceId, '/')[8] : ''
 
@@ -87,7 +88,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
 
 resource existingLogAnalyticsWorkspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' existing = if (useExisting) {
   name: existingLawName
-  scope: resourceGroup(existingLawResourceGroup)
+  scope: resourceGroup(existingLawSubscription ,existingLawResourceGroup)
 }
 
 resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2023-09-01' = if (!useExisting){
@@ -729,6 +730,7 @@ output aiProjectName string = aiHubProject.name
 output applicationInsightsId string = applicationInsights.id
 output logAnalyticsWorkspaceResourceName string = useExisting ? existingLogAnalyticsWorkspace.name : logAnalytics.name
 output logAnalyticsWorkspaceResourceGroup string = useExisting ? existingLawResourceGroup : resourceGroup().name
+output logAnalyticsWorkspaceSubscription string = useExisting ? existingLawSubscription : subscription().subscriptionId
 
 output storageAccountName string = storageNameCleaned
 

infra/deploy_post_deployment_scripts.bicep

@@ -18,11 +18,12 @@ param sqlUsers array = [
 ]
 param logAnalyticsWorkspaceResourceName string
 param logAnalyticsWorkspaceResourceGroup string
+param logAnalyticsWorkspaceSubscription string
 var resourceGroupName = resourceGroup().name
 
 resource logAnalytics 'Microsoft.OperationalInsights/workspaces@2020-10-01' existing = {
   name: logAnalyticsWorkspaceResourceName
-  scope: resourceGroup(logAnalyticsWorkspaceResourceGroup)
+  scope: resourceGroup(logAnalyticsWorkspaceSubscription, logAnalyticsWorkspaceResourceGroup)
 }
 
 resource containerAppEnv 'Microsoft.App/managedEnvironments@2022-03-01' = {

infra/main.bicep

@@ -169,6 +169,7 @@ module uploadFiles 'deploy_post_deployment_scripts.bicep' = {
     keyVaultName:aifoundry.outputs.keyvaultName
     logAnalyticsWorkspaceResourceName: aifoundry.outputs.logAnalyticsWorkspaceResourceName
     logAnalyticsWorkspaceResourceGroup: aifoundry.outputs.logAnalyticsWorkspaceResourceGroup
+    logAnalyticsWorkspaceSubscription: aifoundry.outputs.logAnalyticsWorkspaceSubscription
     sqlServerName: sqlDBModule.outputs.sqlServerName
     sqlDbName: sqlDBModule.outputs.sqlDbName
     sqlUsers: [