From 24a629c2e2374b61d6ed344a5dc5695df33b0657 Mon Sep 17 00:00:00 2001
From: Rayhan Hossain <hossain.rayhan@outlook.com>
Date: Tue, 16 Nov 2021 13:24:17 -0800
Subject: [PATCH] Update ecs default config for CloudWatch

Signed-off-by: Rayhan Hossain <hossain.rayhan@outlook.com>
---
 config/ecs/ecs-cloudwatch.yaml | 110 ++++++---------------------------
 1 file changed, 18 insertions(+), 92 deletions(-)

diff --git a/config/ecs/ecs-cloudwatch.yaml b/config/ecs/ecs-cloudwatch.yaml
index 2269baa42c..2bee518e04 100644
--- a/config/ecs/ecs-cloudwatch.yaml
+++ b/config/ecs/ecs-cloudwatch.yaml
@@ -20,116 +20,46 @@ processors:
       - ec2
   resource:
     attributes:
-      - key: ClusterName
-        from_attribute: aws.ecs.cluster.name
-        action: insert
-      - key: aws.ecs.cluster.name
-        action: delete
-      - key: ServiceName
-        from_attribute: aws.ecs.service.name
-        action: insert
-      - key: aws.ecs.service.name
-        action: delete
-      - key: TaskId
-        from_attribute: aws.ecs.task.id
-        action: insert
-      - key: aws.ecs.task.id
-        action: delete
       - key: TaskDefinitionFamily
         from_attribute: aws.ecs.task.family
         action: insert
       - key: aws.ecs.task.family
         action: delete
-      - key: TaskARN
-        from_attribute: aws.ecs.task.arn
+      - key: InstanceId
+        from_attribute: host.id
         action: insert
-      - key: aws.ecs.task.arn
+      - key: host.id
         action: delete
-      - key: DockerName
-        from_attribute: aws.ecs.docker.name
-        action: insert
-      - key: aws.ecs.docker.name
+      - key: aws.ecs.task.arn
         action: delete
-      - key: TaskDefinitionRevision
-        from_attribute: aws.ecs.task.version
-        action: insert
-      - key: aws.ecs.task.version
+      - key: aws.ecs.task.revision
         action: delete
-      - key: PullStartedAt
-        from_attribute: aws.ecs.task.pull_started_at
-        action: insert
-      - key: aws.ecs.task.pull_started_at
+      - key: aws.ecs.launchtype
         action: delete
-      - key: PullStoppedAt
-        from_attribute: aws.ecs.task.pull_stopped_at
-        action: insert
-      - key: aws.ecs.task.pull_stopped_at
+      - key: aws.ecs.cluster.arn
         action: delete
-      - key: AvailabilityZone
-        from_attribute: cloud.zone
-        action: insert
-      - key: cloud.zone
-        action: delete
-      - key: LaunchType
-        from_attribute: aws.ecs.task.launch_type
-        action: insert
-      - key: aws.ecs.task.launch_type
+      - key: cloud.provider
         action: delete
-      - key: Region
-        from_attribute: cloud.region
-        action: insert
-      - key: cloud.region
+      - key: cloud.platform
         action: delete
-      - key: AccountId
-        from_attribute: cloud.account.id
-        action: insert
       - key: cloud.account.id
         action: delete
-      - key: DockerId
-        from_attribute: container.id
-        action: insert
-      - key: container.id
-        action: delete
-      - key: ContainerName
-        from_attribute: container.name
-        action: insert
-      - key: container.name
-        action: delete
-      - key: Image
-        from_attribute: container.image.name
-        action: insert
-      - key: container.image.name
+      - key: cloud.region
         action: delete
-      - key: ImageId
-        from_attribute: aws.ecs.container.image.id
-        action: insert
-      - key: aws.ecs.container.image.id
+      - key: cloud.availability_zone
         action: delete
-      - key: ExitCode
-        from_attribute: aws.ecs.container.exit_code
-        action: insert
-      - key: aws.ecs.container.exit_code
+      - key: aws.log.group.names
         action: delete
-      - key: CreatedAt
-        from_attribute: aws.ecs.container.created_at
-        action: insert
-      - key: aws.ecs.container.created_at
+      - key: aws.log.group.arns
         action: delete
-      - key: StartedAt
-        from_attribute: aws.ecs.container.started_at
-        action: insert
-      - key: aws.ecs.container.started_at
+      - key: aws.log.stream.names
         action: delete
-      - key: FinishedAt
-        from_attribute: aws.ecs.container.finished_at
-        action: insert
-      - key: aws.ecs.container.finished_at
+      - key: host.image.id
         action: delete
-      - key: ImageTag
-        from_attribute: container.image.tag
-        action: insert
-      - key: container.image.tag
+      - key: host.name
         action: delete
+      - key: host.name
+        action: host.type
 
 exporters:
   awsemf/application:
@@ -137,10 +67,6 @@ exporters:
     log_group_name: '/aws/ecs/application/metrics'
     resource_to_telemetry_conversion:
       enabled: true
-    dimension_rollup_option: NoDimensionRollup
-    metric_declarations:
-      - dimensions: [ [ TaskDefinitionFamily ] ]
-        metric_name_selectors: [.*]
 
 service:
   pipelines: