Add nf.app/nf.cluster as default tag for all cw metrics (#597)

Add nf.app/nf.cluster as default tag with value "cloudwatch" for all cw metrics (stream + polled), if no mapper defined. The existing test covers no regression for elb/asg metrics. This is useful to allow for scoping expressions narrowly to an app with cw data rather than having broad queries that could come from any app.
Netflix-Skunkworks · Oct 28, 2024 · f8be43f · f8be43f
1 parent b370c42
commit f8be43f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 16 deletions.
diff --git a/atlas-cloudwatch/src/main/scala/com/netflix/atlas/cloudwatch/NetflixTagger.scala b/atlas-cloudwatch/src/main/scala/com/netflix/atlas/cloudwatch/NetflixTagger.scala
@@ -36,13 +36,20 @@ class NetflixTagger(config: Config) extends DefaultTagger(config) {
   override def apply(dimensions: List[Dimension]): Map[String, String] = {
     val baseTags = super.apply(dimensions)
     val extractedTags = keys.flatMap { k =>
-      baseTags.get(k).map { v =>
-        val name = Names.parseName(v)
-        List(
-          opt("nf.app", name.getApp),
-          opt("nf.cluster", name.getCluster),
-          opt("nf.stack", name.getStack)
-        ).flatten
+      baseTags.get(k) match {
+        case Some(v) =>
+          val name = Names.parseName(v)
+          List(
+            opt("nf.app", name.getApp),
+            opt("nf.cluster", name.getCluster),
+            opt("nf.stack", name.getStack)
+          )
+        case None =>
+          // If baseTags.get(k) is empty, add default values
+          List(
+            Some("nf.app"     -> "cloudwatch"),
+            Some("nf.cluster" -> "cloudwatch")
+          )
       }
     }
     extractedTags.flatten.toMap ++ baseTags

diff --git a/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CWMPProcessSuite.scala b/atlas-cloudwatch/src/test/scala/com/netflix/atlas/cloudwatch/CWMPProcessSuite.scala
@@ -188,7 +188,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "statistic"    -> "count",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "rate"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "rate",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           0.31666666666666665
@@ -199,7 +201,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "statistic"    -> "totalAmount",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "rate"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "rate",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           0.65
@@ -210,7 +214,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "statistic"    -> "max",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "gauge"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "gauge",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           7.0
@@ -343,7 +349,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.max",
             "aws.tag"      -> "Val",
             "nf.region"    -> "us-west-2",
-            "atlas.dstype" -> "gauge"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "gauge",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           4.1320470343685605
@@ -380,7 +388,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.offset",
             "aws.tag"      -> "Val",
             "nf.region"    -> "us-west-2",
-            "atlas.dstype" -> "gauge"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "gauge",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts(1.minute),
           1
@@ -412,7 +422,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.mono",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "rate"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "rate",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           1.0
@@ -440,7 +452,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.5min",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "rate"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "rate",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           0.0033333333333333335
@@ -575,7 +589,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.2rulematch",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "gauge"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "gauge",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           1
@@ -585,7 +601,9 @@ class CWMPProcessSuite extends BaseCloudWatchMetricsProcessorSuite {
             "name"         -> "aws.utm.2rulematch",
             "nf.region"    -> "us-west-2",
             "aws.tag"      -> "Val",
-            "atlas.dstype" -> "gauge"
+            "nf.app"       -> "cloudwatch",
+            "atlas.dstype" -> "gauge",
+            "nf.cluster"   -> "cloudwatch"
           ),
           ts,
           7