diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md index 311fc10ca75..df8c30adb36 100644 --- a/docker-compose/monitor/README.md +++ b/docker-compose/monitor/README.md @@ -24,6 +24,45 @@ The following diagram illustrates the relationship between these components: ![SPM diagram](./diagram.png) +```mermaid +flowchart LR + SDK -->|traces| Receiver + Receiver --> MG + Receiver --> Batch + MG --> ExpMetrics + Batch --> ExpTraces + ExpMetrics -->|metrics| Prometheus[(Prometheus)] + ExpTraces -->|traces| Jaeger[Jaeger + Collector] + Prometheus -.-> JaegerUI + Jaeger --> Storage[(Storage)] + Storage -.-> JaegerUI[Jaeger + Query + and UI] + + style Prometheus fill:red,color:white + style Jaeger fill:blue,color:white + style JaegerUI fill:blue,color:white + style Storage fill:gray,color:white + + subgraph Application + SDK[OTel + SDK] + end + + subgraph OTEL[OTel Collector] + Receiver + Batch + MG[Span + Metrics + Connector] + ExpTraces[Traces + Exporter] + ExpMetrics[Metrics + Exporter] + end +``` + # Getting Started ## Quickstart @@ -160,7 +199,7 @@ quantile = 'quantile=' floatValue - The quantile to compute the latency 'P' value. Valid range (0,1]. - Mandatory for 'latencies' type. -groupByOperation = 'groupByOperation=' boolValue +groupByOperation = 'groupByOperation=' boolValue boolValue = '1' | 't' | 'T' | 'true' | 'TRUE' | 'True' | 0 | 'f' | 'F' | 'false' | 'FALSE' | 'False' - A boolean value which will determine if the metrics query will also group by operation. - Optional with default: false diff --git a/examples/hotrod/docker-compose.yml b/examples/hotrod/docker-compose.yml index db58cb2860d..8a0e2a90368 100644 --- a/examples/hotrod/docker-compose.yml +++ b/examples/hotrod/docker-compose.yml @@ -8,9 +8,14 @@ services: image: jaegertracing/all-in-one:${JAEGER_VERSION:-latest} ports: - "16686:16686" + - "4317:4317" - "4318:4318" environment: - LOG_LEVEL=debug + # Since v0.105 the OTEL Collector components default hostname to 'localhost'. + # However, that does not work inside a Docker container, so we listen on all IPs. + - COLLECTOR_OTLP_GRPC_HOST_PORT=0.0.0.0:4317 + - COLLECTOR_OTLP_HTTP_HOST_PORT=0.0.0.0:4318 networks: - jaeger-example hotrod: