Remove config from collectors.

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
+// cpu stats.
-// network device stats.
+func NewStatCollector() (Collector, error) {
-func NewStatCollector(config Config) (Collector, error) {
 	return &statCollector{
-		config: config,
 		cpu: prometheus.NewCounterVec(
 			prometheus.CounterOpts{
 				Namespace: Namespace,

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
+// filesystems stats.
-// network device filesystems.
+func NewFilesystemCollector() (Collector, error) {
-func NewFilesystemCollector(config Config) (Collector, error) {
 	var filesystemLabelNames = []string{"filesystem"}
 
 	return &filesystemCollector{
-		config: config,
 		ignoredMountPointsPattern: regexp.MustCompile(*ignoredMountPoints),
 		size: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{

collector/loadavg.go

@@ -24,8 +24,7 @@ func init() {
 	loadavg[0] = 0
 }
 
-// Takes a prometheus registry and returns a new Collector exposing
+// load1 stat.
-// load, seconds since last login and a list of tags as specified by config.
 func NewLoadavgCollector() (Collector, error) {
 	return &loadavgCollector{
 		metric: prometheus.NewGauge(prometheus.GaugeOpts{

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
 }

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
 }