From 0e958a073c664e0f38831cbce007635ca44d1876 Mon Sep 17 00:00:00 2001
From: Lucas Telles <lucas.telles@indicodata.ai>
Date: Thu, 26 Mar 2026 10:22:38 -0300
Subject: [PATCH 1/3] Add signoz to monitoring

---
 application.tf | 23 +++++++++++++++++------
 monitoring.tf  | 10 +++++-----
 variables.tf   | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/application.tf b/application.tf
index 1fc76c30..6f1d9e8a 100644
--- a/application.tf
+++ b/application.tf
@@ -790,6 +790,8 @@ externalSecretStore:
   vaultRole: ${var.secrets_operator_enabled == true && var.multitenant_enabled == false ? module.secrets-operator-setup[0].vault_auth_role_name : "unused-role"}
   vaultServiceAccount: ${var.secrets_operator_enabled == true && var.multitenant_enabled == false ? module.secrets-operator-setup[0].vault_auth_service_account_name : "vault-sa"}
   vaultSecretName: "vault-auth"
+opentelemetry-operator:
+  enabled: ${var.enable_signoz}
   EOF
   ])
 
@@ -835,16 +837,20 @@ keda:
       podMonitor:
         enabled: true
 kube-prometheus-stack:
+  enabled: ${var.enable_signoz ? false : true}
 ${local.kube_prometheus_stack_values}
 ${local.loki_config}
 metrics-server:
   image:
     repository: ${var.image_registry}/registry.k8s.io/metrics-server/metrics-server
 opentelemetry-collector:
-  enabled: true
+  enabled: ${var.enable_signoz ? false : true}
   image:
     repository: ${var.image_registry}/docker.io/otel/opentelemetry-collector-contrib
+alerting:
+  enabled: ${var.enable_signoz ? false : true}
 tempo:
+  enabled: ${var.enable_signoz ? false : true}
   tempo:
     storage:
       trace:
@@ -852,6 +858,11 @@ tempo:
         s3:
           bucket: ${local.environment_loki_s3_bucket_name}
           endpoint: s3.${var.region}.amazonaws.com
+signoz:
+  enabled: ${var.enable_signoz}
+  clusterName: ${var.label}
+  otelCollectorEndpoint: ${var.signoz_otel_collector_endpoint}
+  token: ${var.signoz_bearer_token}
   EOF
   ] : []
 
@@ -909,10 +920,10 @@ module "indico-common" {
 
 # With the common charts are installed, we can then move on to installing intake and/or insights
 locals {
-  internal_elb                   = var.network_allow_public == false ? true : false
-  backend_port                   = var.acm_arn != "" ? "http" : "https"
-  enableHttp                     = var.acm_arn != "" || var.use_nlb == true ? false : true
-  nginx_ingress_configs          = var.enforce_http_2_only ? (<<EOT
+  internal_elb = var.network_allow_public == false ? true : false
+  backend_port = var.acm_arn != "" ? "http" : "https"
+  enableHttp   = var.acm_arn != "" || var.use_nlb == true ? false : true
+  nginx_ingress_configs = var.enforce_http_2_only ? (<<EOT
 
     config:
       entries:
@@ -979,7 +990,7 @@ noExtraConfigs: true
   EOT
   ) : (<<EOT
 alerting:
-  enabled: true
+  enabled: ${var.enable_signoz ? false : true}
   email:
     enabled: ${var.alerting_email_enabled}
     smarthost: '${var.alerting_email_host}'
diff --git a/monitoring.tf b/monitoring.tf
index 76690add..5f251fab 100644
--- a/monitoring.tf
+++ b/monitoring.tf
@@ -22,10 +22,10 @@ locals {
 
   loki_config = var.enable_loki_logging == true ? (<<EOT
 fluent-bit:
-  enabled: true
+  enabled: ${var.enable_signoz ? false : true}
   ${var.custom_fluentbit_filters != "" ? indent(2, base64decode(var.custom_fluentbit_filters)) : ""}
 loki:
-  enabled: true
+  enabled: ${var.enable_signoz ? false : true}
   loki:
     storage_config:
       aws:
@@ -325,9 +325,9 @@ resource "aws_route53_record" "alertmanager-caa" {
 
 locals {
   monitoring_password = var.multitenant_enabled == false ? random_password.monitoring-password[0].result : ""
-  password = var.multitenant_enabled == false ? random_password.password[0].result : ""
-  salt = var.multitenant_enabled == false ? random_password.salt[0].result : ""
-  hash = var.multitenant_enabled == false ? htpasswd_password.hash[0].bcrypt : ""
+  password            = var.multitenant_enabled == false ? random_password.password[0].result : ""
+  salt                = var.multitenant_enabled == false ? random_password.salt[0].result : ""
+  hash                = var.multitenant_enabled == false ? htpasswd_password.hash[0].bcrypt : ""
 }
 
 resource "random_password" "monitoring-password" {
diff --git a/variables.tf b/variables.tf
index a2b21d00..fc0f5ee3 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1882,3 +1882,21 @@ variable "indico_nat_enable_ssm" {
   default     = false
   description = "When true, install and enable SSM Agent on indico-nat instances for remote shell access"
 }
+
+variable "enable_signoz" {
+  type        = bool
+  default     = false
+  description = "Toggle for enabling signoz"
+}
+
+variable "signoz_otel_collector_endpoint" {
+  type        = string
+  default     = "signoz-collector.devops.indico.io:443"
+  description = "OTEL collector endpoint for signoz"
+}
+
+variable "signoz_bearer_token" {
+  type        = string
+  default     = ""
+  description = "Bearer token for signoz"
+}

From b2bae6d37e3067d72b5ac7edf588eda923ef72a6 Mon Sep 17 00:00:00 2001
From: Lucas Telles <lucas.telles@indicodata.ai>
Date: Thu, 26 Mar 2026 20:36:12 -0300
Subject: [PATCH 2/3] Add environment at signoz

---
 application.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application.tf b/application.tf
index 6f1d9e8a..c4b828fe 100644
--- a/application.tf
+++ b/application.tf
@@ -863,6 +863,7 @@ signoz:
   clusterName: ${var.label}
   otelCollectorEndpoint: ${var.signoz_otel_collector_endpoint}
   token: ${var.signoz_bearer_token}
+  environment: ${var.environment}
   EOF
   ] : []
 

From 7c1458b45a691c6b8c8273f00189014a4cfb7331 Mon Sep 17 00:00:00 2001
From: Lucas Telles <lucas.telles@indicodata.ai>
Date: Fri, 27 Mar 2026 13:48:59 -0300
Subject: [PATCH 3/3] Remove duplicated alerting and add sensitive to var

---
 application.tf | 2 --
 variables.tf   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/application.tf b/application.tf
index c4b828fe..61bf1c4a 100644
--- a/application.tf
+++ b/application.tf
@@ -847,8 +847,6 @@ opentelemetry-collector:
   enabled: ${var.enable_signoz ? false : true}
   image:
     repository: ${var.image_registry}/docker.io/otel/opentelemetry-collector-contrib
-alerting:
-  enabled: ${var.enable_signoz ? false : true}
 tempo:
   enabled: ${var.enable_signoz ? false : true}
   tempo:
diff --git a/variables.tf b/variables.tf
index fc0f5ee3..12a9da87 100644
--- a/variables.tf
+++ b/variables.tf
@@ -1899,4 +1899,5 @@ variable "signoz_bearer_token" {
   type        = string
   default     = ""
   description = "Bearer token for signoz"
+  sensitive   = true
 }