From eec80b208edb754a56ed85d81f57cbba2f9c14c1 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 13:56:08 -0400 Subject: [PATCH 1/7] renotify --- .../modules/monitoring/modules/alert_policies/main.tf | 6 ++++++ 1 file changed, 6 insertions(+) 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" + } + } } From 126e9fb40413582c66fce9848bdc61b8995e2cf7 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 14:04:05 -0400 Subject: [PATCH 2/7] renotify --- .../modules/monitoring/modules/alert_policies/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/workbench/modules/monitoring/modules/alert_policies/main.tf b/modules/workbench/modules/monitoring/modules/alert_policies/main.tf index eae2040..1db8fe0 100644 --- a/modules/workbench/modules/monitoring/modules/alert_policies/main.tf +++ b/modules/workbench/modules/monitoring/modules/alert_policies/main.tf @@ -78,12 +78,12 @@ 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" } } + + # Don't set notification if input is empty. + notification_channels = var.notification_channel_id == "" ? null : each.value.notificationChannels } From 306c6746499127b2117063eb84f449475b53973b Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 14:15:44 -0400 Subject: [PATCH 3/7] upgrade google provider version --- modules/workbench/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workbench/providers.tf b/modules/workbench/providers.tf index 7561dbb..fcc932d 100644 --- a/modules/workbench/providers.tf +++ b/modules/workbench/providers.tf @@ -2,7 +2,7 @@ // Child modules receive their provider configurations from the root module. terraform { required_providers { - google = ">= 3.23.0" + google = ">= 5.1.0" } } From 7153e190a61f356d517806733ea9637d76ee0d6d Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 16:06:22 -0400 Subject: [PATCH 4/7] upgrade google provider version --- modules/workbench/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workbench/providers.tf b/modules/workbench/providers.tf index fcc932d..46263da 100644 --- a/modules/workbench/providers.tf +++ b/modules/workbench/providers.tf @@ -2,7 +2,7 @@ // Child modules receive their provider configurations from the root module. terraform { required_providers { - google = ">= 5.1.0" + google = ">= 5.0.0" } } From 584c1156b0b377ac26bd5583d45c711faada447b Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 16:17:16 -0400 Subject: [PATCH 5/7] upgrade google provider version --- modules/workbench/modules/reporting/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workbench/modules/reporting/main.tf b/modules/workbench/modules/reporting/main.tf index b8edd9b..c0e780f 100644 --- a/modules/workbench/modules/reporting/main.tf +++ b/modules/workbench/modules/reporting/main.tf @@ -86,7 +86,7 @@ locals { # All BigQuery assets for Reporting subsystem module "main" { source = "terraform-google-modules/bigquery/google" - version = "~> 4.3" + version = ">= 4.3" dataset_id = var.reporting_dataset_id project_id = var.project_id location = "US" From 7c3edab17689a5a147ef69000dc886d309356ec3 Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Mon, 9 Oct 2023 16:23:44 -0400 Subject: [PATCH 6/7] upgrade google provider version --- modules/workbench/providers.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/workbench/providers.tf b/modules/workbench/providers.tf index 46263da..4e1f14c 100644 --- a/modules/workbench/providers.tf +++ b/modules/workbench/providers.tf @@ -2,7 +2,7 @@ // Child modules receive their provider configurations from the root module. terraform { required_providers { - google = ">= 5.0.0" + google = ">= 4.7.1" } } From c73532e915f0e91b26a35b7841984143daa5456c Mon Sep 17 00:00:00 2001 From: Yonghao Yu Date: Wed, 11 Oct 2023 10:20:52 -0400 Subject: [PATCH 7/7] renotify --- 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 c0e780f..120a861 100644 --- a/modules/workbench/modules/reporting/main.tf +++ b/modules/workbench/modules/reporting/main.tf @@ -6,6 +6,7 @@ locals { # Values that don't ever change set for this dataset. TABLE_CONSTANTS = { time_partitioning = null + range_partitioning = null expiration_time = null clustering = [] labels = {