From 30f46f09d6ed3712c8e84447eb5aa281e90c8e39 Mon Sep 17 00:00:00 2001
From: Vannick Trinquier <vannick@google.com>
Date: Mon, 20 Oct 2025 13:13:42 +0700
Subject: [PATCH 1/2] Apply alerts and log based metrics after log buckets
 creation (#3442)

---
 modules/project-factory/projects.tf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/project-factory/projects.tf b/modules/project-factory/projects.tf
index fdf97c941..c9779df0c 100644
--- a/modules/project-factory/projects.tf
+++ b/modules/project-factory/projects.tf
@@ -73,7 +73,7 @@ module "projects" {
   })
   default_service_account = try(each.value.default_service_account, "keep")
   descriptive_name        = try(each.value.descriptive_name, null)
-  factories_config        = each.value.factories_config
+  factories_config        = { for k, v in each.value.factories_config : k => v if k != "observability" }
   labels = merge(
     each.value.labels, var.data_merges.labels
   )
@@ -118,6 +118,7 @@ module "projects-iam" {
     kms_keys       = local.ctx.kms_keys
     iam_principals = local.ctx_iam_principals
   })
+  factories_config      = { for k, v in each.value.factories_config : k => v if k == "observability" }
   iam                   = lookup(each.value, "iam", {})
   iam_bindings          = lookup(each.value, "iam_bindings", {})
   iam_bindings_additive = lookup(each.value, "iam_bindings_additive", {})

From c6b66ee80b4d722911470d5ac6f2d91f97ba5c76 Mon Sep 17 00:00:00 2001
From: Ludovico Magnocavallo <ludomagno@google.com>
Date: Mon, 20 Oct 2025 06:32:42 +0000
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c7bac81f..ff42d198c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@ All notable changes to this project will be documented in this file.
 
 ### MODULES
 
+- [[#3442](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3442)] Apply alerts and log based metrics after log buckets creation ([vannicktrinquier](https://github.com/vannicktrinquier)) <!-- 2025-10-20 06:13:42+00:00 -->
 - [[#3440](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3440)] Support resource-level factories config in project factory module and FAST stages ([ludoo](https://github.com/ludoo)) <!-- 2025-10-18 10:41:19+00:00 -->
 - [[#3436](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3436)] Add service agent outputs to folder and organization ([juliocc](https://github.com/juliocc)) <!-- 2025-10-17 15:23:08+00:00 -->
 - [[#3423](https://github.com/GoogleCloudPlatform/cloud-foundation-fabric/pull/3423)] bigquery-connection module ([lcaggio](https://github.com/lcaggio)) <!-- 2025-10-16 15:15:36+00:00 -->