github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

consul: Add tags for consul protocol versions

pull/19/head
Armon Dadgar 2014-03-09 15:46:03 -07:00
parent 2a8d998968
commit cd6842ff6b
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
consul/client.go
View File

@ -110,6 +110,9 @@ func (c *Client) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
conf.NodeName = c.config.NodeName conf.NodeName = c.config.NodeName
conf.Tags["role"] = "node" conf.Tags["role"] = "node"
conf.Tags["dc"] = c.config.Datacenter conf.Tags["dc"] = c.config.Datacenter
conf.Tags["vsn"] = fmt.Sprintf("%d", c.config.ProtocolVersion)
conf.Tags["vsn_min"] = fmt.Sprintf("%d", ProtocolVersionMin)
conf.Tags["vsn_max"] = fmt.Sprintf("%d", ProtocolVersionMax)
conf.MemberlistConfig.LogOutput = c.config.LogOutput conf.MemberlistConfig.LogOutput = c.config.LogOutput
conf.LogOutput = c.config.LogOutput conf.LogOutput = c.config.LogOutput
conf.EventCh = ch conf.EventCh = ch
@ -326,7 +329,7 @@ func (c *Client) Stats() map[string]map[string]string {
"server": "false", "server": "false",
"known_servers": toString(uint64(len(c.consuls))), "known_servers": toString(uint64(len(c.consuls))),
}, },
"serf-lan": c.serf.Stats(), "serf_lan": c.serf.Stats(),
} }
return stats return stats
} }

7
consul/server.go
View File

@ -180,6 +180,9 @@ func (s *Server) setupSerf(conf *serf.Config, ch chan serf.Event, path string) (
conf.NodeName = s.config.NodeName conf.NodeName = s.config.NodeName
conf.Tags["role"] = "consul" conf.Tags["role"] = "consul"
conf.Tags["dc"] = s.config.Datacenter conf.Tags["dc"] = s.config.Datacenter
conf.Tags["vsn"] = fmt.Sprintf("%d", s.config.ProtocolVersion)
conf.Tags["vsn_min"] = fmt.Sprintf("%d", ProtocolVersionMin)
conf.Tags["vsn_max"] = fmt.Sprintf("%d", ProtocolVersionMax)
conf.Tags["port"] = fmt.Sprintf("%d", addr.Port) conf.Tags["port"] = fmt.Sprintf("%d", addr.Port)
if s.config.Bootstrap { if s.config.Bootstrap {
conf.Tags["bootstrap"] = "1" conf.Tags["bootstrap"] = "1"
@ -482,8 +485,8 @@ func (s *Server) Stats() map[string]map[string]string {
"known_datacenters": toString(uint64(len(s.remoteConsuls))), "known_datacenters": toString(uint64(len(s.remoteConsuls))),
}, },
"raft": s.raft.Stats(), "raft": s.raft.Stats(),
"serf-lan": s.serfLAN.Stats(), "serf_lan": s.serfLAN.Stats(),
"serf-wan": s.serfWAN.Stats(), "serf_wan": s.serfWAN.Stats(),
} }
return stats return stats
} }