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/systemd_linux.go b/collector/systemd_linux.go
index 136009c..7817421 100644
--- a/collector/systemd_linux.go
+++ b/collector/systemd_linux.go
@@ -41,7 +41,7 @@ type systemdCollector struct {
 var unitStatesName = []string{"active", "activating", "deactivating", "inactive", "failed"}
 
 func init() {
-        Factories["systemd"] = NewSystemdCollector
+        registerCollector("systemd", defaultDisabled, NewSystemdCollector)
 }
 
 // NewSystemdCollector returns a new Collector exposing systemd statistics.
@@ -49,11 +49,11 @@ func NewSystemdCollector() (Collector, error) {
         const subsystem = "systemd"
 
         unitDesc := prometheus.NewDesc(
-                prometheus.BuildFQName(Namespace, subsystem, "unit_state"),
+                prometheus.BuildFQName(namespace, subsystem, "unit_state"),
                 "Systemd unit", []string{"name", "state"}, nil,
         )
         systemRunningDesc := prometheus.NewDesc(
-                prometheus.BuildFQName(Namespace, subsystem, "system_running"),
+                prometheus.BuildFQName(namespace, subsystem, "system_running"),
                 "Whether the system is operational (see 'systemctl is-system-running')",
                 nil, nil,
         )