Replace --collectors.enabled with per-collector flags (#640)

* Move NodeCollector into package collector

* Refactor collector enabling

* Update README with new collector enabled flags

* Fix out-of-date inline flag reference syntax

* Use new flags in end-to-end tests

* Add flag to disable all default collectors

* Track if a flag has been set explicitly

* Add --collectors.disable-defaults to README

* Revert disable-defaults flag

* Shorten flags

* Fixup timex collector registration

* Fix end-to-end tests

* Change procfs and sysfs path flags

* Fix review comments

1 files changed, 2 insertions, 2 deletions

diff --git a/collector/sockstat_linux.go b/collector/sockstat_linux.go
index 2791b11..92847be 100644
--- a/collector/sockstat_linux.go
+++ b/collector/sockstat_linux.go
@@ -36,7 +36,7 @@ var pageSize = os.Getpagesize()
 type sockStatCollector struct{}
 
 func init() {
-        Factories[sockStatSubsystem] = NewSockStatCollector
+        registerCollector(sockStatSubsystem, defaultEnabled, NewSockStatCollector)
 }
 
 // NewSockStatCollector returns a new Collector exposing socket stats.
@@ -57,7 +57,7 @@ func (c *sockStatCollector) Update(ch chan<- prometheus.Metric) error {
                         }
                         ch <- prometheus.MustNewConstMetric(
                                 prometheus.NewDesc(
-                                        prometheus.BuildFQName(Namespace, sockStatSubsystem, protocol+"_"+name),
+                                        prometheus.BuildFQName(namespace, sockStatSubsystem, protocol+"_"+name),
                                         fmt.Sprintf("Number of %s sockets in state %s.", protocol, name),
                                         nil, nil,
                                 ),