fix: apply account/region to more metrics

lib/common/metric/MetricFactory.ts

@@ -273,6 +273,8 @@ export class MetricFactory {
         label,
         metric.color,
         metric.period,
+        this.getRegion(metric),
+        this.getAccount(metric),
       );
     }
   }
@@ -306,6 +308,8 @@ export class MetricFactory {
         label,
         metric.color,
         metric.period,
+        this.getRegion(metric),
+        this.getAccount(metric),
       );
     }
   }
@@ -361,6 +365,8 @@ export class MetricFactory {
             avgLabel,
             avgMetric.color,
             avgMetric.period,
+            this.getRegion(avgMetric),
+            this.getAccount(avgMetric),
           );
         }
         return avgMetric;
@@ -380,6 +386,8 @@ export class MetricFactory {
           perSecondLabel,
           metric.color,
           metric.period,
+          this.getRegion(metric),
+          this.getAccount(metric),
         );
       case RateComputationMethod.PER_MINUTE:
         return this.createMetricMath(
@@ -388,6 +396,8 @@ export class MetricFactory {
           `${labelPrefix}/m${labelAppendix}`,
           metric.color,
           metric.period,
+          this.getRegion(metric),
+          this.getAccount(metric),
         );
       case RateComputationMethod.PER_HOUR:
         return this.createMetricMath(
@@ -396,6 +406,8 @@ export class MetricFactory {
           `${labelPrefix}/h${labelAppendix}`,
           metric.color,
           metric.period,
+          this.getRegion(metric),
+          this.getAccount(metric),
         );
       case RateComputationMethod.PER_DAY:
         return this.createMetricMath(
@@ -404,6 +416,8 @@ export class MetricFactory {
           `${labelPrefix}/d${labelAppendix}`,
           metric.color,
           metric.period,
+          this.getRegion(metric),
+          this.getAccount(metric),
         );
     }
   }
@@ -480,6 +494,16 @@ export class MetricFactory {
 
     return;
   }
+  private getAccount(metric: MetricWithAlarmSupport): string | undefined {
+    let metricAccount: string | undefined;
+    if (metric instanceof MathExpression) {
+      metricAccount = metric.searchAccount;
+    } else {
+      metricAccount = metric.account;
+    }
+
+    return this.resolveAccount(metricAccount);
+  }
 
   /**
    * Attempts to get the region from the metric if it differs from the scope.
@@ -496,4 +520,14 @@ export class MetricFactory {
 
     return;
   }
+  private getRegion(metric: MetricWithAlarmSupport): string | undefined {
+    let metricRegion: string | undefined;
+    if (metric instanceof MathExpression) {
+      metricRegion = metric.searchRegion;
+    } else {
+      metricRegion = metric.region;
+    }
+
+    return this.resolveRegion(metricRegion);
+  }
 }

lib/monitoring/aws-dynamo/DynamoTableGlobalSecondaryIndexMetricFactory.ts

@@ -68,6 +68,8 @@ export class DynamoTableGlobalSecondaryIndexMetricFactory extends BaseMetricFact
         consumed_rcu_sum: this.table.metricConsumedReadCapacityUnits({
           statistic: MetricStatistic.SUM,
           dimensionsMap: this.dimensionsMap,
+          region: this.region,
+          account: this.account,
         }),
       },
       "Consumed",
@@ -81,6 +83,8 @@ export class DynamoTableGlobalSecondaryIndexMetricFactory extends BaseMetricFact
         consumed_wcu_sum: this.table.metricConsumedWriteCapacityUnits({
           statistic: MetricStatistic.SUM,
           dimensionsMap: this.dimensionsMap,
+          region: this.region,
+          account: this.account,
         }),
       },
       "Consumed",

lib/monitoring/aws-dynamo/DynamoTableMetricFactory.ts

@@ -72,6 +72,10 @@ export class DynamoTableMetricFactory extends BaseMetricFactory<DynamoTableMetri
         }),
       },
       ConsumedLabel,
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -86,6 +90,10 @@ export class DynamoTableMetricFactory extends BaseMetricFactory<DynamoTableMetri
         }),
       },
       ConsumedLabel,
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -97,6 +105,10 @@ export class DynamoTableMetricFactory extends BaseMetricFactory<DynamoTableMetri
         provisioned_read_cap: this.metricProvisionedReadCapacityUnits(),
       },
       "Utilization",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -108,6 +120,10 @@ export class DynamoTableMetricFactory extends BaseMetricFactory<DynamoTableMetri
         provisioned_write_cap: this.metricProvisionedWriteCapacityUnits(),
       },
       "Utilization",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -121,6 +137,10 @@ export class DynamoTableMetricFactory extends BaseMetricFactory<DynamoTableMetri
       },
       MetricStatistic.AVERAGE,
       DynamoDbNamespace,
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 

lib/monitoring/aws-kinesis/KinesisFirehoseMetricFactory.ts

@@ -151,6 +151,10 @@ export class KinesisFirehoseMetricFactory extends BaseMetricFactory<KinesisFireh
         bytes_max: this.metricBytesPerSecondLimit(),
       },
       "Incoming Bytes / Limit",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -162,6 +166,10 @@ export class KinesisFirehoseMetricFactory extends BaseMetricFactory<KinesisFireh
         records_max: this.metricRecordsPerSecondLimit(),
       },
       "Incoming Records / Limit",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -173,6 +181,10 @@ export class KinesisFirehoseMetricFactory extends BaseMetricFactory<KinesisFireh
         requests_max: this.metricPutRequestsPerSecondLimit(),
       },
       "Incoming PutRequests / Limit",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 

lib/monitoring/aws-lambda/LambdaFunctionEnhancedMetricFactory.ts

@@ -89,6 +89,8 @@ export class LambdaFunctionEnhancedMetricFactory extends BaseMetricFactory<Lambd
     return this.metricFactory.adaptMetric(
       this.lambdaFunction.metricDuration({
         statistic: MetricStatistic.SUM,
+        region: this.region,
+        account: this.account,
       }),
     );
   }

lib/monitoring/aws-lambda/LambdaFunctionMetricFactory.ts

@@ -77,6 +77,8 @@ export class LambdaFunctionMetricFactory extends BaseMetricFactory<LambdaFunctio
     return this.metricFactory.adaptMetric(
       this.lambdaFunction.metricInvocations({
         label: "Invocations",
+        region: this.region,
+        account: this.account,
       }),
     );
   }

lib/monitoring/aws-redshift/RedshiftClusterMetricFactory.ts

@@ -60,6 +60,10 @@ export class RedshiftClusterMetricFactory extends BaseMetricFactory<RedshiftClus
       "sQueryLatency90 / 1000",
       { sQueryLatency90 },
       "Short P90",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -73,6 +77,10 @@ export class RedshiftClusterMetricFactory extends BaseMetricFactory<RedshiftClus
       "mQueryLatency90 / 1000",
       { mQueryLatency90 },
       "Medium P90",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -86,6 +94,10 @@ export class RedshiftClusterMetricFactory extends BaseMetricFactory<RedshiftClus
       "lQueryLatency90 / 1000",
       { lQueryLatency90 },
       "Long P90",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -104,6 +116,10 @@ export class RedshiftClusterMetricFactory extends BaseMetricFactory<RedshiftClus
       "readLatency * 1000",
       { readLatency },
       "Read P90",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -118,6 +134,10 @@ export class RedshiftClusterMetricFactory extends BaseMetricFactory<RedshiftClus
       "writeLatency * 1000",
       { writeLatency },
       "Write P90",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 

lib/monitoring/aws-sqs/SqsQueueMetricFactory.ts

@@ -79,6 +79,10 @@ export class SqsQueueMetricFactory extends BaseMetricFactory<SqsQueueMetricFacto
         productionVolume: this.metricIncomingMessageCount(),
       },
       "Production TPS (avg: ${AVG}, max: ${MAX})",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -89,6 +93,10 @@ export class SqsQueueMetricFactory extends BaseMetricFactory<SqsQueueMetricFacto
         consumptionVolume: this.metricDeletedMessageCount(),
       },
       "Consumption TPS (avg: ${AVG}, max: ${MAX})",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 
@@ -103,6 +111,10 @@ export class SqsQueueMetricFactory extends BaseMetricFactory<SqsQueueMetricFacto
         consumptionVolume: this.metricDeletedMessageCount(),
       },
       "Time to Drain (seconds) (avg: ${AVG}, max: ${MAX})",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 }

lib/monitoring/aws-step-functions/StepFunctionServiceIntegrationMetricFactory.ts

@@ -169,6 +169,9 @@ export class StepFunctionServiceIntegrationMetricFactory extends BaseMetricFacto
       this.dimensionsMap,
       undefined,
       Namespace,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 

lib/monitoring/aws-wafv2/WafV2MetricFactory.ts

@@ -73,6 +73,10 @@ export class WafV2MetricFactory extends BaseMetricFactory<WafV2MetricFactoryProp
         blocked: this.metricBlockedRequests(),
       },
       "Blocked (rate)",
+      undefined,
+      undefined,
+      this.region,
+      this.account,
     );
   }
 }