Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the Grafana dashboard and fix the Otel profile volume mounting #170

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Update the Grafana dashboard and fix the Otel profile volume mounting #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4161b8
Get on par with the current version of dashboards and otel-collector
lubosmj Sep 26, 2024
8096292
Make the S3 and otel profile mutually exclusive
lubosmj Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions profiles/opentelemetry_dev/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
version: "3.7"

services:

jaeger:
container_name: jaeger
image: jaegertracing/all-in-one:latest
Expand All @@ -11,23 +10,23 @@ services:
JAEGER_DISABLED: "true"
ports:
- "16686:16686"
- "14250"
- "14268"
- "4317"
- "14250:14250"
- "14268:14268"
- "4317:4317"

otel-collector:
container_name: otel-collector
image: otel/opentelemetry-collector
image: otel/opentelemetry-collector-contrib
command: [--config=/etc/otel-collector/otel-collector-config.yaml]
volumes:
- "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/otel-collector:/etc/otel-collector"
- "{OCI_ENV_DIR}/profiles/opentelemetry_dev/otel-collector:/etc/otel-collector"
ports:
- "1888" # pprof extension
- "8888" # Prometheus metrics exposed by the collector
- "8889" # Prometheus exporter metrics
- "13133" # health_check extension
- "4318" # OTLP http receiver
- "55679" # zpages extension
- "8888:8888" # Prometheus metrics exposed by the collector
- "8889:8889" # Prometheus exporter metrics
- "13133:13133" # health_check extension
- "4318:4318" # OTLP http receiver
- "55679:55679" # zpages extension
depends_on:
- prometheus
- jaeger
Expand All @@ -36,7 +35,7 @@ services:
container_name: prometheus
image: prom/prometheus
volumes:
- "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/prometheus:/etc/prometheus"
- "{OCI_ENV_DIR}/profiles/opentelemetry_dev/prometheus:/etc/prometheus"
ports:
- "9090:9090"

Expand All @@ -46,16 +45,13 @@ services:
- prometheus
restart: "always"
volumes:
- "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/provisioning:/etc/grafana/provisioning"
- "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/dashboards:/var/lib/grafana/dashboards"
- "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/config.ini:/etc/grafana/config.ini"
# - type: bind
# source: ./grafana/config.ini
# target: /etc/grafana/config.ini
- "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/provisioning:/etc/grafana/provisioning"
- "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/dashboards:/var/lib/grafana/dashboards"
- "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/config.ini:/etc/grafana/config.ini"
ports:
- "3000:3000"

networks:
default:
name: oci_env_default
external: "true"
external: true
Loading
Loading