chore: updated iac daemon bootstrap

demeter-run · Oct 10, 2024 · e6eb4ed · e6eb4ed
1 parent a82c152
commit e6eb4ed
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/.github/iac/main.tf b/.github/iac/main.tf
@@ -86,13 +86,14 @@ module "fabric_rpc" {
 module "fabric_daemon" {
   source = "../../bootstrap/daemon"
 
-  namespace      = local.daemon_namespace
-  image          = var.daemon_image
-  cluster_id     = "txpipe-us-east-2-m2"
-  broker_urls    = local.broker_urls
-  consumer_name  = "daemon-us-west-2-m2-hi6"
-  kafka_username = local.kafka_daemon_username
-  kafka_password = local.kafka_daemon_password
-  kafka_topic    = local.kafka_topic
-  mode           = "usage"
+  namespace             = local.daemon_namespace
+  image                 = var.daemon_image
+  cluster_id            = "txpipe-us-east-2-m2"
+  broker_urls           = local.broker_urls
+  consumer_monitor_name = "daemon-us-west-2-m2-monitor-hi6"
+  consumer_cache_name   = "daemon-us-west-2-m2-cache-hi6"
+  kafka_username        = local.kafka_daemon_username
+  kafka_password        = local.kafka_daemon_password
+  kafka_topic           = local.kafka_topic
+  mode                  = "usage"
 }
diff --git a/bootstrap/daemon/config.tf b/bootstrap/daemon/config.tf
@@ -9,7 +9,8 @@ resource "kubernetes_config_map_v1" "fabric_daemon_config" {
       "${path.module}/daemon.toml.tftpl",
       {
         broker_urls           = var.broker_urls
-        consumer_name         = var.consumer_name
+        consumer_cache_name   = var.consumer_cache_name
+        consumer_monitor_name = var.consumer_monitor_name
         kafka_username        = var.kafka_username
         kafka_password        = var.kafka_password
         topic                 = var.kafka_topic

diff --git a/bootstrap/daemon/daemon.toml.tftpl b/bootstrap/daemon/daemon.toml.tftpl
@@ -9,13 +9,27 @@ mode = "${mode}"
 url = "${prometheus_url}"
 query_step = "${prometheus_query_step}"
 
-[kafka]
+[kafka_producer]
 "bootstrap.servers" = "${broker_urls}"
-"group.id"= "${consumer_name}"
+"security.protocol" = "SASL_SSL"
+"sasl.mechanisms" = "SCRAM-SHA-256"
+"sasl.username" = "${kafka_username}"
+"sasl.password" = "${kafka_password}"
 
+[kafka_monitor]
+"bootstrap.servers" = "${broker_urls}"
+"group.id"= "${consumer_monitor_name}"
+"auto.offset.reset" = "earliest"
 "security.protocol" = "SASL_SSL"
 "sasl.mechanisms" = "SCRAM-SHA-256"
 "sasl.username" = "${kafka_username}"
 "sasl.password" = "${kafka_password}"
 
+[kafka_cache]
+"bootstrap.servers" = "${broker_urls}"
+"group.id"= "${consumer_cache_name}"
 "auto.offset.reset" = "earliest"
+"security.protocol" = "SASL_SSL"
+"sasl.mechanisms" = "SCRAM-SHA-256"
+"sasl.username" = "${kafka_username}"
+"sasl.password" = "${kafka_password}"
diff --git a/bootstrap/daemon/main.tf b/bootstrap/daemon/main.tf
@@ -20,7 +20,11 @@ variable "broker_urls" {
   description = "Comma separated values of the queue broker urls."
 }
 
-variable "consumer_name" {
+variable "consumer_monitor_name" {
+  type = string
+}
+
+variable "consumer_cache_name" {
   type = string
 }