Merge pull request #81 from last9/rds-add-coalesce

add coalesce to associate single component with multiple services
last9 · May 18, 2022 · 275119f · 275119f
2 parents c94c6ea + 7f391e8
commit 275119f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/modules/aws/aurora_cloudwatch.hcl b/modules/aws/aurora_cloudwatch.hcl
@@ -22,7 +22,7 @@ ingester aws_aurora_cloudwatch module {
 
   data_for_graph_node {
     type = "aurora_instance_database"
-    name = "$input{DBInstanceIdentifier}-db"
+    name = "coalesce_on_interpolation(\"$input{DBInstanceIdentifier}-db-$input{custom_tag}\",\"$input{DBInstanceIdentifier}-db\")"
   }
 
   using = {

diff --git a/modules/aws/dynamodb_cloudwatch.hcl b/modules/aws/dynamodb_cloudwatch.hcl
@@ -22,7 +22,7 @@ ingester aws_dynamodb_table_operation_cloudwatch module {
 
   data_for_graph_node {
     type = "dynamodb_operation"
-    name = "$input{Operation}"
+    name = "coalesce_on_interpolation(\"$input{Operation}-$input{custom_tag}\",\"$input{Operation}\")"
   }
 
   using = {
@@ -32,11 +32,11 @@ ingester aws_dynamodb_table_operation_cloudwatch module {
   inputs = "$input{inputs}"
 
   input_query = <<-EOF
-    label_set(
-      label_replace(
-        dynamodb_table{$input{tag_filter}}, 'id=TableName'
-      ), "service", "$input{service}"
-    )
+  label_set(
+    label_replace(
+      dynamodb_table{$input{tag_filter}}, 'id=TableName'
+    ), "service", "$input{service}"
+  )
   EOF
 
   gauge "system_errors" {
@@ -144,7 +144,7 @@ ingester aws_dynamodb_table_cloudwatch module {
 
   data_for_graph_node {
     type = "dynamodb"
-    name = "$input{TableName}"
+    name = "coalesce_on_interpolation(\"$input{TableName}-$input{custom_tag}\",\"$input{TableName}\")"
   }
 
   using = {
@@ -154,11 +154,11 @@ ingester aws_dynamodb_table_cloudwatch module {
   inputs = "$input{inputs}"
 
   input_query = <<-EOF
-    label_set(
-      label_replace(
-        dynamodb_table{$input{tag_filter}}, 'id=TableName'
-      ), "service", "$input{service}"
-    )
+  label_set(
+    label_replace(
+      dynamodb_table{$input{tag_filter}}, 'id=TableName'
+    ), "service", "$input{service}"
+  )
   EOF
 
   gauge "rcu" {

diff --git a/modules/aws/elasticache_cloudwatch.hcl b/modules/aws/elasticache_cloudwatch.hcl
@@ -27,7 +27,7 @@ ingester aws_elasticache_cloudwatch module {
 
   data_for_graph_node {
     type = "elasticache_database"
-    name = "$input{CacheClusterId}-db"
+    name = "coalesce_on_interpolation(\"$input{CacheClusterId}-db-$input{custom_tag}\",\"$input{CacheClusterId}-db\")"
   }
 
   using = {

diff --git a/modules/aws/rds_cloudwatch.hcl b/modules/aws/rds_cloudwatch.hcl
@@ -22,7 +22,7 @@ ingester aws_rds_cloudwatch module {
 
   data_for_graph_node {
     type = "rds_database"
-    name = "$input{DBInstanceIdentifier}-db"
+    name = "coalesce_on_interpolation(\"$input{DBInstanceIdentifier}-db-$input{custom_tag}\",\"$input{DBInstanceIdentifier}-db\")"
   }
 
   using = {