diff --git a/docs/sources/tempo/configuration/_index.md b/docs/sources/tempo/configuration/_index.md index 985b5e2f0f24..60cd6d59c984 100644 --- a/docs/sources/tempo/configuration/_index.md +++ b/docs/sources/tempo/configuration/_index.md @@ -532,7 +532,7 @@ metrics_generator: # This option only allows spans with end times that occur within the configured duration to be # considered in metrics generation. # This is to filter out spans that are outdated. - [metrics_ingestion_time_range_slack: | default = 2m0s] + [metrics_ingestion_time_range_slack: | default = 30s] # Timeout for metric requests [query_timeout: | default = 30s ] diff --git a/docs/sources/tempo/configuration/manifest.md b/docs/sources/tempo/configuration/manifest.md index 94e7eb99d61b..ea9c1f8d6820 100644 --- a/docs/sources/tempo/configuration/manifest.md +++ b/docs/sources/tempo/configuration/manifest.md @@ -273,7 +273,7 @@ querier: frontend_worker: frontend_address: 127.0.0.1:9095 dns_lookup_duration: 10s - parallelism: 3 + parallelism: 2 match_max_concurrent: true id: "" grpc_client_config: @@ -602,7 +602,7 @@ metrics_generator: search_encoding: none ingestion_time_range_slack: 2m0s version: vParquet4 - metrics_ingestion_time_range_slack: 2m0s + metrics_ingestion_time_range_slack: 30s query_timeout: 30s override_ring_key: metrics-generator storage: diff --git a/modules/generator/config.go b/modules/generator/config.go index c6858e804fe9..0f6a09491d8d 100644 --- a/modules/generator/config.go +++ b/modules/generator/config.go @@ -43,7 +43,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) cfg.Registry.RegisterFlagsAndApplyDefaults(prefix, f) cfg.Storage.RegisterFlagsAndApplyDefaults(prefix, f) cfg.TracesWAL.Version = encoding.DefaultEncoding().Version() - cfg.TracesWAL.IngestionSlack = 2 * time.Minute + cfg.TracesWAL.IngestionSlack = 30 * time.Second // setting default for max span age before discarding to 30s cfg.MetricsIngestionSlack = 2 * time.Minute diff --git a/modules/querier/config.go b/modules/querier/config.go index 6ebb6e64f017..824622cc3c2f 100644 --- a/modules/querier/config.go +++ b/modules/querier/config.go @@ -72,7 +72,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(prefix string, f *flag.FlagSet) cfg.Worker = worker.Config{ MatchMaxConcurrency: true, MaxConcurrentRequests: cfg.MaxConcurrentQueries, - Parallelism: 3, + Parallelism: 2, GRPCClientConfig: grpcclient.Config{ MaxRecvMsgSize: 100 << 20, MaxSendMsgSize: 16 << 20,