fix: address remaining PR 777 copilot comments

Author: Yatish-Microsoft

infra/main.bicep

@@ -382,7 +382,7 @@ module virtualNetwork 'modules/virtualNetwork.bicep' = if (enablePrivateNetworki
   params: {
     name: 'vnet-${solutionSuffix}'
     addressPrefixes: ['10.0.0.0/20'] // 4096 addresses (enough for 8 /23 subnets or 16 /24)
-    location: location
+    location: solutionLocation
     deployBastionAndJumpbox: enablePrivateNetworking && deployBastionAndJumpbox
     tags: tags
     logAnalyticsWorkspaceId: logAnalyticsWorkspaceResourceId
@@ -405,26 +405,28 @@ var zoneSupportedJumpboxLocations = [
   'uksouth'
   'westus3'
 ]
-var deployAdminAccessResources = enablePrivateNetworking && deployBastionAndJumpbox
+var deployAdminAccessResources = enablePrivateNetworking && deployBastionAndJumpbox && !empty(vmAdminPassword)
 module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (deployAdminAccessResources) {
   name: take('avm.res.network.bastion-host.${bastionHostName}', 64)
   params: {
     name: bastionHostName
     skuName: 'Standard'
-    location: location
+    location: solutionLocation
     virtualNetworkResourceId: virtualNetwork!.outputs.resourceId
-    diagnosticSettings: [
-      {
-        name: 'bastionDiagnostics'
-        workspaceResourceId: logAnalyticsWorkspaceResourceId
-        logCategoriesAndGroups: [
+    diagnosticSettings: !empty(logAnalyticsWorkspaceResourceId)
+      ? [
           {
-            categoryGroup: 'allLogs'
-            enabled: true
+            name: 'bastionDiagnostics'
+            workspaceResourceId: logAnalyticsWorkspaceResourceId
+            logCategoriesAndGroups: [
+              {
+                categoryGroup: 'allLogs'
+                enabled: true
+              }
+            ]
           }
         ]
-      }
-    ]
+      : []
     tags: tags
     enableTelemetry: enableTelemetry
     publicIPAddressObject: {
@@ -434,7 +436,8 @@ module bastionHost 'br/public:avm/res/network/bastion-host:0.8.2' = if (deployAd
 }
 
 // Jumpbox Virtual Machine
-var jumpboxVmName = take('vm-jumpbox-${solutionSuffix}', 15)
+var jumpboxUniqueToken = take(uniqueString(resourceGroup().id, solutionSuffix), 10)
+var jumpboxVmName = take('vm-${jumpboxUniqueToken}', 15)
 module jumpboxVM 'br/public:avm/res/compute/virtual-machine:0.21.0' = if (deployAdminAccessResources) {
   name: take('avm.res.compute.virtual-machine.${jumpboxVmName}', 64)
   params: {

infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.41.2.15936",
-      "templateHash": "876801466335750099"
+      "templateHash": "690774053853233065"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -358,8 +358,9 @@
       "uksouth",
       "westus3"
     ],
-    "deployAdminAccessResources": "[and(parameters('enablePrivateNetworking'), parameters('deployBastionAndJumpbox'))]",
-    "jumpboxVmName": "[take(format('vm-jumpbox-{0}', variables('solutionSuffix')), 15)]",
+    "deployAdminAccessResources": "[and(and(parameters('enablePrivateNetworking'), parameters('deployBastionAndJumpbox')), not(empty(parameters('vmAdminPassword'))))]",
+    "jumpboxUniqueToken": "[take(uniqueString(resourceGroup().id, variables('solutionSuffix')), 10)]",
+    "jumpboxVmName": "[take(format('vm-{0}', variables('jumpboxUniqueToken')), 15)]",
     "privateDnsZones": [
       "privatelink.cognitiveservices.azure.com",
       "privatelink.openai.azure.com",
@@ -4856,7 +4857,7 @@
             ]
           },
           "location": {
-            "value": "[parameters('location')]"
+            "value": "[variables('solutionLocation')]"
           },
           "deployBastionAndJumpbox": {
             "value": "[and(parameters('enablePrivateNetworking'), parameters('deployBastionAndJumpbox'))]"
@@ -7443,25 +7444,12 @@
             "value": "Standard"
           },
           "location": {
-            "value": "[parameters('location')]"
+            "value": "[variables('solutionLocation')]"
           },
           "virtualNetworkResourceId": {
             "value": "[reference('virtualNetwork').outputs.resourceId.value]"
           },
-          "diagnosticSettings": {
-            "value": [
-              {
-                "name": "bastionDiagnostics",
-                "workspaceResourceId": "[if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), if(parameters('enableMonitoring'), reference('logAnalyticsWorkspace').outputs.resourceId.value, ''))]",
-                "logCategoriesAndGroups": [
-                  {
-                    "categoryGroup": "allLogs",
-                    "enabled": true
-                  }
-                ]
-              }
-            ]
-          },
+          "diagnosticSettings": "[if(not(empty(if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), if(parameters('enableMonitoring'), reference('logAnalyticsWorkspace').outputs.resourceId.value, '')))), createObject('value', createArray(createObject('name', 'bastionDiagnostics', 'workspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), if(parameters('enableMonitoring'), reference('logAnalyticsWorkspace').outputs.resourceId.value, '')), 'logCategoriesAndGroups', createArray(createObject('categoryGroup', 'allLogs', 'enabled', true()))))), createObject('value', createArray()))]",
           "tags": {
             "value": "[parameters('tags')]"
           },
@@ -24873,8 +24861,8 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "virtualNetwork"
       ]
     },

src/backend/event_utils.py

@@ -1,8 +1,18 @@
 import os
+import logging
 from azure.monitor.events.extension import track_event
 
+logger = logging.getLogger(__name__)
+_telemetry_disabled_logged = False
+
 
 def track_event_if_configured(event_name: str, event_data: dict):
+    global _telemetry_disabled_logged
     connection_string = os.getenv("APPLICATIONINSIGHTS_CONNECTION_STRING")
-    if connection_string:
-        track_event(event_name, event_data)
+    if not connection_string:
+        if not _telemetry_disabled_logged:
+            logger.warning("Application Insights connection string is not set; telemetry events are disabled.")
+            _telemetry_disabled_logged = True
+        return
+
+    track_event(event_name, event_data)