Fix Looking For Old Metrics For EKS Fargate Container Metrics (#436)

Author: sethAmazon

terraform/eks/container-insights-agent/config_map_fargate.yml

@@ -337,7 +337,7 @@ data:
             metric1: pod_network_rx_bytes
             metric2: pod_network_tx_bytes
             operation: add
-          - name: pod_memory_utilization_over_pod_limit
+          - name: pod_memory_utilization_over_pod_limit_${TestingId}
             unit: Percent
             type: calculate
             metric1: pod_memory_working_set
@@ -360,7 +360,7 @@ data:
 
       experimental_metricsgeneration/2:
         rules:
-          - name: pod_cpu_utilization_over_pod_limit
+          - name: pod_cpu_utilization_over_pod_limit_${TestingId}
             type: calculate
             unit: Percent
             metric1: pod_cpu_usage_total
@@ -420,8 +420,8 @@ data:
         metric_declarations:
           - dimensions: [ [ClusterName, LaunchType], [ClusterName, Namespace, LaunchType], [ClusterName, Namespace, PodName, LaunchType]]
             metric_name_selectors:
-              - pod_cpu_utilization_over_pod_limit
-              - pod_memory_utilization_over_pod_limit
+              - pod_cpu_utilization_over_pod_limit_${TestingId}
+              - pod_memory_utilization_over_pod_limit_${TestingId}
               - pod_memory_working_set
               - pod_memory_limit
               - pod_network_rx_bytes

terraform/eks/container_insights_agent.tf

@@ -66,8 +66,12 @@ resource "kubectl_manifest" "cluster_role_binding" {
 }
 
 resource "kubectl_manifest" "config_map" {
-  count      = 1
-  yaml_body  = var.deployment_type == "fargate" ? templatefile("./container-insights-agent/config_map_fargate.yml", { Namespace : tolist(aws_eks_fargate_profile.test_profile[count.index].selector)[0].namespace }) : data.template_file.config_map_file[count.index].rendered
+  count = 1
+  yaml_body = var.deployment_type == "fargate" ? templatefile("./container-insights-agent/config_map_fargate.yml",
+    {
+      Namespace : tolist(aws_eks_fargate_profile.test_profile[count.index].selector)[0].namespace,
+      TestingId : module.common.testing_id
+  }) : data.template_file.config_map_file[count.index].rendered
   depends_on = [aws_eks_fargate_profile.test_profile]
 }
 

validator/src/main/resources/expected-data-template/EKSFargateCWCIExpectedMetric.mustache

@@ -1,5 +1,5 @@
 -
-  metricName: pod_cpu_utilization_over_pod_limit
+  metricName: pod_cpu_utilization_over_pod_limit_{{testingId}}
   namespace: ContainerInsightsFargate
   dimensions:
     -
@@ -29,7 +29,7 @@
       name: LaunchType
       value: fargate
 -
-  metricName: pod_memory_utilization_over_pod_limit
+  metricName: pod_memory_utilization_over_pod_limit_{{testingId}}
   namespace: ContainerInsightsFargate
   dimensions:
     -
@@ -98,7 +98,7 @@
       name: Namespace
       value: SKIP
 -
-  metricName: pod_memory_utilization_over_pod_limit
+  metricName: pod_memory_utilization_over_pod_limit_{{testingId}}
   namespace: ContainerInsightsFargate
   dimensions:
     -
@@ -185,7 +185,7 @@
       name: PodName
       value: SKIP
 -
-  metricName: pod_memory_utilization_over_pod_limit
+  metricName: pod_memory_utilization_over_pod_limit_{{testingId}}
   namespace: ContainerInsightsFargate
   dimensions:
     -