Skip to content

Clean deprecated flags in e2e test #7222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SungJin1212 wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −30
Open

Clean deprecated flags in e2e test #7222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01838e1
clean deprecated flags in e2e test
SungJin1212 Jan 19, 2026
e0a0975
go fmt
SungJin1212 Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion integration/backward_compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
1 change: 0 additions & 1 deletion integration/blocks_storage_backends_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions integration/parquet_querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions integration/querier_sharding_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
4 changes: 0 additions & 4 deletions integration/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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",
})

Expand Down
11 changes: 0 additions & 11 deletions integration/query_fuzz_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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(),
Expand All @@ -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.
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down
6 changes: 0 additions & 6 deletions integration/remote_write_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Loading