RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Address review comments 

Signed-off-by: gotjosh <josue@grafana.com>
This commit is contained in:
gotjosh 2021-02-24 15:35:16 +00:00
parent 9a2ae39430
commit eb3048f2df
No known key found for this signature in database
GPG Key ID: 731A782929412860
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1/api.go
View File

@ -216,7 +216,7 @@ func getClusterStatus(p cluster.ClusterPeer) *clusterStatus {
for _, n := range p.Peers() { for _, n := range p.Peers() {
s.Peers = append(s.Peers, peerStatus{ s.Peers = append(s.Peers, peerStatus{
Name: n.String(), Name: n.Name(),
Address: n.Address(), Address: n.Address(),
}) })
} }

2
api/v2/api.go
View File

@ -179,7 +179,7 @@ func (api *API) getStatusHandler(params general_ops.GetStatusParams) middleware.
peers := []*open_api_models.PeerStatus{} peers := []*open_api_models.PeerStatus{}
for _, n := range api.peer.Peers() { for _, n := range api.peer.Peers() {
address := n.Address() address := n.Address()
name := n.String() name := n.Name()
peers = append(peers, &open_api_models.PeerStatus{ peers = append(peers, &open_api_models.PeerStatus{
Name: &name, Name: &name,
Address: &address, Address: &address,

35
cluster/cluster.go
View File

@ -33,22 +33,20 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
) )
// ClusterPeer helps consumers gather information about the peer(s) in the cluster // Peer is a single peer in a gossip cluster.
type ClusterPeer interface { type ClusterPeer interface {
// Name returns the unique identifier of this peer in the cluster. // Name returns the unique identifier of this peer in the cluster.
Name() string Name() string
// Address returns the IP address of this peer in the cluster.
Address() string
// Status returns a status string representing the peer state. // Status returns a status string representing the peer state.
Status() string Status() string
// Peers returns the peer nodes in the cluster. // Peers returns the peer nodes in the cluster.
Peers() []Node Peers() []ClusterMember
} }
// Node interface that represents node peers in a cluster // ClusterMember interface that represents node peers in a cluster
type Node interface { type ClusterMember interface {
// String returns the name of the node // Name returns the name of the node
String() string Name() string
// Address returns the IP address of the node // Address returns the IP address of the node
Address() string Address() string
} }
@ -565,10 +563,6 @@ func (p *Peer) Name() string {
return p.mlist.LocalNode().Name return p.mlist.LocalNode().Name
} }
func (p *Peer) Address() string {
return p.mlist.LocalNode().Addr.String()
}
// ClusterSize returns the current number of alive members in the cluster. // ClusterSize returns the current number of alive members in the cluster.
func (p *Peer) ClusterSize() int { func (p *Peer) ClusterSize() int {
return p.mlist.NumMembers() return p.mlist.NumMembers()
@ -615,11 +609,22 @@ func (p *Peer) Self() *memberlist.Node {
return p.mlist.LocalNode() return p.mlist.LocalNode()
} }
// Member represents a member in the cluster.
type Member struct {
*memberlist.Node
}
// Name implements cluster.ClusterMember
func (m Member) Name() string { return m.Node.Name }
// Address implements cluster.ClusterMember
func (m Member) Address() string { return m.Node.Address() }
// Peers returns the peers in the cluster. // Peers returns the peers in the cluster.
func (p *Peer) Peers() []Node { func (p *Peer) Peers() []ClusterMember {
peers := make([]Node, 0, len(p.mlist.Members())) peers := make([]ClusterMember, 0, len(p.mlist.Members()))
for _, member := range p.mlist.Members() { for _, member := range p.mlist.Members() {
peers = append(peers, member) peers = append(peers, Member{
Node: member,
})
} }
return peers return peers
} }