Skip to content

Commit

Permalink
port fixes from #530
Browse files Browse the repository at this point in the history
  • Loading branch information
James Ranson committed Feb 1, 2021
1 parent 73f2bc3 commit ffda1fa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
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 @@ -82,7 +82,7 @@ listen_port = 8480
path = '/'
match_type = 'prefix'
handler = 'proxycache'
collapsed_forwarding = 'progressive'
collapsed_forwarding = 'progressive'

[logging]
log_level = 'info'
Expand Down

0 comments on commit ffda1fa

Please sign in to comment.