luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

fix: missing segment and partition (#14194)

This commit is contained in:
cskh 2022-08-12 15:21:39 -04:00 committed by GitHub
parent 11884bfb99
commit c20d016f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/consul/client_serf.go
View File

@ -62,7 +62,7 @@ func (c *Client) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
return nil, err return nil, err
} }
addSerfMetricsLabels(conf, false, "", "", "") addSerfMetricsLabels(conf, false, c.config.Segment, c.config.AgentEnterpriseMeta().PartitionOrDefault(), "")
addEnterpriseSerfTags(conf.Tags, c.config.AgentEnterpriseMeta()) addEnterpriseSerfTags(conf.Tags, c.config.AgentEnterpriseMeta())

2
agent/consul/server_serf.go
View File

@ -232,7 +232,7 @@ func (s *Server) setupSerfConfig(opts setupSerfOptions) (*serf.Config, error) {
conf.ReconnectTimeoutOverride = libserf.NewReconnectOverride(s.logger) 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()) addEnterpriseSerfTags(conf.Tags, s.config.AgentEnterpriseMeta())