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, 3 insertions, 3 deletions

diff --git a/collector/conntrack_linux.go b/collector/conntrack_linux.go
index e830327..4a0e375 100644
--- a/collector/conntrack_linux.go
+++ b/collector/conntrack_linux.go
@@ -25,19 +25,19 @@ type conntrackCollector struct {
 }
 
 func init() {
-        Factories["conntrack"] = NewConntrackCollector
+        registerCollector("conntrack", defaultEnabled, NewConntrackCollector)
 }
 
 // NewConntrackCollector returns a new Collector exposing conntrack stats.
 func NewConntrackCollector() (Collector, error) {
         return &conntrackCollector{
                 current: prometheus.NewDesc(
-                        prometheus.BuildFQName(Namespace, "", "nf_conntrack_entries"),
+                        prometheus.BuildFQName(namespace, "", "nf_conntrack_entries"),
                         "Number of currently allocated flow entries for connection tracking.",
                         nil, nil,
                 ),
                 limit: prometheus.NewDesc(
-                        prometheus.BuildFQName(Namespace, "", "nf_conntrack_entries_limit"),
+                        prometheus.BuildFQName(namespace, "", "nf_conntrack_entries_limit"),
                         "Maximum size of connection tracking table.",
                         nil, nil,
                 ),