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

[refactor] Move SPM v2 config to cmd/jaeger/ with all other configs #6256

Merged
merged 4 commits into from
Nov 26, 2024
Merged

[refactor] Move SPM v2 config to cmd/jaeger/ with all other configs #6256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
702e4b0
Move SPM v2 config to cmd/jaeger/ with all other configs
yurishkuro Nov 26, 2024
6e56019
fix
yurishkuro Nov 26, 2024
0a5683b
Merge branch 'main' into move-spm-config
yurishkuro Nov 26, 2024
da5ed5d
fix
yurishkuro Nov 26, 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
5 changes: 5 additions & 0 deletions docker-compose/monitor/jaeger-v2-config.yml → cmd/jaeger/config-spm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker-compose/monitor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion docker-compose/monitor/docker-compose-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@ 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"
- "8888:8888"
- "8889:8889"
- "4317:4317"
- "4318:4318"

microsim:
networks:
Expand Down
Loading