Merge branch 'main' into add-healthcheck-path-to-infrastructure

Author: steventux

.azuredevops/pipelines/cd-infrastructure-dev-audit.yaml

@@ -14,7 +14,7 @@ resources:
     - repository: dtos-devops-templates
       type: github
       name: NHSDigital/dtos-devops-templates
-      ref: d00eaa9a7ce04b78ff5ebf488f6d265d929a58b3
+      ref: fix/log-analytics-private-DNS
       endpoint: NHSDigital
 
 variables:

infrastructure/tf-audit/private_link_scoped_service.tf

@@ -0,0 +1,33 @@
+# Create the private link service for Application Insights
+module "private_link_scoped_service_app_insights" {
+  for_each = var.features.private_endpoints_enabled ? var.regions : {}
+
+  source = "../../../dtos-devops-templates/infrastructure/modules/private-link-scoped-service"
+
+  providers = {
+    azurerm = azurerm.hub
+  }
+
+  name                = "${module.regions_config[each.key].names.log-analytics-workspace}-ampls-service-app-insights"
+  resource_group_name = data.terraform_remote_state.hub.outputs.private_endpoint_rg_name[each.key]
+
+  linked_resource_id = module.app_insights_audit[each.key].id
+  scope_name         = data.terraform_remote_state.hub.outputs.azure_monitor_private_link_scope_name
+}
+
+# Create the private link service for Log Analytics
+module "private_link_scoped_service_law" {
+  for_each = var.features.private_endpoints_enabled ? var.regions : {}
+
+  source = "../../../dtos-devops-templates/infrastructure/modules/private-link-scoped-service"
+
+  providers = {
+    azurerm = azurerm.hub
+  }
+
+  name                = "${module.regions_config[each.key].names.log-analytics-workspace}-ampls-service-law"
+  resource_group_name = data.terraform_remote_state.hub.outputs.private_endpoint_rg_name[each.key]
+
+  linked_resource_id = module.log_analytics_workspace_audit[each.key].id
+  scope_name         = data.terraform_remote_state.hub.outputs.azure_monitor_private_link_scope_name
+}

infrastructure/tf-audit/private_link_scopes.tf

@@ -4,6 +4,7 @@
     "development": "b838b13c-f98c-4def-93f0-515d4e4f4ee1",
     "integration": "97eaad14-a72c-45f3-bbcd-c0071113c1c2",
     "nft": "97eaad14-a72c-45f3-bbcd-c0071113c1c2",
+    "pre_production": "97eaad14-a72c-45f3-bbcd-c0071113c1c2",
     "production": "97eaad14-a72c-45f3-bbcd-c0071113c1c2",
 }