Consolidate collector selection

Remove special tags necessary for gmond and runit collectors. All
collectors get built. Selection of which collectors to use continues to
happen via parameter.

collector/gmond.go

@@ -1,4 +1,4 @@
-// +build ganglia
+// +build !nogmond
 
 package collector
 
@@ -24,7 +24,7 @@ const (
 )
 
 type gmondCollector struct {
-	Metrics map[string]*prometheus.GaugeVec
+	metrics map[string]*prometheus.GaugeVec
 	config  Config
 }
 
@@ -38,41 +38,12 @@ var illegalCharsRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
 func NewGmondCollector(config Config) (Collector, error) {
 	c := gmondCollector{
 		config:  config,
-		Metrics: map[string]*prometheus.GaugeVec{},
+		metrics: map[string]*prometheus.GaugeVec{},
 	}
 
 	return &c, nil
 }
 
-func (c *gmondCollector) setMetric(name, cluster string, metric ganglia.Metric) {
-	if _, ok := c.Metrics[name]; !ok {
-		var desc string
-		var title string
-		for _, element := range metric.ExtraData.ExtraElements {
-			switch element.Name {
-			case "DESC":
-				desc = element.Val
-			case "TITLE":
-				title = element.Val
-			}
-			if title != "" && desc != "" {
-				break
-			}
-		}
-		glog.V(1).Infof("Register %s: %s", name, desc)
-		gv := prometheus.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Namespace: gangliaMetricsPrefix,
-				Name:      name,
-				Help:      desc,
-			},
-			[]string{"cluster"},
-		)
-	}
-	glog.V(1).Infof("Set %s{cluster=%q}: %f", name, cluster, metric.Value)
-	c.Metrics[name].WithLabelValues(cluster).Set(metric.Value)
-}
-
 func (c *gmondCollector) Update(ch chan<- prometheus.Metric) (err error) {
 	conn, err := net.Dial(gangliaProto, gangliaAddress)
 	glog.V(1).Infof("gmondCollector Update")
@@ -100,12 +71,41 @@ func (c *gmondCollector) Update(ch chan<- prometheus.Metric) (err error) {
 			}
 		}
 	}
-	for _, m := range c.Metrics {
+	for _, m := range c.metrics {
 		m.Collect(ch)
 	}
 	return err
 }
 
+func (c *gmondCollector) setMetric(name, cluster string, metric ganglia.Metric) {
+	if _, ok := c.metrics[name]; !ok {
+		var desc string
+		var title string
+		for _, element := range metric.ExtraData.ExtraElements {
+			switch element.Name {
+			case "DESC":
+				desc = element.Val
+			case "TITLE":
+				title = element.Val
+			}
+			if title != "" && desc != "" {
+				break
+			}
+		}
+		glog.V(1).Infof("Register %s: %s", name, desc)
+		c.metrics[name] = prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: gangliaMetricsPrefix,
+				Name:      name,
+				Help:      desc,
+			},
+			[]string{"cluster"},
+		)
+	}
+	glog.V(1).Infof("Set %s{cluster=%q}: %f", name, cluster, metric.Value)
+	c.metrics[name].WithLabelValues(cluster).Set(metric.Value)
+}
+
 func toUtf8(charset string, input io.Reader) (io.Reader, error) {
 	return input, nil //FIXME
 }

collector/megacli.go

@@ -1,4 +1,4 @@
-// +build megacli
+// +build !nomegacli
 
 package collector
 

collector/megacli_test.go

@@ -1,4 +1,4 @@
-// +build megacli
+// +build !nomegacli
 
 package collector
 

collector/runit.go

@@ -1,4 +1,4 @@
-// +build runit
+// +build !norunit
 
 package collector
 
@@ -8,10 +8,6 @@ import (
 	"github.com/soundcloud/go-runit/runit"
 )
 
-const (
-	runitSubsystem = "runit"
-)
-
 type runitCollector struct {
 	config Config
 
@@ -23,36 +19,43 @@ func init() {
 }
 
 func NewRunitCollector(config Config) (Collector, error) {
-	var labels = []string{"service"}
+	var (
+		subsystem   = "service"
+		constLabels = prometheus.Labels{"supervisor": "runit"}
+		labelNames  = []string{"service"}
+	)
 
 	return &runitCollector{
 		config: config,
 		state: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
-				Namespace: Namespace,
-				Subsystem: runitSubsystem,
-				Name:      "state",
-				Help:      "state of runit service.",
+				Namespace:   Namespace,
+				Subsystem:   subsystem,
+				Name:        "state",
+				Help:        "state of runit service.",
+				ConstLabels: constLabels,
 			},
-			labels,
+			labelNames,
 		),
 		stateDesired: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
-				Namespace: Namespace,
-				Subsystem: runitSubsystem,
-				Name:      "desired_state",
-				Help:      "desired state of runit service.",
+				Namespace:   Namespace,
+				Subsystem:   subsystem,
+				Name:        "desired_state",
+				Help:        "desired state of runit service.",
+				ConstLabels: constLabels,
 			},
-			labels,
+			labelNames,
 		),
 		stateNormal: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
-				Namespace: Namespace,
-				Subsystem: runitSubsystem,
-				Name:      "normal_state",
-				Help:      "normal state of runit service.",
+				Namespace:   Namespace,
+				Subsystem:   subsystem,
+				Name:        "normal_state",
+				Help:        "normal state of runit service.",
+				ConstLabels: constLabels,
 			},
-			labels,
+			labelNames,
 		),
 	}, nil
 }