From 9693fda902f3c958aca7cd43ed6fefb82ce11287 Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Wed, 24 Jul 2024 16:32:07 -0700 Subject: [PATCH 1/2] Remove laser alerts Signed-off-by: Nghia Tran --- modules/cloudevent-recorder/README.md | 1 - modules/cloudevent-recorder/main.tf | 65 ----------------- modules/configmap/README.md | 1 - modules/configmap/main.tf | 52 ------------- modules/cron/README.md | 2 - modules/cron/main.tf | 101 -------------------------- modules/regional-go-service/main.tf | 5 -- modules/regional-service/README.md | 1 - modules/regional-service/main.tf | 53 -------------- modules/secret/README.md | 1 - modules/secret/main.tf | 46 ------------ modules/serverless-gclb/README.md | 1 - modules/serverless-gclb/main.tf | 42 ----------- 13 files changed, 371 deletions(-) diff --git a/modules/cloudevent-recorder/README.md b/modules/cloudevent-recorder/README.md index 60dbcf39..1e02ec64 100644 --- a/modules/cloudevent-recorder/README.md +++ b/modules/cloudevent-recorder/README.md @@ -108,7 +108,6 @@ No requirements. | [google_bigquery_table.types](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/bigquery_table) | resource | | [google_bigquery_table_iam_binding.import-writes-to-tables](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/bigquery_table_iam_binding) | resource | | [google_monitoring_alert_policy.bq_dts](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_alert_policy) | resource | -| [google_monitoring_alert_policy.bucket-access](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_alert_policy) | resource | | [google_pubsub_subscription.dead-letter-pull-sub](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/pubsub_subscription) | resource | | [google_pubsub_subscription.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/pubsub_subscription) | resource | | [google_pubsub_subscription_iam_binding.allow-pubsub-to-ack](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/pubsub_subscription_iam_binding) | resource | diff --git a/modules/cloudevent-recorder/main.tf b/modules/cloudevent-recorder/main.tf index ed7a1237..4dbf9938 100644 --- a/modules/cloudevent-recorder/main.tf +++ b/modules/cloudevent-recorder/main.tf @@ -50,68 +50,3 @@ resource "google_storage_bucket" "recorder" { // What identity is deploying this? data "google_client_openid_userinfo" "me" {} -resource "google_monitoring_alert_policy" "bucket-access" { - # In the absence of data, incident will auto-close after an hour - alert_strategy { - auto_close = "3600s" - - notification_rate_limit { - period = "3600s" // re-alert hourly if condition still valid. - } - } - - display_name = "Abnormal Event Bucket Access: ${var.name}" - combiner = "OR" - - conditions { - display_name = "Bucket Access" - - condition_matched_log { - filter = < Date: Wed, 24 Jul 2024 16:48:29 -0700 Subject: [PATCH 2/2] Revert secrets Signed-off-by: Nghia Tran --- modules/secret/README.md | 1 + modules/secret/main.tf | 46 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/modules/secret/README.md b/modules/secret/README.md index e31d6894..5856a0f0 100644 --- a/modules/secret/README.md +++ b/modules/secret/README.md @@ -76,6 +76,7 @@ No modules. | Name | Type | |------|------| +| [google_monitoring_alert_policy.anomalous-secret-access](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/monitoring_alert_policy) | resource | | [google_secret_manager_secret.this](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/secret_manager_secret) | resource | | [google_secret_manager_secret_iam_binding.authorize-service-access](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/secret_manager_secret_iam_binding) | resource | | [google_secret_manager_secret_iam_binding.authorize-version-adder](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/secret_manager_secret_iam_binding) | resource | diff --git a/modules/secret/main.tf b/modules/secret/main.tf index 632007da..3beb9ff4 100644 --- a/modules/secret/main.tf +++ b/modules/secret/main.tf @@ -39,3 +39,49 @@ resource "google_secret_manager_secret_iam_binding" "authorize-version-adder" { // Get a project number for this project ID. data "google_project" "project" { project_id = var.project_id } +// Create an alert policy to notify if the secret is accessed by an unauthorized entity. +resource "google_monitoring_alert_policy" "anomalous-secret-access" { + # In the absence of data, incident will auto-close after an hour + alert_strategy { + auto_close = "3600s" + + notification_rate_limit { + period = "3600s" // re-alert hourly if condition still valid. + } + } + + display_name = "Abnormal Secret Access: ${var.name}" + combiner = "OR" + + conditions { + display_name = "Abnormal Secret Access: ${var.name}" + + condition_matched_log { + filter = <