diff --git a/docs/sources/shared/configuration.md b/docs/sources/shared/configuration.md index 0d0752b1af79..0df4beb87dc2 100644 --- a/docs/sources/shared/configuration.md +++ b/docs/sources/shared/configuration.md @@ -114,36 +114,6 @@ Pass the `-config.expand-env` flag at the command line to enable this way of set # querier. [querier: ] -querier_rf1: - # Enable the RF1 querier. If set, replaces the usual querier with an RF-1 - # querier. - # CLI flag: -querier-rf1.enabled - [enabled: | default = false] - - # Time to wait before sending more than the minimum successful query requests. - # CLI flag: -querier-rf1.extra-query-delay - [extra_query_delay: | default = 0s] - - engine: - # The maximum amount of time to look back for log lines. Used only for - # instant log queries. - # CLI flag: -querier-rf1.engine.max-lookback-period - [max_look_back_period: | default = 30s] - - # The maximum number of labels the heap of a topk query using a count min - # sketch can track. - # CLI flag: -querier-rf1.engine.max-count-min-sketch-heap-size - [max_count_min_sketch_heap_size: | default = 10000] - - # The maximum number of queries that can be simultaneously processed by the - # querier. - # CLI flag: -querier-rf1.max-concurrent - [max_concurrent: | default = 4] - - # When true, querier limits sent via a header are enforced. - # CLI flag: -querier-rf1.per-request-limits-enabled - [per_request_limits_enabled: | default = false] - # The query_scheduler block configures the Loki query scheduler. When configured # it separates the tenant query queues from the query-frontend. [query_scheduler: ] diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go index 52af53b1b055..7a3d20df2139 100644 --- a/pkg/loki/loki.go +++ b/pkg/loki/loki.go @@ -51,7 +51,6 @@ import ( "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" "github.com/grafana/loki/v3/pkg/pattern" "github.com/grafana/loki/v3/pkg/querier" - querierrf1 "github.com/grafana/loki/v3/pkg/querier-rf1" "github.com/grafana/loki/v3/pkg/querier/queryrange" "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" "github.com/grafana/loki/v3/pkg/querier/worker" @@ -87,7 +86,6 @@ type Config struct { InternalServer internalserver.Config `yaml:"internal_server,omitempty" doc:"hidden"` Distributor distributor.Config `yaml:"distributor,omitempty"` Querier querier.Config `yaml:"querier,omitempty"` - QuerierRF1 querierrf1.Config `yaml:"querier_rf1,omitempty"` QueryScheduler scheduler.Config `yaml:"query_scheduler"` Frontend lokifrontend.Config `yaml:"frontend,omitempty"` QueryRange queryrange.Config `yaml:"query_range,omitempty"` @@ -166,7 +164,6 @@ func (c *Config) RegisterFlags(f *flag.FlagSet) { c.Common.RegisterFlags(f) c.Distributor.RegisterFlags(f) c.Querier.RegisterFlags(f) - c.QuerierRF1.RegisterFlags(f) c.CompactorHTTPClient.RegisterFlags(f) c.CompactorGRPCClient.RegisterFlags(f) c.IngesterClient.RegisterFlags(f) diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index de7299799034..cd6f9d31c8e9 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -47,7 +47,6 @@ import ( "github.com/grafana/loki/v3/pkg/distributor" "github.com/grafana/loki/v3/pkg/indexgateway" "github.com/grafana/loki/v3/pkg/ingester" - "github.com/grafana/loki/v3/pkg/ingester-rf1/objstore" "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/loki/v3/pkg/logql" "github.com/grafana/loki/v3/pkg/logqlmodel/stats" @@ -57,7 +56,6 @@ import ( "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" "github.com/grafana/loki/v3/pkg/pattern" "github.com/grafana/loki/v3/pkg/querier" - querierrf1 "github.com/grafana/loki/v3/pkg/querier-rf1" "github.com/grafana/loki/v3/pkg/querier/queryrange" "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" "github.com/grafana/loki/v3/pkg/ruler" @@ -393,21 +391,9 @@ func (t *Loki) initQuerier() (services.Service, error) { return nil, err } - if t.Cfg.QuerierRF1.Enabled { - logger.Log("Using RF-1 querier implementation") - store, err := objstore.New(t.Cfg.SchemaConfig.Configs, t.Cfg.StorageConfig, t.ClientMetrics) - if err != nil { - return nil, err - } - t.Querier, err = querierrf1.New(t.Cfg.QuerierRF1, t.Store, t.Overrides, deleteStore, t.MetastoreClient, store, logger) - if err != nil { - return nil, err - } - } else { - t.Querier, err = querier.New(t.Cfg.Querier, t.Store, t.ingesterQuerier, t.Overrides, deleteStore, prometheus.DefaultRegisterer, logger) - if err != nil { - return nil, err - } + t.Querier, err = querier.New(t.Cfg.Querier, t.Store, t.ingesterQuerier, t.Overrides, deleteStore, prometheus.DefaultRegisterer, logger) + if err != nil { + return nil, err } if t.Cfg.Pattern.Enabled {