Improve wording of --query-store-after description (#3628)

* Improve wording of --query-store-after description

The two cases controlled by this flag are "just ingesters" and
"ingesters plus store", so saying "only be queried from storage" was
confusing.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

* Add missed doc file

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>

Author: bboreham

docs/blocks-storage/querier.md

@@ -132,11 +132,11 @@ querier:
   # CLI flag: -querier.query-store-for-labels-enabled
   [query_store_for_labels_enabled: <boolean> | default = false]
 
-  # The time after which a metric should only be queried from storage and not
-  # just ingesters. 0 means all queries are sent to store. When running the
-  # blocks storage, if this option is enabled, the time range of the query sent
-  # to the store will be manipulated to ensure the query end is not more recent
-  # than 'now - query-store-after'.
+  # The time after which a metric should be queried from storage and not just
+  # ingesters. 0 means all queries are sent to store. When running the blocks
+  # storage, if this option is enabled, the time range of the query sent to the
+  # store will be manipulated to ensure the query end is not more recent than
+  # 'now - query-store-after'.
   # CLI flag: -querier.query-store-after
   [query_store_after: <duration> | default = 0s]
 

docs/configuration/config-file-reference.md

@@ -788,7 +788,7 @@ The `querier_config` configures the Cortex querier.
 # CLI flag: -querier.query-store-for-labels-enabled
 [query_store_for_labels_enabled: <boolean> | default = false]
 
-# The time after which a metric should only be queried from storage and not just
+# The time after which a metric should be queried from storage and not just
 # ingesters. 0 means all queries are sent to store. When running the blocks
 # storage, if this option is enabled, the time range of the query sent to the
 # store will be manipulated to ensure the query end is not more recent than 'now

pkg/querier/querier.go

@@ -91,7 +91,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 	f.BoolVar(&cfg.QueryStoreForLabels, "querier.query-store-for-labels-enabled", false, "Query long-term store for series, label values and label names APIs. Works only with blocks engine.")
 	f.DurationVar(&cfg.MaxQueryIntoFuture, "querier.max-query-into-future", 10*time.Minute, "Maximum duration into the future you can query. 0 to disable.")
 	f.DurationVar(&cfg.DefaultEvaluationInterval, "querier.default-evaluation-interval", time.Minute, "The default evaluation interval or step size for subqueries.")
-	f.DurationVar(&cfg.QueryStoreAfter, "querier.query-store-after", 0, "The time after which a metric should only be queried from storage and not just ingesters. 0 means all queries are sent to store. When running the blocks storage, if this option is enabled, the time range of the query sent to the store will be manipulated to ensure the query end is not more recent than 'now - query-store-after'.")
+	f.DurationVar(&cfg.QueryStoreAfter, "querier.query-store-after", 0, "The time after which a metric should be queried from storage and not just ingesters. 0 means all queries are sent to store. When running the blocks storage, if this option is enabled, the time range of the query sent to the store will be manipulated to ensure the query end is not more recent than 'now - query-store-after'.")
 	f.StringVar(&cfg.ActiveQueryTrackerDir, "querier.active-query-tracker-dir", "./active-query-tracker", "Active query tracker monitors active queries, and writes them to the file in given directory. If Cortex discovers any queries in this log during startup, it will log them to the log file. Setting to empty value disables active query tracker, which also disables -querier.max-concurrent option.")
 	f.StringVar(&cfg.StoreGatewayAddresses, "querier.store-gateway-addresses", "", "Comma separated list of store-gateway addresses in DNS Service Discovery format. This option should be set when using the blocks storage and the store-gateway sharding is disabled (when enabled, the store-gateway instances form a ring and addresses are picked from the ring).")
 	f.DurationVar(&cfg.LookbackDelta, "querier.lookback-delta", 5*time.Minute, "Time since the last sample after which a time series is considered stale and ignored by expression evaluations.")