Merge pull request #75 from prometheus/remove-attribute-module

Use flags instead of config and remove attributes

Author: juliusv

README.md

@@ -31,7 +31,6 @@ Which collectors are used is controlled by the `--collectors.enabled` flag.
 
 Name     | Description
 ---------|------------
-attributes | Exposes attributes from the configuration file. Deprecated, use textfile module instead.
 diskstats | Exposes disk I/O statistics from `/proc/diskstats`.
 filesystem | Exposes filesystem statistics, such as disk space used.
 loadavg | Exposes load average.

collector/attributes.go

@@ -26,7 +26,7 @@ func init() {
 
 // NewBondingCollector returns a newly allocated bondingCollector.
 // It exposes the number of configured and active slave of linux bonding interfaces.
-func NewBondingCollector(config Config) (Collector, error) {
+func NewBondingCollector() (Collector, error) {
 	return &bondingCollector{
 		slaves: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{

collector/bonding.go

@@ -7,7 +7,7 @@ import (
 
 const Namespace = "node"
 
-var Factories = make(map[string]func(Config) (Collector, error))
+var Factories = make(map[string]func() (Collector, error))
 
 // Interface a collector has to implement.
 type Collector interface {
@@ -20,8 +20,3 @@ type Collector interface {
 // scraped. (However, for metric gathering that takes very long, it might
 // actually be better to do them proactively before scraping to minimize scrape
 // time.)
-
-type Config struct {
-	Config     map[string]string `json:"config"`
-	Attributes map[string]string `json:"attributes"`
-}

collector/collector.go

@@ -26,7 +26,7 @@ var (
 )
 
 type diskstatsCollector struct {
-	config                Config
+	
 	ignoredDevicesPattern *regexp.Regexp
 	metrics               []prometheus.Collector
 }
@@ -35,13 +35,12 @@ func init() {
 	Factories["diskstats"] = NewDiskstatsCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
+// Takes a prometheus registry and returns a new Collector exposing
 // disk device stats.
-func NewDiskstatsCollector(config Config) (Collector, error) {
+func NewDiskstatsCollector() (Collector, error) {
 	var diskLabelNames = []string{"device"}
 
 	return &diskstatsCollector{
-		config:                config,
 		ignoredDevicesPattern: regexp.MustCompile(*ignoredDevices),
 		// Docs from https://www.kernel.org/doc/Documentation/iostats.txt
 		metrics: []prometheus.Collector{

collector/diskstats.go

@@ -25,7 +25,7 @@ var (
 )
 
 type filesystemCollector struct {
-	config                    Config
+	
 	ignoredMountPointsPattern *regexp.Regexp
 
 	size, free, avail, files, filesFree *prometheus.GaugeVec
@@ -35,13 +35,13 @@ func init() {
 	Factories["filesystem"] = NewFilesystemCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
+// Takes a prometheus registry and returns a new Collector exposing
 // network device filesystems.
-func NewFilesystemCollector(config Config) (Collector, error) {
+func NewFilesystemCollector() (Collector, error) {
 	var filesystemLabelNames = []string{"filesystem"}
 
 	return &filesystemCollector{
-		config: config,
+		
 		ignoredMountPointsPattern: regexp.MustCompile(*ignoredMountPoints),
 		size: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{

collector/filesystem.go

@@ -25,7 +25,7 @@ const (
 
 type gmondCollector struct {
 	metrics map[string]*prometheus.GaugeVec
-	config  Config
+	
 }
 
 func init() {
@@ -34,10 +34,9 @@ func init() {
 
 var illegalCharsRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)
 
-// Takes a config struct and prometheus registry and returns a new Collector scraping ganglia.
-func NewGmondCollector(config Config) (Collector, error) {
+// Takes a prometheus registry and returns a new Collector scraping ganglia.
+func NewGmondCollector() (Collector, error) {
 	c := gmondCollector{
-		config:  config,
 		metrics: map[string]*prometheus.GaugeVec{},
 	}
 

collector/gmond.go

@@ -18,19 +18,19 @@ const (
 )
 
 type interruptsCollector struct {
-	config Config
+	
 	metric *prometheus.CounterVec
 }
 
 func init() {
 	Factories["interrupts"] = NewInterruptsCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
+// Takes a prometheus registry and returns a new Collector exposing
 // interrupts stats
-func NewInterruptsCollector(config Config) (Collector, error) {
+func NewInterruptsCollector() (Collector, error) {
 	return &interruptsCollector{
-		config: config,
+		
 		metric: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Namespace: Namespace,

collector/interrupts.go

@@ -3,13 +3,18 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"strconv"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/procfs"
 )
 
+var (
+	ipvsProcfsMountPoint = flag.String("collector.ipvs.procfs", procfs.DefaultMountPoint, "procfs mountpoint.")
+)
+
 type ipvsCollector struct {
 	Collector
 	fs                                                                          procfs.FS
@@ -23,11 +28,11 @@ func init() {
 
 // NewIPVSCollector sets up a new collector for IPVS metrics. It accepts the
 // "procfs" config parameter to override the default proc location (/proc).
-func NewIPVSCollector(config Config) (Collector, error) {
-	return newIPVSCollector(config)
+func NewIPVSCollector() (Collector, error) {
+	return newIPVSCollector()
 }
 
-func newIPVSCollector(config Config) (*ipvsCollector, error) {
+func newIPVSCollector() (*ipvsCollector, error) {
 	var (
 		ipvsBackendLabelNames = []string{
 			"local_address",
@@ -37,23 +42,14 @@ func newIPVSCollector(config Config) (*ipvsCollector, error) {
 			"proto",
 		}
 		c         ipvsCollector
-		subsystem string
 		err       error
+		subsystem = "ipvs"
 	)
 
-	if p, ok := config.Config["procfs"]; !ok {
-		c.fs, err = procfs.NewFS(procfs.DefaultMountPoint)
-	} else {
-		c.fs, err = procfs.NewFS(p)
-	}
+	c.fs, err = procfs.NewFS(*ipvsProcfsMountPoint)
 	if err != nil {
 		return nil, err
 	}
-	if s, ok := config.Config["ipvs_subsystem"]; ok {
-		subsystem = s
-	} else {
-		subsystem = "ipvs"
-	}
 
 	c.connections = prometheus.NewCounter(
 		prometheus.CounterOpts{

collector/ipvs.go

@@ -1,6 +1,7 @@
 package collector
 
 import (
+	"flag"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -106,7 +107,10 @@ var (
 )
 
 func TestIPVSCollector(t *testing.T) {
-	collector, err := newIPVSCollector(Config{Config: map[string]string{"procfs": "fixtures"}})
+	if err := flag.Set("collector.ipvs.procfs", "fixtures"); err != nil {
+		t.Fatal(err)
+	}
+	collector, err := newIPVSCollector()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -165,7 +169,10 @@ func (c miniCollector) Describe(ch chan<- *prometheus.Desc) {
 }
 
 func TestIPVSCollectorResponse(t *testing.T) {
-	collector, err := NewIPVSCollector(Config{Config: map[string]string{"procfs": "fixtures"}})
+	if err := flag.Set("collector.ipvs.procfs", "fixtures"); err != nil {
+		t.Fatal(err)
+	}
+	collector, err := NewIPVSCollector()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -183,6 +190,7 @@ func TestIPVSCollectorResponse(t *testing.T) {
 	wantLines := strings.Split(string(wantMetrics), "\n")
 	gotLines := strings.Split(string(rw.Body.String()), "\n")
 	gotLinesIdx := 0
+	t.Log(gotLines)
 
 	// Until the Prometheus Go client library offers better testability
 	// (https://github.com/prometheus/client_golang/issues/58), we simply compare