address comments

Signed-off-by: yeya24 <benye@amazon.com>

Author: yeya24

docs/configuration/config-file-reference.md

@@ -3714,7 +3714,7 @@ lifecycler:
 # Duration of each sub-window for active queried series tracking (e.g., 1
 # minute). Used to divide the total tracking period into smaller windows.
 # CLI flag: -ingester.active-queried-series-metrics-window-duration
-[active_queried_series_metrics_window_duration: <duration> | default = 1m]
+[active_queried_series_metrics_window_duration: <duration> | default = 15m]
 
 # Sampling rate for active queried series tracking (1.0 = 100% sampling, 0.1 =
 # 10% sampling). By default, all queries are sampled.
@@ -3724,7 +3724,7 @@ lifecycler:
 # Time windows to expose queried series metric. Each window tracks queried
 # series within that time period.
 # CLI flag: -ingester.active-queried-series-metrics-windows
-[active_queried_series_metrics_windows: <list of duration> | default = ]
+[active_queried_series_metrics_windows: <list of duration> | default = 2h0m0s]
 
 # Enable uploading compacted blocks.
 # CLI flag: -ingester.upload-compacted-blocks-enabled

pkg/ingester/active_queried_series.go

@@ -380,8 +380,11 @@ type ActiveQueriedSeriesService struct {
 
 // NewActiveQueriedSeriesService creates a new ActiveQueriedSeriesService service.
 func NewActiveQueriedSeriesService(logger log.Logger, registerer prometheus.Registerer) *ActiveQueriedSeriesService {
-	// Cap at 8 workers to avoid excessive goroutines
-	numWorkers := min(runtime.NumCPU()/2, 8)
+	// Cap at 4 workers to avoid excessive goroutines
+	numWorkers := min(runtime.NumCPU()/2, 4)
+	if numWorkers < 1 {
+		numWorkers = 1
+	}
 
 	m := &ActiveQueriedSeriesService{
 		updateChan: make(chan activeQueriedSeriesUpdate, 10000), // Buffered channel to avoid blocking

pkg/ingester/ingester.go

@@ -189,8 +189,9 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
 
 	f.BoolVar(&cfg.ActiveQueriedSeriesMetricsEnabled, "ingester.active-queried-series-metrics-enabled", false, "Enable tracking of active queried series using probabilistic data structure and export them as metrics.")
 	f.DurationVar(&cfg.ActiveQueriedSeriesMetricsUpdatePeriod, "ingester.active-queried-series-metrics-update-period", 1*time.Minute, "How often to update active queried series metrics.")
-	f.DurationVar(&cfg.ActiveQueriedSeriesMetricsWindowDuration, "ingester.active-queried-series-metrics-window-duration", 1*time.Minute, "Duration of each sub-window for active queried series tracking (e.g., 1 minute). Used to divide the total tracking period into smaller windows.")
+	f.DurationVar(&cfg.ActiveQueriedSeriesMetricsWindowDuration, "ingester.active-queried-series-metrics-window-duration", 15*time.Minute, "Duration of each sub-window for active queried series tracking (e.g., 1 minute). Used to divide the total tracking period into smaller windows.")
 	f.Float64Var(&cfg.ActiveQueriedSeriesMetricsSampleRate, "ingester.active-queried-series-metrics-sample-rate", 1.0, "Sampling rate for active queried series tracking (1.0 = 100% sampling, 0.1 = 10% sampling). By default, all queries are sampled.")
+	cfg.ActiveQueriedSeriesMetricsWindows = cortex_tsdb.DurationList{2 * time.Hour}
 	f.Var(&cfg.ActiveQueriedSeriesMetricsWindows, "ingester.active-queried-series-metrics-windows", "Time windows to expose queried series metric. Each window tracks queried series within that time period.")
 
 	f.BoolVar(&cfg.UploadCompactedBlocksEnabled, "ingester.upload-compacted-blocks-enabled", true, "Enable uploading compacted blocks.")

schemas/cortex-config-schema.json

@@ -4499,13 +4499,14 @@
           "x-format": "duration"
         },
         "active_queried_series_metrics_window_duration": {
-          "default": "1m0s",
+          "default": "15m0s",
           "description": "Duration of each sub-window for active queried series tracking (e.g., 1 minute). Used to divide the total tracking period into smaller windows.",
           "type": "string",
           "x-cli-flag": "ingester.active-queried-series-metrics-window-duration",
           "x-format": "duration"
         },
         "active_queried_series_metrics_windows": {
+          "default": "2h0m0s",
           "description": "Time windows to expose queried series metric. Each window tracks queried series within that time period.",
           "items": {
             "type": "string"