Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
* [FEATURE] Querier: Support for configuring query optimizers and enabling XFunctions in the Thanos engine. #6873
* [FEATURE] Query Frontend: Add support /api/v1/format_query API for formatting queries. #6893
* [FEATURE] Query Frontend: Add support for /api/v1/parse_query API (experimental) to parse a PromQL expression and return it as a JSON-formatted AST (abstract syntax tree). #6978
* [FEATURE] StoreGateway: Introduces a new parquet mode. #7046
* [ENHANCEMENT] Upgrade the Prometheus version to 3.6.0 and add a `-name-validation-scheme` flag to support UTF-8. #7040 #7056
* [ENHANCEMENT] Distributor: Emit an error with a 400 status code when empty labels are found before the relabelling or label dropping process. #7052
* [ENHANCEMENT] Parquet Storage: Add support for additional sort columns during Parquet file generation #7003
Expand Down
4 changes: 4 additions & 0 deletions docs/blocks-storage/querier.md
Original file line number Diff line number Diff line change
Expand Up @@ -1729,6 +1729,10 @@ blocks_storage:
# CLI flag: -blocks-storage.bucket-store.block-discovery-strategy
[block_discovery_strategy: <string> | default = "concurrent"]

# Type of bucket store to use (tsdb or parquet).
# CLI flag: -blocks-storage.bucket-store.bucket-store-type
[bucket_store_type: <string> | default = "tsdb"]

# Max size - in bytes - of a chunks pool, used to reduce memory allocations.
# The pool is shared across all tenants. 0 to disable the limit.
# CLI flag: -blocks-storage.bucket-store.max-chunk-pool-bytes
Expand Down
4 changes: 4 additions & 0 deletions docs/blocks-storage/store-gateway.md
Original file line number Diff line number Diff line change
Expand Up @@ -1815,6 +1815,10 @@ blocks_storage:
# CLI flag: -blocks-storage.bucket-store.block-discovery-strategy
[block_discovery_strategy: <string> | default = "concurrent"]

# Type of bucket store to use (tsdb or parquet).
# CLI flag: -blocks-storage.bucket-store.bucket-store-type
[bucket_store_type: <string> | default = "tsdb"]

# Max size - in bytes - of a chunks pool, used to reduce memory allocations.
# The pool is shared across all tenants. 0 to disable the limit.
# CLI flag: -blocks-storage.bucket-store.max-chunk-pool-bytes
Expand Down
4 changes: 4 additions & 0 deletions docs/configuration/config-file-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -2401,6 +2401,10 @@ bucket_store:
# CLI flag: -blocks-storage.bucket-store.block-discovery-strategy
[block_discovery_strategy: <string> | default = "concurrent"]

# Type of bucket store to use (tsdb or parquet).
# CLI flag: -blocks-storage.bucket-store.bucket-store-type
[bucket_store_type: <string> | default = "tsdb"]

# Max size - in bytes - of a chunks pool, used to reduce memory allocations.
# The pool is shared across all tenants. 0 to disable the limit.
# CLI flag: -blocks-storage.bucket-store.max-chunk-pool-bytes
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/lib/pq v1.10.9
github.com/minio/minio-go/v7 v7.0.93
github.com/mitchellh/go-wordwrap v1.0.1
github.com/oklog/ulid v1.3.1 // indirect
github.com/oklog/ulid v1.3.1
github.com/opentracing-contrib/go-grpc v0.1.2
github.com/opentracing-contrib/go-stdlib v1.1.0
github.com/opentracing/opentracing-go v1.2.0
Expand Down
35 changes: 35 additions & 0 deletions integration/e2ecortex/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,41 @@ func NewIngesterWithConfigFile(name string, store RingStore, address, configFile
)
}

func NewParquetConverter(name string, store RingStore, address string, flags map[string]string, image string) *CortexService {
return NewParquetConverterWithConfigFile(name, store, address, "", flags, image)
}

func NewParquetConverterWithConfigFile(name string, store RingStore, address, configFile string, flags map[string]string, image string) *CortexService {
if configFile != "" {
flags["-config.file"] = filepath.Join(e2e.ContainerSharedDir, configFile)
}

// Configure the ingesters ring backend
flags["-ring.store"] = string(store)
switch store {
case RingStoreConsul:
flags["-consul.hostname"] = address
case RingStoreEtcd:
flags["-etcd.endpoints"] = address
}

if image == "" {
image = GetDefaultImage()
}

return NewCortexService(
name,
image,
e2e.NewCommandWithoutEntrypoint("cortex", e2e.BuildArgs(e2e.MergeFlags(map[string]string{
"-target": "parquet-converter",
"-log.level": "warn",
}, flags))...),
e2e.NewHTTPReadinessProbe(httpPort, "/ready", 200, 299),
httpPort,
grpcPort,
)
}

func NewQueryFrontend(name string, flags map[string]string, image string) *CortexService {
return NewQueryFrontendWithConfigFile(name, "", flags, image)
}
Expand Down
Loading
Loading