Skip to content

Commit

Permalink
Update architecture diagram and docs (#629)
Browse files Browse the repository at this point in the history
* Updated architecture diagram and tempo-query description

Signed-off-by: Joe Elliott <number101010@gmail.com>

* improved querying confgi title

Signed-off-by: Joe Elliott <number101010@gmail.com>
  • Loading branch information
joe-elliott committed Apr 5, 2021
1 parent 5f90df2 commit 154ec0b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
5 changes: 2 additions & 3 deletions docs/tempo/website/architecture/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ Queries should be sent to the Query Frontend.

Compactors stream blocks to and from the backend storage to reduce the total number of blocks.

### Tempo-Query
Tempo itself does not provide a way to visualize traces and relies on [Jaeger Query](https://www.jaegertracing.io/docs/1.19/deployment/#query-service--ui) to do so. `tempo-query` is [Jaeger Query](https://www.jaegertracing.io/docs/1.19/deployment/#query-service--ui) with a [GRPC Plugin](https://github.com/jaegertracing/jaeger/tree/master/plugin/storage/grpc) that allows it to speak with Tempo.
## Grafana 7.4.x

Tempo Query is also the method by which Grafana queries traces.
When using older versions of Grafana you must also use `tempo-query` in order to visualize traces. `tempo-query` is [Jaeger Query](https://www.jaegertracing.io/docs/1.19/deployment/#query-service--ui) with a [GRPC Plugin](https://github.com/jaegertracing/jaeger/tree/master/plugin/storage/grpc) that allows it to query Tempo. See [this example](https://github.com/grafana/tempo/tree/master/example/docker-compose#grafana-74x) and [these docs](../../configuration/querying) for help.
Binary file modified docs/tempo/website/architecture/tempo_arch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/tempo/website/configuration/querying.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: Querying
title: Querying with Grafana
weight: 30
---

Expand Down

0 comments on commit 154ec0b

Please sign in to comment.