Move noopScanner to scanner.go and fix RegisterFlagsWithPrefix

Signed-off-by: Justin Jung <[email protected]>

Author: justinjung04

docs/configuration/config-file-reference.md

@@ -3203,13 +3203,17 @@ lifecycler:
 [upload_compacted_blocks_enabled: <boolean> | default = true]
 
 instance_limits:
-  # Max CPU utilization that this ingester can reach before rejecting new query
-  # request (across all tenants) in percentage, between 0 and 1. 0 = unlimited.
+  # EXPERIMENTAL: Max CPU utilization that this ingester can reach before
+  # rejecting new query request (across all tenants) in percentage, between 0
+  # and 1. monitored_resources config must include the resource type. 0 to
+  # disable.
   # CLI flag: -ingester.instance-limits.cpu-utilization
   [cpu_utilization: <float> | default = 0]
 
-  # Max heap utilization that this ingester can reach before rejecting new query
-  # request (across all tenants) in percentage, between 0 and 1. 0 = unlimited.
+  # EXPERIMENTAL: Max heap utilization that this ingester can reach before
+  # rejecting new query request (across all tenants) in percentage, between 0
+  # and 1. monitored_resources config must include the resource type. 0 to
+  # disable.
   # CLI flag: -ingester.instance-limits.heap-utilization
   [heap_utilization: <float> | default = 0]
 

pkg/ingester/instance_limits.go

@@ -38,8 +38,7 @@ func (cfg *InstanceLimits) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix strin
 	f.Int64Var(&cfg.MaxInMemorySeries, prefix+"instance-limits.max-series", 0, "Max series that this ingester can hold (across all tenants). Requests to create additional series will be rejected. This limit only works when using blocks engine. 0 = unlimited.")
 	f.Int64Var(&cfg.MaxInflightPushRequests, prefix+"instance-limits.max-inflight-push-requests", 0, "Max inflight push requests that this ingester can handle (across all tenants). Additional requests will be rejected. 0 = unlimited.")
 	f.Int64Var(&cfg.MaxInflightQueryRequests, prefix+"instance-limits.max-inflight-query-requests", 0, "Max inflight query requests that this ingester can handle (across all tenants). Additional requests will be rejected. 0 = unlimited.")
-	f.Float64Var(&cfg.CPUUtilization, prefix+"instance-limits.cpu-utilization", 0, "Max CPU utilization that this ingester can reach before rejecting new query request (across all tenants) in percentage, between 0 and 1. 0 = unlimited.")
-	f.Float64Var(&cfg.HeapUtilization, prefix+"instance-limits.heap-utilization", 0, "Max heap utilization that this ingester can reach before rejecting new query request (across all tenants) in percentage, between 0 and 1. 0 = unlimited.")
+	cfg.InstanceLimits.RegisterFlagsWithPrefix(f, prefix)
 }
 
 func (cfg *InstanceLimits) Validate(monitoredResources flagext.StringSliceCSV) error {

pkg/util/resource/scanner.go

@@ -13,6 +13,12 @@ type scanner interface {
 	scan() (float64, error)
 }
 
+type noopScanner struct{}
+
+func (s *noopScanner) scan() (float64, error) {
+	return 0, nil
+}
+
 type heapScanner struct {
 	metricSamples []metrics.Sample
 }

pkg/util/resource/scanner_darwin.go

@@ -8,12 +8,6 @@ import (
 	"github.com/cortexproject/cortex/pkg/util/log"
 )
 
-type noopScanner struct{}
-
-func (s *noopScanner) scan() (float64, error) {
-	return 0, nil
-}
-
 func newCPUScanner() (scanner, error) {
 	level.Warn(log.Logger).Log("msg", "CPU scanner not supported in darwin.")
 	return &noopScanner{}, nil

pkg/util/resource/scanner_test.go

@@ -0,0 +1,14 @@
+package resource
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_NoopScanner(t *testing.T) {
+	s := noopScanner{}
+	val, err := s.scan()
+	require.NoError(t, err)
+	require.Zero(t, val)
+}