service/cluster: add common block for clustering arguments

component/loki/source/kubernetes/kubernetes.go

@@ -43,13 +43,7 @@ type Arguments struct {
 	// Client settings to connect to Kubernetes.
 	Client commonk8s.ClientArguments `river:"client,block,optional"`
 
-	Clustering Clustering `river:"clustering,block,optional"`
-}
-
-// Clustering holds values that configure clustering-specific behavior.
-type Clustering struct {
-	// TODO(@tpaschalis) Move this block to a shared place for all components using clustering.
-	Enabled bool `river:"enabled,attr"`
+	Clustering cluster.ComponentBlock `river:"clustering,block,optional"`
 }
 
 // DefaultArguments holds default settings for loki.source.kubernetes.

component/loki/source/podlogs/podlogs.go

@@ -47,13 +47,7 @@ type Arguments struct {
 	Selector          config.LabelSelector `river:"selector,block,optional"`
 	NamespaceSelector config.LabelSelector `river:"namespace_selector,block,optional"`
 
-	Clustering Clustering `river:"clustering,block,optional"`
-}
-
-// Clustering holds values that configure clustering-specific behavior.
-type Clustering struct {
-	// TODO(@tpaschalis) Move this block to a shared place for all components using clustering.
-	Enabled bool `river:"enabled,attr"`
+	Clustering cluster.ComponentBlock `river:"clustering,block,optional"`
 }
 
 // DefaultArguments holds default settings for loki.source.kubernetes.

component/prometheus/operator/types.go

@@ -7,6 +7,7 @@ import (
 	"github.com/grafana/agent/component/common/kubernetes"
 	flow_relabel "github.com/grafana/agent/component/common/relabel"
 	"github.com/grafana/agent/component/prometheus/scrape"
+	"github.com/grafana/agent/service/cluster"
 	"github.com/prometheus/common/model"
 	promconfig "github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/storage"
@@ -26,19 +27,13 @@ type Arguments struct {
 	// LabelSelector allows filtering discovered monitor resources by labels
 	LabelSelector *config.LabelSelector `river:"selector,block,optional"`
 
-	Clustering Clustering `river:"clustering,block,optional"`
+	Clustering cluster.ComponentBlock `river:"clustering,block,optional"`
 
 	RelabelConfigs []*flow_relabel.Config `river:"rule,block,optional"`
 
 	Scrape ScrapeOptions `river:"scrape,block,optional"`
 }
 
-// Clustering holds values that configure clustering-specific behavior.
-type Clustering struct {
-	// TODO(@tpaschalis) Move this block to a shared place for all components using clustering.
-	Enabled bool `river:"enabled,attr"`
-}
-
 // ScrapeOptions holds values that configure scraping behavior.
 type ScrapeOptions struct {
 	// DefaultScrapeInterval is the default interval to scrape targets.

component/prometheus/scrape/scrape.go

@@ -88,13 +88,7 @@ type Arguments struct {
 	ExtraMetrics              bool `river:"extra_metrics,attr,optional"`
 	EnableProtobufNegotiation bool `river:"enable_protobuf_negotiation,attr,optional"`
 
-	Clustering Clustering `river:"clustering,block,optional"`
-}
-
-// Clustering holds values that configure clustering-specific behavior.
-type Clustering struct {
-	// TODO(@tpaschalis) Move this block to a shared place for all components using clustering.
-	Enabled bool `river:"enabled,attr"`
+	Clustering cluster.ComponentBlock `river:"clustering,block,optional"`
 }
 
 // SetToDefault implements river.Defaulter.

component/pyroscope/scrape/scrape.go

@@ -81,7 +81,7 @@ type Arguments struct {
 
 	ProfilingConfig ProfilingConfig `river:"profiling_config,block,optional"`
 
-	Clustering scrape.Clustering `river:"clustering,block,optional"`
+	Clustering cluster.ComponentBlock `river:"clustering,block,optional"`
 }
 
 type ProfilingConfig struct {

converter/internal/prometheusconvert/component/scrape.go

@@ -12,6 +12,7 @@ import (
 	"github.com/grafana/agent/converter/diag"
 	"github.com/grafana/agent/converter/internal/common"
 	"github.com/grafana/agent/converter/internal/prometheusconvert/build"
+	"github.com/grafana/agent/service/cluster"
 	prom_config "github.com/prometheus/prometheus/config"
 	prom_discovery "github.com/prometheus/prometheus/discovery"
 	"github.com/prometheus/prometheus/storage"
@@ -61,7 +62,7 @@ func toScrapeArguments(scrapeConfig *prom_config.ScrapeConfig, forwardTo []stora
 		HTTPClientConfig:          *common.ToHttpClientConfig(&scrapeConfig.HTTPClientConfig),
 		ExtraMetrics:              false,
 		EnableProtobufNegotiation: false,
-		Clustering:                scrape.Clustering{Enabled: false},
+		Clustering:                cluster.ComponentBlock{Enabled: false},
 	}
 }
 

service/cluster/cluster.go

@@ -355,6 +355,13 @@ type Component interface {
 	NotifyClusterChange()
 }
 
+// ComponentBlock holds common arguments for clustering settings within a
+// component. ComponentBlock is intended to be exposed as a block called
+// "clustering".
+type ComponentBlock struct {
+	Enabled bool `river:"enabled,attr"`
+}
+
 // Cluster is a read-only view of a cluster.
 type Cluster interface {
 	// Lookup determines the set of replicationFactor owners for a given key.