Skip to content

Commit

Permalink
Minor Docs Fix (#1497)
Browse files Browse the repository at this point in the history
* Minor docs cleanup

Signed-off-by: Joe Elliott <[email protected]>

* Update docs/tempo/website/configuration/_index.md

Co-authored-by: Kim Nylander <[email protected]>

* Update docs/tempo/website/configuration/_index.md

Co-authored-by: Kim Nylander <[email protected]>

Co-authored-by: Kim Nylander <[email protected]>
  • Loading branch information
joe-elliott and knylander-grafana authored Jun 16, 2022
1 parent 205787b commit d2e4b8a
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions docs/tempo/website/configuration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -919,10 +919,9 @@ memberlist:
## Overrides

Tempo provides an overrides module for users to set global or per-tenant override settings.
**Currenly only ingestion limits can be overridden.**

### Ingestion limits
The default limits in Tempo may not be sufficient in high volume tracing environments. Errors including `RATE_LIMITED`/`TRACE_TOO_LARGE`/`LIVE_TRACES_EXCEEDED` will occur when these limits are exceeded.
The default limits in Tempo may not be sufficient in high-volume tracing environments. Errors including `RATE_LIMITED`/`TRACE_TOO_LARGE`/`LIVE_TRACES_EXCEEDED` occur when these limits are exceeded. See below for how to override these limits globally or per tenant.

#### Standard overrides
You can create an `overrides` section to configure new ingestion limits that applies to all tenants of the cluster.
Expand Down Expand Up @@ -1042,7 +1041,7 @@ overrides:
#### Tenant-specific overrides
You can set tenant-specific overrides settings in a separate file and point `per_tenant_override_config` to it. This overrides file is dynamically loaded. It can be changed at runtime and will be reloaded by Tempo without restarting the application.
You can set tenant-specific overrides settings in a separate file and point `per_tenant_override_config` to it. This overrides file is dynamically loaded. It can be changed at runtime and reloaded by Tempo without restarting the application. These override settings can be set per tenant.
```yaml
# /conf/tempo.yaml
# Overrides configuration block
Expand Down

0 comments on commit d2e4b8a

Please sign in to comment.