mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix style issues in retrieval/...

Browse source
This commit is contained in:
beorn7 2016-05-19 17:14:04 +02:00
parent b95c096a45
commit d43c0159aa
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
retrieval/discovery/consul.go
View file

@ -18,6 +18,7 @@ import (
"github.com/prometheus/prometheus/retrieval/discovery/consul" "github.com/prometheus/prometheus/retrieval/discovery/consul"
) )
// NewConsul creates a new Consul based Discovery.
func NewConsul(cfg *config.ConsulSDConfig) (*consul.Discovery, error) { func NewConsul(cfg *config.ConsulSDConfig) (*consul.Discovery, error) {
return consul.NewDiscovery(cfg) return consul.NewDiscovery(cfg)
} }

16
retrieval/discovery/kubernetes/discovery.go
View file

@ -253,10 +253,10 @@ func (kd *Discovery) updateNode(node *Node, eventType EventType) {
defer kd.nodesMu.Unlock() defer kd.nodesMu.Unlock()
updatedNodeName := node.ObjectMeta.Name updatedNodeName := node.ObjectMeta.Name
switch eventType { switch eventType {
case deleted: case Deleted:
// Deleted - remove from nodes map. // Deleted - remove from nodes map.
delete(kd.nodes, updatedNodeName) delete(kd.nodes, updatedNodeName)
case added, modified: case Added, Modified:
// Added/Modified - update the node in the nodes map. // Added/Modified - update the node in the nodes map.
kd.nodes[updatedNodeName] = node kd.nodes[updatedNodeName] = node
} }
@ -331,7 +331,7 @@ func (kd *Discovery) watchNodes(events chan interface{}, done <-chan struct{}, r
kd.nodes = map[string]*Node{} kd.nodes = map[string]*Node{}
for _, node := range nodes { for _, node := range nodes {
events <- &nodeEvent{added, node} events <- &nodeEvent{Added, node}
} }
req, err := http.NewRequest("GET", nodesURL, nil) req, err := http.NewRequest("GET", nodesURL, nil)
@ -391,12 +391,12 @@ func (kd *Discovery) startServiceWatch(events chan<- interface{}, done <-chan st
for oldNSName, oldNS := range existingServices { for oldNSName, oldNS := range existingServices {
if ns, ok := services[oldNSName]; !ok { if ns, ok := services[oldNSName]; !ok {
for _, service := range existingServices[oldNSName] { for _, service := range existingServices[oldNSName] {
events <- &serviceEvent{deleted, service} events <- &serviceEvent{Deleted, service}
} }
} else { } else {
for oldServiceName, oldService := range oldNS { for oldServiceName, oldService := range oldNS {
if _, ok := ns[oldServiceName]; !ok { if _, ok := ns[oldServiceName]; !ok {
events <- &serviceEvent{deleted, oldService} events <- &serviceEvent{Deleted, oldService}
} }
} }
} }
@ -407,7 +407,7 @@ func (kd *Discovery) startServiceWatch(events chan<- interface{}, done <-chan st
for _, ns := range services { for _, ns := range services {
for _, service := range ns { for _, service := range ns {
events <- &serviceEvent{added, service} events <- &serviceEvent{Added, service}
} }
} }
@ -510,9 +510,9 @@ func (kd *Discovery) updateService(service *Service, eventType EventType) *confi
defer kd.servicesMu.Unlock() defer kd.servicesMu.Unlock()
switch eventType { switch eventType {
case deleted: case Deleted:
return kd.deleteService(service) return kd.deleteService(service)
case added, modified: case Added, Modified:
return kd.addService(service) return kd.addService(service)
} }
return nil return nil

10
retrieval/discovery/kubernetes/types.go
View file

@ -13,12 +13,14 @@
package kubernetes package kubernetes
// EventType can legally only have the values defined as constants below.
type EventType string type EventType string
// Possible values for EventType.
const ( const (
added EventType = "ADDED" Added EventType = "ADDED"
modified EventType = "MODIFIED" Modified EventType = "MODIFIED"
deleted EventType = "DELETED" Deleted EventType = "DELETED"
) )
type nodeEvent struct { type nodeEvent struct {
@ -200,6 +202,7 @@ type NodeStatus struct {
Addresses []NodeAddress `json:"addresses,omitempty" description:"list of addresses reachable to the node; see http://releases.k8s.io/HEAD/docs/admin/node.md#node-addresses" patchStrategy:"merge" patchMergeKey:"type"` Addresses []NodeAddress `json:"addresses,omitempty" description:"list of addresses reachable to the node; see http://releases.k8s.io/HEAD/docs/admin/node.md#node-addresses" patchStrategy:"merge" patchMergeKey:"type"`
} }
// NodeAddressType can legally only have the values defined as constants below.
type NodeAddressType string type NodeAddressType string
// These are valid address types of node. NodeLegacyHostIP is used to transit // These are valid address types of node. NodeLegacyHostIP is used to transit
@ -211,6 +214,7 @@ const (
NodeInternalIP NodeAddressType = "InternalIP" NodeInternalIP NodeAddressType = "InternalIP"
) )
// NodeAddress defines the address of a node.
type NodeAddress struct { type NodeAddress struct {
Type NodeAddressType `json:"type" description:"node address type, one of Hostname, ExternalIP or InternalIP"` Type NodeAddressType `json:"type" description:"node address type, one of Hostname, ExternalIP or InternalIP"`
Address string `json:"address" description:"the node address"` Address string `json:"address" description:"the node address"`