grafana · tcp13equals2 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025 · Nov 7, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@
 * [FEATURE] Query-frontends: Automatically adjust features used in query plans generated for remote execution based on what the available queriers support. #13017 #13164
 * [FEATURE] Memberlist: Add experimental support for zone-aware routing, in order to reduce memberlist cross-AZ data transfer. #13129
 * [FEATURE] Query-frontend and querier: Add experimental support for performing query planning in query-frontends and distributing portions of the plan to queriers for execution. #13058
+* [FEATURE] MQE: Add support for experimental extended range selector modifiers `smoothed` and `anchored`. #13398
 * [FEATURE] Querier: Add `querier.mimir-query-engine.enable-reduce-matchers` flag that enables a new MQE AST optimization pass that eliminates duplicate or redundant matchers that are part of selector expressions. #13178
 * [ENHANCEMENT] Compactor, Store-gateway: Change default value of `-compactor.upload-sparse-index-headers` to `true`. This improves lazy loading performance in the store-gateway. #13089
 * [ENHANCEMENT] Store-gateway: Verify CRC32 checksums for 1 out of every 128 chunks read from object storage and the chunks cache to detect corruption. #13151

@@ -210,6 +210,7 @@ The following features are currently experimental:
   - Remote execution of queries in queriers: `-query-frontend.enable-remote-execution=true`
   - Performing query sharding within MQE: `-query-frontend.use-mimir-query-engine-for-sharding=true`
   - Rewriting of queries to optimize processing: `-query-frontend.rewrite-histogram-queries` and `-query-frontend.rewrite-propagate-matchers`
+  - Enable experimental Prometheus extended range selector modifiers `smoothed` and `anchored`. Note that this flag is shared with enabling experimental Prometheus functions (`-query-frontend.enabled-promql-experimental-functions=smoothed, anchored, ...`)
 - Query-scheduler
   - `-query-scheduler.querier-forget-delay`
 - Store-gateway

@@ -144,6 +144,8 @@ func cloneExpr(expr parser.Expr) (parser.Expr, error) {
 			LabelMatchers:           matchers,
 			BypassEmptyMatcherCheck: e.BypassEmptyMatcherCheck,
 			PosRange:                e.PosRange,
+			Anchored:                e.Anchored,
+			Smoothed:                e.Smoothed,
 		}, nil
 
 	case *parser.MatrixSelector:

@@ -139,6 +139,12 @@ func TestCloneExpr(t *testing.T) {
 		`foo and bar`,
 		`foo == bar`,
 		`foo == bool bar`,
+
+		// Range modifiers
+		`metric[1m] anchored`,
+		`metric[1m] smoothed`,
+		`rate(metric[1m] anchored)`,
+		`increase(metric[1m] smoothed)`,
 	}
 
 	for i, tc := range testCases {
@@ -245,11 +251,14 @@ func loadTestExpressionsFromDirectory(t *testing.T, dir string, accumulatedExpre
 func enableExperimentalParserFeaturesDuringTest(t *testing.T) {
 	oldDurationExpressions := parser.ExperimentalDurationExpr
 	oldExperimentalFunctions := parser.EnableExperimentalFunctions
+	oldEnableExtendedRangeSelectors := parser.EnableExtendedRangeSelectors
 	parser.ExperimentalDurationExpr = true
 	parser.EnableExperimentalFunctions = true
+	parser.EnableExtendedRangeSelectors = true
 	t.Cleanup(func() {
 		parser.ExperimentalDurationExpr = oldDurationExpressions
 		parser.EnableExperimentalFunctions = oldExperimentalFunctions
+		parser.EnableExtendedRangeSelectors = oldEnableExtendedRangeSelectors
 	})
 }
 

@@ -100,6 +100,18 @@ func containedExperimentalFunctions(expr parser.Expr) map[string]struct{} {
 			if n.Op.IsExperimentalAggregator() {
 				expFuncNames[n.Op.String()] = struct{}{}
 			}
+		case *parser.MatrixSelector:
+			// technically anchored & smoothed are range selectors not functions
+			vs, ok := n.VectorSelector.(*parser.VectorSelector)
+			if ok && vs.Anchored {
+				expFuncNames["anchored"] = struct{}{}
+			} else if ok && vs.Smoothed {
+				expFuncNames["smoothed"] = struct{}{}
+			}
+		case *parser.VectorSelector:
+			if n.Smoothed {
+				expFuncNames["smoothed"] = struct{}{}
+			}
 		}
 		return nil
 	})

@@ -10,8 +10,12 @@ import (
 )
 
 func TestContainedExperimentalFunctions(t *testing.T) {
-	t.Cleanup(func() { parser.EnableExperimentalFunctions = false })
+	t.Cleanup(func() {
+		parser.EnableExperimentalFunctions = false
+		parser.EnableExtendedRangeSelectors = false
+	})
 	parser.EnableExperimentalFunctions = true
+	parser.EnableExtendedRangeSelectors = true
 
 	testCases := map[string]struct {
 		query  string
@@ -48,6 +52,26 @@ func TestContainedExperimentalFunctions(t *testing.T) {
 			query:  `limit_ratio(0.5, mad_over_time(up[5m]))`,
 			expect: []string{"limit_ratio", "mad_over_time"},
 		},
+		"metric smoothed": {
+			query:  `metric smoothed`,
+			expect: []string{"smoothed"},
+		},
+		"metric[1m] smoothed": {
+			query:  `metric[1m] smoothed`,
+			expect: []string{"smoothed"},
+		},
+		"metric[1m] anchored": {
+			query:  `metric[1m] anchored`,
+			expect: []string{"anchored"},
+		},
+		"rate(metric[1m] smoothed)": {
+			query:  `rate(metric[1m] smoothed)`,
+			expect: []string{"smoothed"},
+		},
+		"increase(metric[1m] anchored)": {
+			query:  `increase(metric[1m] anchored)`,
+			expect: []string{"anchored"},
+		},
 	}
 
 	for name, tc := range testCases {

@@ -264,6 +264,9 @@ func newQueryTripperware(
 	// This enables duration arithmetic https://github.com/prometheus/prometheus/pull/16249.
 	parser.ExperimentalDurationExpr = true
 
+	// This enables the anchored and smoothed selector modifiers
+	parser.EnableExtendedRangeSelectors = true
+
 	var c cache.Cache
 	if cfg.CacheResults || cfg.cardinalityBasedShardingEnabled() {
 		var err error

@@ -197,6 +197,9 @@ func New(cfg Config, limits *validation.Overrides, distributor Distributor, quer
 	// This enables duration arithmetic https://github.com/prometheus/prometheus/pull/16249.
 	parser.ExperimentalDurationExpr = true
 
+	// This enables the anchored and smoothed selector modifiers
+	parser.EnableExtendedRangeSelectors = true
+
 	var eng promql.QueryEngine
 	var streamingEngine *streamingpromql.Engine