diff --git a/integration/backward_compatibility_test.go b/integration/backward_compatibility_test.go index 510e7ea7b3d..1df6f1bdf3e 100644 --- a/integration/backward_compatibility_test.go +++ b/integration/backward_compatibility_test.go @@ -179,7 +179,6 @@ func TestCanSupportHoltWintersFunc(t *testing.T) { "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul.NetworkHTTPEndpoint(), diff --git a/integration/blocks_storage_backends_test.go b/integration/blocks_storage_backends_test.go index 862018815df..6f254adf454 100644 --- a/integration/blocks_storage_backends_test.go +++ b/integration/blocks_storage_backends_test.go @@ -24,7 +24,6 @@ func TestBlocksStorageWithEtcd(t *testing.T) { "-blocks-storage.tsdb.block-ranges-period": "1h", "-blocks-storage.tsdb.head-compaction-interval": "1m", "-store-gateway.sharding-enabled": "true", - "-querier.ingester-streaming": "true", }) // Start dependencies. diff --git a/integration/parquet_querier_test.go b/integration/parquet_querier_test.go index 27b274fb69e..9fb453a4b06 100644 --- a/integration/parquet_querier_test.go +++ b/integration/parquet_querier_test.go @@ -54,7 +54,6 @@ func TestParquetFuzz(t *testing.T) { "-blocks-storage.bucket-store.bucket-index.idle-timeout": "1s", "-blocks-storage.bucket-store.bucket-index.enabled": "true", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // compactor "-compactor.cleanup-interval": "1s", // Ingester. @@ -204,7 +203,6 @@ func TestParquetProjectionPushdownFuzz(t *testing.T) { "-blocks-storage.bucket-store.bucket-index.idle-timeout": "1s", "-blocks-storage.bucket-store.bucket-index.enabled": "true", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // compactor "-compactor.cleanup-interval": "1s", // Ingester. diff --git a/integration/querier_sharding_test.go b/integration/querier_sharding_test.go index 414c212affc..31b688fa993 100644 --- a/integration/querier_sharding_test.go +++ b/integration/querier_sharding_test.go @@ -66,11 +66,11 @@ func runQuerierShardingTest(t *testing.T, cfg querierShardingTestConfig) { require.NoError(t, s.StartAndWaitReady(consul, memcached)) flags := mergeFlags(BlocksStorageFlags(), map[string]string{ - "-querier.cache-results": "true", - "-querier.split-queries-by-interval": "24h", - "-querier.query-ingesters-within": "12h", // Required by the test on query /series out of ingesters time range - "-frontend.memcached.addresses": "dns+" + memcached.NetworkEndpoint(e2ecache.MemcachedPort), - "-querier.max-outstanding-requests-per-tenant": strconv.Itoa(numQueries), // To avoid getting errors. + "-querier.cache-results": "true", + "-querier.split-queries-by-interval": "24h", + "-querier.query-ingesters-within": "12h", // Required by the test on query /series out of ingesters time range + "-frontend.memcached.addresses": "dns+" + memcached.NetworkEndpoint(e2ecache.MemcachedPort), + "-frontend.max-outstanding-requests-per-tenant": strconv.Itoa(numQueries), // To avoid getting errors. }) minio := e2edb.NewMinio(9000, flags["-blocks-storage.s3.bucket-name"]) diff --git a/integration/querier_test.go b/integration/querier_test.go index 45be6289808..93b4172183f 100644 --- a/integration/querier_test.go +++ b/integration/querier_test.go @@ -295,7 +295,6 @@ func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) { "-store-gateway.sharding-enabled": strconv.FormatBool(testCfg.blocksShardingStrategy != ""), "-store-gateway.sharding-strategy": testCfg.blocksShardingStrategy, "-store-gateway.tenant-shard-size": fmt.Sprintf("%d", testCfg.tenantShardSize), - "-querier.query-store-for-labels-enabled": "true", "-querier.thanos-engine": strconv.FormatBool(thanosEngine), "-blocks-storage.bucket-store.bucket-index.enabled": strconv.FormatBool(testCfg.bucketIndexEnabled), "-blocks-storage.bucket-store.bucket-store-type": testCfg.bucketStorageType, @@ -677,7 +676,6 @@ func TestQuerierWithBlocksStorageRunningInSingleBinaryMode(t *testing.T) { "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), "-blocks-storage.bucket-store.bucket-index.enabled": strconv.FormatBool(testCfg.bucketIndexEnabled), "-blocks-storage.bucket-store.bucket-store-type": testCfg.bucketStorageType, - "-querier.query-store-for-labels-enabled": "true", "-querier.thanos-engine": strconv.FormatBool(thanosEngine), "-querier.enable-x-functions": strconv.FormatBool(thanosEngine), // Ingester. @@ -1243,7 +1241,6 @@ func TestQuerierWithBlocksStorageLimits(t *testing.T) { "-querier.max-fetched-series-per-query": "1", }), "") querier := e2ecortex.NewQuerier("querier", e2ecortex.RingStoreConsul, consul.NetworkHTTPEndpoint(), mergeFlags(flags, map[string]string{ - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.bucket-store.sync-interval": "5s", }), "") require.NoError(t, s.StartAndWaitReady(querier, storeGateway)) @@ -1371,7 +1368,6 @@ func TestQueryLimitsWithBlocksStorageRunningInMicroServices(t *testing.T) { "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.bucket-store.sync-interval": "1s", "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), - "-querier.query-store-for-labels-enabled": "true", "-querier.max-fetched-series-per-query": "3", }) diff --git a/integration/query_fuzz_test.go b/integration/query_fuzz_test.go index e338e6acda7..bd5691bfe1f 100644 --- a/integration/query_fuzz_test.go +++ b/integration/query_fuzz_test.go @@ -77,7 +77,6 @@ func TestNativeHistogramFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "1s", "-blocks-storage.tsdb.retention-period": "24h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul.NetworkHTTPEndpoint(), @@ -173,7 +172,6 @@ func TestExperimentalPromQLFuncsWithPrometheus(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "1s", "-blocks-storage.tsdb.retention-period": "24h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul.NetworkHTTPEndpoint(), @@ -281,7 +279,6 @@ func TestDisableChunkTrimmingFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", // Distributor. @@ -442,7 +439,6 @@ func TestExpandedPostingsCacheFuzz(t *testing.T) { "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul1.NetworkHTTPEndpoint(), @@ -466,7 +462,6 @@ func TestExpandedPostingsCacheFuzz(t *testing.T) { "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.expanded_postings_cache.head.enabled": "true", "-blocks-storage.expanded_postings_cache.block.enabled": "true", // Ingester. @@ -683,7 +678,6 @@ func TestVerticalShardingFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul1.NetworkHTTPEndpoint(), @@ -801,7 +795,6 @@ func TestProtobufCodecFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul1.NetworkHTTPEndpoint(), @@ -1159,7 +1152,6 @@ func TestStoreGatewayLazyExpandedPostingsSeriesFuzz(t *testing.T) { flags := mergeFlags(BlocksStorageFlags(), map[string]string{ "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", "-ring.store": "consul", "-consul.hostname": consul1.NetworkHTTPEndpoint(), "-store-gateway.sharding-enabled": "false", @@ -1320,7 +1312,6 @@ func TestStoreGatewayLazyExpandedPostingsSeriesFuzzWithPrometheus(t *testing.T) flags := mergeFlags(BlocksStorageFlags(), map[string]string{ "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", "-ring.store": "consul", "-consul.hostname": consul.NetworkHTTPEndpoint(), "-store-gateway.sharding-enabled": "false", @@ -1503,7 +1494,6 @@ func TestBackwardCompatibilityQueryFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.tsdb.retention-period": "2h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul1.NetworkHTTPEndpoint(), @@ -1621,7 +1611,6 @@ func TestPrometheusCompatibilityQueryFuzz(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "1s", "-blocks-storage.tsdb.retention-period": "24h", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, - "-querier.query-store-for-labels-enabled": "true", // Ingester. "-ring.store": "consul", "-consul.hostname": consul.NetworkHTTPEndpoint(), diff --git a/integration/remote_write_v2_test.go b/integration/remote_write_v2_test.go index eaaeeb5d315..ed0f1902fc6 100644 --- a/integration/remote_write_v2_test.go +++ b/integration/remote_write_v2_test.go @@ -46,7 +46,6 @@ func TestIngesterRollingUpdate(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.block-ranges-period": blockRangePeriod.String(), "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), @@ -156,7 +155,6 @@ func TestIngest_SenderSendPRW2_DistributorNotAllowPRW2(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.block-ranges-period": blockRangePeriod.String(), "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), @@ -224,7 +222,6 @@ func TestIngest_EnableTypeAndUnitLabels(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.block-ranges-period": blockRangePeriod.String(), "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), @@ -295,7 +292,6 @@ func TestIngest(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.block-ranges-period": blockRangePeriod.String(), "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(), @@ -416,7 +412,6 @@ func TestExemplar(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.enable-native-histograms": "true", // Ingester. @@ -499,7 +494,6 @@ func Test_WriteStatWithReplication(t *testing.T) { "-blocks-storage.bucket-store.sync-interval": "15m", "-blocks-storage.bucket-store.index-cache.backend": tsdb.IndexCacheBackendInMemory, "-blocks-storage.bucket-store.bucket-index.enabled": "true", - "-querier.query-store-for-labels-enabled": "true", "-blocks-storage.tsdb.ship-interval": "1s", "-blocks-storage.tsdb.enable-native-histograms": "true", // Ingester.