Skip to content

Commit 0293acb

Browse files
authored
Merge branch 'master' into per-tenant-query-limits
Signed-off-by: Shvejan <49836470+Shvejan@users.noreply.github.com>
2 parents 3bd1fdc + 51ec847 commit 0293acb

22 files changed

Lines changed: 1644 additions & 140 deletions

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
# Changelog
22

33
## master / unreleased
4+
* [FEATURE] Distributor: Add experimental `-distributor.enable-start-timestamp` flag for Prometheus Remote Write 2.0. When enabled, `StartTimestamp (ST)` is ingested. #7371
45
* [ENHANCEMENT] Metrics Helper: Add native histogram support for aggregating and merging, including dual-format histogram handling that exposes both native and classic bucket formats. #7359
56
* [ENHANCEMENT] Cache: Add per-tenant TTL configuration for query results cache to control cache expiration on a per-tenant basis with separate TTLs for regular and out-of-order data. #7357
67
* [CHANGE] Querier: Make query time range configurations per-tenant: `query_ingesters_within`, `query_store_after`, and `shuffle_sharding_ingesters_lookback_period`. Uses `model.Duration` instead of `time.Duration` to support serialization but has minimum unit of 1ms (nanoseconds/microseconds not supported). #7160
78
* [ENHANCEMENT] Tenant Federation: Add a local cache to regex resolver. #7363
89
* [ENHANCEMENT] Query Scheduler: Add `cortex_query_scheduler_tracked_requests` metric to track the current number of requests held by the scheduler. #7355
10+
* [BUGFIX] Alertmanager: Fix disappearing user config and state when ring is temporarily unreachable. #7372
911
* [BUGFIX] Fix nil when ingester_query_max_attempts > 1. #7369
12+
* [BUGFIX] Querier: Fix queryWithRetry and labelsWithRetry returning (nil, nil) on cancelled context by propagating ctx.Err(). #7370
1013
* [BUGFIX] Metrics Helper: Fix non-deterministic bucket order in merged histograms by sorting buckets after map iteration, matching Prometheus client library behavior. #7380
14+
* [BUGFIX] Fix memory leak in `ReuseWriteRequestV2` by explicitly clearing the `Symbols` backing array string pointers before returning the object to `sync.Pool`. #7373
15+
* [BUGFIX] Distributor: Return HTTP 401 Unauthorized when tenant ID resolution fails in the Prometheus Remote Write 2.0 path. #7389
1116

1217
## 1.21.0 in progress
1318

docs/configuration/config-file-reference.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4111,6 +4111,12 @@ The `limits_config` configures default and per-tenant limits imposed by Cortex s
41114111
# CLI flag: -distributor.enable-type-and-unit-labels
41124112
[enable_type_and_unit_labels: <boolean> | default = false]
41134113
4114+
# EXPERIMENTAL: If true, StartTimestampMs (ST) is handled for remote write v2
4115+
# samples and histograms. CreatedTimestamp (CT) is used as a fallback when ST is
4116+
# not set.
4117+
# CLI flag: -distributor.enable-start-timestamp
4118+
[enable_start_timestamp: <boolean> | default = false]
4119+
41144120
# The maximum number of active series per user, per ingester. 0 to disable.
41154121
# CLI flag: -ingester.max-series-per-user
41164122
[max_series_per_user: <int> | default = 5000000]

docs/configuration/v1-guarantees.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ Currently experimental features are:
115115
- Distributor/Ingester: Stream push connection
116116
- Enable stream push connection between distributor and ingester by setting `-distributor.use-stream-push=true` on Distributor.
117117
- Add `__type__` and `__unit__` labels to OTLP and remote write v2 requests (`-distributor.enable-type-and-unit-labels`)
118+
- Handle StartTimestampMs (ST) for remote write v2 samples and histograms, using CreatedTimestamp (CT) as a fallback when ST is not set (`-distributor.enable-start-timestamp`)
118119
- Ingester: Series Queried Metric
119120
- Enable on Ingester via `-ingester.active-queried-series-metrics-enabled=true`
120121
- Set the time window to expose via metrics using `-ingester.active-queried-series-metrics-windows=2h`. At least 1 time window is required to expose the metric.

docs/proposals/per-tenant-cardinality-api.md

Lines changed: 407 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)