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.

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

[Minor] Correct Compose sample config #530

Merged
merged 1 commit into from
Jan 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion deploy/trickster-demo/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Once the composition is running, a great place to start exploring is Grafana, wh

Also, take a look at Jaeger UI, available at <http://127.0.0.1:16686>, which provides visualization of traces shipped by Trickster and Grafana. The more you use trickster-based data sources in Grafana, the more traces you will see in Jaeger. This composition runs the Jaeger All-in-One container, and Trickster ships some traces to the Agent, and others directly to the Collector, so as to demonstrate both capabilities. The Trickster config determines which upstream origin ships which traces to where.

Speaking of, definitely review the various files in the `docker-compose-data` folder, which is full of configurations and other bootstrap data. This might be useful for configuring and using Trickster (or any of these other fantastic projects) in your own deployments. It might be fun to add, remove or change some of the trickster configurations in [./docker-compose-data/trikcster-config/trickster.conf](./docker-compose-data/trikcster-config/trickster.conf) and then `docker exec trickster-demo_trickster_1 kill -1 1` into the Trickster container to apply the changes, or restart the environment altogether with `docker-compose restart`. Just be sure to make a backup of the original config first, so you don't have to download it again later.
Speaking of, definitely review the various files in the `docker-compose-data` folder, which is full of configurations and other bootstrap data. This might be useful for configuring and using Trickster (or any of these other fantastic projects) in your own deployments. It might be fun to add, remove or change some of the trickster configurations in [./docker-compose-data/trickster-config/trickster.conf](./docker-compose-data/trickster-config/trickster.conf) and then `docker exec trickster-demo_trickster_1 kill -1 1` into the Trickster container to apply the changes, or restart the environment altogether with `docker-compose restart`. Just be sure to make a backup of the original config first, so you don't have to download it again later.

## Example Datasources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,39 +50,39 @@ listen_port = 8480

[origins]
[origins.prom1] # prometheus cached with a memory cache, traces sent to stdout
provider = 'prometheus'
origin_type = 'prometheus'
origin_url = 'http://prometheus:9090'
tracing_name = 'std1'
cache_name = 'mem1'

[origins.prom2] # prometheus cached with a filesystem cache, traces sent to jaeger collector
provider = 'prometheus'
origin_type = 'prometheus'
origin_url = 'http://prometheus:9090'
tracing_name = 'jc1'
cache_name = 'fs1'

[origins.sim1] # simulated prometheus cached with a memory cache, traces sent to jaeger agent
provider = 'prometheus'
origin_type = 'prometheus'
origin_url = 'http://mockster:8482/prometheus'
tracing_name = 'ja1'
cache_name = 'mem1'

[origins.sim2] # simulated prometheus cached with a Redis cache, traces sent to jaeger agent
provider = 'prometheus'
origin_type = 'prometheus'
origin_url = 'http://mockster:8482/prometheus'
tracing_name = 'ja1'
cache_name = 'rds1'

[origins.rpc1] # memory reverse proxy cache of the byterange request simulation endpoint, traces sent to jager agent
provider = 'reverseproxycache'
origin_type = 'reverseproxycache'
origin_url = 'http://mockster:8482/byterange'
tracing_name = 'ja1'
cache_name = 'mem1'
[origins.rpc1.paths.root]
path = '/'
match_type = 'prefix'
handler = 'proxycache'
collapsed_forwarding = 'progressive'
collapsed_forwarding = 'progressive'

[logging]
log_level = 'info'
Expand Down