Skip to content

Commit

Permalink
(prometheus) Add OTLP write support (open-telemetry#1149)
Browse files Browse the repository at this point in the history
  • Loading branch information
puckpuck authored and Dylan Myers committed Oct 25, 2023
1 parent 696cfab commit 375415f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@ services:
- "/jaeger/ui"
- "--prometheus.server-url"
- "http://${PROMETHEUS_ADDR}"
- "--prometheus.query.support-spanmetrics-connector=true"
deploy:
resources:
limits:
Expand Down Expand Up @@ -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:
Expand Down
11 changes: 5 additions & 6 deletions src/otelcollector/otelcol-observability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

0 comments on commit 375415f

Please sign in to comment.