From b2717b1e61b4cb0e899f84a4788b2ada0540ec34 Mon Sep 17 00:00:00 2001
From: Ole Langbehn <ole.langbehn@inoio.de>
Date: Wed, 6 Nov 2024 19:37:49 +0100
Subject: [PATCH] feat(monitoring): HOLI-10120 HOLI-10121 pull monitoring into
terraform
---
terraform/environments/init.tf | 8 ++++++++
terraform/environments/monitoring.tf | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/terraform/environments/init.tf b/terraform/environments/init.tf
index 7fe737b..9937cd7 100644
--- a/terraform/environments/init.tf
+++ b/terraform/environments/init.tf
@@ -13,6 +13,14 @@ data "terraform_remote_state" "holi_infra_state" {
}
}
+data "terraform_remote_state" "holi_infra_monitoring_state" {
+ backend = "gcs"
+ config = {
+ bucket = "holi-shared-terraform-state"
+ prefix = "infra-monitoring"
+ }
+}
+
data "terraform_remote_state" "holi_chat_server_common_state" {
backend = "gcs"
config = {
diff --git a/terraform/environments/monitoring.tf b/terraform/environments/monitoring.tf
index 71c318c..f8643c0 100644
--- a/terraform/environments/monitoring.tf
+++ b/terraform/environments/monitoring.tf
@@ -1,7 +1,7 @@
resource "google_monitoring_alert_policy" "chat_server_cpu_utilization" {
count = local.environment == "production" ? 1 : 0
display_name = "COMO: Production chat server CPU utilization exceeded"
- notification_channels = [data.terraform_remote_state.holi_infra_state.outputs.monitoring_notification_channel_rocket_chat_production_id]
+ notification_channels = [data.terraform_remote_state.holi_infra_monitoring_state.outputs.monitoring_notification_channel_rocket_chat_production_id]
severity = "WARNING"
alert_strategy {
auto_close = "86400s" # 1 day
@@ -41,7 +41,7 @@ resource "google_monitoring_alert_policy" "chat_server_cpu_utilization" {
resource "google_monitoring_alert_policy" "chat_server_memory_utilization" {
count = local.environment == "production" ? 1 : 0
display_name = "COMO: ${local.environment} chat server memory utilization exceeded"
- notification_channels = [data.terraform_remote_state.holi_infra_state.outputs.monitoring_notification_channel_rocket_chat_production_id]
+ notification_channels = [data.terraform_remote_state.holi_infra_monitoring_state.outputs.monitoring_notification_channel_rocket_chat_production_id]
severity = "WARNING"
alert_strategy {
auto_close = "86400s" # 1 day
--
GitLab