From 155c8e8d279e0e1fce1d33e3944f8ed4f6369cc1 Mon Sep 17 00:00:00 2001
From: Dmitrii Anoshin <anoshindx@gmail.com>
Date: Tue, 7 Feb 2023 12:53:30 -0800
Subject: [PATCH] Add fluentforward receiver in ECS/EC2 default config (#2537)

Enable fluentforward receiver in the default ECS/EC2 configuration so users with [docker logging driver](https://docs.docker.com/config/containers/logging/fluentd/) can easily forward their logs through the collector
---
 cmd/otelcol/Dockerfile                           | 2 +-
 cmd/otelcol/config/collector/ecs_ec2_config.yaml | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cmd/otelcol/Dockerfile b/cmd/otelcol/Dockerfile
index 29496ae5fcd..44ffc9f318c 100644
--- a/cmd/otelcol/Dockerfile
+++ b/cmd/otelcol/Dockerfile
@@ -68,4 +68,4 @@ COPY --chown=999 config/collector/ecs_ec2_config.yaml /etc/otel/collector/ecs_ec
 
 USER splunk-otel-collector
 ENTRYPOINT ["/otelcol"]
-EXPOSE 13133 14250 14268 4317 4318 6060 8888 9411 9443 9080
+EXPOSE 13133 14250 14268 4317 4318 6060 8006 8888 9411 9443 9080
diff --git a/cmd/otelcol/config/collector/ecs_ec2_config.yaml b/cmd/otelcol/config/collector/ecs_ec2_config.yaml
index b7a9eb7092e..2b0aee010c2 100644
--- a/cmd/otelcol/config/collector/ecs_ec2_config.yaml
+++ b/cmd/otelcol/config/collector/ecs_ec2_config.yaml
@@ -25,6 +25,9 @@ extensions:
     size_mib: ${SPLUNK_BALLAST_SIZE_MIB}
 
 receivers:
+  # The fluentforward receiver can be used to forward logs from the Docker fluentd logging driver.
+  fluentforward:	
+    endpoint: 0.0.0.0:8006
   hostmetrics:
     collection_interval: 10s
     scrapers:
@@ -153,7 +156,7 @@ service:
       processors: [memory_limiter, batch, filter, resourcedetection/internal]
       exporters: [signalfx]
     logs:
-      receivers: [otlp]
+      receivers: [otlp, fluentforward]
       processors:
         - memory_limiter
         - batch