diff --git a/infrastructure/environments/live/variables.tfvars b/infrastructure/environments/live/variables.tfvars index 794403e3..d744277e 100644 --- a/infrastructure/environments/live/variables.tfvars +++ b/infrastructure/environments/live/variables.tfvars @@ -27,7 +27,7 @@ projects = { } infra_key_vault_name = "kv-lungcs-live-inf" -infra_key_vault_rg = "rg-hub-live-uks-bootstrap" +infra_key_vault_rg = "rg-hub-live-uks-bootstrap" diagnostic_settings = { metric_enabled = true diff --git a/infrastructure/environments/nonlive/variables.tfvars b/infrastructure/environments/nonlive/variables.tfvars index f8036dc4..805ed5db 100644 --- a/infrastructure/environments/nonlive/variables.tfvars +++ b/infrastructure/environments/nonlive/variables.tfvars @@ -25,7 +25,7 @@ projects = { } infra_key_vault_name = "kv-lungcs-nonlive-inf" -infra_key_vault_rg = "rg-hub-nonlive-uks-bootstrap" +infra_key_vault_rg = "rg-hub-nonlive-uks-bootstrap" diagnostic_settings = { metric_enabled = true diff --git a/infrastructure/modules/container-apps/main.tf b/infrastructure/modules/container-apps/main.tf index 3b98a8b9..f5d947f8 100644 --- a/infrastructure/modules/container-apps/main.tf +++ b/infrastructure/modules/container-apps/main.tf @@ -11,8 +11,8 @@ module "webapp" { azurerm.hub = azurerm.hub } - name = "${var.app_short_name}-web-${var.environment}" - container_app_environment_id = var.container_app_environment_id + name = "${var.app_short_name}-web-${var.environment}" + container_app_environment_id = var.container_app_environment_id # alerts action_group_id = var.action_group_id diff --git a/infrastructure/modules/infra/main.tf b/infrastructure/modules/infra/main.tf index 071e06d1..3e46c69f 100644 --- a/infrastructure/modules/infra/main.tf +++ b/infrastructure/modules/infra/main.tf @@ -62,13 +62,15 @@ module "container-app-environment" { azurerm.dns = azurerm.hub } - name = "cae-${var.environment}-uks-${var.app_short_name}" - resource_group_name = azurerm_resource_group.main.name - internal_load_balancer_enabled = var.features.private_networking - log_analytics_workspace_id = module.log_analytics_workspace_audit.id - vnet_integration_subnet_id = module.container_app_subnet.id - private_dns_zone_rg_name = var.features.private_networking ? "rg-hub-${var.hub}-uks-private-dns-zones" : null - zone_redundancy_enabled = var.cae_zone_redundancy_enabled + name = "cae-${var.environment}-uks-${var.app_short_name}" + resource_group_name = azurerm_resource_group.main.name + internal_load_balancer_enabled = var.features.private_networking + log_analytics_workspace_id = module.log_analytics_workspace_audit.id + vnet_integration_subnet_id = module.container_app_subnet.id + private_dns_zone_rg_name = var.features.private_networking ? "rg-hub-${var.hub}-uks-private-dns-zones" : null + zone_redundancy_enabled = var.cae_zone_redundancy_enabled + logs_destination = "azure-monitor" + monitor_diagnostic_setting_cae_enabled_logs = ["ContainerAppConsoleLogs", "ContainerAppSystemLogs"] } module "app_insights_audit" {