Skip to content

Commit

Permalink
[DOC] DRAFT Update the S3 config doc to add ListObjects (#3164) (#3168)
Browse files Browse the repository at this point in the history
* Add blog link to release notes

* Update S3 config doc

* Add ListObjects

* Fix types in Azure

(cherry picked from commit 3a723b8)

Co-authored-by: Kim Nylander <[email protected]>
  • Loading branch information
github-actions[bot] and knylander-grafana authored Nov 27, 2023
1 parent c3bdd90 commit 7fdde5d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/sources/tempo/configuration/azure.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@ tempo:
## Azure blocklist polling
If you are hosting Tempo on Azure, two values may need to be updated to ensure consistent successful blocklist polling. If you are
experiencing [this issue](https://stackoverflow.com/questions/12917857/the-specified-block-list-is-invalid-while-uploading-blobs-in-parallel/55902744#55902744), we recommend to set `blocklist_poll_tenant_index_builders` to 1.
experiencing [this issue](https://stackoverflow.com/questions/12917857/the-specified-block-list-is-invalid-while-uploading-blobs-in-parallel/55902744#55902744), try setting `blocklist_poll_tenant_index_builders` to 1.

Additionally, if you are seeing DNS failures like the ones below, try increasing `blocklist_poll_jitter_ms`. Discussion [here](https://github.com/grafana/tempo/issues/1462).
```
reading storage container: Head "https://tempoe**************.blob.core.windows.net/tempo/single-tenant/d8aafc48-5796-4221-ac0b-58e001d18515/meta.compacted.json?timeout=61": dial tcp: lookup tempoe**************.blob.core.windows.net on 10.0.0.10:53: dial udp 10.0.0.10:53: operation was canceled
```
Your final config may look something like:
Your final configuration may look something like:
```
storage:
trace:
Expand Down
1 change: 1 addition & 0 deletions docs/sources/tempo/configuration/s3.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ The following IAM policy shows minimal permissions required by Tempo, where the
"s3:PutObject",
"s3:GetObject",
"s3:ListBucket",
"s3:ListObjects",
"s3:DeleteObject",
"s3:GetObjectTagging",
"s3:PutObjectTagging"
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/tempo/release-notes/v2-3.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,5 +201,5 @@ For a complete list, refer to the [Tempo changelog](https://github.com/grafana/t
* Respected spss on GRPC streaming. [PR 2971](https://github.com/grafana/tempo/pull/2840)
* Moved empty root span substitution from `querier` to `query-frontend`. [PR 2671](https://github.com/grafana/tempo/issues/2671)
* Ingester errors correctly propagate on the query path [PR 2935](https://github.com/grafana/tempo/issues/2935)
* Fixed an issue where ingester didn’t stop a query after timeout [PR 3031](https://github.com/grafana/tempo/pull/3031)
* Fixed an issue where the ingester didn’t stop a query after timeout [PR 3031](https://github.com/grafana/tempo/pull/3031)
* Reordered the S3 credential chain and upgraded `minio-go`. `native_aws_auth_enabled` is deprecated [PR 3006](https://github.com/grafana/tempo/pull/3006)

0 comments on commit 7fdde5d

Please sign in to comment.