From f7563fe7a2f7ea2698350d11d89824f51ac1b64f Mon Sep 17 00:00:00 2001
From: Siavash Safi <siavash.safi@gmail.com>
Date: Tue, 23 Jun 2015 18:19:18 +0430
Subject: [PATCH] Remove config from collectors.

---
 collector/cpu_freebsd.go        | 9 +++------
 collector/filesystem_freebsd.go | 7 ++-----
 collector/loadavg.go            | 3 +--
 collector/meminfo_freebsd.go    | 5 +----
 collector/netdev_freebsd.go     | 5 +----
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/collector/cpu_freebsd.go b/collector/cpu_freebsd.go
index 54fa8cbf..39ffc50c 100644
--- a/collector/cpu_freebsd.go
+++ b/collector/cpu_freebsd.go
@@ -24,19 +24,16 @@ import "C"
 const ()
 
 type statCollector struct {
-	config Config
-	cpu    *prometheus.CounterVec
+	cpu *prometheus.CounterVec
 }
 
 func init() {
 	Factories["cpu"] = NewStatCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
-// network device stats.
-func NewStatCollector(config Config) (Collector, error) {
+// cpu stats.
+func NewStatCollector() (Collector, error) {
 	return &statCollector{
-		config: config,
 		cpu: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Namespace: Namespace,
diff --git a/collector/filesystem_freebsd.go b/collector/filesystem_freebsd.go
index d33a1d6d..b726a656 100644
--- a/collector/filesystem_freebsd.go
+++ b/collector/filesystem_freebsd.go
@@ -30,7 +30,6 @@ var (
 )
 
 type filesystemCollector struct {
-	config                    Config
 	ignoredMountPointsPattern *regexp.Regexp
 
 	size, free, avail, files, filesFree *prometheus.GaugeVec
@@ -40,13 +39,11 @@ func init() {
 	Factories["filesystem"] = NewFilesystemCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
-// network device filesystems.
-func NewFilesystemCollector(config Config) (Collector, error) {
+// filesystems stats.
+func NewFilesystemCollector() (Collector, error) {
 	var filesystemLabelNames = []string{"filesystem"}
 
 	return &filesystemCollector{
-		config: config,
 		ignoredMountPointsPattern: regexp.MustCompile(*ignoredMountPoints),
 		size: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
diff --git a/collector/loadavg.go b/collector/loadavg.go
index d1eab262..6be49616 100644
--- a/collector/loadavg.go
+++ b/collector/loadavg.go
@@ -24,8 +24,7 @@ func init() {
 	loadavg[0] = 0
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
-// load, seconds since last login and a list of tags as specified by config.
+// load1 stat.
 func NewLoadavgCollector() (Collector, error) {
 	return &loadavgCollector{
 		metric: prometheus.NewGauge(prometheus.GaugeOpts{
diff --git a/collector/meminfo_freebsd.go b/collector/meminfo_freebsd.go
index 9d655a5c..7c9e2469 100644
--- a/collector/meminfo_freebsd.go
+++ b/collector/meminfo_freebsd.go
@@ -33,7 +33,6 @@ const (
 )
 
 type meminfoCollector struct {
-	config  Config
 	metrics map[string]prometheus.Gauge
 }
 
@@ -41,11 +40,9 @@ func init() {
 	Factories["meminfo"] = NewMeminfoCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
 // memory stats.
-func NewMeminfoCollector(config Config) (Collector, error) {
+func NewMeminfoCollector() (Collector, error) {
 	return &meminfoCollector{
-		config:  config,
 		metrics: map[string]prometheus.Gauge{},
 	}, nil
 }
diff --git a/collector/netdev_freebsd.go b/collector/netdev_freebsd.go
index 36ea91e3..ad07aaca 100644
--- a/collector/netdev_freebsd.go
+++ b/collector/netdev_freebsd.go
@@ -24,7 +24,6 @@ const (
 )
 
 type netDevCollector struct {
-	config  Config
 	metrics map[string]*prometheus.CounterVec
 }
 
@@ -32,11 +31,9 @@ func init() {
 	Factories["netdev"] = NewNetDevCollector
 }
 
-// Takes a config struct and prometheus registry and returns a new Collector exposing
 // network device stats.
-func NewNetDevCollector(config Config) (Collector, error) {
+func NewNetDevCollector() (Collector, error) {
 	return &netDevCollector{
-		config:  config,
 		metrics: map[string]*prometheus.CounterVec{},
 	}, nil
 }