Add support for AWS Account ID in s3 fast sync bucket

indexer/indexer_monitors.tf

@@ -11,4 +11,5 @@ module "indexer_monitors" {
   team                          = var.monitoring_team
   url                           = var.indexer_url
   enable_precautionary_monitors = var.enable_precautionary_monitors
+  aws_account_id                = var.monitoring_aws_account_id
 }

indexer/variables.tf

@@ -332,6 +332,12 @@ variable "monitoring_team" {
   default     = "v4-indexer"
 }
 
+variable "monitoring_aws_account_id" {
+  type        = string
+  description = "Account ID for the AWS account"
+  default     = ""
+}
+
 variable "enable_precautionary_monitors" {
   type        = bool
   description = "Whether to enable precautionary monitors"

modules/indexer_monitors/locals.tf

@@ -6,6 +6,7 @@ locals {
   tick_frequency         = 300  # 5 minutes
   retry_interval         = 3000 # 3 seconds in milliseconds
   retry_count            = 3    # 3 retries
+  snapshot_bucket_prefix = var.aws_account_id == "" ? var.environment : "${var.aws_account_id}-${var.environment}"
 
   api_http_synthetic_monitor_configurations = {
     "height" : {

modules/indexer_monitors/monitors.tf

@@ -198,7 +198,7 @@ resource "datadog_monitor_json" "fast_sync_snapshots" {
     "id": 131752782,
     "name": "[${var.environment}] Indexer fast sync snapshots haven't been uploaded in the last day",
     "type": "query alert",
-    "query": "sum(last_1d):sum:aws.s3.put_requests{bucketname:${var.environment}-full-node-snapshots}.as_count() < 1",
+    "query": "sum(last_1d):sum:aws.s3.put_requests{bucketname:${local.snapshot_bucket_prefix}-full-node-snapshots}.as_count() < 1",
     "message": "Indexer fast sync snapshots haven't been uploaded in the last day. Please investigate the snapshotting full node.\n\n${local.monitor_suffix_literal}",
     "tags": [
         "team:${var.team}",

modules/indexer_monitors/variables.tf

@@ -42,3 +42,8 @@ variable "enable_precautionary_monitors" {
   type        = bool
   description = "Whether to enable precautionary monitors"
 }
+
+variable "aws_account_id" {
+  type        = string
+  description = "Account ID for the AWS account"
+}