implement selective enabling of additional collectors, closes #216

collector/bonding_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -31,6 +32,7 @@ type bondingCollector struct {
 
 func init() {
 	Factories["bonding"] = NewBondingCollector
+	CollectorsEnabledState["bonding"] = flag.Bool("collectors.bonding.enabled", false, "enables bonding-collector")
 }
 
 // NewBondingCollector returns a newly allocated bondingCollector.

collector/collector.go

@@ -21,6 +21,7 @@ import (
 const Namespace = "node"
 
 var Factories = make(map[string]func() (Collector, error))
+var CollectorsEnabledState = make(map[string]*bool)
 
 // Interface a collector has to implement.
 type Collector interface {

collector/conntrack_linux.go

@@ -16,6 +16,8 @@
 package collector
 
 import (
+	"flag"
+
 	"github.com/prometheus/client_golang/prometheus"
 )
 
@@ -26,6 +28,7 @@ type conntrackCollector struct {
 
 func init() {
 	Factories["conntrack"] = NewConntrackCollector
+	CollectorsEnabledState["conntrack"] = flag.Bool("collectors.conntrack.enabled", true, "enables conntrack-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/cpu_dragonfly.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 	"fmt"
 	"unsafe"
 
@@ -89,6 +90,7 @@ type statCollector struct {
 
 func init() {
 	Factories["cpu"] = NewStatCollector
+	enabledCollectors["cpu"] = flag.Bool("collectors.cpu.enabled", true, "enables cpu-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/cpu_freebsd.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 	"strconv"
 	"unsafe"
 
@@ -111,6 +112,7 @@ type statCollector struct {
 
 func init() {
 	Factories["cpu"] = NewStatCollector
+	enabledCollectors["cpu"] = flag.Bool("collectors.cpu.enabled", true, "enables cpu-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/devstat_dragonfly.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -100,6 +101,7 @@ type devstatCollector struct {
 
 func init() {
 	Factories["devstat"] = NewDevstatCollector
+	enabledCollectors["devstat"] = flag.Bool("collectors.devstat.enabled", false, "enables devstat-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/devstat_freebsd.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -147,6 +148,7 @@ type devstatCollector struct {
 
 func init() {
 	Factories["devstat"] = NewDevstatCollector
+	enabledCollectors["devstat"] = flag.Bool("collectors.devstat.enabled", false, "enables devstat-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/diskstats_linux.go

@@ -45,6 +45,7 @@ type diskstatsCollector struct {
 
 func init() {
 	Factories["diskstats"] = NewDiskstatsCollector
+	CollectorsEnabledState["diskstats"] = flag.Bool("collectors.diskstats.enabled", true, "enables diskstats-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/drbd_linux.go

@@ -15,6 +15,7 @@ package collector
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"os"
 	"strconv"
@@ -149,6 +150,7 @@ type drbdCollector struct{}
 
 func init() {
 	Factories["drbd"] = newDRBDCollector
+	CollectorsEnabledState["drdb"] = flag.Bool("collectors.drdb.enabled", false, "enables drdb-collector")
 }
 
 func newDRBDCollector() (Collector, error) {

collector/entropy_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -27,6 +28,7 @@ type entropyCollector struct {
 
 func init() {
 	Factories["entropy"] = NewEntropyCollector
+	CollectorsEnabledState["entropy"] = flag.Bool("collectors.entropy.enabled", true, "enables entropy-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/filefd_linux.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -34,6 +35,7 @@ type fileFDStatCollector struct{}
 
 func init() {
 	Factories[fileFDStatSubsystem] = NewFileFDStatCollector
+	CollectorsEnabledState["filefd"] = flag.Bool("collectors.filefd.enabled", true, "enables filefd-collector")
 }
 
 // NewFileFDStatCollector returns a new Collector exposing file-nr stats.

collector/filesystem_common.go

@@ -58,6 +58,7 @@ type filesystemStats struct {
 
 func init() {
 	Factories["filesystem"] = NewFilesystemCollector
+	CollectorsEnabledState["filesystem"] = flag.Bool("collectors.filesystem.enabled", true, "enables filesystem-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/gmond.go

@@ -18,6 +18,7 @@ package collector
 import (
 	"bufio"
 	"encoding/xml"
+	"flag"
 	"fmt"
 	"io"
 	"net"
@@ -42,6 +43,7 @@ type gmondCollector struct {
 
 func init() {
 	Factories["gmond"] = NewGmondCollector
+	CollectorsEnabledState["gmond"] = flag.Bool("collectors.gmond.enabled", false, "enables gmond-collector")
 }
 
 var illegalCharsRE = regexp.MustCompile(`[^a-zA-Z0-9_]`)

collector/hwmon_linux.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 	"io/ioutil"
 	"os"
 	"path"
@@ -45,6 +46,7 @@ var (
 
 func init() {
 	Factories["hwmon"] = NewHwMonCollector
+	CollectorsEnabledState["hwmon"] = flag.Bool("collectors.hwmon.enabled", true, "enables hwmon-collector")
 }
 
 type hwMonCollector struct{}

collector/interrupts_common.go

@@ -16,14 +16,19 @@
 
 package collector
 
-import "github.com/prometheus/client_golang/prometheus"
+import (
+	"flag"
+
+	"github.com/prometheus/client_golang/prometheus"
+)
 
 type interruptsCollector struct {
 	metric *prometheus.CounterVec
 }
 
 func init() {
 	Factories["interrupts"] = NewInterruptsCollector
+	CollectorsEnabledState["interrupts"] = flag.Bool("collectors.interrupts.enabled", false, "enables interrupts-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/ipvs_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"strconv"
 
@@ -32,6 +33,7 @@ type ipvsCollector struct {
 
 func init() {
 	Factories["ipvs"] = NewIPVSCollector
+	CollectorsEnabledState["ipvs"] = flag.Bool("collectors.ipvs.enabled", false, "enable interrupts-collector")
 }
 
 // NewIPVSCollector sets up a new collector for IPVS metrics. It accepts the

collector/ksmd_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"path"
 
@@ -33,6 +34,7 @@ type ksmdCollector struct {
 
 func init() {
 	Factories["ksmd"] = NewKsmdCollector
+	CollectorsEnabledState["ksmd"] = flag.Bool("collectors.ksmd.enabled", false, "enables ksmd-collector")
 }
 
 func getCanonicalMetricName(filename string) string {

collector/loadavg.go

@@ -17,6 +17,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -29,6 +30,7 @@ type loadavgCollector struct {
 
 func init() {
 	Factories["loadavg"] = NewLoadavgCollector
+	CollectorsEnabledState["loadavg"] = flag.Bool("collectors.loadavg.enabled", true, "enable loadavg-collector")
 }
 
 // Take a prometheus registry and return a new Collector exposing load average.

collector/logind_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"os"
 	"strconv"
@@ -79,6 +80,7 @@ type logindSeatEntry struct {
 
 func init() {
 	Factories["logind"] = NewLogindCollector
+	CollectorsEnabledState["logind"] = flag.Bool("collectors.logind.enabled", false, "enables logind-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/mdadm_linux.go

@@ -16,6 +16,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -48,6 +49,7 @@ type mdadmCollector struct{}
 
 func init() {
 	Factories["mdadm"] = NewMdadmCollector
+	CollectorsEnabledState["mdadm"] = flag.Bool("collectors.mdadm.enabled", true, "enable mdadm-collector")
 }
 
 func evalStatusline(statusline string) (active, total, size int64, err error) {

collector/megacli.go

@@ -45,6 +45,7 @@ type megaCliCollector struct {
 
 func init() {
 	Factories["megacli"] = NewMegaCliCollector
+	CollectorsEnabledState["megacli"] = flag.Bool("collectors.megacli.enabled", false, "enables megacli-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/meminfo_bsd.go

@@ -18,6 +18,7 @@ package collector
 
 import (
 	"errors"
+	"flag"
 
 	"github.com/prometheus/client_golang/prometheus"
 )
@@ -49,6 +50,7 @@ type meminfoCollector struct{}
 
 func init() {
 	Factories["meminfo"] = NewMeminfoCollector
+	CollectorsEnabledState["meminfo"] = flag.Bool("collectors.meminfo.enabled", true, "enables meminfo-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/meminfo_linux.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -36,6 +37,7 @@ type meminfoCollector struct{}
 
 func init() {
 	Factories["meminfo"] = NewMeminfoCollector
+	CollectorsEnabledState["meminfo"] = flag.Bool("collectors.meminfo.enabled", true, "enables meminfo-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/meminfo_numa_linux.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -48,6 +49,7 @@ type meminfoNumaCollector struct {
 
 func init() {
 	Factories["meminfo_numa"] = NewMeminfoNumaCollector
+	CollectorsEnabledState["meminfo_numa"] = flag.Bool("collectors.meminfo_numa.enabled", false, "enable meminfo-numa-collector")
 }
 
 // Takes a prometheus registry and returns a new Collector exposing

collector/mountstats_linux.go

@@ -14,6 +14,7 @@
 package collector
 
 import (
+	"flag"
 	"fmt"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -61,6 +62,7 @@ type mountStatsCollector struct {
 
 func init() {
 	Factories["mountstats"] = NewMountStatsCollector
+	CollectorsEnabledState["mountstats"] = flag.Bool("collectors.mountstats.enabled", false, "enable mountstats-collectors")
 }
 
 func NewMountStatsCollector() (Collector, error) {

collector/netdev_common.go

@@ -39,6 +39,7 @@ type netDevCollector struct {
 
 func init() {
 	Factories["netdev"] = NewNetDevCollector
+	CollectorsEnabledState["netdev"] = flag.Bool("collectors.netdev.enabled", true, "enables netdev-collector")
 }
 
 // NewNetDevCollector returns a new Collector exposing network device stats.

collector/netstat_linux.go

@@ -17,6 +17,7 @@ package collector
 
 import (
 	"bufio"
+	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -34,6 +35,7 @@ type netStatCollector struct{}
 
 func init() {
 	Factories["netstat"] = NewNetStatCollector
+	CollectorsEnabledState["netstat"] = flag.Bool("collectors.netstat.enabled", true, "enables netstat-collector")
 }
 
 // NewNetStatCollector takes and returns