@@ -263,39 +263,55 @@ services:
263263 # ----------------------------------------------------------------------------------------------
264264 # OTEL COLLECTOR - OpenTelemetry Collector
265265 # ----------------------------------------------------------------------------------------------
266+ # Supports dual ingestion: v1 (OTEL standard) and v2 (TelemetryFlow enhanced)
267+ #
268+ # OTLP HTTP Endpoints:
269+ # TelemetryFlow Platform (Recommended - TFO Standalone):
270+ # POST http://localhost:4318/v2/traces
271+ # POST http://localhost:4318/v2/metrics
272+ # POST http://localhost:4318/v2/logs
273+ #
274+ # OTEL Community (Backwards Compatible - OCB/Standard):
275+ # POST http://localhost:4318/v1/traces
276+ # POST http://localhost:4318/v1/metrics
277+ # POST http://localhost:4318/v1/logs
278+ #
279+ # gRPC (Both versions via same port): localhost:4317
280+ # ----------------------------------------------------------------------------------------------
266281 otel-collector :
267282 profiles : ["monitoring", "all"]
268283 platform : linux/amd64
269284 # =============================================================================
270- # OTEL Collector Community Contributor (Standard OTEL format)
271- # image: otel/opentelemetry -collector-contrib :${OTEL_VERSION:-0.142.0 }
272- # command: ["--config=/etc/otelcol-contrib/config .yaml"]
285+ # TelemetryFlow Collector (TFO-Collector) - Custom TFO format with OTLP support (v1.1.1+ )
286+ image : telemetryflow/telemetryflow -collector:${TFO_VERSION:-latest }
287+ # command: ["--config=/etc/tfo-collector/tfo-collector .yaml"]
273288 # =============================================================================
274289 # TelemetryFlow Collector OCB (TFO-Collector-OCB) - Standard OTEL format
275- image : telemetryflow/telemetryflow-collector-ocb:${OTEL_VERSION :-latest}
276- command : ["--config=/etc/tfo-collector/otel-collector.yaml"]
290+ # image: telemetryflow/telemetryflow-collector-ocb:${TFO_VERSION :-latest}
291+ # command: ["--config=/etc/tfo-collector/otel-collector.yaml"]
277292 # =============================================================================
278- # TelemetryFlow Collector (TFO-Collector) - Custom TFO format (OTLP not implemented yet )
279- # image: telemetryflow/telemetryflow -collector:${OTEL_VERSION:-latest }
280- # command: ["--config=/etc/tfo-collector/tfo-collector .yaml"]
293+ # OTEL Collector Community Contributor (Standard OTEL format )
294+ # image: otel/opentelemetry -collector-contrib :${OTEL_VERSION:-0.142.0 }
295+ # command: ["--config=/etc/otelcol-contrib/config .yaml"]
281296 # =============================================================================
282297 container_name : ${CONTAINER_OTEL:-telemetryflow_core_otel}
283298 restart : unless-stopped
284299 volumes :
285- # OTEL Collector Community Contributor config
286- # - ./config/otel/otel -collector.yaml:/etc/otelcol-contrib/config .yaml:ro
300+ # TelemetryFlow Collector config (Custom TFO format)
301+ - ./config/otel/tfo -collector.yaml:/etc/tfo-collector/tfo-collector .yaml:ro
287302 # =============================================================================
288303 # TelemetryFlow Collector OCB config (Standard OTEL format)
289- - ./config/otel/otel-collector.yaml:/etc/tfo-collector/otel-collector.yaml:ro
304+ # - ./config/otel/otel-collector.yaml:/etc/tfo-collector/otel-collector.yaml:ro
290305 # =============================================================================
291- # TelemetryFlow Collector config (Custom TFO format)
292- # - ./config/otel/tfo -collector.yaml:/etc/tfo-collector/tfo-collector .yaml:ro
306+ # OTEL Collector Community Contributor config (Standard OTEL format)
307+ # - ./config/otel/otel -collector.yaml:/etc/otelcol-contrib/config .yaml:ro
293308 ports :
294- - " ${PORT_OTEL_GRPC:-4317}:4317" # OTLP gRPC
295- - " ${PORT_OTEL_HTTP:-4318}:4318" # OTLP HTTP
309+ - " ${PORT_OTEL_GRPC:-4317}:4317" # OTLP gRPC (v1 & v2)
310+ - " ${PORT_OTEL_HTTP:-4318}:4318" # OTLP HTTP (v1 & v2)
296311 - " ${PORT_OTEL_METRICS:-8889}:8889" # Prometheus metrics
297312 - " ${PORT_OTEL_HEALTH:-13133}:13133" # Health check
298- - " ${PORT_OTEL_ZPAGES:-55679}:55679" # zPage
313+ - " ${PORT_OTEL_ZPAGES:-55679}:55679" # zPages
314+ - " ${PORT_OTEL_PPROF:-1777}:1777" # pprof
299315 healthcheck :
300316 test : ["CMD", "wget", "--spider", "-q", "http://localhost:13133"]
301317 interval : 10s
@@ -312,7 +328,7 @@ services:
312328 jaeger :
313329 profiles : ["monitoring", "all"]
314330 platform : linux/amd64
315- image : jaegertracing/jaeger:${JAEGER_VERSION:-2.2 .0}
331+ image : jaegertracing/jaeger:${JAEGER_VERSION:-2.13 .0}
316332 container_name : ${CONTAINER_JAEGER:-telemetryflow_core_jaeger}
317333 restart : unless-stopped
318334 ports :
0 commit comments