diff --git a/CHANGELOG.md b/CHANGELOG.md index ec2449594a7..4fa9df869be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,7 @@ * [BUGFIX] Fix counter samples being downsampled by backdate to the previous minute the initial sample when the series is new [#44236](https://github.com/grafana/tempo/pull/4236) (@javiermolinar) * [BUGFIX] Skip computing exemplars for instant queries. [#4204](https://github.com/grafana/tempo/pull/4204) (@javiermolinar) * [BUGFIX] Gave context to orphaned spans related to various maintenance processes. [#4260](https://github.com/grafana/tempo/pull/4260) (@joe-elliott) +* [FEATURE] add sse configuration options for s3 [#3914](https://github.com/grafana/tempo/pull/3914) (@KyriosGN0) # v2.6.1 diff --git a/docs/sources/tempo/configuration/_index.md b/docs/sources/tempo/configuration/_index.md index 3e48575f5e6..5c45e8956bb 100644 --- a/docs/sources/tempo/configuration/_index.md +++ b/docs/sources/tempo/configuration/_index.md @@ -640,14 +640,14 @@ query_frontend: # The number of shards to break ingester queries into. [ingester_shards]: | default = 1] - + # SLO configuration for Metadata (tags and tag values) endpoints. metadata_slo: # If set to a non-zero value, it's value will be used to decide if metadata query is within SLO or not. # Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. # NOTE: Requires `duration_slo` AND `throughput_bytes_slo` to be configured. [duration_slo: | default = 0s ] - + # If set to a non-zero value, it's value will be used to decide if metadata query is within SLO or not. # Query is within SLO if it returned 200 within duration_slo seconds OR processed throughput_slo bytes/s data. [throughput_bytes_slo: | default = 0 ] @@ -680,7 +680,7 @@ query_frontend: # Maximun number of exemplars per range query. Limited to 100. [max_exemplars: | default = 100 ] - + # query_backend_after controls where the query-frontend searches for traces. # Time ranges older than query_backend_after will be searched in the backend/object storage only. # Time ranges between query_backend_after and now will be queried from the metrics-generators. @@ -1048,6 +1048,22 @@ storage: # See the [S3 documentation on object tagging](https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-tagging.html) for more detail. [tags: ] + + [sse: ]: + # Optional + # Example: type: SSE-S3 + # Type of encryption to use with s3 bucket, either SSE-KMS or SSE-S3 + [type: string]: + + # Optional + # Example: kms_key_id: "1234abcd-12ab-34cd-56ef-1234567890ab" + # the kms key id is the identification of the key in an account or region + kms_key_id: + # Optional + # Example: kms_encryption_context: "encryptionContext": {"department": "10103.0"} + # KMS Encryption Context used for object encryption. It expects JSON formatted string + kms_encryption_context: + # azure configuration. Will be used only if value of backend is "azure" # EXPERIMENTAL azure: @@ -1739,7 +1755,7 @@ overrides: # Cost attribution usage tracker configuration cost_attribution: # List of attributes to group ingested data by. Map value is optional. Can be used to rename and - # combine attributes. + # combine attributes. dimensions: