diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml index 61e9170148c..0f79258024a 100644 --- a/docker-compose/monitor/docker-compose.yml +++ b/docker-compose/monitor/docker-compose.yml @@ -17,6 +17,7 @@ services: - PROMETHEUS_QUERY_NORMALIZE_DURATION=true ports: - "16686:16686" + otel_collector: networks: - backend @@ -26,6 +27,9 @@ services: command: --config /etc/otelcol/otel-collector-config.yml depends_on: - jaeger + ports: + - "8889:8889" + microsim: networks: - backend @@ -36,6 +40,7 @@ services: - OTEL_EXPORTER_OTLP_INSECURE=true depends_on: - otel_collector + prometheus: networks: - backend @@ -44,6 +49,7 @@ services: - "./prometheus.yml:/etc/prometheus/prometheus.yml" ports: - "9090:9090" + grafana: networks: - backend @@ -56,7 +62,7 @@ services: - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - GF_AUTH_DISABLE_LOGIN_FORM=true ports: - - 3000:3000 + - "3000:3000" networks: backend: diff --git a/docker-compose/monitor/otel-collector-config-connector.yml b/docker-compose/monitor/otel-collector-config-connector.yml index 038f5f86c29..72d577d4321 100644 --- a/docker-compose/monitor/otel-collector-config-connector.yml +++ b/docker-compose/monitor/otel-collector-config-connector.yml @@ -1,9 +1,4 @@ receivers: - jaeger: - protocols: - thrift_http: - endpoint: "0.0.0.0:14278" - otlp: protocols: grpc: @@ -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]