[ecs-ec2] Update default configs (#343)

* Update logging.yaml

* Update config.yaml

* Update CHANGELOG.md

otel-agent/ecs-ec2/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## OpenTelemtry-Agent
 
+### v0.0.31 / 2023-12-13
+* [FIX] fix config example files
+
 ### v0.0.31 / 2023-10-17
 * [FIX] log.file.path removal from coralogix exporter subsystem attributes
 

otel-agent/ecs-ec2/config.yaml

@@ -6,18 +6,26 @@ receivers:
       http:
         endpoint: "0.0.0.0:4318"
 
+  prometheus:
+    config:
+      scrape_configs:
+      - job_name: otel-collector-metrics
+        scrape_interval: 60s
+        static_configs:
+        - targets: ['localhost:8888']
+
   filelog:
     start_at: end
     include:
       - /hostfs/var/lib/docker/containers/*/*.log
 
     include_file_path: true
 
-    # add log.file.name to resource attributes
+    # add log.file.path to resource attributes
     operators:
       - type: move
-        from: attributes["log.file.name"]
-        to: resource["log.file.name"]
+        from: attributes["log.file.path"]
+        to: resource["log.file.path"]
 
   # add metrics
   awsecscontainermetricsd:
@@ -32,16 +40,7 @@ processors:
   ecsattributes:
     container_id:
       sources:
-        - "log.file.name"
-
-  # only allow logs with container.name label
-  filter/ecslogs:
-    logs:
-      include:
-        match_type: regexp
-        resource_attributes:
-          - key: aws.ecs.container.name
-            value: '.*'
+        - "log.file.path"
 
   transform/logs:
     error_mode: ignore
@@ -54,7 +53,13 @@ processors:
           - delete_key(attributes, "image.id")
 
   batch:
-
+
+  # otel-collector resource detection for collector
+  resourcedetection/otel-collector:
+    detectors: [ecs, ec2]
+    timeout: 2s
+    override: false
+
 exporters:
   logging:
   coralogix:
@@ -63,20 +68,28 @@ exporters:
     application_name: "$APP_NAME"
     subsystem_name: "$SUB_SYS"
     application_name_attributes:
+    - "aws.ecs.cluster"
+    - "aws.ecs.cluster.name"
     - "aws.ecs.task.definition.family"
     subsystem_name_attributes:
+    - "aws.ecs.container.name"
+    - "aws.ecs.docker.name"
     - "docker.name"
     timeout: 30s
+
+extensions:
+  health_check:
 
 service:
+  extensions:
+    - health_check
   pipelines:
     logs:
       receivers: 
         - filelog
       processors:
         - resourcedetection
         - ecsattributes
-        - filter/ecslogs
         - transform/logs
       exporters:
         - coralogix
@@ -95,4 +108,17 @@ service:
       processors:
         - batch
       exporters:
-        - coralogix
+        - coralogix
+
+    metrics/otel-collector:
+      receivers:
+        - prometheus
+      processors:
+        - resourcedetection/otel-collector
+      exporters:
+        - coralogix
+
+  telemetry:
+    metrics:
+      address: 0.0.0.0:8888
+      level: detailed

otel-agent/ecs-ec2/logging.yaml

@@ -1,16 +1,31 @@
 receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: "0.0.0.0:4317"
+      http:
+        endpoint: "0.0.0.0:4318"
+
+  prometheus:
+    config:
+      scrape_configs:
+      - job_name: otel-collector-metrics
+        scrape_interval: 60s
+        static_configs:
+        - targets: ['localhost:8888']
+
   filelog:
     start_at: end
     include:
       - /hostfs/var/lib/docker/containers/*/*.log
 
     include_file_path: true
 
-    # add log.file.name to resource attributes
+    # add log.file.path to resource attributes
     operators:
       - type: move
-        from: attributes["log.file.name"]
-        to: resource["log.file.name"]
+        from: attributes["log.file.path"]
+        to: resource["log.file.path"]
 
 processors:
   resourcedetection:
@@ -20,22 +35,9 @@ processors:
     override: false
 
   ecsattributes:
-    attributes:
-      - ^image$
-      - ^aws.*
-      - ^labels.*
     container_id:
       sources:
-        - "log.file.name"
-
-  # only allow logs with container.name label
-  filter/ecslogs:
-    logs:
-      include:
-        match_type: regexp
-        resource_attributes:
-          - key: aws.ecs.container.name
-            value: .*
+        - "log.file.path"
 
   transform/logs:
     error_mode: ignore
@@ -44,29 +46,66 @@ processors:
         statements:
           - set(attributes["cx_container_id"], attributes["docker.id"])
           - set(attributes["aws_ecs_task_family"], attributes["aws.ecs.task.definition.family"])
-
+          - set(attributes["image_id"], attributes["image.id"])
+          - delete_key(attributes, "image.id")
+
+  # otel-collector resource detection for collector
+  resourcedetection/otel-collector:
+    detectors: [ecs, ec2]
+    timeout: 2s
+    override: false
+
 exporters:
+  logging:
+    verbosity: detailed
   coralogix:
     domain: "$CORALOGIX_DOMAIN"
     private_key: "$PRIVATE_KEY"
     application_name: "$APP_NAME"
     subsystem_name: "$SUB_SYS"
     application_name_attributes:
+    - "aws.ecs.cluster"
+    - "aws.ecs.cluster.name"
     - "aws.ecs.task.definition.family"
     subsystem_name_attributes:
+    - "aws.ecs.container.name"
+    - "aws.ecs.docker.name"
     - "docker.name"
     timeout: 30s
 
+extensions:
+  health_check:
+
 service:
+  extensions:
+    - health_check
+
   pipelines:
     logs:
       receivers: 
         - filelog
       processors:
         - resourcedetection
         - ecsattributes
-        - filter/ecslogs
         - transform/logs
       exporters:
         - coralogix
 
+    traces:
+      receivers:
+        - otlp
+      exporters:
+        - coralogix
+
+    metrics/otel-collector:
+      receivers:
+        - prometheus
+      processors:
+        - resourcedetection/otel-collector
+      exporters:
+        - coralogix
+
+  telemetry:
+    metrics:
+      address: 0.0.0.0:8888
+      level: detailed