From ffda1facfafcc8c583d443c028c9ef396519a7c7 Mon Sep 17 00:00:00 2001 From: James Ranson Date: Mon, 1 Feb 2021 07:22:37 -0700 Subject: [PATCH] port fixes from #530 --- deploy/trickster-demo/README.md | 2 +- .../docker-compose-data/trickster-config/trickster.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/trickster-demo/README.md b/deploy/trickster-demo/README.md index 6e74405d8..b384fe4b0 100644 --- a/deploy/trickster-demo/README.md +++ b/deploy/trickster-demo/README.md @@ -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 , 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 diff --git a/deploy/trickster-demo/docker-compose-data/trickster-config/trickster.conf b/deploy/trickster-demo/docker-compose-data/trickster-config/trickster.conf index 84c383891..57a03f5a4 100644 --- a/deploy/trickster-demo/docker-compose-data/trickster-config/trickster.conf +++ b/deploy/trickster-demo/docker-compose-data/trickster-config/trickster.conf @@ -82,7 +82,7 @@ listen_port = 8480 path = '/' match_type = 'prefix' handler = 'proxycache' - collapsed_forwarding = 'progressive' + collapsed_forwarding = 'progressive' [logging] log_level = 'info'