Skip to content

Commit

Permalink
Clean-up
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <[email protected]>
  • Loading branch information
yurishkuro committed Jul 20, 2024
1 parent 176c332 commit 50e312c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
8 changes: 7 additions & 1 deletion docker-compose/monitor/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ services:
- PROMETHEUS_QUERY_NORMALIZE_DURATION=true
ports:
- "16686:16686"

otel_collector:
networks:
- backend
Expand All @@ -26,6 +27,9 @@ services:
command: --config /etc/otelcol/otel-collector-config.yml
depends_on:
- jaeger
ports:
- "8889:8889"

microsim:
networks:
- backend
Expand All @@ -36,6 +40,7 @@ services:
- OTEL_EXPORTER_OTLP_INSECURE=true
depends_on:
- otel_collector

prometheus:
networks:
- backend
Expand All @@ -44,6 +49,7 @@ services:
- "./prometheus.yml:/etc/prometheus/prometheus.yml"
ports:
- "9090:9090"

grafana:
networks:
- backend
Expand All @@ -56,7 +62,7 @@ services:
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
- GF_AUTH_DISABLE_LOGIN_FORM=true
ports:
- 3000:3000
- "3000:3000"

networks:
backend:
12 changes: 4 additions & 8 deletions docker-compose/monitor/otel-collector-config-connector.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
receivers:
jaeger:
protocols:
thrift_http:
endpoint: "0.0.0.0:14278"

otlp:
protocols:
grpc:
Expand All @@ -27,11 +22,12 @@ processors:
service:
pipelines:
traces:
receivers: [otlp, jaeger]
receivers: [otlp]
processors: [batch]
exporters: [spanmetrics, otlp]
# The exporter name in this pipeline must match the spanmetrics.metrics_exporter name.
# The receiver is just a dummy and never used; added to pass validation requiring at least one receiver in a pipeline.

# The metrics pipeline receives generated span metrics from 'spanmetrics' connector
# and pushes to Prometheus exporter, which makes them available for scraping on :8889.
metrics/spanmetrics:
receivers: [spanmetrics]
exporters: [prometheus]

0 comments on commit 50e312c

Please sign in to comment.