add logic

Signed-off-by: Ben Ye <yb532204897@gmail.com>

cmd/thanos/query_frontend.go

@@ -57,8 +57,8 @@ func registerQueryFrontend(app *extkingpin.App) {
 	cfg.http.registerFlag(cmd)
 
 	// Query range tripperware flags.
-	cmd.Flag("query-range.align-querier-with-step", "Mutate incoming queries to align their start and end with their step.").
-		Default("true").BoolVar(&cfg.QueryRangeConfig.AlignQueriesWithStep)
+	cmd.Flag("query-range.align-range-with-step", "Mutate incoming queries to align their start and end with their step for better cache-ability. Note: Grafana dashboards do that by default.").
+		Default("true").BoolVar(&cfg.QueryRangeConfig.AlignRangeWithStep)
 
 	cmd.Flag("query-range.split-interval", "Split query range requests by an interval and execute in parallel, it should be greater than 0 when query-range.response-cache-config is configured.").
 		Default("24h").DurationVar(&cfg.QueryRangeConfig.SplitQueriesByInterval)

docs/components/query-frontend.md

@@ -126,9 +126,11 @@ Flags:
                                  Listen host:port for HTTP endpoints.
       --http-grace-period=2m     Time to wait after an interrupt received for
                                  HTTP Server.
-      --query-range.align-querier-with-step
+      --query-range.align-range-with-step
                                  Mutate incoming queries to align their start
-                                 and end with their step.
+                                 and end with their step for better
+                                 cache-ability. Note: Grafana dashboards do that
+                                 by default.
       --query-range.split-interval=24h
                                  Split query range requests by an interval and
                                  execute in parallel, it should be greater than

pkg/queryfrontend/config.go

@@ -139,7 +139,7 @@ type QueryRangeConfig struct {
 	ResultsCacheConfig *queryrange.ResultsCacheConfig
 	CachePathOrContent extflag.PathOrContent
 
-	AlignQueriesWithStep   bool
+	AlignRangeWithStep   bool
 	SplitQueriesByInterval time.Duration
 	MaxRetries             int
 	Limits                 *cortexvalidation.Limits

pkg/queryfrontend/roundtrip.go

@@ -144,11 +144,13 @@ func newQueryRangeTripperware(
 	m := queryrange.NewInstrumentMiddlewareMetrics(reg)
 
 	// step align middleware.
-	queryRangeMiddleware = append(
-		queryRangeMiddleware,
-		queryrange.InstrumentMiddleware("step_align", m),
-		queryrange.StepAlignMiddleware,
-	)
+	if config.AlignRangeWithStep {
+		queryRangeMiddleware = append(
+			queryRangeMiddleware,
+			queryrange.InstrumentMiddleware("step_align", m),
+			queryrange.StepAlignMiddleware,
+		)
+	}
 
 	queryIntervalFn := func(_ queryrange.Request) time.Duration {
 		return config.SplitQueriesByInterval