Pick-up changes from main

Author: costin

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/promql/TranslatePromqlToTimeSeriesAggregate.java

@@ -9,6 +9,7 @@
 
 import org.elasticsearch.xpack.esql.EsqlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.action.PromqlFeatures;
+import org.elasticsearch.xpack.esql.capabilities.ConfigurationAware;
 import org.elasticsearch.xpack.esql.core.QlIllegalArgumentException;
 import org.elasticsearch.xpack.esql.core.expression.Alias;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
@@ -196,7 +197,8 @@ private static MapResult map(PromqlCommand promqlCommand, PromqlFunctionCall fun
                 // use default lookback for instant queries
                 timeBucketSize = Literal.timeDuration(promqlCommand.source(), DEFAULT_LOOKBACK);
             }
-            Bucket b = new Bucket(promqlCommand.source(), promqlCommand.timestamp(), timeBucketSize, null, null);
+            Bucket b = new Bucket(promqlCommand.source(), promqlCommand.timestamp(), timeBucketSize, null, null,
+                ConfigurationAware.CONFIGURATION_MARKER);
             String bucketName = "TBUCKET";
             Alias tbucket = new Alias(b.source(), bucketName, b);
             aggs.add(tbucket.toAttribute());