From 305232cac41db05055d4c6d05ca53b3c17cb4321 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Wed, 7 Aug 2024 21:21:42 +0700
Subject: [PATCH 01/25] Allow to enable lifecycle for snapshot bucket, load
 balancer logs bucket and rds snapshot bucket (#111)

Default:
- enable lifecycle
- 7 days for fullnode snapshot, 31 days for logs and rds snapshot
---
 indexer/s3_bucket.tf | 43 +++++++++++++++++++++++++++++++++++++++++++
 indexer/variables.tf | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/indexer/s3_bucket.tf b/indexer/s3_bucket.tf
index e0b9636b..7c2516cf 100644
--- a/indexer/s3_bucket.tf
+++ b/indexer/s3_bucket.tf
@@ -9,6 +9,20 @@ resource "aws_s3_bucket" "load_balancer" {
   }
 }
 
+resource "aws_s3_bucket_lifecycle_configuration" "load_balancer" {
+  count  = var.enable_s3_load_balancer_logs_lifecycle ? 1 : 0
+  bucket = aws_s3_bucket.load_balancer.id
+
+  rule {
+    id     = "expire-old-logs"
+    status = "Enabled"
+
+    expiration {
+      days = var.s3_load_balancer_logs_expiration_days
+    }
+  }
+}
+
 # TODO: refactor snapshotting full node into a separate module
 # AWS S3 bucket to store all Indexer full node snapshots
 resource "aws_s3_bucket" "indexer_full_node_snapshots" {
@@ -22,6 +36,21 @@ resource "aws_s3_bucket" "indexer_full_node_snapshots" {
   }
 }
 
+resource "aws_s3_bucket_lifecycle_configuration" "indexer_full_node_snapshots" {
+  count  = var.enable_s3_snapshot_lifecycle ? 1 : 0
+  bucket = aws_s3_bucket.indexer_full_node_snapshots.id
+
+  rule {
+    id     = "expire-old-snapshots"
+    status = "Enabled"
+
+    expiration {
+      days = var.s3_snapshot_expiration_days
+    }
+  }
+}
+
+
 # Enable S3 bucket metrics to be sent to Datadog for monitoring
 resource "aws_s3_bucket_metric" "indexer_full_node_snapshots" {
   bucket = aws_s3_bucket.indexer_full_node_snapshots.id
@@ -64,3 +93,17 @@ resource "aws_s3_bucket" "athena_rds_snapshots" {
     Environment = var.environment
   }
 }
+
+resource "aws_s3_bucket_lifecycle_configuration" "athena_rds_snapshots" {
+  count  = var.enable_s3_rds_snapshot_lifecycle ? 1 : 0
+  bucket = aws_s3_bucket.athena_rds_snapshots.id
+
+  rule {
+    id     = "expire-old-snapshots"
+    status = "Enabled"
+
+    expiration {
+      days = var.s3_rds_snapshot_expiration_days
+    }
+  }
+}
diff --git a/indexer/variables.tf b/indexer/variables.tf
index 37f1ed6d..52df4816 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -472,3 +472,39 @@ variable "image_count" {
   description = "Number of images to store for ECR, defaults to 100."
   default     = 100
 }
+
+variable "enable_s3_snapshot_lifecycle" {
+  type        = bool
+  description = "Enables S3 lifecycle on snapshot bucket. Default is true"
+  default     = true
+}
+
+variable "s3_snapshot_expiration_days" {
+  type        = number
+  description = "Number of days to store fullnode snapshot on S3, defaults to 7."
+  default     = 7
+}
+
+variable "enable_s3_rds_snapshot_lifecycle" {
+  type        = bool
+  description = "Enables S3 lifecycle on rds snapshot bucket. Default is true"
+  default     = true
+}
+
+variable "s3_rds_snapshot_expiration_days" {
+  type        = number
+  description = "Number of days to store rds snapshot on S3, defaults to 31."
+  default     = 31
+}
+
+variable "enable_s3_load_balancer_logs_lifecycle" {
+  type        = bool
+  description = "Enables S3 lifecycle on snapshot bucket. Default is true"
+  default     = true
+}
+
+variable "s3_load_balancer_logs_expiration_days" {
+  type        = number
+  description = "Number of days to store load balancer logs on S3, defaults to 31."
+  default     = 31
+}

From 42ddef9f28f3cd8986c41c5dd50873a8fa7cd657 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 15:35:02 +0700
Subject: [PATCH 02/25] Allow to enable/disable multi_az option on master node
 and remove read_replica_2 instance on dev* (#113)

---
 indexer/rds.tf       |  3 ++-
 indexer/route53.tf   |  3 ++-
 indexer/variables.tf | 12 ++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/indexer/rds.tf b/indexer/rds.tf
index 72a7383e..bfa4316e 100644
--- a/indexer/rds.tf
+++ b/indexer/rds.tf
@@ -215,7 +215,7 @@ resource "aws_db_instance" "main" {
   performance_insights_enabled          = true
   performance_insights_retention_period = 31
   auto_minor_version_upgrade            = false
-  multi_az                              = true
+  multi_az                              = var.enable_rds_main_multiaz
 
   tags = {
     Name        = local.aws_db_instance_main_name
@@ -250,6 +250,7 @@ resource "aws_db_instance" "read_replica" {
 
 # Read replica 2
 resource "aws_db_instance" "read_replica_2" {
+  count          = var.create_read_replica_2 ? 1 : 0
   identifier     = "${local.aws_db_instance_main_name}-read-replica-2"
   instance_class = var.rds_db_instance_class
   # engine, engine_version, name, username, db_subnet_group_name, allocated_storage do not have to
diff --git a/indexer/route53.tf b/indexer/route53.tf
index 60b2ad26..6adac3f0 100644
--- a/indexer/route53.tf
+++ b/indexer/route53.tf
@@ -19,11 +19,12 @@ resource "aws_route53_record" "read_replica_1" {
 }
 
 resource "aws_route53_record" "read_replica_2" {
+  count   = var.create_read_replica_2 ? 1 : 0
   zone_id = aws_route53_zone.main.zone_id
   name    = "postgres-main-rr.dydx-indexer.private"
   type    = "CNAME"
   ttl     = "30"
-  records = ["${aws_db_instance.read_replica_2.address}"]
+  records = ["${aws_db_instance.read_replica_2[count.index].address}"]
   weighted_routing_policy {
     weight = 1
   }
diff --git a/indexer/variables.tf b/indexer/variables.tf
index 52df4816..f464fa3e 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -508,3 +508,15 @@ variable "s3_load_balancer_logs_expiration_days" {
   description = "Number of days to store load balancer logs on S3, defaults to 31."
   default     = 31
 }
+
+variable "create_read_replica_2" {
+  description = "Create read replia 2 or not. Default: true"
+  type        = bool
+  default     = true
+}
+
+variable "enable_rds_main_multiaz" {
+  description = "Enable RDS main instance. Default: true"
+  type        = bool
+  default     = true
+}

From b25fdc05c8e476361821d324de6fde8bf53011d3 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 15:37:21 +0700
Subject: [PATCH 03/25] Reduce fullnode, fullnode_snapshot, and fullnode_backup
 storage to 1TB (#114)

---
 indexer/backup_full_node_ap_northeast_1.tf | 2 ++
 indexer/full_node_ap_northeast_1.tf        | 2 ++
 indexer/variables.tf                       | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/indexer/backup_full_node_ap_northeast_1.tf b/indexer/backup_full_node_ap_northeast_1.tf
index d95b16fa..d7a07430 100644
--- a/indexer/backup_full_node_ap_northeast_1.tf
+++ b/indexer/backup_full_node_ap_northeast_1.tf
@@ -37,6 +37,8 @@ module "backup_full_node_ap_northeast_1" {
 
   use_persistent_docker_volume = var.full_node_use_persistent_docker_volume
 
+  root_block_device_size = var.full_node_root_block_device_size
+
   providers = {
     aws = aws.ap_northeast_1
   }
diff --git a/indexer/full_node_ap_northeast_1.tf b/indexer/full_node_ap_northeast_1.tf
index 5b39959e..29b34c67 100644
--- a/indexer/full_node_ap_northeast_1.tf
+++ b/indexer/full_node_ap_northeast_1.tf
@@ -36,6 +36,8 @@ module "full_node_ap_northeast_1" {
 
   use_persistent_docker_volume = var.full_node_use_persistent_docker_volume
 
+  root_block_device_size = var.full_node_root_block_device_size
+
   providers = {
     aws = aws.ap_northeast_1
   }
diff --git a/indexer/variables.tf b/indexer/variables.tf
index f464fa3e..079b47c5 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -162,6 +162,12 @@ variable "full_node_container_chain_home" {
   description = "Full-node's home directory for the chain. Used to boot up the chain, and configure the `cmd` in ECS"
 }
 
+variable "full_node_root_block_device_size" {
+  type        = number
+  description = "Size of root block device in gigabytes"
+  default     = 3000
+}
+
 variable "snapshot_full_node_container_chain_home" {
   type        = string
   description = "Snapshot full-node's home directory for the chain. Used to boot up the chain, and configure the `cmd` in ECS"

From 0588f12ebf3e34e94360651b490bf45c3491ffd8 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 15:40:48 +0700
Subject: [PATCH 04/25] Change root_block_device_delete_on_termination = true
 to avoid unattached volumes (#115)

---
 indexer/backup_full_node_ap_northeast_1.tf   | 3 ++-
 indexer/full_node_ap_northeast_1.tf          | 3 ++-
 indexer/snapshot_full_node_ap_northeast_1.tf | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/indexer/backup_full_node_ap_northeast_1.tf b/indexer/backup_full_node_ap_northeast_1.tf
index d7a07430..74679033 100644
--- a/indexer/backup_full_node_ap_northeast_1.tf
+++ b/indexer/backup_full_node_ap_northeast_1.tf
@@ -37,7 +37,8 @@ module "backup_full_node_ap_northeast_1" {
 
   use_persistent_docker_volume = var.full_node_use_persistent_docker_volume
 
-  root_block_device_size = var.full_node_root_block_device_size
+  root_block_device_size                  = var.full_node_root_block_device_size
+  root_block_device_delete_on_termination = true
 
   providers = {
     aws = aws.ap_northeast_1
diff --git a/indexer/full_node_ap_northeast_1.tf b/indexer/full_node_ap_northeast_1.tf
index 29b34c67..470f5fbc 100644
--- a/indexer/full_node_ap_northeast_1.tf
+++ b/indexer/full_node_ap_northeast_1.tf
@@ -36,7 +36,8 @@ module "full_node_ap_northeast_1" {
 
   use_persistent_docker_volume = var.full_node_use_persistent_docker_volume
 
-  root_block_device_size = var.full_node_root_block_device_size
+  root_block_device_size                  = var.full_node_root_block_device_size
+  root_block_device_delete_on_termination = true
 
   providers = {
     aws = aws.ap_northeast_1
diff --git a/indexer/snapshot_full_node_ap_northeast_1.tf b/indexer/snapshot_full_node_ap_northeast_1.tf
index 832c905c..8d7ff590 100644
--- a/indexer/snapshot_full_node_ap_northeast_1.tf
+++ b/indexer/snapshot_full_node_ap_northeast_1.tf
@@ -42,7 +42,8 @@ module "full_node_snapshot_ap_northeast_1" {
 
   datadog_env = "snapshot-${var.environment}"
 
-  root_block_device_size = var.full_node_snapshot_ebs_volume_size
+  root_block_device_size                  = var.full_node_snapshot_ebs_volume_size
+  root_block_device_delete_on_termination = true
 
   entry_point = [
     "sh",

From 1bab89a244b1c428f12aa7c1e9fd83651c65d234 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 15:45:56 +0700
Subject: [PATCH 05/25] Set assign_public_ip = false as all the tasks are in
 private subnet (#116)

---
 indexer/ecs.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/ecs.tf b/indexer/ecs.tf
index b7a172c9..7ffc821b 100644
--- a/indexer/ecs.tf
+++ b/indexer/ecs.tf
@@ -50,7 +50,7 @@ resource "aws_ecs_service" "main" {
       aws_subnet.private_subnets[subnet_name].id
     ] : [for subnet in aws_subnet.private_subnets : subnet.id]
     security_groups  = [aws_security_group.services[each.key].id]
-    assign_public_ip = true
+    assign_public_ip = false
   }
 
   dynamic "load_balancer" {

From 14fd9a4fcf77b08c71dc55f1bb6ee84fac0bf43f Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 16:09:37 +0700
Subject: [PATCH 06/25] Reduce msk storage of dev env to 500 (#117)

---
 indexer/msk.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/msk.tf b/indexer/msk.tf
index 69112991..c0aca667 100644
--- a/indexer/msk.tf
+++ b/indexer/msk.tf
@@ -36,7 +36,7 @@ resource "aws_msk_cluster" "main" {
     instance_type = var.msk_instance_type
     storage_info {
       ebs_storage_info {
-        volume_size = var.environment == "mainnet" ? 2000 : 1000 # in GB
+        volume_size = var.environment == "mainnet" ? 2000 : (contains(["dev", "dev2", "dev3", "dev4", "dev5"], var.environment) ? 500 : 1000) # in GB
       }
     }
     client_subnets = [

From 59c3b26b325351ebee323cafbe4f8cd89e096f5f Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 17:06:01 +0700
Subject: [PATCH 07/25] Reduce socks memory to 8192 (#118)

---
 indexer/locals.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/locals.tf b/indexer/locals.tf
index 1169f232..d0e57fff 100644
--- a/indexer/locals.tf
+++ b/indexer/locals.tf
@@ -98,7 +98,7 @@ locals {
     },
     "${local.service_names["socks"]}" : {
       ecs_desired_count : 5,
-      task_definition_memory : 20480,
+      task_definition_memory : 8192,
       task_definition_cpu : 4096,
       is_public_facing : true,
       ports : [8080, 8000],

From 74e8fbb2cbe0f089c21edb41c7ce9d9fee7ba665 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Thu, 8 Aug 2024 21:51:35 +0700
Subject: [PATCH 08/25] Allow to changes ecs tasks architecture, lambda
 funciton. Default value: (#119)

X86_64 to be ready with existing docker images
---
 indexer/backup_full_node_ap_northeast_1.tf   |  1 +
 indexer/ecs.tf                               |  1 +
 indexer/full_node_ap_northeast_1.tf          |  1 +
 indexer/lambda.tf                            |  2 +-
 indexer/snapshot_full_node_ap_northeast_1.tf |  1 +
 indexer/variables.tf                         | 39 ++++++++++++++++++++
 modules/validator/ecs.tf                     |  5 +++
 modules/validator/variables.tf               | 13 +++++++
 8 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/indexer/backup_full_node_ap_northeast_1.tf b/indexer/backup_full_node_ap_northeast_1.tf
index 74679033..6a59bce7 100644
--- a/indexer/backup_full_node_ap_northeast_1.tf
+++ b/indexer/backup_full_node_ap_northeast_1.tf
@@ -39,6 +39,7 @@ module "backup_full_node_ap_northeast_1" {
 
   root_block_device_size                  = var.full_node_root_block_device_size
   root_block_device_delete_on_termination = true
+  ecs_task_cpu_architecture               = var.fullnode_ecs_task_cpu_architecture
 
   providers = {
     aws = aws.ap_northeast_1
diff --git a/indexer/ecs.tf b/indexer/ecs.tf
index 7ffc821b..0743def9 100644
--- a/indexer/ecs.tf
+++ b/indexer/ecs.tf
@@ -162,6 +162,7 @@ resource "aws_ecs_task_definition" "main" {
 
   runtime_platform {
     operating_system_family = "LINUX"
+    cpu_architecture        = var.indexer_ecs_task_cpu_architecture
   }
 
   tags = {
diff --git a/indexer/full_node_ap_northeast_1.tf b/indexer/full_node_ap_northeast_1.tf
index 470f5fbc..84c04301 100644
--- a/indexer/full_node_ap_northeast_1.tf
+++ b/indexer/full_node_ap_northeast_1.tf
@@ -38,6 +38,7 @@ module "full_node_ap_northeast_1" {
 
   root_block_device_size                  = var.full_node_root_block_device_size
   root_block_device_delete_on_termination = true
+  ecs_task_cpu_architecture               = var.fullnode_ecs_task_cpu_architecture
 
   providers = {
     aws = aws.ap_northeast_1
diff --git a/indexer/lambda.tf b/indexer/lambda.tf
index 32f67ec2..db71fa2a 100644
--- a/indexer/lambda.tf
+++ b/indexer/lambda.tf
@@ -12,7 +12,7 @@ resource "aws_lambda_function" "main" {
   package_type  = "Image"
   function_name = "${each.key}_lambda_function"
   role          = aws_iam_role.lambda_services[each.key].arn
-  architectures = ["x86_64"]
+  architectures = [lower(var.lambda_cpu_architecture)]
   timeout       = 120
 
   environment {
diff --git a/indexer/snapshot_full_node_ap_northeast_1.tf b/indexer/snapshot_full_node_ap_northeast_1.tf
index 8d7ff590..92c1af4d 100644
--- a/indexer/snapshot_full_node_ap_northeast_1.tf
+++ b/indexer/snapshot_full_node_ap_northeast_1.tf
@@ -44,6 +44,7 @@ module "full_node_snapshot_ap_northeast_1" {
 
   root_block_device_size                  = var.full_node_snapshot_ebs_volume_size
   root_block_device_delete_on_termination = true
+  ecs_task_cpu_architecture               = var.fullnode_ecs_task_cpu_architecture
 
   entry_point = [
     "sh",
diff --git a/indexer/variables.tf b/indexer/variables.tf
index 079b47c5..85786696 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -526,3 +526,42 @@ variable "enable_rds_main_multiaz" {
   type        = bool
   default     = true
 }
+
+variable "indexer_ecs_task_cpu_architecture" {
+  type        = string
+  description = "Type of ecs cpu architecture. Accept: X86_64 or ARM64"
+  default     = "X86_64"
+  validation {
+    condition = contains(
+      ["X86_64", "ARM64"],
+      var.indexer_ecs_task_cpu_architecture
+    )
+    error_message = "Err: invalid environment. Must be one of {X86_64 | ARM64}."
+  }
+}
+
+variable "fullnode_ecs_task_cpu_architecture" {
+  type        = string
+  description = "Type of ecs cpu architecture. Accept: X86_64 or ARM64"
+  default     = "X86_64"
+  validation {
+    condition = contains(
+      ["X86_64", "ARM64"],
+      var.fullnode_ecs_task_cpu_architecture
+    )
+    error_message = "Err: invalid environment. Must be one of {X86_64 | ARM64}."
+  }
+}
+
+variable "lambda_cpu_architecture" {
+  type        = string
+  description = "Type of lambda cpu architecture. Accept: X86_64 or ARM64"
+  default     = "X86_64"
+  validation {
+    condition = contains(
+      ["X86_64", "ARM64"],
+      var.lambda_cpu_architecture
+    )
+    error_message = "Err: invalid environment. Must be one of {X86_64 | ARM64}."
+  }
+}
diff --git a/modules/validator/ecs.tf b/modules/validator/ecs.tf
index 1cd2810f..f62c9b45 100644
--- a/modules/validator/ecs.tf
+++ b/modules/validator/ecs.tf
@@ -230,6 +230,11 @@ resource "aws_ecs_task_definition" "main" {
     }
   }
 
+  runtime_platform {
+    operating_system_family = "LINUX"
+    cpu_architecture        = var.ecs_task_cpu_architecture
+  }
+
   tags = {
     Name        = "${var.environment}-${var.name}-task"
     Environment = var.environment
diff --git a/modules/validator/variables.tf b/modules/validator/variables.tf
index 1c02d851..e07c25de 100644
--- a/modules/validator/variables.tf
+++ b/modules/validator/variables.tf
@@ -266,3 +266,16 @@ variable "dd_site" {
   default     = "datadoghq.com"
   description = "The site that the datadog agent will send data to"
 }
+
+variable "ecs_task_cpu_architecture" {
+  type        = string
+  description = "Type of ecs cpu architecture. Accept: X86_64 or ARM64"
+  default     = "X86_64"
+  validation {
+    condition = contains(
+      ["X86_64", "ARM64"],
+      var.ecs_task_cpu_architecture
+    )
+    error_message = "Err: invalid environment. Must be one of {X86_64 | ARM64}."
+  }
+}

From ea1ba0f608345964848c80298e76d4d38d226d46 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Fri, 9 Aug 2024 09:44:16 +0700
Subject: [PATCH 09/25] Set default retetion for s3_rds_snapshot and
 load_balancer_logs to 14 (#121)

---
 indexer/variables.tf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indexer/variables.tf b/indexer/variables.tf
index 85786696..cc4f6f25 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -499,8 +499,8 @@ variable "enable_s3_rds_snapshot_lifecycle" {
 
 variable "s3_rds_snapshot_expiration_days" {
   type        = number
-  description = "Number of days to store rds snapshot on S3, defaults to 31."
-  default     = 31
+  description = "Number of days to store rds snapshot on S3, defaults to 14."
+  default     = 14
 }
 
 variable "enable_s3_load_balancer_logs_lifecycle" {
@@ -511,8 +511,8 @@ variable "enable_s3_load_balancer_logs_lifecycle" {
 
 variable "s3_load_balancer_logs_expiration_days" {
   type        = number
-  description = "Number of days to store load balancer logs on S3, defaults to 31."
-  default     = 31
+  description = "Number of days to store load balancer logs on S3, defaults to 14."
+  default     = 14
 }
 
 variable "create_read_replica_2" {

From 39b0eb9a810329b0d478c0cd1b79094a05f95da9 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Fri, 9 Aug 2024 09:48:56 +0700
Subject: [PATCH 10/25] Change full_node_root_block_device_size default value
 to 1000 GB (#122)

---
 indexer/variables.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/variables.tf b/indexer/variables.tf
index cc4f6f25..56575de5 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -165,7 +165,7 @@ variable "full_node_container_chain_home" {
 variable "full_node_root_block_device_size" {
   type        = number
   description = "Size of root block device in gigabytes"
-  default     = 3000
+  default     = 1000
 }
 
 variable "snapshot_full_node_container_chain_home" {

From e69975b845007fe479a177c8a835d09d1b743879 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Fri, 9 Aug 2024 10:00:32 +0700
Subject: [PATCH 11/25] Add new variable: msk_storage_size to set storage of
 kafka (#123)

---
 indexer/variables.tf | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/indexer/variables.tf b/indexer/variables.tf
index 56575de5..59f0d1e4 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -105,6 +105,12 @@ variable "msk_instance_type" {
   description = "Instance type for MSK brokers"
 }
 
+variable "msk_storage_size" {
+  type        = string
+  description = "Storage size of MSK nodes. Suggested value: 2000 for mainnet, 1000 for staging and testnet and 500 for dev."
+  default     = "500"
+}
+
 variable "rds_db_instance_class" {
   type        = string
   description = "Instance class for the Postgres RDS DB"
@@ -565,3 +571,4 @@ variable "lambda_cpu_architecture" {
     error_message = "Err: invalid environment. Must be one of {X86_64 | ARM64}."
   }
 }
+

From d6b364428bcf3ace6c61fd21201b168563fa7e03 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Fri, 9 Aug 2024 15:07:12 +0700
Subject: [PATCH 12/25] Allow to disable backup_full_node (#124)

---
 indexer/backup_full_node_ap_northeast_1.tf | 6 ++++++
 indexer/route_table.tf                     | 9 +++++----
 indexer/security_group.tf                  | 2 +-
 indexer/variables.tf                       | 5 +++++
 indexer/vpc.tf                             | 3 ++-
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/indexer/backup_full_node_ap_northeast_1.tf b/indexer/backup_full_node_ap_northeast_1.tf
index 6a59bce7..d248edf8 100644
--- a/indexer/backup_full_node_ap_northeast_1.tf
+++ b/indexer/backup_full_node_ap_northeast_1.tf
@@ -1,5 +1,6 @@
 module "backup_full_node_ap_northeast_1" {
   source = "../modules/validator"
+  count  = var.create_backup_full_node ? 1 : 0
 
   environment = var.environment
 
@@ -45,3 +46,8 @@ module "backup_full_node_ap_northeast_1" {
     aws = aws.ap_northeast_1
   }
 }
+
+moved {
+  from = module.backup_full_node_ap_northeast_1
+  to   = module.backup_full_node_ap_northeast_1[0]
+}
diff --git a/indexer/route_table.tf b/indexer/route_table.tf
index b19491e2..ce37872d 100644
--- a/indexer/route_table.tf
+++ b/indexer/route_table.tf
@@ -68,9 +68,10 @@ resource "aws_route" "full_node_route_to_indexer" {
 # NOTE: This is not an individual AWS resource, but rather an attachment to the route table, and so
 # no tags are added.
 resource "aws_route" "backup_full_node_route_to_indexer" {
-  route_table_id            = module.backup_full_node_ap_northeast_1.route_table_id
+  count                     = var.create_backup_full_node ? 1 : 0
+  route_table_id            = module.backup_full_node_ap_northeast_1[0].route_table_id
   destination_cidr_block    = var.indexers[var.region].vpc_cidr_block
-  vpc_peering_connection_id = aws_vpc_peering_connection.backup_full_node_peer.id
+  vpc_peering_connection_id = aws_vpc_peering_connection.backup_full_node_peer[0].id
 }
 
 # Route from the Indexer's private subnets to the full node's VPC. Needed so that the full node can
@@ -88,9 +89,9 @@ resource "aws_route" "indexer_route_to_full_node" {
 }
 
 resource "aws_route" "indexer_route_to_backup_full_node" {
-  for_each = aws_route_table.private
+  for_each = var.create_backup_full_node ? aws_route_table.private : {}
 
   route_table_id            = each.value.id
   destination_cidr_block    = var.backup_full_node_cidr_vpc
-  vpc_peering_connection_id = aws_vpc_peering_connection.backup_full_node_peer.id
+  vpc_peering_connection_id = aws_vpc_peering_connection.backup_full_node_peer[0].id
 }
diff --git a/indexer/security_group.tf b/indexer/security_group.tf
index 08d8cd59..c2e1a79c 100644
--- a/indexer/security_group.tf
+++ b/indexer/security_group.tf
@@ -62,7 +62,7 @@ resource "aws_security_group" "msk" {
     security_groups = flatten([
       aws_security_group.devbox.id,
       module.full_node_ap_northeast_1.aws_security_group_id,
-      module.backup_full_node_ap_northeast_1.aws_security_group_id,
+      var.create_backup_full_node ? [module.backup_full_node_ap_northeast_1[0].aws_security_group_id] : [],
       # Lambda Services
       [
         for service in keys(local.lambda_services) :
diff --git a/indexer/variables.tf b/indexer/variables.tf
index 59f0d1e4..f4ba3b73 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -572,3 +572,8 @@ variable "lambda_cpu_architecture" {
   }
 }
 
+variable "create_backup_full_node" {
+  description = "Create backup full node. Default: true for mainnet, testnet"
+  type        = bool
+  default     = true
+}
diff --git a/indexer/vpc.tf b/indexer/vpc.tf
index dbb30339..6ae30168 100644
--- a/indexer/vpc.tf
+++ b/indexer/vpc.tf
@@ -84,8 +84,9 @@ resource "aws_vpc_peering_connection" "full_node_peer" {
 }
 
 resource "aws_vpc_peering_connection" "backup_full_node_peer" {
+  count       = var.create_backup_full_node ? 1 : 0
   peer_vpc_id = aws_vpc.main.id
-  vpc_id      = module.backup_full_node_ap_northeast_1.aws_vpc_id
+  vpc_id      = module.backup_full_node_ap_northeast_1[0].aws_vpc_id
   # Auto-accept allows the VPC peering connection to be made programmatically with no manual steps
   # to accept the VPC peering connection in the console
   # This can only be done if both VPCs are in the same region and AWS account (which they are)

From 18b88b5b66703c60ef232b66d4bb2e54079d27f0 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Fri, 9 Aug 2024 15:29:58 +0700
Subject: [PATCH 13/25] Fix image filter value to find image based on cpu
 architecture (#125)

---
 modules/validator/ec2.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/validator/ec2.tf b/modules/validator/ec2.tf
index a4894320..cc3279eb 100644
--- a/modules/validator/ec2.tf
+++ b/modules/validator/ec2.tf
@@ -27,7 +27,7 @@ data "aws_ami" "amazon_linux_ecs_ami" {
 
   filter {
     name   = "name"
-    values = ["amzn2-ami-ecs-inf-hvm-*-x86_64-ebs"]
+    values = [var.ecs_task_cpu_architecture == "X86_64" ? "amzn2-ami-ecs-inf-hvm-*-x86_64-ebs" : "amzn2-ami-ecs-hvm-*-arm64-ebs"]
   }
 }
 

From 10ff2023c1c8918b628b3e458762bfffa14de156 Mon Sep 17 00:00:00 2001
From: owl-king <tranvuong0402@gmail.com>
Date: Mon, 12 Aug 2024 15:28:08 +0700
Subject: [PATCH 14/25] Change default value of create_backup_full_node to
 false (#127)

---
 indexer/variables.tf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indexer/variables.tf b/indexer/variables.tf
index f4ba3b73..f3a3ad84 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -573,7 +573,7 @@ variable "lambda_cpu_architecture" {
 }
 
 variable "create_backup_full_node" {
-  description = "Create backup full node. Default: true for mainnet, testnet"
+  description = "Create backup full node. Default: false for all envs test and dev environment. Mainnet and Testnet should enable it."
   type        = bool
-  default     = true
+  default     = false
 }

From 7e171e616a0d117d29a4c3efda116210a7f402a8 Mon Sep 17 00:00:00 2001
From: Vuong <tranvuong0402@gmail.com>
Date: Sun, 25 Aug 2024 16:10:12 +0700
Subject: [PATCH 15/25] Change msk storage to msk_storage_size

---
 indexer/msk.tf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indexer/msk.tf b/indexer/msk.tf
index c0aca667..3d74cadb 100644
--- a/indexer/msk.tf
+++ b/indexer/msk.tf
@@ -36,7 +36,7 @@ resource "aws_msk_cluster" "main" {
     instance_type = var.msk_instance_type
     storage_info {
       ebs_storage_info {
-        volume_size = var.environment == "mainnet" ? 2000 : (contains(["dev", "dev2", "dev3", "dev4", "dev5"], var.environment) ? 500 : 1000) # in GB
+        volume_size = var.msk_storage_size
       }
     }
     client_subnets = [
@@ -56,4 +56,5 @@ resource "aws_msk_cluster" "main" {
     arn      = aws_msk_configuration.main.arn
     revision = aws_msk_configuration.main.latest_revision
   }
-}
\ No newline at end of file
+}
+

From 81673990677c3d0a03cb9ed3c17ced3fab1f4777 Mon Sep 17 00:00:00 2001
From: Vuong <tranvuong0402@gmail.com>
Date: Wed, 28 Aug 2024 12:05:53 +0700
Subject: [PATCH 16/25] Change default storage of full_node_snapshot to 1000

---
 indexer/lambda.tf    | 2 +-
 indexer/variables.tf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/indexer/lambda.tf b/indexer/lambda.tf
index db71fa2a..42faf841 100644
--- a/indexer/lambda.tf
+++ b/indexer/lambda.tf
@@ -13,7 +13,7 @@ resource "aws_lambda_function" "main" {
   function_name = "${each.key}_lambda_function"
   role          = aws_iam_role.lambda_services[each.key].arn
   architectures = [lower(var.lambda_cpu_architecture)]
-  timeout       = 120
+  timeout       = 300
 
   environment {
     variables = merge(
diff --git a/indexer/variables.tf b/indexer/variables.tf
index f3a3ad84..cffe8226 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -213,7 +213,7 @@ variable "full_node_snapshot_upload_period" {
 variable "full_node_snapshot_ebs_volume_size" {
   type        = number
   description = "Size (in GiB) of the EBS volume used for the fast sync full node"
-  default     = 3000
+  default     = 1000
 }
 
 variable "full_node_ec2_instance_type" {

From 13822e49c2358b593ab117b088314507e0d344bc Mon Sep 17 00:00:00 2001
From: roy-dydx <133032749+roy-dydx@users.noreply.github.com>
Date: Wed, 18 Sep 2024 12:11:21 -0400
Subject: [PATCH 17/25] Remove apne-1a az (#132)

---
 indexer/terraform.tfvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/terraform.tfvars b/indexer/terraform.tfvars
index 96ecf5d4..02ca0eaa 100644
--- a/indexer/terraform.tfvars
+++ b/indexer/terraform.tfvars
@@ -1,7 +1,7 @@
 indexers = {
   ap-northeast-1 = {
     name               = "indexer-apne1"
-    availability_zones = ["ap-northeast-1a", "ap-northeast-1c", "ap-northeast-1d"]
+    availability_zones = ["ap-northeast-1c", "ap-northeast-1d"]
     vpc_cidr_block     = "10.0.0.0/16"
     private_subnets_availability_zone_to_cidr_block = {
       "ap-northeast-1a" = "10.0.0.0/24"

From bd21af51181688cd0e1ad5024d3571a395fcfe14 Mon Sep 17 00:00:00 2001
From: roy-dydx <133032749+roy-dydx@users.noreply.github.com>
Date: Wed, 18 Sep 2024 13:57:19 -0400
Subject: [PATCH 18/25] Revert "Remove apne-1a az (#132)" (#133)

This reverts commit 6c743321fe34dde9be7df84e827b0c2774d81705.
---
 indexer/terraform.tfvars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indexer/terraform.tfvars b/indexer/terraform.tfvars
index 02ca0eaa..96ecf5d4 100644
--- a/indexer/terraform.tfvars
+++ b/indexer/terraform.tfvars
@@ -1,7 +1,7 @@
 indexers = {
   ap-northeast-1 = {
     name               = "indexer-apne1"
-    availability_zones = ["ap-northeast-1c", "ap-northeast-1d"]
+    availability_zones = ["ap-northeast-1a", "ap-northeast-1c", "ap-northeast-1d"]
     vpc_cidr_block     = "10.0.0.0/16"
     private_subnets_availability_zone_to_cidr_block = {
       "ap-northeast-1a" = "10.0.0.0/24"

From 30ef8a6e2a3433cee22afd56b3993b7cdc73176e Mon Sep 17 00:00:00 2001
From: jerryfan01234 <44346807+jerryfan01234@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:21:40 -0400
Subject: [PATCH 19/25] [OTE-821] Add roundtable monitors for update affiliate
 info and update wallet total volume (#134)

* upgrade kafka version and reduce session timeout

* Add partition level logging for mainnet MSK

* Fix terraform apply resource conflict

* Add partition offset plot to vulcan dashboard

* dummy

* Add stale compliance data monitor for mainnet

* add roundtable monitors for update affiliate info and update wallet total volume
---
 indexer/msk.tf                                |  2 +-
 .../indexer_monitors/roundtable_monitors.tf   | 51 +++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 modules/indexer_monitors/roundtable_monitors.tf

diff --git a/indexer/msk.tf b/indexer/msk.tf
index 3d74cadb..b3d75f7f 100644
--- a/indexer/msk.tf
+++ b/indexer/msk.tf
@@ -19,6 +19,7 @@ resource "aws_msk_configuration" "main" {
   message.max.bytes=4194304
   unclean.leader.election.enable=true
   zookeeper.session.timeout.ms=6000
+  replica.selector.class = org.apache.kafka.common.replica.RackAwareReplicaSelector
   PROPERTIES
 
   lifecycle {
@@ -57,4 +58,3 @@ resource "aws_msk_cluster" "main" {
     revision = aws_msk_configuration.main.latest_revision
   }
 }
-
diff --git a/modules/indexer_monitors/roundtable_monitors.tf b/modules/indexer_monitors/roundtable_monitors.tf
new file mode 100644
index 00000000..b16972aa
--- /dev/null
+++ b/modules/indexer_monitors/roundtable_monitors.tf
@@ -0,0 +1,51 @@
+resource "datadog_monitor_json" "roundtable_update_affiliate_info_persistent_cache_stale" {
+  monitor = <<EOF
+{
+	"name": "[${var.environment}] Update affiliate info roundtable is not running successfully.",
+	"type": "query alert",
+    "query": "max(last_5m):avg:rroundtable.persistent_cache_affiliateInfoUpdateTime_lag_seconds{env:${var.environment}} > 600",
+	"message": "persistentCache.affiliateInfoUpdateTime is more than 10 minutes in the past. This indicates that update-affiliate-info roundtable has not run successfully in past 10 min -> affiliate_info table is stale.",
+	"tags": [
+        "team:${var.team}",
+        "env:${var.env_tag}"
+	],
+	"options": {
+		"thresholds": {
+			"critical": 600
+		},
+		"notify_audit": false,
+		"include_tags": false,
+		"notify_no_data": false,
+		"silenced": {}
+	},
+	"priority": null,
+    "restricted_roles": null
+}
+EOF
+}
+
+resource "datadog_monitor_json" "roundtable_update_wallet_total_volume_persistent_cache_stale" {
+  monitor = <<EOF
+{
+	"name": "[${var.environment}] Update wallet total volume roundtable is not running successfully.",
+	"type": "query alert",
+    "query": "max(last_5m):avg:roundtable.persistent_cache_totalVolumeUpdateTime_lag_seconds{env:${var.environment}} > 600",
+    "message": "persistentCache.totalVolumeUpdateTime is more than 10 minutes in the past. This indicates that update-wallet-total-volume roundtable has not run successfully in past 10 min -> totalVolume column of wallets table is stale.",
+	"tags": [
+        "team:${var.team}",
+        "env:${var.env_tag}"
+	],
+	"options": {
+		"thresholds": {
+			"critical": 600
+		},
+		"notify_audit": false,
+		"include_tags": false,
+		"notify_no_data": false,
+		"silenced": {}
+	},
+	"priority": null,
+    "restricted_roles": null
+}
+EOF
+}
\ No newline at end of file

From b2c4e325ab73b1c1de18afff7016b15b059a8ed1 Mon Sep 17 00:00:00 2001
From: roy-dydx <133032749+roy-dydx@users.noreply.github.com>
Date: Fri, 27 Sep 2024 13:00:18 -0400
Subject: [PATCH 20/25] Add AWS_REGION envvar to services that connect to kafka
 (#136)

---
 indexer/locals.tf | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indexer/locals.tf b/indexer/locals.tf
index d0e57fff..c071a08e 100644
--- a/indexer/locals.tf
+++ b/indexer/locals.tf
@@ -38,6 +38,10 @@ locals {
       should_deploy_in_rds_subnet : true,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "PG_POOL_MAX",
             value : "30"
@@ -109,6 +113,10 @@ locals {
       should_deploy_in_rds_subnet : false,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "COMLINK_URL",
             value : aws_lb.public.dns_name,
@@ -207,6 +215,10 @@ locals {
       should_deploy_in_rds_subnet : false,
       ecs_environment_variables : flatten(
         [
+          {
+            name : "AWS_REGION",
+            value : var.region,
+          },
           {
             name : "PG_POOL_MAX",
             value : "2"

From 29a24e2599846412af7b791aa2f86dca9eaa83f7 Mon Sep 17 00:00:00 2001
From: dydxwill <119354122+dydxwill@users.noreply.github.com>
Date: Mon, 30 Sep 2024 14:25:25 -0400
Subject: [PATCH 21/25] Add read replica storage variable (#137)

* add read replica storage var

* set default
---
 indexer/locals.tf    |  6 +++---
 indexer/rds.tf       |  2 ++
 indexer/variables.tf | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/indexer/locals.tf b/indexer/locals.tf
index c071a08e..e398b6b9 100644
--- a/indexer/locals.tf
+++ b/indexer/locals.tf
@@ -55,7 +55,7 @@ locals {
       ),
     },
     "${local.service_names["comlink"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.comlink_ecs_desired_count,
       task_definition_memory : 4096,
       task_definition_cpu : 2048,
       is_public_facing : true,
@@ -101,7 +101,7 @@ locals {
       ),
     },
     "${local.service_names["socks"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.socks_ecs_desired_count,
       task_definition_memory : 8192,
       task_definition_cpu : 4096,
       is_public_facing : true,
@@ -203,7 +203,7 @@ locals {
       ),
     },
     "${local.service_names["vulcan"]}" : {
-      ecs_desired_count : 5,
+      ecs_desired_count : var.vulcan_ecs_desired_count,
       task_definition_memory : 8192,
       task_definition_cpu : 4096,
       is_public_facing : false,
diff --git a/indexer/rds.tf b/indexer/rds.tf
index bfa4316e..ee6771cf 100644
--- a/indexer/rds.tf
+++ b/indexer/rds.tf
@@ -231,6 +231,7 @@ resource "aws_db_instance" "read_replica" {
   # be specified for a replica, and will match the properties on the source db.
   vpc_security_group_ids = [aws_security_group.rds.id]
   parameter_group_name   = aws_db_parameter_group.main.name
+  allocated_storage      = var.rds_read_replica_db_allocated_storage_gb
   publicly_accessible    = false
   # Set to true if any planned changes need to be applied before the next maintenance window.
   apply_immediately                     = false
@@ -257,6 +258,7 @@ resource "aws_db_instance" "read_replica_2" {
   # be specified for a replica, and will match the properties on the source db.
   vpc_security_group_ids = [aws_security_group.rds.id]
   parameter_group_name   = aws_db_parameter_group.main.name
+  allocated_storage      = var.rds_read_replica_db_allocated_storage_gb
   publicly_accessible    = false
   # Set to true if any planned changes need to be applied before the next maintenance window.
   apply_immediately                     = false
diff --git a/indexer/variables.tf b/indexer/variables.tf
index cffe8226..d822628c 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -121,6 +121,12 @@ variable "rds_db_allocated_storage_gb" {
   description = "Storage allocated to the Postgres RDS DB in GB"
 }
 
+variable "rds_read_replica_db_allocated_storage_gb" {
+  type        = number
+  description = "Storage allocated to the Postgres RDS read replica DBs in GB"
+  default     = 1000
+}
+
 variable "elasticache_redis_num_cache_clusters" {
   type        = number
   description = "Number of elasticache cache clusters"
@@ -577,3 +583,21 @@ variable "create_backup_full_node" {
   type        = bool
   default     = false
 }
+
+variable "vulcan_ecs_desired_count" {
+  type        = number
+  description = "Number of desired vulcan instances."
+  default     = 5
+}
+
+variable "comlink_ecs_desired_count" {
+  type        = number
+  description = "Number of desired comlinnk instances."
+  default     = 5
+}
+
+variable "socks_ecs_desired_count" {
+  type        = number
+  description = "Number of desired socks instances."
+  default     = 5
+}

From 6e058af6d3f0d2951fe8f475aca692e8a139f798 Mon Sep 17 00:00:00 2001
From: dydxwill <119354122+dydxwill@users.noreply.github.com>
Date: Mon, 30 Sep 2024 14:43:05 -0400
Subject: [PATCH 22/25] Remove Indexer dashboards from terraform (#139)

---
 indexer_dashboards/indexer_dashboards.tf      |    4 -
 indexer_dashboards/providers.tf               |    6 -
 indexer_dashboards/terraform.tfvars           |   51 -
 indexer_dashboards/variables.tf               |   40 -
 indexer_dashboards/versions.tf                |   18 -
 .../indexer_dashboards/comlink_dashboard.tf   |  822 ----
 modules/indexer_dashboards/ender_dashboard.tf | 3354 -----------------
 .../indexer_dashboards/full_node_dashboard.tf |  544 ---
 modules/indexer_dashboards/locals.tf          |   69 -
 .../indexer_dashboards/postgres_dashboard.tf  |   66 -
 .../roundtable_dashboard.tf                   |  952 -----
 modules/indexer_dashboards/socks_dashboard.tf | 1526 --------
 modules/indexer_dashboards/variables.tf       |   22 -
 modules/indexer_dashboards/versions.tf        |   10 -
 .../indexer_dashboards/vulcan_dashboard.tf    | 1813 ---------
 15 files changed, 9297 deletions(-)
 delete mode 100644 indexer_dashboards/indexer_dashboards.tf
 delete mode 100644 indexer_dashboards/providers.tf
 delete mode 100644 indexer_dashboards/terraform.tfvars
 delete mode 100644 indexer_dashboards/variables.tf
 delete mode 100644 indexer_dashboards/versions.tf
 delete mode 100644 modules/indexer_dashboards/comlink_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/ender_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/full_node_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/locals.tf
 delete mode 100644 modules/indexer_dashboards/postgres_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/roundtable_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/socks_dashboard.tf
 delete mode 100644 modules/indexer_dashboards/variables.tf
 delete mode 100644 modules/indexer_dashboards/versions.tf
 delete mode 100644 modules/indexer_dashboards/vulcan_dashboard.tf

diff --git a/indexer_dashboards/indexer_dashboards.tf b/indexer_dashboards/indexer_dashboards.tf
deleted file mode 100644
index 031fed71..00000000
--- a/indexer_dashboards/indexer_dashboards.tf
+++ /dev/null
@@ -1,4 +0,0 @@
-module "indexer_dashboards" {
-  source                            = "../modules/indexer_dashboards"
-  indexer_services_variable_mapping = var.indexer_services_variable_mapping
-}
diff --git a/indexer_dashboards/providers.tf b/indexer_dashboards/providers.tf
deleted file mode 100644
index 8d83a778..00000000
--- a/indexer_dashboards/providers.tf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default provider.
-provider "datadog" {
-  api_key = var.datadog_api_key
-  app_key = var.datadog_app_key
-  api_url = var.datadog_api_url
-}
diff --git a/indexer_dashboards/terraform.tfvars b/indexer_dashboards/terraform.tfvars
deleted file mode 100644
index d83fce12..00000000
--- a/indexer_dashboards/terraform.tfvars
+++ /dev/null
@@ -1,51 +0,0 @@
-indexer_services_variable_mapping = {
-  "dev" : {
-    "environment" : "dev",
-    "service" : "indexer",
-    "cluster_name" : "dev-indexer-apne1-cluster",
-    "ecs_cluster_name" : "dev-indexer-full-node-cluster",
-    "msk_cluster_name" : "dev-indexer-apne1-msk-cluster"
-  },
-  "dev2" : {
-    "environment" : "dev2",
-    "service" : "indexer",
-    "cluster_name" : "dev2-indexer-apne1-cluster",
-    "ecs_cluster_name" : "dev2-indexer-full-node-cluster",
-    "msk_cluster_name" : "dev2-indexer-apne1-msk-cluster"
-  },
-  "dev3" : {
-    "environment" : "dev3",
-    "service" : "indexer",
-    "cluster_name" : "dev3-indexer-apne1-cluster",
-    "ecs_cluster_name" : "dev3-indexer-full-node-cluster",
-    "msk_cluster_name" : "dev3-indexer-apne1-msk-cluster"
-  },
-  "dev4" : {
-    "environment" : "dev4",
-    "service" : "indexer",
-    "cluster_name" : "dev4-indexer-apne1-cluster",
-    "ecs_cluster_name" : "dev4-indexer-full-node-cluster",
-    "msk_cluster_name" : "dev4-indexer-apne1-msk-cluster"
-  },
-  "dev5" : {
-    "environment" : "dev5",
-    "service" : "indexer",
-    "cluster_name" : "dev5-indexer-apne1-cluster",
-    "ecs_cluster_name" : "dev5-indexer-full-node-cluster",
-    "msk_cluster_name" : "dev5-indexer-apne1-msk-cluster"
-  },
-  "staging" : {
-    "environment" : "staging",
-    "service" : "indexer",
-    "cluster_name" : "staging-indexer-apne1-cluster",
-    "ecs_cluster_name" : "staging-indexer-full-node-cluster",
-    "msk_cluster_name" : "staging-indexer-apne1-msk-cluster"
-  },
-  "testnet2" : {
-    "environment" : "testnet2",
-    "service" : "indexer",
-    "cluster_name" : "testnet2-indexer-apne1-cluster",
-    "ecs_cluster_name" : "testnet2-indexer-full-node-cluster",
-    "msk_cluster_name" : "testnet2-indexer-apne1-msk-cluster"
-  },
-}
diff --git a/indexer_dashboards/variables.tf b/indexer_dashboards/variables.tf
deleted file mode 100644
index 1f9bd1fd..00000000
--- a/indexer_dashboards/variables.tf
+++ /dev/null
@@ -1,40 +0,0 @@
-variable "indexer_services_variable_mapping" {
-  type = map(
-    object({
-      # Environment
-      environment = string
-
-      # Service name
-      service = string
-
-      # Cluster name for the indexer services
-      cluster_name = string
-
-      # ECS cluster name for the full node
-      ecs_cluster_name = string
-
-      # MSK cluster name
-      msk_cluster_name = string
-    })
-  )
-
-  description = "Map of variable name to preset values of variables used in indexer services."
-}
-
-variable "datadog_api_key" {
-  type        = string
-  description = "Datadog API key"
-  sensitive   = true
-}
-
-variable "datadog_app_key" {
-  type        = string
-  description = "Datadog app key"
-  sensitive   = true
-}
-
-variable "datadog_api_url" {
-  type        = string
-  description = "The datadog api url"
-  default     = "https://api.datadoghq.com/"
-}
diff --git a/indexer_dashboards/versions.tf b/indexer_dashboards/versions.tf
deleted file mode 100644
index 401824f8..00000000
--- a/indexer_dashboards/versions.tf
+++ /dev/null
@@ -1,18 +0,0 @@
-terraform {
-  cloud {
-    organization = "dydxprotocol"
-
-    workspaces {
-      tags = ["indexer-dashboards"]
-    }
-  }
-
-  required_providers {
-    datadog = {
-      source  = "DataDog/datadog"
-      version = "~> 3.29"
-    }
-  }
-
-  required_version = "~> 1.3.2"
-}
diff --git a/modules/indexer_dashboards/comlink_dashboard.tf b/modules/indexer_dashboards/comlink_dashboard.tf
deleted file mode 100644
index c3c7b154..00000000
--- a/modules/indexer_dashboards/comlink_dashboard.tf
+++ /dev/null
@@ -1,822 +0,0 @@
-resource "datadog_dashboard_json" "comlink" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Comlink",
-  "description": "",
-  "widgets": [
-    {
-      "id": 2253178479422500,
-      "definition": {
-        "title": "Comlink",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 5851150069681238,
-            "definition": {
-              "title": "CPU Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.cpu.percent{task_name:*comlink-task,$cluster_name,container_name:*comlink-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3727308551181742,
-            "definition": {
-              "title": "Mem Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.mem.rss{task_name:*comlink-task,$cluster_name,container_name:*comlink-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5372651126220702,
-            "definition": {
-              "title": "Running Instances",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "min:aws.ecs.service.running{cluster:$cluster_name.value,v4service:comlink} by {v4service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 303190507260328,
-            "definition": {
-              "type": "free_text",
-              "text": "Request Handling",
-              "color": "#4d4d4d",
-              "font_size": "24",
-              "text_align": "left"
-            },
-            "layout": {
-              "x": 0,
-              "y": 2,
-              "width": 12,
-              "height": 1
-            }
-          },
-          {
-            "id": 7723789610732574,
-            "definition": {
-              "title": "Comlink API Avg Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "get_height avg(ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "get_fills avg(ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "get_addresses avg(ms)",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "get_perp_markets avg(ms)",
-                      "formula": "query5"
-                    },
-                    {
-                      "alias": "get_positions avg(ms)",
-                      "formula": "query6"
-                    },
-                    {
-                      "alias": "get_trades avg(ms)",
-                      "formula": "query7"
-                    },
-                    {
-                      "alias": "get_orderbook avg(ms)",
-                      "formula": "query8"
-                    },
-                    {
-                      "alias": "get_candles avg(ms)",
-                      "formula": "query9"
-                    },
-                    {
-                      "alias": "get_sparklines avg(ms)",
-                      "formula": "query10"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:comlink.height_controller.get_latest_block_height.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.get_fills.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.get_addresses.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.get_perpetual_markets.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    },
-                    {
-                      "query": "avg:comlink.positions_controller.get_positions.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query6"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.get_trades.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query7"
-                    },
-                    {
-                      "query": "avg:comlink.orderbook_controller.get_orderbooks.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query8"
-                    },
-                    {
-                      "query": "avg:comlink.candles_controller.get_candles_market.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query9"
-                    },
-                    {
-                      "query": "avg:comlink.sparklines_controller.get_sparklines.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query10"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "scale": "log",
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 585001811877332,
-            "definition": {
-              "title": "Comlink API 95% Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "get_height avg(ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "get_fills 95%(ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "get_addresses 95%(ms)",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "get_perp_markets 95%(ms)",
-                      "formula": "query5"
-                    },
-                    {
-                      "alias": "get_positions 95%(ms)",
-                      "formula": "query6"
-                    },
-                    {
-                      "alias": "get_trades 95%(ms)",
-                      "formula": "query7"
-                    },
-                    {
-                      "alias": "get_orderbook 95%(ms)",
-                      "formula": "query8"
-                    },
-                    {
-                      "alias": "get_candles 95%(ms)",
-                      "formula": "query9"
-                    },
-                    {
-                      "alias": "get_candles 95%(ms)",
-                      "formula": "query10"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:comlink.height_controller.get_latest_block_height.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.get_fills.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.get_addresses.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.get_perpetual_markets.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    },
-                    {
-                      "query": "avg:comlink.positions_controller.get_positions.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query6"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.get_trades.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query7"
-                    },
-                    {
-                      "query": "avg:comlink.orderbook_controller.get_orderbooks.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query8"
-                    },
-                    {
-                      "query": "avg:comlink.candles_controller.get_candles_market.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query9"
-                    },
-                    {
-                      "query": "avg:comlink.sparklines_controller.get_sparklines.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query10"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "scale": "log",
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1887744464488532,
-            "definition": {
-              "title": "Comlink API Success Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "height_controller success rate",
-                      "formula": "query1 / query2"
-                    },
-                    {
-                      "alias": "fills_controller success rate",
-                      "formula": "query3 / query4"
-                    },
-                    {
-                      "alias": "broadcast_controller success rate",
-                      "formula": "query5 / query6"
-                    },
-                    {
-                      "alias": "addr_controller success rate",
-                      "formula": "query7 / query8"
-                    },
-                    {
-                      "alias": "perp_market_controller success rate",
-                      "formula": "query9 / query10"
-                    },
-                    {
-                      "alias": "perpetual_positions_controller success rate",
-                      "formula": "query11 / query12"
-                    },
-                    {
-                      "alias": "trades_controller success rate",
-                      "formula": "query13 / query14"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:comlink.height_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:comlink.height_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:comlink.braodcast_tx_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    },
-                    {
-                      "query": "avg:comlink.braodcast_tx_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query6"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query7"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query8"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query9"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query10"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_positions_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query11"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_positions_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query12"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.response_status_code.200{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query13"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query14"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4592855879076858,
-            "definition": {
-              "title": "Comlink API Internal Server Error Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "time": {},
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "height_controller ISE rate",
-                      "formula": "query1 / query2"
-                    },
-                    {
-                      "alias": "fills_controller ISE rate",
-                      "formula": "query3 / query4"
-                    },
-                    {
-                      "alias": "addr_controller ISE rate",
-                      "formula": "query7 / query8"
-                    },
-                    {
-                      "alias": "perp_market_controller ISE rate",
-                      "formula": "query9 / query10"
-                    },
-                    {
-                      "alias": "perpetual_positions_controller ISE rate",
-                      "formula": "query11 / query12"
-                    },
-                    {
-                      "alias": "trades_controller ISE rate",
-                      "formula": "query13 / query14"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:comlink.height_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:comlink.height_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query7"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query8"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query9"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query10"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_positions_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query11"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_positions_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query12"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.response_status_code.500{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query13"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.response_status_code{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query14"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 5,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4059636139759006,
-            "definition": {
-              "title": "Comlink API Call Count",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "get_height",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "get_fills",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "get_addresses",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "get_perp_markets",
-                      "formula": "query5"
-                    },
-                    {
-                      "alias": "get_positions",
-                      "formula": "query6"
-                    },
-                    {
-                      "alias": "get_trades",
-                      "formula": "query7"
-                    },
-                    {
-                      "alias": "get_orderbook",
-                      "formula": "query8"
-                    },
-                    {
-                      "alias": "get_candles",
-                      "formula": "query9"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:comlink.height_controller.get_latest_block_height.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:comlink.fills_controller.get_fills.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:comlink.addresses_controller.get_addresses.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_markets_controller.get_perpetual_markets.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    },
-                    {
-                      "query": "avg:comlink.perpetual_positions_controller.get_perpetual_positions.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query6"
-                    },
-                    {
-                      "query": "avg:comlink.trades_controller.get_trades.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query7"
-                    },
-                    {
-                      "query": "avg:comlink.orderbook_controller.get_orderbooks.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query8"
-                    },
-                    {
-                      "query": "avg:comlink.candles_controller.get_candles_market.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query9"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "scale": "linear",
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 5,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 64,
-        "width": 12,
-        "height": 8
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/ender_dashboard.tf b/modules/indexer_dashboards/ender_dashboard.tf
deleted file mode 100644
index 6014633c..00000000
--- a/modules/indexer_dashboards/ender_dashboard.tf
+++ /dev/null
@@ -1,3354 +0,0 @@
-resource "datadog_dashboard_json" "ender" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Ender",
-  "description": "",
-  "widgets": [
-    {
-      "id": 7674265371488300,
-      "definition": {
-        "title": "Ender",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 1719973905086946,
-            "definition": {
-              "title": "CPU Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.cpu.percent{task_name:*ender-task,$cluster_name,container_name:*ender-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4698906611633678,
-            "definition": {
-              "title": "Mem Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.mem.rss{task_name:*ender-task,$cluster_name,container_name:*ender-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1191034270571868,
-            "definition": {
-              "title": "Running Instances",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "min:aws.ecs.service.running{cluster:$cluster_name.value,v4service:ender}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Kafka",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 4442168476470202,
-            "definition": {
-              "title": "Max Offset Lag",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "max:aws.kafka.sum_offset_lag{$msk_cluster_name,topic:to-ender}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 619206947726950,
-            "definition": {
-              "title": "Message Time In Queue",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ender.message_time_in_queue.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "max:ender.message_time_in_queue.95percentile{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "max:ender.message_time_in_queue.max{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              },
-              "markers": []
-            },
-            "layout": {
-              "x": 4,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4313854730348314,
-            "definition": {
-              "title": "Message Stats",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "total msgs received in last min",
-                      "style": {
-                        "palette_index": 1,
-                        "palette": "classic"
-                      },
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "empty msgs received in last min",
-                      "style": {
-                        "palette_index": 4,
-                        "palette": "warm"
-                      },
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "msg parse failures in last min",
-                      "style": {
-                        "palette_index": 6,
-                        "palette": "warm"
-                      },
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:ender.received_kafka_message{$Environment,$Service}.as_count().rollup(avg, 60)",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:ender.empty_kafka_message{$Environment,$Service}.rollup(avg, 60)",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:ender.parse_kafka_message.failure{$Environment,$Service}.rollup(avg, 60)",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Block Processing",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 1392227558964432,
-            "definition": {
-              "title": "Ender Processed Block Height",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "v4 tendermint consensus height",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "v4 cometbft consensus height",
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "max:ender.processing_block_height{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "max:dydxprotocol.cometbft_consensus_height{$Environment}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id":186182794607506,
-            "definition":{
-               "title":"Ender Processed Block Lag",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"horizontal",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "time":{
-
-               },
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "formula":"query1 - query2"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "query":"avg:ender.processing_block_height{$Environment,$Service}",
-                           "data_source":"metrics",
-                           "name":"query1"
-                        },
-                        {
-                           "query":"max:dydxprotocol.cometbft_consensus_height{$Environment}",
-                           "data_source":"metrics",
-                           "name":"query2"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ],
-               "yaxis":{
-                  "include_zero":false
-               }
-            },
-            "layout":{
-               "x":4,
-               "y":0,
-               "width":4,
-               "height":2
-            }
-          },
-          {
-            "id": 8677442900434532,
-            "definition": {
-              "title": "Ender Block Processing Latency Success",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg(ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Max (ms)",
-                      "style": {
-                        "palette_index": 6,
-                        "palette": "warm"
-                      },
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:ender.processed_block.timing.avg{$Environment,$Service,success:true}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:ender.processed_block.timing.95percentile{$Environment,$Service,success:true}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:ender.processed_block.timing.max{$Environment,$Service,success:true}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1162493075260492,
-            "definition": {
-              "title": "Ender Block Processing Failed",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg(ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Max (ms)",
-                      "style": {
-                        "palette_index": 6,
-                        "palette": "warm"
-                      },
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:ender.processed_block.timing.avg{$Environment,$Service,success:false}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:ender.processed_block.timing.95percentile{$Environment,$Service,success:false}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:ender.processed_block.timing.max{$Environment,$Service,success:false}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                },
-                {
-                  "on_right_yaxis": true,
-                  "formulas": [
-                    {
-                      "alias": "count",
-                      "formula": "query0"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "data_source": "metrics",
-                      "name": "query0",
-                      "query": "avg:ender.processed_block.timing.count{$Environment,$Service,success:false}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 758079451716292,
-            "definition": {
-              "title": "Ender Block Processing Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "time": {},
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg(ms)",
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:ender.processed_block.timing.count{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6315905888407408,
-            "definition": {
-              "title": "Batch Processing Time",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_process_time.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_process_time.95percentile{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_process_time.max{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8498110465635644,
-            "definition": {
-              "title": "Batch Size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_size.median{$Environment,$Service}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_size.95percentile{$Environment,$Service}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.batch_size.max{$Environment,$Service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 659088676025712,
-            "definition": {
-              "title": "Batches in a Block",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.num_batches_in_block.avg{$Environment,$Service}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.num_batches_in_block.95percentile{$Environment,$Service}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.num_batches_in_block.max{$Environment,$Service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8938748914537290,
-            "definition": {
-              "title": "Event Type frequency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "MarketEvent count",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "OrderFillEvent count",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "SubaccountUpdateEvent count",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "TransferEvent count",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "FundingEvent count",
-                      "formula": "query5"
-                    },
-                    {
-                      "alias": "StatefulOrderEvent count",
-                      "formula": "query6"
-                    },
-                    {
-                      "alias": "PerpetualMarketCreateEvent count",
-                      "formula": "query7"
-                    },
-                    {
-                      "alias": "LiquidityTierUpsertEvent count",
-                      "formula": "query8"
-                    },
-                    {
-                      "alias": "AssetCreateEvent count",
-                      "formula": "query9"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:marketevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:orderfillevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:subaccountupdateevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query4",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:transferevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query5",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:fundingevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query6",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:statefulorderevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query7",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:perpetualmarketcreateevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query8",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:liquiditytierupsertevent}.as_count().rollup(avg, 60)"
-                    },
-                    {
-                      "name": "query9",
-                      "data_source": "metrics",
-                      "query": "sum:ender.handle_event.timing.count{$Environment,$Service,eventtype:assetcreateevent}.as_count().rollup(avg, 60)"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 10,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Handlers",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 7228183408491306,
-            "definition": {
-              "title": "Order Fill Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:orderfillevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,eventtype:orderfillevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 13,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 44474999340134,
-            "definition": {
-              "title": "Order Fill Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:orderfillevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,eventtype:orderfillevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 13,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5369691550666448,
-            "definition": {
-              "title": "Order Fill Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:orderfillevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,eventtype:orderfillevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 13,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5975978528365952,
-            "definition": {
-              "title": "Subaccount Update Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:subaccountupdateevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,eventtype:subaccountupdateevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 15,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2371605848090710,
-            "definition": {
-              "title": "Subaccount Update Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{eventtype:subaccountupdateevent,$Environment,$Service} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{eventtype:subaccountupdateevent,$Environment,$Service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 15,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1306814740535988,
-            "definition": {
-              "title": "Subaccount Update Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:subaccountupdateevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,eventtype:subaccountupdateevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 15,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6162410151079282,
-            "definition": {
-              "title": "Market Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:marketevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,eventtype:marketevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 17,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 781023063240698,
-            "definition": {
-              "title": "Market Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:marketevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,eventtype:marketevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 17,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3795138445174226,
-            "definition": {
-              "title": "Market Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:marketevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,eventtype:marketevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 17,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6506728734781804,
-            "definition": {
-              "title": "Transfer Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:transferevent*} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,class:transferhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 19,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2166478134211908,
-            "definition": {
-              "title": "Transfer Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:transferevent*} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,eventtype:transferevent*}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 19,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1904598562942338,
-            "definition": {
-              "title": "Transfer Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:transferevent*} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,eventtype:transferevent*}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 19,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4293391004494110,
-            "definition": {
-              "title": "Funding Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:fundingevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,eventtype:fundingevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3485173661741046,
-            "definition": {
-              "title": "Funding Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:fundingevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,eventtype:fundingevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 63146674063398,
-            "definition": {
-              "title": "Funding Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:fundingevent} by {fnname}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,eventtype:fundingevent}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id":445534052010062,
-            "definition":{
-              "title":"Funding Index Per Ticker",
-              "title_size":"16",
-              "title_align":"left",
-              "show_legend":true,
-              "legend_layout":"auto",
-              "legend_columns":[
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type":"timeseries",
-              "requests":[
-                {
-                  "formulas":[
-                    {
-                      "alias":"btc-usd",
-                      "formula":"query1"
-                    },
-                    {
-                      "alias":"eth-usd",
-                      "formula":"query2"
-                    },
-                    {
-                      "alias":"ada-usd",
-                      "formula":"query3"
-                    },
-                    {
-                      "alias":"ape-usd",
-                      "formula":"query4"
-                    },
-                    {
-                      "alias":"link-usd",
-                      "formula":"query5"
-                    },
-                    {
-                      "alias":"matic-usd",
-                      "formula":"query6"
-                    },
-                    {
-                      "alias":"crv-usd",
-                      "formula":"query7"
-                    },
-                    {
-                      "alias":"sol-usd",
-                      "formula":"query8"
-                    },
-                    {
-                      "alias":"avax-usd",
-                      "formula":"query9"
-                    },
-                    {
-                      "alias":"fil-usd",
-                      "formula":"query10"
-                    },
-                    {
-                      "alias":"ltc-usd",
-                      "formula":"query11"
-                    },
-                    {
-                      "alias":"doge-usd",
-                      "formula":"query12"
-                    },
-                    {
-                      "alias":"atom-usd",
-                      "formula":"query13"
-                    },
-                    {
-                      "alias":"dot-usd",
-                      "formula":"query14"
-                    },
-                    {
-                      "alias":"uni-usd",
-                      "formula":"query15"
-                    },
-                    {
-                      "alias":"bch-usd",
-                      "formula":"query16"
-                    },
-                    {
-                      "alias":"trx-usd",
-                      "formula":"query17"
-                    },
-                    {
-                      "alias":"near-usd",
-                      "formula":"query18"
-                    },
-                    {
-                      "alias":"mkr-usd",
-                      "formula":"query19"
-                    },
-                    {
-                      "alias":"xlm-usd",
-                      "formula":"query20"
-                    },
-                    {
-                      "alias":"etc-usd",
-                      "formula":"query21"
-                    },
-                    {
-                      "alias":"comp-usd",
-                      "formula":"query22"
-                    },
-                    {
-                      "alias":"wld-usd",
-                      "formula":"query23"
-                    },
-                    {
-                      "alias":"apt-usd",
-                      "formula":"query24"
-                    },
-                    {
-                      "alias":"arb-usd",
-                      "formula":"query25"
-                    },
-                    {
-                      "alias":"blur-usd",
-                      "formula":"query26"
-                    },
-                    {
-                      "alias":"ldo-usd",
-                      "formula":"query27"
-                    },
-                    {
-                      "alias":"op-usd",
-                      "formula":"query28"
-                    },
-                    {
-                      "alias":"pepe-usd",
-                      "formula":"query29"
-                    },
-                    {
-                      "alias":"sei-usd",
-                      "formula":"query30"
-                    },
-                    {
-                      "alias":"shib-usd",
-                      "formula":"query31"
-                    },
-                    {
-                      "alias":"sui-usd",
-                      "formula":"query32"
-                    },
-                    {
-                      "alias":"xrp-usd",
-                      "formula":"query33"
-                    }
-                  ],
-                  "queries":[
-                    {
-                      "name":"query1",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:btc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query2",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:eth-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query3",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:ada-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query4",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:ape-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query5",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:link-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query6",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:matic-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query7",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:crv-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query8",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:sol-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query9",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:avax-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query10",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:fil-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query11",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:ltc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query12",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:doge-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query13",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:atom-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query14",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:dot-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query15",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:uni-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query16",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:bch-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query17",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:trx-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query18",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:near-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query19",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:mkr-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query20",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:xlm-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query21",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:etc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query22",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:comp-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query23",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:wld-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query24",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:apt-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query25",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:arb-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query26",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:blur-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query27",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:ldo-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query28",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:op-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query29",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:pepe-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query30",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:sei-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query31",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:shib-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query32",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:sui-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query33",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update{$Environment,$Service,$region, ticker:xrp-usd} by {fnname}"
-                    }
-                  ],
-                  "response_format":"timeseries",
-                  "style":{
-                    "palette":"dog_classic",
-                    "line_type":"solid",
-                    "line_width":"normal"
-                  },
-                  "display_type":"line"
-                }
-              ]
-            },
-            "layout":{
-              "x":8,
-              "y":25,
-              "width":4,
-              "height":2
-            }
-          },
-          {
-            "id":332207013024142,
-            "definition":{
-              "title":"Funding Index Received Event Per Ticker",
-              "title_size":"16",
-              "title_align":"left",
-              "show_legend":true,
-              "legend_layout":"auto",
-              "legend_columns":[
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type":"timeseries",
-              "requests":[
-                {
-                  "formulas":[
-                    {
-                      "alias":"btc-usd",
-                      "formula":"query1"
-                    },
-                    {
-                      "alias":"eth-usd",
-                      "formula":"query2"
-                    },
-                    {
-                      "alias":"ada-usd",
-                      "formula":"query3"
-                    },
-                    {
-                      "alias":"ape-usd",
-                      "formula":"query4"
-                    },
-                    {
-                      "alias":"link-usd",
-                      "formula":"query5"
-                    },
-                    {
-                      "alias":"matic-usd",
-                      "formula":"query6"
-                    },
-                    {
-                      "alias":"crv-usd",
-                      "formula":"query7"
-                    },
-                    {
-                      "alias":"sol-usd",
-                      "formula":"query8"
-                    },
-                    {
-                      "alias":"avax-usd",
-                      "formula":"query9"
-                    },
-                    {
-                      "alias":"fil-usd",
-                      "formula":"query10"
-                    },
-                    {
-                      "alias":"ltc-usd",
-                      "formula":"query11"
-                    },
-                    {
-                      "alias":"doge-usd",
-                      "formula":"query12"
-                    },
-                    {
-                      "alias":"atom-usd",
-                      "formula":"query13"
-                    },
-                    {
-                      "alias":"dot-usd",
-                      "formula":"query14"
-                    },
-                    {
-                      "alias":"uni-usd",
-                      "formula":"query15"
-                    },
-                    {
-                      "alias":"bch-usd",
-                      "formula":"query16"
-                    },
-                    {
-                      "alias":"trx-usd",
-                      "formula":"query17"
-                    },
-                    {
-                      "alias":"near-usd",
-                      "formula":"query18"
-                    },
-                    {
-                      "alias":"mkr-usd",
-                      "formula":"query19"
-                    },
-                    {
-                      "alias":"xlm-usd",
-                      "formula":"query20"
-                    },
-                    {
-                      "alias":"etc-usd",
-                      "formula":"query21"
-                    },
-                    {
-                      "alias":"comp-usd",
-                      "formula":"query22"
-                    },
-                    {
-                      "alias":"wld-usd",
-                      "formula":"query23"
-                    },
-                    {
-                      "alias":"apt-usd",
-                      "formula":"query24"
-                    },
-                    {
-                      "alias":"arb-usd",
-                      "formula":"query25"
-                    },
-                    {
-                      "alias":"blur-usd",
-                      "formula":"query26"
-                    },
-                    {
-                      "alias":"ldo-usd",
-                      "formula":"query27"
-                    },
-                    {
-                      "alias":"op-usd",
-                      "formula":"query28"
-                    },
-                    {
-                      "alias":"pepe-usd",
-                      "formula":"query29"
-                    },
-                    {
-                      "alias":"sei-usd",
-                      "formula":"query30"
-                    },
-                    {
-                      "alias":"shib-usd",
-                      "formula":"query31"
-                    },
-                    {
-                      "alias":"sui-usd",
-                      "formula":"query32"
-                    },
-                    {
-                      "alias":"xrp-usd",
-                      "formula":"query33"
-                    }
-                  ],
-                  "queries":[
-                    {
-                      "name":"query1",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:btc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query2",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:eth-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query3",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:ada-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query4",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:ape-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query5",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:link-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query6",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:matic-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query7",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:crv-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query8",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:sol-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query9",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:avax-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query10",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:fil-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query11",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:ltc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query12",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:doge-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query13",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:atom-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query14",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:dot-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query15",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:uni-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query16",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:bch-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query17",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:trx-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query18",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:near-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query19",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:mkr-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query20",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:xlm-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query21",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:etc-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query22",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:comp-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query23",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:wld-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query24",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:apt-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query25",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:arb-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query26",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:blur-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query27",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:ldo-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query28",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:op-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query29",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:pepe-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query30",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:sei-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query31",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:shib-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query32",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:sui-usd} by {fnname}"
-                    },
-                    {
-                      "name":"query33",
-                      "data_source":"metrics",
-                      "query":"avg:ender.funding_index_update_event{$Environment,$Service,$region, ticker:xrp-usd} by {fnname}"
-                    }
-                  ],
-                  "response_format":"timeseries",
-                  "style":{
-                    "palette":"dog_classic",
-                    "line_type":"solid",
-                    "line_width":"normal"
-                  },
-                  "display_type":"line"
-                }
-              ]
-            },
-            "layout":{
-              "x":8,
-              "y":25,
-              "width":4,
-              "height":2
-            }
-          },
-          {
-            "id": 1036075888844532,
-            "definition": {
-              "title": "Stateful Order Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    },
-                    {
-                      "formula": "query4"
-                    },
-                    {
-                      "formula": "query5"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:statefulorderevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:statefulorderplacementhandler}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:statefulorderexpirationhandler}"
-                    },
-                    {
-                      "name": "query4",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:statefulordercancelationhandler}"
-                    },
-                    {
-                      "name": "query5",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:statefulorderremovalhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 23,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 447316509760946,
-            "definition": {
-              "title": "Stateful Order Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    },
-                    {
-                      "formula": "query4"
-                    },
-                    {
-                      "formula": "query5"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:statefulorderevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:statefulorderplacementhandler}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:statefulorderexpirationhandler}"
-                    },
-                    {
-                      "name": "query4",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:statefulordercancelationhandler}"
-                    },
-                    {
-                      "name": "query5",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:statefulorderremovalhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 23,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 15913965816198,
-            "definition": {
-              "title": "Stateful Order Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    },
-                    {
-                      "formula": "query4"
-                    },
-                    {
-                      "formula": "query5"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:statefulorderevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:statefulorderplacementhandler}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:statefulorderexpirationhandler}"
-                    },
-                    {
-                      "name": "query4",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:statefulordercancelationhandler}"
-                    },
-                    {
-                      "name": "query5",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:statefulorderremovalhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 23,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8232777336586544,
-            "definition": {
-              "title": "Asset Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:assetcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:assetcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 25,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7023721873558032,
-            "definition": {
-              "title": "Asset Creation Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:assetcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:assetcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 25,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2521661296883830,
-            "definition": {
-              "title": "Asset Creation Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:assetcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:assetcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 25,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7254478644607454,
-            "definition": {
-              "title": "Perpetual Market Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:perpetualmarketcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:perpetualmarketcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 27,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3449410088269996,
-            "definition": {
-              "title": "Perpetual Market Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:perpetualmarketcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:perpetualmarketcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 27,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3651649040009954,
-            "definition": {
-              "title": "Perpetual Market Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:perpetualmarketcreateevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:perpetualmarketcreationhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 27,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2050175477011680,
-            "definition": {
-              "title": "Liquidity Tier Handler Metrics (avg)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.avg{$Environment,$Service,eventtype:liquiditytierupsertevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.avg{$Environment,$Service,classname:liquiditytierhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 29,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7079814083503344,
-            "definition": {
-              "title": "Liquidity Tier Handler Metrics (95%)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.95percentile{$Environment,$Service,eventtype:liquiditytierupsertevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.95percentile{$Environment,$Service,classname:liquiditytierhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 29,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 136548017662728,
-            "definition": {
-              "title": "Liquidity Tier Handler Metrics (max)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:ender.generic_function.timing.max{$Environment,$Service,eventtype:liquiditytierupsertevent}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:ender.handle_event.timing.max{$Environment,$Service,classname:liquiditytierhandler}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 29,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 0,
-        "width": 12,
-        "height": 32
-      }
-    }
-  ],
-  "template_variables": [
-    {
-      "name": "Environment",
-      "prefix": "env",
-      "available_values": [],
-      "default": "*"
-    },
-    {
-      "name": "Service",
-      "prefix": "service",
-      "available_values": [],
-      "default": "indexer"
-    },
-    {
-      "name": "cluster_name",
-      "prefix": "cluster_name",
-      "available_values": [
-        "testnet-indexer-apne1-cluster",
-        "staging-indexer-apne1-cluster",
-        "dev-indexer-apne1-cluster",
-        "dev-indexer-apne1-msk-cluster",
-        "testnet-indexer-apne1-msk-cluster",
-        "staging-indexer-apne1-msk-cluster",
-        "dev2-indexer-apne1-cluster",
-        "dev3-indexer-apne1-cluster",
-        "dev4-indexer-apne1-cluster",
-        "dev5-indexer-apne1-cluster",
-        "testnet1-indexer-apne1-cluster"
-      ],
-      "default": "dev-indexer-apne1-cluster"
-    },
-    {
-      "name": "ecs_cluster_name",
-      "prefix": "ecs_cluster_name",
-      "available_values": [
-        "testnet-indexer-full-node-cluster",
-        "dev-indexer-full-node-cluster",
-        "staging-indexer-full-node-cluster",
-        "dev4-indexer-full-node-cluster",
-        "dev2-indexer-full-node-cluster",
-        "dev3-indexer-full-node-cluster",
-        "dev5-indexer-full-node-cluster",
-        "testnet1-indexer-full-node-cluster"
-      ],
-      "default": "dev-indexer-full-node-cluster"
-    },
-    {
-      "name": "cluster",
-      "prefix": "cluster",
-      "available_values": [
-        "dev-indexer-apne1-cluster",
-        "staging-indexer-apne1-cluster",
-        "testnet-indexer-apne1-cluster",
-        "dev2-indexer-apne1-cluster",
-        "dev3-indexer-apne1-cluster",
-        "dev4-indexer-apne1-cluster",
-        "dev5-indexer-apne1-cluster",
-        "testnet1-indexer-apne1-cluster"
-      ],
-      "default": "dev-indexer-apne1-cluster"
-    },
-    {
-      "name": "msk_cluster_name",
-      "prefix": "cluster_name",
-      "available_values": [
-        "dev-indexer-apne1-msk-cluster",
-        "staging-indexer-apne1-msk-cluster",
-        "testnet-indexer-apne1-msk-cluster",
-        "dev2-indexer-apne1-msk-cluster",
-        "dev3-indexer-apne1-msk-cluster",
-        "dev4-indexer-apne1-msk-cluster",
-        "dev5-indexer-apne1-msk-cluster",
-        "testnet1-indexer-apne1-msk-cluster"
-      ],
-      "default": "*"
-    }
-  ],
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/full_node_dashboard.tf b/modules/indexer_dashboards/full_node_dashboard.tf
deleted file mode 100644
index 557e6138..00000000
--- a/modules/indexer_dashboards/full_node_dashboard.tf
+++ /dev/null
@@ -1,544 +0,0 @@
-resource "datadog_dashboard_json" "full_node" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Full node",
-  "description": "",
-  "widgets": [
-    {
-      "id": 3627505918109706,
-      "definition": {
-        "title": "V4 Full Node",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 4389905702208102,
-            "definition": {
-              "title": "Send Off-chain Data Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "latency (ms)",
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:dydxprotocol.send_offchain_data_latency.quantile{$ecs_cluster_name} by {quantile}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5175223202514392,
-            "definition": {
-              "title": "Send Off-chain Data Count",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "success",
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "sum:dydxprotocol.msgsender_message_send_success.count{$ecs_cluster_name}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2065638610961772,
-            "definition": {
-              "title": "BTC Orderbook Best Bid / Ask (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Indexer Best Ask",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Indexer Best Bid",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Full Node Best Bid",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "Full Node Best Ask",
-                      "formula": "query4"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_ask_subticks{$Environment,clob_pair_id:0}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_bid_subticks{$Environment,clob_pair_id:0}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_bid_clob_pair{$Environment,clob_pair_id:0,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_ask_clob_pair{$Environment,clob_pair_id:0,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4200226330250326,
-            "definition": {
-              "title": "ETH Orderbook Best Bid / Ask (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Indexer Best Ask",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Indexer Best Bid",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Full Node Best Bid",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "Full Node Best Ask",
-                      "formula": "query4"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_ask_subticks{$Environment,clob_pair_id:1}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_bid_subticks{$Environment,clob_pair_id:1}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_bid_clob_pair{$Environment,clob_pair_id:1,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_ask_clob_pair{$Environment,clob_pair_id:1,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 2,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4965251786604264,
-            "definition": {
-              "title": "% Difference for Best Bid (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "abs(((query2 - query3) / query2) * 100)"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_bid_subticks{$Environment} by {clob_pair_id}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_bid_clob_pair{$Environment,$ecs_cluster_name} by {clob_pair_id}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 2,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1872936273501168,
-            "definition": {
-              "title": "% Difference for Best Ask (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "abs(((query2 - query3) / query2) * 100)"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_ask_subticks{$Environment} by {clob_pair_id}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_ask_clob_pair{$Environment , $ecs_cluster_name} by {clob_pair_id}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 2,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2662411043829594,
-            "definition": {
-              "title": "ETH Orderbook Spread (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Indexer Spread",
-                      "formula": "query1 - query2"
-                    },
-                    {
-                      "alias": "Full Node Spread",
-                      "formula": "query4 - query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_ask_subticks{$Environment,clob_pair_id:1}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_bid_subticks{$Environment,clob_pair_id:1}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_ask_clob_pair{$Environment,clob_pair_id:1,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_bid_clob_pair{$Environment,clob_pair_id:1,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 4,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5242619265899866,
-            "definition": {
-              "title": "BTC Orderbook Spread (Indexer vs Full-Node)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Indexer Spread",
-                      "formula": "query1 - query2"
-                    },
-                    {
-                      "alias": "Full Node Spread",
-                      "formula": "query4 - query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_ask_subticks{$Environment,clob_pair_id:0}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.crossed_orderbook.best_bid_subticks{$Environment,clob_pair_id:0}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_ask_clob_pair{$Environment,clob_pair_id:0,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:dydxprotocol.clob_best_bid_clob_pair{$Environment,clob_pair_id:0,$ecs_cluster_name}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 4,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 87,
-        "width": 12,
-        "height": 7
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/locals.tf b/modules/indexer_dashboards/locals.tf
deleted file mode 100644
index d569f118..00000000
--- a/modules/indexer_dashboards/locals.tf
+++ /dev/null
@@ -1,69 +0,0 @@
-locals {
-  template_variable_presets = [for name, variables in var.indexer_services_variable_mapping :
-    {
-      name = name,
-      template_variables = [
-        {
-          name  = "Environment",
-          value = variables.environment,
-        },
-        {
-          name  = "Service",
-          value = variables.service,
-        },
-        {
-          name  = "cluster_name",
-          value = variables.cluster_name,
-        },
-        {
-          name  = "ecs_cluster_name",
-          value = variables.ecs_cluster_name,
-        },
-        {
-          name  = "msk_cluster_name",
-          value = variables.msk_cluster_name,
-        },
-      ]
-    }
-  ]
-
-  indexer_service_variables = [for name, variables in var.indexer_services_variable_mapping : variables]
-  template_variables = [
-    {
-      name             = "Environment",
-      prefix           = "env",
-      available_values = [],
-      default          = "*",
-    },
-    {
-      name             = "Service",
-      prefix           = "service",
-      available_values = [],
-      default          = "indexer",
-    },
-    {
-      name   = "cluster_name",
-      prefix = "cluster_name",
-      available_values = [
-        for variables in local.indexer_service_variables : variables.cluster_name
-      ],
-      default = local.indexer_service_variables[0].cluster_name,
-    },
-    {
-      name   = "ecs_cluster_name",
-      prefix = "ecs_cluster_name",
-      available_values = [
-        for variables in local.indexer_service_variables : variables.ecs_cluster_name
-      ],
-      default = local.indexer_service_variables[0].ecs_cluster_name,
-    },
-    {
-      name   = "msk_cluster_name",
-      prefix = "cluster_name",
-      available_values = [
-        for variables in local.indexer_service_variables : variables.msk_cluster_name
-      ],
-      default = local.indexer_service_variables[0].msk_cluster_name,
-    },
-  ]
-}
diff --git a/modules/indexer_dashboards/postgres_dashboard.tf b/modules/indexer_dashboards/postgres_dashboard.tf
deleted file mode 100644
index dbf267bb..00000000
--- a/modules/indexer_dashboards/postgres_dashboard.tf
+++ /dev/null
@@ -1,66 +0,0 @@
-resource "datadog_dashboard_json" "postgres" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Postgres",
-  "description": null,
-  "widgets": [
-    {
-      "id": 8395172130666522,
-      "definition": {
-        "title": "RDS Replica Lag",
-        "title_size": "16",
-        "title_align": "left",
-        "show_legend": true,
-        "legend_layout": "auto",
-        "legend_columns": [
-          "avg",
-          "min",
-          "max",
-          "value",
-          "sum"
-        ],
-        "time": {},
-        "type": "timeseries",
-        "requests": [
-          {
-            "formulas": [
-              {
-                "formula": "query1"
-              }
-            ],
-            "queries": [
-              {
-                "name": "query1",
-                "data_source": "metrics",
-                "query": "avg:aws.rds.replica_lag{environment:$Environment.value,name:*-indexer-apne1-db-read-replica}"
-              }
-            ],
-            "response_format": "timeseries",
-            "style": {
-              "palette": "dog_classic",
-              "line_type": "solid",
-              "line_width": "normal"
-            },
-            "display_type": "line"
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 0,
-        "width": 4,
-        "height": 2
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "layout_type": "ordered",
-  "notify_list": [],
-  "reflow_type": "fixed",
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/roundtable_dashboard.tf b/modules/indexer_dashboards/roundtable_dashboard.tf
deleted file mode 100644
index 359f6ee2..00000000
--- a/modules/indexer_dashboards/roundtable_dashboard.tf
+++ /dev/null
@@ -1,952 +0,0 @@
-resource "datadog_dashboard_json" "roundtable" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Roundtable",
-  "description": "",
-  "widgets": [
-    {
-      "id": 3704865606287398,
-      "definition": {
-        "title": "Roundtable",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 3854037923215042,
-            "definition": {
-              "title": "CPU Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.cpu.percent{task_name:*roundtable-task,$cluster_name,container_name:*roundtable-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1083112124540652,
-            "definition": {
-              "title": "Mem Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.mem.rss{task_name:*roundtable-task,$cluster_name,container_name:*roundtable-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1153755667830218,
-            "definition": {
-              "title": "Running Instances",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "min:aws.ecs.service.running{cluster:$cluster_name.value,v4service:roundtable}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6571746955570588,
-            "definition": {
-              "type": "free_text",
-              "text": "Tasks",
-              "color": "#4d4d4d",
-              "font_size": "24",
-              "text_align": "left"
-            },
-            "layout": {
-              "x": 0,
-              "y": 2,
-              "width": 12,
-              "height": 1
-            }
-          },
-          {
-            "id": 7729639252558346,
-            "definition": {
-              "title": "Roundtable Market Updater Loop Completion Ratio",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "market updater success ratio",
-                      "formula": "query2 / query1"
-                    },
-                    {
-                      "alias": "compute pnl success ratio",
-                      "formula": "query3 / query4"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.market_updater.completed{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.market_updater.started{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.create_pnl_ticks.completed{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.create_pnl_ticks.started{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4533400894838476,
-            "definition": {
-              "title": "",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Market Updater Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Market Updater Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Market Updater Loop Max (ms)",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "Get Fills Avg (ms)",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "Market Updater Timing Avg (ms)",
-                      "formula": "query5"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.market_updater.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.market_updater.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.market_updater.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:roundtable.markets_updater_get_fills_positions_and_markets_timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:roundtable.market_updater_update_timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1086754073342310,
-            "definition": {
-              "title": "Create Pnl Ticks Task Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Create Pnl Ticks Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Create Pnl Ticks Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Create Pnl Ticks Loop Max (ms)",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "Create Pnl Ticks Timing Avg (ms)",
-                      "formula": "query4"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.create_pnl_ticks.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.create_pnl_ticks.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.create_pnl_ticks.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:roundtable_generate_ticks_timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1627630683167724,
-            "definition": {
-              "title": "Roundtable Locking and Concurrency Stats",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.exceeded_max_concurrent_tasks{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.could_not_acquire_extended_lock{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 5,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5159327596208808,
-            "definition": {
-              "title": "Roundtable publishToMarketsWebsocket stats",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Max (ms)",
-                      "formula": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.publish_markets_websocket_updates_duration.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.publish_markets_websocket_updates_duration.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.publish_markets_websocket_updates_duration.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                },
-                {
-                  "formulas": [
-                    {
-                      "formula": "query0",
-                      "style": {
-                        "palette_index": 4,
-                        "palette": "green"
-                      }
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "on_right_yaxis": true,
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.publish_markets_websocket_updates_duration.count{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query0"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 5,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3676577945587352,
-            "definition": {
-              "title": "Roundtable Loop Duration Ratio (Interval of 10s)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.duration_ratio{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 5,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7560792979630466,
-            "definition": {
-              "title": "Delete Zero Levels Task Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Delete Zero Levels Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Delete Zero Levels Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Delete Zero Levels Loop Max (ms)",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.delete_zero_price_levels.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.delete_zero_price_levels.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.delete_zero_price_levels.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                },
-                {
-                  "on_right_yaxis": true,
-                  "formulas": [
-                    {
-                      "alias": "Num Zero Levels Deleted",
-                      "formula": "query0"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "data_source": "metrics",
-                      "name": "query0",
-                      "query": "avg:roundtable.delete_zero_price_levels.num_levels_deleted{$Environment,$Service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 7,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7888562347332680,
-            "definition": {
-              "title": "Expire Orders Task Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Remove Expired Orders Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Remove Expired Orders Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Remove Expired Orders Loop Max (ms)",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.remove_expired_orders.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.remove_expired_orders.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.remove_expired_orders.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                },
-                {
-                  "on_right_yaxis": true,
-                  "formulas": [
-                    {
-                      "alias": "Expire Messages sent",
-                      "formula": "query0"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "data_source": "metrics",
-                      "name": "query0",
-                      "query": "avg:roundtable.expiry_message_sent{$Environment,$Service}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 7,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1723944386631222,
-            "definition": {
-              "title": "Cancel Stale Orders Task Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Cancel Stale Orders Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Cancel Stale Orders Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Cancel Stale Orders Loop Max (ms)",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.cancel_stale_orders.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.cancel_stale_orders.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.cancel_stale_orders.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                },
-                {
-                  "on_right_yaxis": true,
-                  "formulas": [
-                    {
-                      "alias": "Num Stale Orders Canceled",
-                      "formula": "query0"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "data_source": "metrics",
-                      "name": "query0",
-                      "query": "avg:roundtable.num_stale_orders_canceled.count{$Environment,$Service}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 7,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3626710840643786,
-            "definition": {
-              "title": "Update Research Environment Task Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Update Research Environment Loop Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "Update Research Environment Loop 95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "Update Research Environment Loop Max (ms)",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:roundtable.loops.update_research_environment.timing.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.update_research_environment.timing.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:roundtable.loops.update_research_environment.timing.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 9,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 63,
-        "width": 12,
-        "height": 1,
-        "is_column_break": true
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/socks_dashboard.tf b/modules/indexer_dashboards/socks_dashboard.tf
deleted file mode 100644
index bfb54f94..00000000
--- a/modules/indexer_dashboards/socks_dashboard.tf
+++ /dev/null
@@ -1,1526 +0,0 @@
-resource "datadog_dashboard_json" "socks" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Socks",
-  "description": "",
-  "widgets": [
-    {
-      "id": 4647534798635852,
-      "definition": {
-        "title": "Socks",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 7318245889214448,
-            "definition": {
-              "title": "CPU Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.cpu.percent{task_name:*socks-task,$cluster_name,container_name:*socks-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7082174723337478,
-            "definition": {
-              "title": "Mem Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.mem.rss{task_name:*socks-task,$cluster_name,container_name:*socks-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2254057628579770,
-            "definition": {
-              "title": "Message Forwarding Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.forward_message.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.forward_message.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5136594378205182,
-            "definition": {
-              "type": "free_text",
-              "text": "Kafka",
-              "color": "#4d4d4d",
-              "font_size": "24",
-              "text_align": "left"
-            },
-            "layout": {
-              "x": 0,
-              "y": 2,
-              "width": 12,
-              "height": 1
-            }
-          },
-          {
-            "id": 1427040631058316,
-            "definition": {
-              "title": "Max Offset Lag",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "top(query1, 5, 'mean', 'asc')"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:aws.kafka.max_offset_lag{consumer_group:socks_*,$msk_cluster_name} by {consumer_group}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 810503967841644,
-            "definition": {
-              "title": "Message Time in Queue",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "max (ms)",
-                      "formula": "query3"
-                    },
-                    {
-                      "alias": "Avg (ms)",
-                      "formula": "query4"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query5"
-                    },
-                    {
-                      "alias": "max (ms)",
-                      "formula": "query6"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "max:socks.message_time_in_queue.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "max:socks.message_time_in_queue.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "max:socks.message_time_in_queue.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "max:socks.forward_message.message_time_in_queue.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "max:socks.forward_message.message_time_in_queue.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query5"
-                    },
-                    {
-                      "query": "max:socks.forward_message.message_time_in_queue.max{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query6"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 3,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1879068026839852,
-            "definition": {
-              "type": "free_text",
-              "text": "Message Forwarding",
-              "color": "#4d4d4d",
-              "font_size": "24",
-              "text_align": "left"
-            },
-            "layout": {
-              "x": 0,
-              "y": 5,
-              "width": 12,
-              "height": 1
-            }
-          },
-          {
-            "id": 7199039943554564,
-            "definition": {
-              "title": "Message to Forward QPS",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "qps",
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.message_to_forward{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8163527023021030,
-            "definition": {
-              "title": "% of Messages Forwarded",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "% of Messages Forwarded",
-                      "formula": "query2 / query1 * 100"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.forward_message_with_subscribers{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.message_to_forward{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3134784320636988,
-            "definition": {
-              "title": "Subscribe Send Message Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.subscribe_send_message.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.subscribe_send_message.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6887843049406098,
-            "definition": {
-              "title": "Socks Update Perpetual Market Loop Latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "avg (ms)",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "95% (ms)",
-                      "formula": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.loops.update_perpetual_markets.avg{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.loops.update_perpetual_markets.95percentile{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4448252288059946,
-            "definition": {
-              "title": "Subscriptions Channel Size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "avg",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "max",
-                      "formula": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.subscriptions.channel_size{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "max:socks.subscriptions.channel_size{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5484955330270804,
-            "definition": {
-              "title": "Client Forwarding Success Rates",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "Individual Success Rate",
-                      "formula": "query4 / (query3 + query4)"
-                    },
-                    {
-                      "alias": "Batch Success Rate",
-                      "formula": "query1 / (query1 + query2)"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.forward_to_client_batch_success{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.forward_to_client_batch_error{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.forward_to_client_error{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    },
-                    {
-                      "query": "avg:socks.forward_to_client_success{$Environment,$Service}.as_count()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id":6421181883162304,
-            "definition":{
-               "title":"Stream Destroyed Errors",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"horizontal",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "formula":"query4"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "query":"avg:socks.ws_send.stream_destroyed_errors{$Environment,$Service}.as_count()",
-                           "data_source":"metrics",
-                           "name":"query4"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ]
-            },
-            "layout":{
-               "x":8,
-               "y":10,
-               "width":4,
-               "height":2
-            }
-          },
-          {
-            "id":1855914397159130,
-            "definition":{
-               "title":"Message Not Sent Because Websocket Not Open",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"horizontal",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "time":{
-
-               },
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "formula":"query4"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "query":"avg:socks.ws_message_not_sent{$Environment,$Service}.as_rate()",
-                           "data_source":"metrics",
-                           "name":"query4"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ]
-            },
-            "layout":{
-              "x":0,
-              "y":14,
-              "width":4,
-              "height":2
-            }
-          },
-          {
-            "id": 870204027095636,
-            "definition": {
-              "title": "Initial GET Response Latency (v4_markets)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "95pct",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "avg",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "max",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.initial_response_get.95percentile{$cluster_name,channel:v4_markets}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.avg{$cluster_name,channel:v4_markets}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.max{$cluster_name,channel:v4_markets}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 10,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6486907288951536,
-            "definition": {
-              "title": "Number of Concurrent Connections",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "queries": [
-                    {
-                      "query": "avg:socks.num_concurrent_connections{$Environment,$Service}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    }
-                  ],
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 10,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4038310831400512,
-            "definition": {
-              "title": "Initial GET Response Latency (v4_orderbook)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "95pct",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "avg",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "max",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.initial_response_get.95percentile{$cluster_name,channel:v4_orderbook}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.avg{$cluster_name,channel:v4_orderbook}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.max{$cluster_name,channel:v4_orderbook}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 10,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6471300902234644,
-            "definition": {
-              "title": "Initial GET Response Latency (v4_trades)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "95pct",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "avg",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "max",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.initial_response_get.95percentile{$cluster_name,channel:v4_trades}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.avg{$cluster_name,channel:v4_trades}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.max{$cluster_name,channel:v4_trades}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 12,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8728511752582676,
-            "definition": {
-              "title": "Initial GET Response Latency (v4_subaccounts)",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "95pct",
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "avg",
-                      "formula": "query2"
-                    },
-                    {
-                      "alias": "max",
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.initial_response_get.95percentile{$cluster_name,channel:v4_subaccounts}",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.avg{$cluster_name,channel:v4_subaccounts}",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    },
-                    {
-                      "query": "avg:socks.initial_response_get.max{$cluster_name,channel:v4_subaccounts}",
-                      "data_source": "metrics",
-                      "name": "query3"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 4,
-              "y": 12,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 4203524001537582,
-            "definition": {
-              "title": "Messages Received",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "time": {},
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query4"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.message_received_ping{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    },
-                    {
-                      "query": "avg:socks.message_received_subscribe{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:socks.message_received_unsubscribe{$Environment,$Service}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "warm",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 14,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3752846208191998,
-            "definition": {
-              "title": "Websocket Disconnects",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query4"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:socks.num_disconnects{$Environment,$Service} by {code,reason}.as_rate()",
-                      "data_source": "metrics",
-                      "name": "query4"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 14,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id":3716085033070512,
-            "definition":{
-               "title":"Socks Avg Message Time Since Received",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"auto",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "time":{
-                  
-               },
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "alias":"stateful order removal",
-                           "formula":"query2"
-                        },
-                        {
-                           "alias":"stateful order placement",
-                           "formula":"query1"
-                        },
-                        {
-                           "alias":"conditional order triggered",
-                           "formula":"query3"
-                        },
-                        {
-                           "alias":"short term order removal",
-                           "formula":"query4"
-                        },
-                        {
-                           "alias":"short term order placement",
-                           "formula":"query5"
-                        },
-                        {
-                           "alias":"short term order update",
-                           "formula":"query6"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "name":"query2",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:statefulorderremoval}"
-                        },
-                        {
-                           "name":"query1",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:statefulorderplacement}"
-                        },
-                        {
-                           "name":"query3",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:conditionalordertriggered}"
-                        },
-                        {
-                           "name":"query4",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:shorttermorderremoval}"
-                        },
-                        {
-                           "name":"query5",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:shorttermorderplacement}"
-                        },
-                        {
-                           "name":"query6",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.avg{$Environment,$Service, event_type:shorttermorderupdate}"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ],
-               "yaxis":{
-                  "include_zero":false
-               }
-            },
-            "layout":{
-               "x":0,
-               "y":16,
-               "width":4,
-               "height":2
-            }
-          },
-          {
-            "id":3841512914445306,
-            "definition":{
-               "title":"Socks 95% Message Time Since Received",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"auto",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "time":{
-                  
-               },
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "alias":"stateful order removal",
-                           "formula":"query2"
-                        },
-                        {
-                           "alias":"stateful order placement",
-                           "formula":"query1"
-                        },
-                        {
-                           "alias":"conditional order triggered",
-                           "formula":"query3"
-                        },
-                        {
-                           "alias":"short term order removal",
-                           "formula":"query4"
-                        },
-                        {
-                           "alias":"short term order placement",
-                           "formula":"query5"
-                        },
-                        {
-                           "alias":"short term order update",
-                           "formula":"query6"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "name":"query2",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:statefulorderremoval}"
-                        },
-                        {
-                           "name":"query1",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:statefulorderplacement}"
-                        },
-                        {
-                           "name":"query3",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:conditionalordertriggered}"
-                        },
-                        {
-                           "name":"query4",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:shorttermorderremoval}"
-                        },
-                        {
-                           "name":"query5",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:shorttermorderplacement}"
-                        },
-                        {
-                           "name":"query6",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.95percentile{$Environment,$Service, event_type:shorttermorderupdate}"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ],
-               "yaxis":{
-                  "include_zero":false
-               }
-            },
-            "layout":{
-               "x":4,
-               "y":16,
-               "width":4,
-               "height":2
-            }
-          },
-          {
-            "id":8278143928290718,
-            "definition":{
-               "title":"Socks Max Message Time Since Received",
-               "title_size":"16",
-               "title_align":"left",
-               "show_legend":true,
-               "legend_layout":"auto",
-               "legend_columns":[
-                  "avg",
-                  "min",
-                  "max",
-                  "value",
-                  "sum"
-               ],
-               "time":{
-                  
-               },
-               "type":"timeseries",
-               "requests":[
-                  {
-                     "formulas":[
-                        {
-                           "alias":"stateful order removal",
-                           "formula":"query2"
-                        },
-                        {
-                           "alias":"stateful order placement",
-                           "formula":"query1"
-                        },
-                        {
-                           "alias":"conditional order triggered",
-                           "formula":"query3"
-                        },
-                        {
-                           "alias":"short term order removal",
-                           "formula":"query4"
-                        },
-                        {
-                           "alias":"short term order placement",
-                           "formula":"query5"
-                        },
-                        {
-                           "alias":"short term order update",
-                           "formula":"query6"
-                        }
-                     ],
-                     "queries":[
-                        {
-                           "name":"query2",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:statefulorderremoval}"
-                        },
-                        {
-                           "name":"query1",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:statefulorderplacement}"
-                        },
-                        {
-                           "name":"query3",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:conditionalordertriggered}"
-                        },
-                        {
-                           "name":"query4",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:shorttermorderremoval}"
-                        },
-                        {
-                           "name":"query5",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:shorttermorderplacement}"
-                        },
-                        {
-                           "name":"query6",
-                           "data_source":"metrics",
-                           "query":"avg:socks.message_time_since_received.max{$Environment,$Service, event_type:shorttermorderupdate}"
-                        }
-                     ],
-                     "response_format":"timeseries",
-                     "style":{
-                        "palette":"dog_classic",
-                        "line_type":"solid",
-                        "line_width":"normal"
-                     },
-                     "display_type":"line"
-                  }
-               ],
-               "yaxis":{
-                  "include_zero":false
-               }
-            },
-            "layout":{
-               "x":8,
-               "y":16,
-               "width":4,
-               "height":2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 72,
-        "width": 12,
-        "height": 15
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}
diff --git a/modules/indexer_dashboards/variables.tf b/modules/indexer_dashboards/variables.tf
deleted file mode 100644
index f8232d32..00000000
--- a/modules/indexer_dashboards/variables.tf
+++ /dev/null
@@ -1,22 +0,0 @@
-variable "indexer_services_variable_mapping" {
-  type = map(
-    object({
-      # Environment
-      environment = string
-
-      # Service name
-      service = string
-
-      # Cluster name for the indexer services
-      cluster_name = string
-
-      # ECS cluster name for the full node
-      ecs_cluster_name = string
-
-      # MSK cluster name
-      msk_cluster_name = string
-    })
-  )
-
-  description = "Map of variable name to preset values of variables used in indexer services."
-}
diff --git a/modules/indexer_dashboards/versions.tf b/modules/indexer_dashboards/versions.tf
deleted file mode 100644
index d41867e6..00000000
--- a/modules/indexer_dashboards/versions.tf
+++ /dev/null
@@ -1,10 +0,0 @@
-terraform {
-  required_providers {
-    datadog = {
-      source  = "DataDog/datadog"
-      version = "~> 3.29"
-    }
-  }
-
-  required_version = "~> 1.3.2"
-}
diff --git a/modules/indexer_dashboards/vulcan_dashboard.tf b/modules/indexer_dashboards/vulcan_dashboard.tf
deleted file mode 100644
index 7bfafa86..00000000
--- a/modules/indexer_dashboards/vulcan_dashboard.tf
+++ /dev/null
@@ -1,1813 +0,0 @@
-resource "datadog_dashboard_json" "vulcan" {
-  dashboard = <<EOF
-{
-  "title": "V4 Indexer Vulcan",
-  "description": "",
-  "widgets": [
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Vulcan",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 4990642480582282,
-            "definition": {
-              "title": "CPU Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.cpu.percent{task_name:*vulcan-task,$cluster_name,container_name:*vulcan-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5535428031972446,
-            "definition": {
-              "title": "Mem Usage - Per Container",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:ecs.fargate.mem.rss{task_name:*vulcan-task,$cluster_name,container_name:*vulcan-service-container} by {task_name,container_id}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2143842224796494,
-            "definition": {
-              "title": "Running Instances",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "min:aws.ecs.service.running{cluster:$cluster_name.value,v4service:vulcan}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 6799018071117473,
-      "definition": {
-        "title": "Kafka",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 5790017990948222,
-            "definition": {
-              "title": "Max Offset Lag",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "max:aws.kafka.max_offset_lag{consumer_group:vulcan,$msk_cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8713395057313654,
-            "definition": {
-              "title": "Message Time In Queue",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "max:vulcan.message_time_in_queue.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "max:vulcan.message_time_in_queue.95percentile{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "max:vulcan.message_time_in_queue.max{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1289757450147340,
-            "definition": {
-              "title": "Message Stats",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "horizontal",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "alias": "total msgs received in last min",
-                      "style": {
-                        "palette_index": 1,
-                        "palette": "classic"
-                      },
-                      "formula": "query1"
-                    },
-                    {
-                      "alias": "empty msgs received in last min",
-                      "style": {
-                        "palette_index": 4,
-                        "palette": "warm"
-                      },
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "query": "avg:vulcan.received_kafka_message{$Environment,$Service}.as_count().rollup(avg, 60)",
-                      "data_source": "metrics",
-                      "name": "query1"
-                    },
-                    {
-                      "query": "avg:vulcan.empty_kafka_message{$Environment,$Service}.rollup(avg, 60)",
-                      "data_source": "metrics",
-                      "name": "query2"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 8,
-              "y": 0,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 750613763910334,
-            "definition": {
-              "title": "Partition Offset Lag",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "data_source": "metrics",
-                      "name": "query1",
-                      "query": "avg:aws.kafka.offset_lag{consumer_group:vulcan, $msk_cluster_name} by {partition}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "order_by": "values",
-                    "color_order": "shuffled",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ]
-            },
-            "layout": {
-              "x": 0,
-              "y": 2,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 3,
-        "width": 12,
-        "height": 5
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Processing Metrics",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 7986094966409234,
-            "definition": {
-              "title": "Overall Timing Per Update",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query3"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.max{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.95percentile{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5529526737223540,
-            "definition": {
-              "title": "Overall Rate of Updates",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:vulcan.processed_update.timing.count{$Environment,$Service,$cluster_name}.as_rate()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5214425847715280,
-            "definition": {
-              "title": "Total Time Spent Per Update Type",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1 * query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.avg{$Environment,$Service,$cluster_name} by {messagetype}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:vulcan.processed_update.timing.count{$Environment,$Service,$cluster_name} by {messagetype}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 6,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8097913084238316,
-            "definition": {
-              "title": "Flush websocket latency",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.timing.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.timing.95percentile{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.timing.max{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5162583186058608,
-            "definition": {
-              "title": "Flush websocket message batch size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.size.avg{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.size.95percentile{$Environment,$Service,$cluster_name}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.flush_websocket.size.max{$Environment,$Service,$cluster_name}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 8,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Order Place",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 1327422510394566,
-            "definition": {
-              "title": "Order Place Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.avg{$Environment,$Service,$cluster_name,messagetype:orderplace}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.95percentile{$Environment,$Service,$cluster_name,messagetype:orderplace}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.max{$Environment,$Service,$cluster_name,messagetype:orderplace}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 11,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8026213644553916,
-            "definition": {
-              "title": "Order Place Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:vulcan.processed_update.timing.count{$Environment,$Service,$cluster_name,messagetype:orderplace}.as_rate()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 11,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 7322186465820558,
-            "definition": {
-              "title": "Update Order Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:place_order_cache_update}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:place_order_cache_update}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:place_order_cache_update}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 11,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8541277752606820,
-            "definition": {
-              "title": "Update Orderbook Levels Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:update_price_level}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:update_price_level}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderplacehandler,fnname:update_price_level}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 13,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Order Remove",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 8622086620358788,
-            "definition": {
-              "title": "Order Remove Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.avg{$Environment,$Service,$cluster_name,messagetype:orderremove}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.95percentile{$Environment,$Service,$cluster_name,messagetype:orderremove}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.max{$Environment,$Service,$cluster_name,messagetype:orderremove}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 16,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5036382829855140,
-            "definition": {
-              "title": "Order Remove Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:vulcan.processed_update.timing.count{$Environment,$Service,$cluster_name,messagetype:orderremove}.as_rate()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 16,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8098893349382624,
-            "definition": {
-              "title": "Update Order Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:remove_order}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:remove_order}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:remove_order}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 16,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2943131632021642,
-            "definition": {
-              "title": "Update Postgres Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:cancel_order_in_postgres}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:cancel_order_in_postgres}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:cancel_order_in_postgres}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 18,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 1521543023370678,
-            "definition": {
-              "title": "Update Orderbook Levels Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:update_price_level_cache}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:update_price_level_cache}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderremovehandler,fnname:update_price_level_cache}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 18,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Order Update",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 1718743095879270,
-            "definition": {
-              "title": "Order Update Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.avg{$Environment,$Service,$cluster_name,messagetype:orderupdate}"
-                    },
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.95percentile{$Environment,$Service,$cluster_name,messagetype:orderupdate}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.processed_update.timing.max{$Environment,$Service,$cluster_name,messagetype:orderupdate}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 8439377482246760,
-            "definition": {
-              "title": "Order Update Rate",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "sum:vulcan.processed_update.timing.count{$Environment,$Service,$cluster_name,messagetype:orderupdate}.as_rate()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 5815845323322498,
-            "definition": {
-              "title": "Update Order Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_order_cache_update}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_order_cache_update}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_order_cache_update}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 21,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 6980289889102320,
-            "definition": {
-              "title": "Update Orderbook Levels Cache Timing",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query2"
-                    },
-                    {
-                      "formula": "query1"
-                    },
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query2",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.avg{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_price_level}"
-                    },
-                    {
-                      "name": "query1",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.95percentile{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_price_level}"
-                    },
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.generic_function.timing.max{$Environment,$Service,$cluster_name,classname:orderupdatehandler,fnname:update_price_level}"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "line"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 23,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      }
-    },
-    {
-      "id": 3519142303443504,
-      "definition": {
-        "title": "Invalid Messages",
-        "show_title": true,
-        "type": "group",
-        "layout_type": "ordered",
-        "widgets": [
-          {
-            "id": 6787615124723576,
-            "definition": {
-              "title": "Order Updates for Non-existent Orders",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.order_update_order_does_not_exist{$Environment}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 26,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 284124667782840,
-            "definition": {
-              "title": "Order Updates Previous Total Filled Exceeds Size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.order_update_old_total_filled_exceeds_size{$Environment}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 4,
-              "y": 26,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 3323582301264028,
-            "definition": {
-              "title": "Order Updates Updated Total Filled Exceeds Size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.order_update_total_filled_exceeds_size{$Environment}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 8,
-              "y": 26,
-              "width": 4,
-              "height": 2
-            }
-          },
-          {
-            "id": 2579194859254922,
-            "definition": {
-              "title": "Order Updates Replaced Order Total Filled Exceeds Size",
-              "title_size": "16",
-              "title_align": "left",
-              "show_legend": true,
-              "legend_layout": "auto",
-              "legend_columns": [
-                "avg",
-                "min",
-                "max",
-                "value",
-                "sum"
-              ],
-              "type": "timeseries",
-              "requests": [
-                {
-                  "formulas": [
-                    {
-                      "formula": "query3"
-                    }
-                  ],
-                  "queries": [
-                    {
-                      "name": "query3",
-                      "data_source": "metrics",
-                      "query": "avg:vulcan.order_place_total_filled_exceeds_size{$Environment}.as_count()"
-                    }
-                  ],
-                  "response_format": "timeseries",
-                  "style": {
-                    "palette": "dog_classic",
-                    "line_type": "solid",
-                    "line_width": "normal"
-                  },
-                  "display_type": "bars"
-                }
-              ],
-              "yaxis": {
-                "include_zero": false,
-                "scale": "log"
-              }
-            },
-            "layout": {
-              "x": 0,
-              "y": 28,
-              "width": 4,
-              "height": 2
-            }
-          }
-        ]
-      },
-      "layout": {
-        "x": 0,
-        "y": 32,
-        "width": 12,
-        "height": 31
-      }
-    }
-  ],
-  "template_variables": ${jsonencode(local.template_variables)},
-  "template_variable_presets": ${jsonencode(local.template_variable_presets)},
-  "reflow_type": "fixed",
-  "layout_type": "ordered",
-  "notify_list": [],
-  "tags": [
-    "team:v4-indexer"
-  ]
-}
-EOF
-}

From 106d9e958f339bbb498c622127008c9248dd6141 Mon Sep 17 00:00:00 2001
From: roy-dydx <133032749+roy-dydx@users.noreply.github.com>
Date: Mon, 30 Sep 2024 16:59:29 -0400
Subject: [PATCH 23/25] Add variable for full_node root_block_device_size
 (#141)

* Update full_node_ap_northeast_1.tf

* Update variables.tf

From 105efcef042812b2f5d46a39a661ade398276eb6 Mon Sep 17 00:00:00 2001
From: dydxwill <119354122+dydxwill@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:48:01 -0400
Subject: [PATCH 24/25] set log retention hours to 120 (#142)

---
 indexer/msk.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indexer/msk.tf b/indexer/msk.tf
index b3d75f7f..55c05d95 100644
--- a/indexer/msk.tf
+++ b/indexer/msk.tf
@@ -20,6 +20,7 @@ resource "aws_msk_configuration" "main" {
   unclean.leader.election.enable=true
   zookeeper.session.timeout.ms=6000
   replica.selector.class = org.apache.kafka.common.replica.RackAwareReplicaSelector
+  log.retention.hours = 120
   PROPERTIES
 
   lifecycle {

From 239a52aec5c4697dcb6c4277af07f984cffcd3ab Mon Sep 17 00:00:00 2001
From: dydxwill <119354122+dydxwill@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:08:07 -0400
Subject: [PATCH 25/25] add default (#143)

---
 indexer/variables.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indexer/variables.tf b/indexer/variables.tf
index d822628c..b8981d62 100644
--- a/indexer/variables.tf
+++ b/indexer/variables.tf
@@ -119,6 +119,7 @@ variable "rds_db_instance_class" {
 variable "rds_db_allocated_storage_gb" {
   type        = number
   description = "Storage allocated to the Postgres RDS DB in GB"
+  default     = 1000
 }
 
 variable "rds_read_replica_db_allocated_storage_gb" {