From 5c0b2b98275db4b60c6048eb1427fcb009d595c3 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 4 Sep 2024 17:49:57 -0400 Subject: [PATCH 1/5] enable monitoring --- main.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.tf b/main.tf index 9b1aa65..4d6b625 100644 --- a/main.tf +++ b/main.tf @@ -323,28 +323,28 @@ resource "helm_release" "loki" { ##### Monitoring ##### set { name = "loki.analytics.reporting_enabled" - value = "false" + value = "true" } set { name = "monitoring.dashboards.enabled" - value = "false" + value = "true" } set { name = "monitoring.rules.enabled" - value = "false" + value = "true" } set { name = "monitoring.serviceMonitor.enabled" - value = "false" + value = "true" } set { name = "monitoring.selfMonitoring.enabled" - value = "false" + value = "true" } set { name = "monitoring.lokiCanary.enabled" - value = "false" + value = "true" } } From 3fcb6767a43c5d57ff61420e6945920c9b8714f4 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 4 Sep 2024 18:05:15 -0400 Subject: [PATCH 2/5] selective --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 4d6b625..c1e4562 100644 --- a/main.tf +++ b/main.tf @@ -328,11 +328,11 @@ resource "helm_release" "loki" { set { name = "monitoring.dashboards.enabled" - value = "true" + value = "false" } set { name = "monitoring.rules.enabled" - value = "true" + value = "false" } set { name = "monitoring.serviceMonitor.enabled" From cfeba91c7b957a74efbfd7cbeab1d88b90591158 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 4 Sep 2024 18:43:00 -0400 Subject: [PATCH 3/5] no monitoring then --- main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index c1e4562..83ec524 100644 --- a/main.tf +++ b/main.tf @@ -336,15 +336,15 @@ resource "helm_release" "loki" { } set { name = "monitoring.serviceMonitor.enabled" - value = "true" + value = "false" } set { name = "monitoring.selfMonitoring.enabled" - value = "true" + value = "false" } set { name = "monitoring.lokiCanary.enabled" - value = "true" + value = "false" } } From 9542def3a226671606a9e13caced3cd9873bb842 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 4 Sep 2024 19:12:37 -0400 Subject: [PATCH 4/5] how about enable test --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 83ec524..2a7a25b 100644 --- a/main.tf +++ b/main.tf @@ -273,7 +273,7 @@ resource "helm_release" "loki" { } set { name = "test.enabled" - value = "false" + value = "true" } ##### Compactor Config ##### @@ -323,7 +323,7 @@ resource "helm_release" "loki" { ##### Monitoring ##### set { name = "loki.analytics.reporting_enabled" - value = "true" + value = "false" } set { From aa204c7c522a9d7e31d961c4f19af7dbc2b22cfd Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 4 Sep 2024 20:11:36 -0400 Subject: [PATCH 5/5] update source for submodule --- main.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 2a7a25b..4ab3816 100644 --- a/main.tf +++ b/main.tf @@ -39,7 +39,7 @@ module "loki_irsa_role" { # source = "git@github.it.census.gov:SOA/tfmod-custom-iam-role-for-service-account-eks.git/?ref=1.0.0" # tflint-ignore: terraform_module_version # tflint-ignore: terraform_module_pinned_source - source = "git@github.it.census.gov:SOA/tfmod-custom-iam-role-for-service-account-eks.git/" + source = "git@github.e.it.census.gov:SCT-Engineering/tfmod-custom-iam-role-for-service-account-eks.git" role_name = "${var.cluster_name}-loki" @@ -273,7 +273,7 @@ resource "helm_release" "loki" { } set { name = "test.enabled" - value = "true" + value = "false" } ##### Compactor Config ##### @@ -325,7 +325,6 @@ resource "helm_release" "loki" { name = "loki.analytics.reporting_enabled" value = "false" } - set { name = "monitoring.dashboards.enabled" value = "false"