From 702e4b0b26986d39b1b0e1b238dbb0c3e444352e Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Mon, 25 Nov 2024 22:13:51 -0500 Subject: [PATCH 1/3] Move SPM v2 config to cmd/jaeger/ with all other configs Signed-off-by: Yuri Shkuro --- .../jaeger-v2-config.yml => cmd/jaeger/config-spm.yaml | 0 docker-compose/monitor/docker-compose-v2.yml | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename docker-compose/monitor/jaeger-v2-config.yml => cmd/jaeger/config-spm.yaml (100%) diff --git a/docker-compose/monitor/jaeger-v2-config.yml b/cmd/jaeger/config-spm.yaml similarity index 100% rename from docker-compose/monitor/jaeger-v2-config.yml rename to cmd/jaeger/config-spm.yaml diff --git a/docker-compose/monitor/docker-compose-v2.yml b/docker-compose/monitor/docker-compose-v2.yml index 8e5a248c509..4f7089365fe 100644 --- a/docker-compose/monitor/docker-compose-v2.yml +++ b/docker-compose/monitor/docker-compose-v2.yml @@ -7,11 +7,13 @@ services: image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest} volumes: - "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this. - - "./jaeger-v2-config.yml:/etc/jaeger/config.yml" + - "../../cmd/jaeger/config-spm.yaml:/etc/jaeger/config.yml" command: ["--config", "/etc/jaeger/config.yml"] ports: - "16686:16686" - "8889:8889" + - "4317:4317" + - "4318:4318" microsim: networks: From 6e560192b06d232661c53993a3042448822296f9 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Mon, 25 Nov 2024 22:17:11 -0500 Subject: [PATCH 2/3] fix Signed-off-by: Yuri Shkuro --- docker-compose/monitor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/monitor/README.md b/docker-compose/monitor/README.md index 1d555de4880..b020dda7fd9 100644 --- a/docker-compose/monitor/README.md +++ b/docker-compose/monitor/README.md @@ -98,7 +98,7 @@ JAEGER_IMAGE_TAG=1.62.0 docker compose up or for Jaeger v2: ```shell -JAEGER_IMAGE_TAG=2.0.0-rc2 docker compose -f docker-compose-v2.yml up +JAEGER_IMAGE_TAG=2.0.0 docker compose -f docker-compose-v2.yml up ``` ## Development From da5ed5d09ce1077281f3309fe9854f5696109bd1 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Tue, 26 Nov 2024 01:11:11 -0500 Subject: [PATCH 3/3] fix Signed-off-by: Yuri Shkuro --- cmd/jaeger/config-spm.yaml | 5 +++++ docker-compose/monitor/docker-compose-v2.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/cmd/jaeger/config-spm.yaml b/cmd/jaeger/config-spm.yaml index de1a4ac0616..86d6a64576a 100644 --- a/cmd/jaeger/config-spm.yaml +++ b/cmd/jaeger/config-spm.yaml @@ -9,6 +9,11 @@ service: receivers: [spanmetrics] exporters: [prometheus] telemetry: + resource: + service.name: jaeger + metrics: + level: detailed + address: 0.0.0.0:8888 logs: level: DEBUG diff --git a/docker-compose/monitor/docker-compose-v2.yml b/docker-compose/monitor/docker-compose-v2.yml index 4f7089365fe..ddadff0ddd0 100644 --- a/docker-compose/monitor/docker-compose-v2.yml +++ b/docker-compose/monitor/docker-compose-v2.yml @@ -11,6 +11,7 @@ services: command: ["--config", "/etc/jaeger/config.yml"] ports: - "16686:16686" + - "8888:8888" - "8889:8889" - "4317:4317" - "4318:4318"