Rework collector registration.

cmd/scollector/collectors/collectors.go

@@ -99,11 +99,6 @@ var (
 	}
 	WatchProcessesDotNet = func() {}
 
-	AddSystemdServiceConfig = func(params conf.ServiceParams) error {
-		return fmt.Errorf("systemd service watching not implemented on this platform")
-	}
-	WatchSystemd = func() {}
-
 	KeepalivedCommunity = ""
 )
 

cmd/scollector/collectors/systemd_linux.go

@@ -20,29 +20,30 @@ type systemdServiceConfig struct {
 var systemdServices []*systemdServiceConfig
 
 func init() {
-	// The following two func defs have no-op stubs in collectors.go, as they are
-	// called by main.go, but only functional on Linux environments.
-	WatchSystemd = func() {
+	registerInit(func(c *conf.Conf) {
+		for _, s := range c.SystemdService {
+			AddSystemdServiceConfig(s)
+		}
 		collectors = append(collectors, &IntervalCollector{
 			F: func() (opentsdb.MultiDataPoint, error) {
 				return c_systemd()
 			},
 			name: "c_systemd",
 		})
-	}
+	})
+}
 
-	AddSystemdServiceConfig = func(params conf.ServiceParams) error {
-		if params.Name == "" {
-			return fmt.Errorf("empty service Name")
-		}
-		reg, err := regexp.Compile(params.Name)
-		if err != nil {
-			return err
-		}
-		serviceConfig := systemdServiceConfig{regex: reg, watch: params.WatchProc}
-		systemdServices = append(systemdServices, &serviceConfig)
-		return nil
+func AddSystemdServiceConfig(params conf.ServiceParams) error {
+	if params.Name == "" {
+		return fmt.Errorf("empty service Name")
+	}
+	reg, err := regexp.Compile(params.Name)
+	if err != nil {
+		return err
 	}
+	serviceConfig := systemdServiceConfig{regex: reg, watch: params.WatchProc}
+	systemdServices = append(systemdServices, &serviceConfig)
+	return nil
 }
 
 // c_systemd() iterates through all units provided by systemd's dbus info.

cmd/scollector/main.go

@@ -117,9 +117,6 @@ func main() {
 	for _, p := range conf.Process {
 		check(collectors.AddProcessConfig(p))
 	}
-	for _, p := range conf.SystemdService {
-		check(collectors.AddSystemdServiceConfig(p))
-	}
 	for _, p := range conf.ProcessDotNet {
 		check(collectors.AddProcessDotNetConfig(p))
 	}
@@ -145,8 +142,6 @@ func main() {
 	collectors.WatchProcesses()
 	collectors.WatchProcessesDotNet()
 
-	collectors.WatchSystemd()
-
 	if *flagFake > 0 {
 		collectors.InitFake(*flagFake)
 	}