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

Jump to bottom

add advance conf for otel-collector #212

Merged
merged 13 commits into from
Aug 4, 2022
Merged

add advance conf for otel-collector #212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
58080e7
add advance conf for otel-collector
Frapschen Jul 16, 2022
42f6466
undo not relate change
Frapschen Jul 22, 2022
19926a8
Apply suggestions from code review
Frapschen Jul 28, 2022
2d1c2d3
apply reviewer's suggestion
Frapschen Jul 28, 2022
dc7335e
Merge branch 'main' into add_advance_demo
Frapschen Jul 28, 2022
b31861b
apply reviewer's suggestion
Frapschen Aug 1, 2022
6d4cde8
Merge branch 'main' into add_advance_demo
Frapschen Aug 1, 2022
be08941
Apply suggestions from code review
Frapschen Aug 3, 2022
3519219
Merge branch 'main' into add_advance_demo
cartersocha Aug 3, 2022
54fc540
add changelog entry.
Frapschen Aug 4, 2022
f09fa8a
Merge branch 'main' into add_advance_demo
Frapschen Aug 4, 2022
aea17a7
fix markdown
Frapschen Aug 4, 2022
fa2cfb7
Apply suggestions from code review
Frapschen Aug 4, 2022
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
Prev Previous commit
Next Next commit
apply reviewer's suggestion
  • Loading branch information
@Frapschen
Frapschen committed Aug 1, 2022
commit b31861bd1ae66426c4fda112819ee371d9b6ab22
5 changes: 0 additions & 5 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ services:
jaeger:
image: jaegertracing/all-in-one
container_name: jaeger
volumes:
- ./src/jaeger/jaeger-ui.json:/etc/jaeger/jaeger-ui.json
command: --query.ui-config /etc/jaeger/jaeger-ui.json
ports:
- "5775:5775"
- "5778:5778"
Expand All @@ -20,8 +17,6 @@ services:
- "14269:14269"
environment:
- COLLECTOR_ZIPKIN_HOST_PORT
- METRICS_STORAGE_TYPE=prometheus
- PROMETHEUS_SERVER_URL=http://prometheus:9090

# Collector
otelcol:
Expand Down
8 changes: 0 additions & 8 deletions src/jaeger/jaeger-ui.json
View file
Open in desktop

This file was deleted.