From 3fa25ada59a48b96ec27e6e18f60b419077eac64 Mon Sep 17 00:00:00 2001
From: Dany Contreras <78437433+danycontre@users.noreply.github.com>
Date: Wed, 16 Oct 2024 21:56:49 -0500
Subject: [PATCH] updates

---
 workload/arm/deploy-baseline.json                         | 8 ++++----
 workload/bicep/modules/avdInsightsMonitoring/deploy.bicep | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json
index 624b63757..5e66fad70 100644
--- a/workload/arm/deploy-baseline.json
+++ b/workload/arm/deploy-baseline.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.30.23.60470",
-      "templateHash": "12801986197009122891"
+      "templateHash": "7531174900982543619"
     },
     "name": "AVD Accelerator - Baseline Deployment",
     "description": "AVD Accelerator - Deployment Baseline",
@@ -2125,7 +2125,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.30.23.60470",
-              "templateHash": "4236169587998799965"
+              "templateHash": "10746678051697223286"
             },
             "name": "AVD LZA insights monitoring",
             "description": "This module deploys Log analytics workspace, DCR and policies",
@@ -3855,7 +3855,7 @@
             {
               "type": "Microsoft.Resources/deployments",
               "apiVersion": "2022-09-01",
-              "name": "[format('DCR-{0}', parameters('time'))]",
+              "name": "[format('Mon-DCR-{0}', parameters('time'))]",
               "subscriptionId": "[format('{0}', parameters('subscriptionId'))]",
               "resourceGroup": "[format('{0}', parameters('monitoringRgName'))]",
               "properties": {
@@ -4031,7 +4031,7 @@
             },
             "dataCollectionRuleId": {
               "type": "string",
-              "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', format('{0}', parameters('subscriptionId')), format('{0}', parameters('monitoringRgName'))), 'Microsoft.Resources/deployments', format('DCR-{0}', parameters('time'))), '2022-09-01').outputs.dataCollectionRulesId.value]"
+              "value": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', format('{0}', parameters('subscriptionId')), format('{0}', parameters('monitoringRgName'))), 'Microsoft.Resources/deployments', format('Mon-DCR-{0}', parameters('time'))), '2022-09-01').outputs.dataCollectionRulesId.value]"
             }
           }
         }
diff --git a/workload/bicep/modules/avdInsightsMonitoring/deploy.bicep b/workload/bicep/modules/avdInsightsMonitoring/deploy.bicep
index f6a77c564..c152660e9 100644
--- a/workload/bicep/modules/avdInsightsMonitoring/deploy.bicep
+++ b/workload/bicep/modules/avdInsightsMonitoring/deploy.bicep
@@ -121,7 +121,7 @@ resource existingAlaw 'Microsoft.OperationalInsights/workspaces@2022-10-01' exis
 // data collection rules
 module dataCollectionRule './.bicep/dataCollectionRules.bicep' = {
   scope: resourceGroup('${subscriptionId}', '${monitoringRgName}')
-  name: 'DCR-${time}'
+  name: 'Mon-DCR-${time}'
   params: {
     location: deployAlaWorkspace ? alaWorkspace.outputs.location : existingAlaw.location
     name: dataCollectionRulesName
@@ -129,6 +129,8 @@ module dataCollectionRule './.bicep/dataCollectionRules.bicep' = {
     tags: tags
   }
   dependsOn: [
+    alaWorkspace
+    existingAlaw
     baselineMonitoringResourceGroup
   ]
 }