Skip to content

PPHA-686: Adding Diagnostic settings into cae #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrlockstar wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −11
Open

PPHA-686: Adding Diagnostic settings into cae #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infrastructure/environments/live/variables.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion infrastructure/environments/nonlive/variables.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions infrastructure/modules/container-apps/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 9 additions & 7 deletions infrastructure/modules/infra/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
Loading