From e3434704d0831da2022aa442662a80ebb49c535e Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Fri, 1 Nov 2024 09:56:21 +0100 Subject: [PATCH] Fix monitor example by aligning metrics namespace to new default Signed-off-by: Pavol Loffay --- docker-compose/monitor/README.md | 2 +- docker-compose/monitor/docker-compose.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md index df8c30adb36..d795114487f 100644 --- a/docker-compose/monitor/README.md +++ b/docker-compose/monitor/README.md @@ -78,7 +78,7 @@ docker compose up - Let the application run for a couple of minutes to ensure there is enough time series data to plot in the dashboard. - Navigate to Jaeger UI at http://localhost:16686/ and inspect the Monitor tab. Select `redis` service from the dropdown to see more than one endpoint. - To visualize the raw metrics stored on the Prometheus server (for debugging and local development use cases), a Grafana server is included in the docker-compose config, which is preconfigured to read metrics from the Prometheus server. - To access Grafana, navigate to http://localhost:3000/, click on the "Explore" and click the "Select metric" dropdown then select `calls_total`, for example. + To access Grafana, navigate to http://localhost:3000/, click on the "Explore" and click the "Select metric" dropdown then select `traces_span_metrics_calls_total`, for example. **Warning:** The included [docker-compose.yml](./docker-compose.yml) file uses the `latest` version of Jaeger and other components. If your local Docker registry already contains older versions, which may still be tagged as `latest`, you may want to delete those images before running the full set, to ensure consistent behavior: diff --git a/docker-compose/monitor/docker-compose.yml b/docker-compose/monitor/docker-compose.yml index 983e3c2e68b..1aa365e5c27 100644 --- a/docker-compose/monitor/docker-compose.yml +++ b/docker-compose/monitor/docker-compose.yml @@ -9,7 +9,6 @@ services: environment: - METRICS_STORAGE_TYPE=prometheus - PROMETHEUS_SERVER_URL=http://prometheus:9090 - - PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-} - PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-} - PROMETHEUS_QUERY_NORMALIZE_CALLS=true - PROMETHEUS_QUERY_NORMALIZE_DURATION=true @@ -21,7 +20,7 @@ services: backend: # This is the host name used in Prometheus scrape configuration. aliases: [spm_metrics_source] - image: otel/opentelemetry-collector-contrib:${OTEL_IMAGE_TAG:-0.109.0} + image: otel/opentelemetry-collector-contrib:${OTEL_IMAGE_TAG:-0.112.0} volumes: - ${OTEL_CONFIG_SRC:-./otel-collector-config-connector.yml}:/etc/otelcol/otel-collector-config.yml command: --config /etc/otelcol/otel-collector-config.yml