tls-app fix: migrate prod otel (#170)

utilitywarehouse · Mar 1, 2024 · 16b1a77 · 16b1a77
1 parent 0532dc4
commit 16b1a77
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/prod-aws/kafka-shared/otel/otel.tf b/prod-aws/kafka-shared/otel/otel.tf
@@ -20,13 +20,19 @@ resource "kafka_topic" "otlp_spans" {
 }
 
 module "otel_collector" {
-  source           = "../../../modules/tls-app"
+  source           = "../../../modules/tls-app-v2"
   produce_topics   = [kafka_topic.otlp_spans.name]
   cert_common_name = "otel/collector"
 }
 
 module "tempo_distributor" {
-  source           = "../../../modules/tls-app"
-  consume_topics   = { (kafka_topic.otlp_spans.name) : "processor-tempo" }
+  source           = "../../../modules/tls-app-v2"
+  consume_topics   = [(kafka_topic.otlp_spans.name)]
+  consume_groups   = ["processor-tempo"]
   cert_common_name = "otel/tempo-distributor"
 }
+
+moved {
+  from = module.tempo_distributor.kafka_acl.group_acl["otel.otlp_spans"]
+  to   = module.tempo_distributor.kafka_acl.group_acl["processor-tempo"]
+}