From 04e81ece29bb2cb70d71c5a155f73bad256f5b2c Mon Sep 17 00:00:00 2001
From: Stuart Auld <sja@marsupialmusic.net>
Date: Wed, 30 Oct 2024 09:05:20 +1100
Subject: [PATCH] feat(aws): add support for metric filters

---
 .../modules/cloud-integrations/aws/main.tf     | 18 ++++++++++++++++++
 .../cloud-integrations/aws/variables.tf        | 12 ++++++++++++
 .../cloud_integrations_guide.html.markdown     | 14 ++++++++++----
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/examples/modules/cloud-integrations/aws/main.tf b/examples/modules/cloud-integrations/aws/main.tf
index 865761485..7e5776756 100644
--- a/examples/modules/cloud-integrations/aws/main.tf
+++ b/examples/modules/cloud-integrations/aws/main.tf
@@ -191,6 +191,24 @@ resource "aws_cloudwatch_metric_stream" "newrelic_metric_stream" {
   role_arn      = aws_iam_role.metric_stream_to_firehose.arn
   firehose_arn  = aws_kinesis_firehose_delivery_stream.newrelic_firehose_stream.arn
   output_format = "opentelemetry0.7"
+
+  dynamic "exclude_filter" {
+    for_each = var.exclude_metric_filters
+
+    content {
+      namespace    = exclude_filter.key
+      metric_names = exclude_filter.value
+    }
+  }
+
+  dynamic "include_filter" {
+    for_each = var.include_metric_filters
+
+    content {
+      namespace    = include_filter.key
+      metric_names = include_filter.value
+    }
+  }
 }
 
 resource "newrelic_cloud_aws_link_account" "newrelic_cloud_integration_pull" {
diff --git a/examples/modules/cloud-integrations/aws/variables.tf b/examples/modules/cloud-integrations/aws/variables.tf
index aa8094544..378af7083 100644
--- a/examples/modules/cloud-integrations/aws/variables.tf
+++ b/examples/modules/cloud-integrations/aws/variables.tf
@@ -16,3 +16,15 @@ variable "name" {
   type    = string
   default = "production"
 }
+
+variable "exclude_metric_filters" {
+  description = "Map of exclusive metric filters. Use the namespace as the key and the list of metric names as the value."
+  type        = map(list(string))
+  default     = {}
+}
+
+variable "include_metric_filters" {
+  description = "Map of inclusive metric filters. Use the namespace as the key and the list of metric names as the value."
+  type        = map(list(string))
+  default     = {}
+}
diff --git a/website/docs/guides/cloud_integrations_guide.html.markdown b/website/docs/guides/cloud_integrations_guide.html.markdown
index 9163eefd3..6c1427586 100644
--- a/website/docs/guides/cloud_integrations_guide.html.markdown
+++ b/website/docs/guides/cloud_integrations_guide.html.markdown
@@ -60,6 +60,11 @@ module "newrelic-aws-cloud-integrations" {
   newrelic_account_id     = 1234567
   newrelic_account_region = "US"
   name                    = "production"
+
+  include_metric_filters = {
+    "AWS/EC2" = [], # include ALL metrics from the EC2 namespace
+    "AWS/S3" = ["NumberOfObjects"]. # include just a specific metric from the S3 namespace
+  }
 }
 ```
 
@@ -68,10 +73,11 @@ module "newrelic-aws-cloud-integrations" {
 
 Variables:
 
-* newrelic_account_id: The New Relic account you want to link to AWS. This account will receive all the data observability from your AWS environment.
-* newrelic_account_region: The region of your New Relic account, this can be `US` for United States or `EU` for Europe. (Default `US`)
-* name: A unique name used throughout the module to name the resources.
-
+* `newrelic_account_id`: The New Relic account you want to link to AWS. This account will receive all the data observability from your AWS environment.
+* `newrelic_account_region` (Optional): The region of your New Relic account, this can be `US` for United States or `EU` for Europe. (Default `US`)
+* `name` (Optional): A unique name used throughout the module to name the resources. (Default `production`)
+* `exclude_metric_filters` (Optional): a map of namespaces and metric names to exclude from the Cloudwatch metric stream. `Conflicts with include_metric_filters`.
+* `include_metric_filters` (Optional): a map of namespaces and metric names to include in the Cloudwatch metric stream. `Conflicts with exclude_metric_filters`.
 
 ### Azure