From c20d016f621e8be294c10a566995d83746037466 Mon Sep 17 00:00:00 2001 From: cskh Date: Fri, 12 Aug 2022 15:21:39 -0400 Subject: [PATCH] fix: missing segment and partition (#14194) --- agent/consul/client_serf.go | 2 +- agent/consul/server_serf.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/consul/client_serf.go b/agent/consul/client_serf.go index 05db21e2f..7d993c4ac 100644 --- a/agent/consul/client_serf.go +++ b/agent/consul/client_serf.go @@ -62,7 +62,7 @@ func (c *Client) setupSerf(conf *serf.Config, ch chan serf.Event, path string) ( return nil, err } - addSerfMetricsLabels(conf, false, "", "", "") + addSerfMetricsLabels(conf, false, c.config.Segment, c.config.AgentEnterpriseMeta().PartitionOrDefault(), "") addEnterpriseSerfTags(conf.Tags, c.config.AgentEnterpriseMeta()) diff --git a/agent/consul/server_serf.go b/agent/consul/server_serf.go index b9c8ad95f..569bc977f 100644 --- a/agent/consul/server_serf.go +++ b/agent/consul/server_serf.go @@ -232,7 +232,7 @@ func (s *Server) setupSerfConfig(opts setupSerfOptions) (*serf.Config, error) { conf.ReconnectTimeoutOverride = libserf.NewReconnectOverride(s.logger) - addSerfMetricsLabels(conf, opts.WAN, "", "", "") + addSerfMetricsLabels(conf, opts.WAN, opts.Segment, s.config.AgentEnterpriseMeta().PartitionOrDefault(), "") addEnterpriseSerfTags(conf.Tags, s.config.AgentEnterpriseMeta())