Update dcra name

hmcts · Sep 5, 2024 · e966c73 · e966c73
1 parent 44a8a1b
commit e966c73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/azure_monitor.tf b/azure_monitor.tf
@@ -47,7 +47,7 @@ data "azurerm_monitor_data_collection_rule" "windows_data_collection_rule" {
 resource "azurerm_monitor_data_collection_rule_association" "linux_vm_dcra" {
   count = var.install_azure_monitor == true && lower(var.os_type) == "linux" && var.virtual_machine_type == "vm" ? 1 : 0
 
-  name                    = "vm-${var.virtual_machine_id}-dcra"
+  name                    = "vm-${local.vm_name}-dcra"
   target_resource_id      = var.virtual_machine_id
   data_collection_rule_id = data.azurerm_monitor_data_collection_rule.linux_data_collection_rule.id
   description             = "Association between a linux VM and the appropriate data collection rule."
@@ -56,7 +56,7 @@ resource "azurerm_monitor_data_collection_rule_association" "linux_vm_dcra" {
 resource "azurerm_monitor_data_collection_rule_association" "linux_vmss_dcra" {
   count = var.install_azure_monitor == true && lower(var.os_type) == "linux" && var.virtual_machine_type == "vmss" ? 1 : 0
 
-  name                    = "vmss-${var.virtual_machine_scale_set_id}-dcra"
+  name                    = "vmss-${local.vmss_name}-dcra"
   target_resource_id      = var.virtual_machine_scale_set_id
   data_collection_rule_id = data.azurerm_monitor_data_collection_rule.linux_data_collection_rule.id
   description             = "Association between a linux VMSS and the appropriate data collection rule."
@@ -65,7 +65,7 @@ resource "azurerm_monitor_data_collection_rule_association" "linux_vmss_dcra" {
 resource "azurerm_monitor_data_collection_rule_association" "windows_vm_dcra" {
   count = var.install_azure_monitor == true && lower(var.os_type) == "windows" && var.virtual_machine_type == "vm" ? 1 : 0
 
-  name                    = "vm-${var.virtual_machine_id}-dcra"
+  name                    = "vm-${local.vm_name}-dcra"
   target_resource_id      = var.virtual_machine_id
   data_collection_rule_id = data.azurerm_monitor_data_collection_rule.windows_data_collection_rule.id
   description             = "Association between a windows VM and the appropriate data collection rule."
@@ -74,7 +74,7 @@ resource "azurerm_monitor_data_collection_rule_association" "windows_vm_dcra" {
 resource "azurerm_monitor_data_collection_rule_association" "windows_vmss_dcra" {
   count = var.install_azure_monitor == true && lower(var.os_type) == "windows" && var.virtual_machine_type == "vmss" ? 1 : 0
 
-  name                    = "vmss-${var.virtual_machine_scale_set_id}-dcra"
+  name                    = "vmss-${local.vmss_name}-dcra"
   target_resource_id      = var.virtual_machine_scale_set_id
   data_collection_rule_id = data.azurerm_monitor_data_collection_rule.windows_data_collection_rule.id
   description             = "Association between a windows VMSS and the appropriate data collection rule."

diff --git a/locals.tf b/locals.tf
@@ -32,8 +32,10 @@ locals {
 
   xdr_tags_list = var.xdr_tags != null ? join(",", [var.xdr_tags, "hmcts,server"]) : "hmcts,server"
 
-  log_analytics_workspace = var.log_analytics_workspace_names[var.env]
-
+  log_analytics_workspace    = var.log_analytics_workspace_names[var.env]
   log_analytics_subscription = var.log_analytics_sub_id[local.log_analytics_workspace]
 
+  vm_name   = regex("virtualMachines/([^/]+)", var.virtual_machine_id)[0]
+  vmss_name = regex("virtualMachineScaleSets/([^/]+)", var.virtual_machine_scale_set_id)[0]
+
 }