Make EnableProtobufNegotiation configurable

grafana · Oct 17, 2024 · 3a7cc50 · 3a7cc50
1 parent 69e7872
commit 3a7cc50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/static/metrics/instance/global.go b/static/metrics/instance/global.go
@@ -17,6 +17,8 @@ type GlobalConfig struct {
 	Prometheus  config.GlobalConfig         `yaml:",inline"`
 	RemoteWrite []*config.RemoteWriteConfig `yaml:"remote_write,omitempty"`
 
+	EnableProtobufNegotiation bool `yaml:"enable_protobuf_negotiation,omitempty"`
+
 	ExtraMetrics      bool          `yaml:"-"`
 	DisableKeepAlives bool          `yaml:"-"`
 	IdleConnTimeout   time.Duration `yaml:"-"`

diff --git a/static/metrics/instance/instance.go b/static/metrics/instance/instance.go
@@ -439,8 +439,9 @@ func (i *Instance) initialize(ctx context.Context, reg prometheus.Registerer, cf
 	i.storage = storage.NewFanout(i.logger, i.wal, i.remoteStore)
 
 	opts := &scrape.Options{
-		ExtraMetrics:      cfg.global.ExtraMetrics,
-		HTTPClientOptions: []config_util.HTTPClientOption{},
+		ExtraMetrics:              cfg.global.ExtraMetrics,
+		HTTPClientOptions:         []config_util.HTTPClientOption{},
+		EnableProtobufNegotiation: cfg.global.EnableProtobufNegotiation,
 	}
 
 	if cfg.global.DisableKeepAlives {