Merge pull request #10 from jhoglin/master

Ignore exposed ports during explicit discovery mode

README.md

@@ -85,6 +85,7 @@ Usage:
 
 Flags:
  -c, --clean Disconnects unused networks from the Prometheus container, and deletes them. (default true)
+ -d, --discovery Discovery time: implicit, explicit. Implicit scans all the services found while explicit scans only labeled services. (default "implicit")
  -i, --interval int The interval, in seconds, at which the discovery process is kicked off (default 30)
  -l, --loglevel string Specify log level: debug, info, warn, error (default "info")
  -o, --output string Output file that contains the Prometheus endpoints. (default "swarm-endpoints.json")

swarm.go

@@ -169,7 +169,7 @@ type scrapeTask struct {
 
 // collectPorts builds a map of ports collected from container exposed ports and/or from ports defined
 // as container labels
-func collectPorts(task swarm.Task, serviceIDMap map[string]swarm.Service) map[int]struct{} {
+func collectPorts(task swarm.Task, serviceIDMap map[string]swarm.Service, discoveryType string) map[int]struct{} {
 
  ports := make(map[int]struct{})
 
@@ -180,9 +180,13 @@ func collectPorts(task swarm.Task, serviceIDMap map[string]swarm.Service) map[in
  }
  }
 
- // collects exposed ports
- for _, port := range serviceIDMap[task.ServiceID].Spec.EndpointSpec.Ports {
- ports[int(port.TargetPort)] = struct{}{}
+ // collects exposed ports, but only if we use implicit discovery
+ if discoveryType == implicit {
+ for _, port := range serviceIDMap[task.ServiceID].Spec.EndpointSpec.Ports {
+ ports[int(port.TargetPort)] = struct{}{}
+ }
+ } else {
+ logger.Debugf("Exposed ports on Service %s ignored by Prometheus", task.ServiceID)
  }
 
  return ports
@@ -270,7 +274,7 @@ func discoverSwarm(prometheusContainerID string, outputFile string, discoveryTyp
  }
  }
 
- ports := collectPorts(task, serviceIDMap)
+ ports := collectPorts(task, serviceIDMap, discoveryType)
  containerIPs, taskNetworks := collectIPs(task)
  var taskEndpoints []string