From 5af4b045138828dc310109c891a4417375cb8806 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 10 Jan 2024 10:35:48 -0500 Subject: [PATCH 1/3] rename to artifact registry --- modules/workbench/outputs.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workbench/outputs.tf b/modules/workbench/outputs.tf index 7a7db8f..8a7f5ff 100644 --- a/modules/workbench/outputs.tf +++ b/modules/workbench/outputs.tf @@ -12,6 +12,6 @@ output "table_names" { output "docker_repo_name" { description = "Remote docker GAR repo name" - value = module.repository.docker_repo_name + value = module.artifact_registry.docker_repo_name } From 1af7bd6a865d1e3a30f7176a2b24bb54e817587b Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 10 Jan 2024 10:44:32 -0500 Subject: [PATCH 2/3] set delete protect --- modules/workbench/modules/reporting/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/workbench/modules/reporting/main.tf b/modules/workbench/modules/reporting/main.tf index eba060b..f441721 100644 --- a/modules/workbench/modules/reporting/main.tf +++ b/modules/workbench/modules/reporting/main.tf @@ -29,6 +29,7 @@ locals { # to refer to other values in the same object when defining it. table_id = replace(basename(full_path), local.TABLE_SCHEMA_SUFFIX, "") range_partitioning = null + deletion_protection = false }] # Merge calculated inputs with the ones we use every time. From 0602238d9298ac11a7b61ea3f5d8b64bfbd60f42 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 17 Jan 2024 17:14:59 -0500 Subject: [PATCH 3/3] alert policy --- .../modules/monitoring/modules/alert_policies/main.tf | 6 ++++++ modules/workbench/modules/reporting/main.tf | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/workbench/modules/monitoring/modules/alert_policies/main.tf b/modules/workbench/modules/monitoring/modules/alert_policies/main.tf index 0670bfa..eae2040 100644 --- a/modules/workbench/modules/monitoring/modules/alert_policies/main.tf +++ b/modules/workbench/modules/monitoring/modules/alert_policies/main.tf @@ -80,4 +80,10 @@ resource "google_monitoring_alert_policy" "policy" { user_labels = lookup(each.value, "userLabels", null) # Don't set notification if input is empty. notification_channels = var.notification_channel_id == "" ? null : each.value.notificationChannels + + alert_strategy { + notification_channel_strategy { + renotify_interval = "1d" + } + } } diff --git a/modules/workbench/modules/reporting/main.tf b/modules/workbench/modules/reporting/main.tf index f441721..cb20b70 100644 --- a/modules/workbench/modules/reporting/main.tf +++ b/modules/workbench/modules/reporting/main.tf @@ -29,7 +29,7 @@ locals { # to refer to other values in the same object when defining it. table_id = replace(basename(full_path), local.TABLE_SCHEMA_SUFFIX, "") range_partitioning = null - deletion_protection = false + deletion_protection = true }] # Merge calculated inputs with the ones we use every time.