rollback optimization from release 1.0.0 (#304)

* rollback optimization from release 1.0.0

Signed-off-by: ShuzZzle <[email protected]>

Author: nschad

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## master / unreleased
 
 * [CHANGE] move from quay.io/kiwigrid/k8s-sidecar to omegavvweapon/kopf-k8s-sidecar image #302
+* [CHANGE] undo querier store optimization #304
+  * config.querier.query_ingesters_within: 13h -> 0s (default)
+  * config.querier.query_store_after: 12h -> 0s (default)
 
 ## 1.2.0 / 2021-12-29
 

README.md

@@ -242,8 +242,6 @@ Kubernetes: `^1.19.0-0`
 | config.​memberlist.​bind_port | int | `7946` |  |
 | config.​memberlist.​join_members | list | `["{{ include \"cortex.fullname\" $ }}-memberlist"]` | the service name of the memberlist if using memberlist discovery |
 | config.​querier.​active_query_tracker_dir | string | `"/data/active-query-tracker"` |  |
-| config.​querier.​query_ingesters_within | string | `"13h"` | Maximum lookback beyond which queries are not sent to ingester. 0 means all queries are sent to ingester. Ingesters by default have no data older than 12 hours, so we can safely set this 13 hours |
-| config.​querier.​query_store_after | string | `"12h"` | The time after which a metric should be queried from storage and not just ingesters. |
 | config.​querier.​store_gateway_addresses | string | automatic | Comma separated list of store-gateway addresses in DNS Service Discovery format. This option should is set automatically 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). |
 | config.​query_range.​align_queries_with_step | bool | `true` |  |
 | config.​query_range.​cache_results | bool | `true` |  |

values.yaml

@@ -114,13 +114,6 @@ config:
       - '{{ include "cortex.fullname" $ }}-memberlist'
   querier:
     active_query_tracker_dir: /data/active-query-tracker
-    # -- Maximum lookback beyond which queries are not sent to ingester. 0 means all
-    # queries are sent to ingester. Ingesters by default have no data older than 12 hours,
-    # so we can safely set this 13 hours
-    query_ingesters_within: 13h
-    # -- The time after which a metric should be queried from storage and not just
-    # ingesters.
-    query_store_after: 12h
     # -- Comma separated list of store-gateway addresses in DNS Service Discovery
     # format. This option should is set automatically when using the blocks storage and the
     # store-gateway sharding is disabled (when enabled, the store-gateway instances