diff --git a/CHANGELOG.md b/CHANGELOG.md index 16a99d9133..cf7c7e3a63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ release. ([#1132](https://github.com/open-telemetry/opentelemetry-demo/pull/1132)) * update dependent components to latest versions ([#1146](https://github.com/open-telemetry/opentelemetry-demo/pull/1146)) +* [prometheus] Enabled support for the OTLP write receiver + ([#1149](https://github.com/open-telemetry/opentelemetry-demo/pull/1149)) ## 1.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 418ee437ee..ab162f5639 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -616,6 +616,7 @@ services: - "/jaeger/ui" - "--prometheus.server-url" - "http://${PROMETHEUS_ADDR}" + - "--prometheus.query.support-spanmetrics-connector=true" deploy: resources: limits: @@ -680,6 +681,7 @@ services: - --web.enable-lifecycle - --web.route-prefix=/ - --enable-feature=exemplar-storage + - --enable-feature=otlp-write-receiver volumes: - ./src/prometheus/prometheus-config.yaml:/etc/prometheus/prometheus-config.yaml deploy: diff --git a/src/otelcollector/otelcol-observability.yml b/src/otelcollector/otelcol-observability.yml index 9b7ebd7e2f..fb4b14646c 100644 --- a/src/otelcollector/otelcol-observability.yml +++ b/src/otelcollector/otelcol-observability.yml @@ -7,15 +7,14 @@ exporters: endpoint: "jaeger:4317" tls: insecure: true - prometheus: - endpoint: "otelcol:9464" - resource_to_telemetry_conversion: - enabled: true - enable_open_metrics: true + otlphttp/prometheus: + endpoint: "http://prometheus:9090/api/v1/otlp" + tls: + insecure: true service: pipelines: traces: exporters: [otlp, logging, spanmetrics] metrics: - exporters: [prometheus, logging] + exporters: [otlphttp/prometheus, logging]