Remove Beats central management

x-pack/auditbeat/cmd/root.go

@@ -7,10 +7,10 @@ package cmd
 import (
 	auditbeatcmd "github.com/elastic/beats/v7/auditbeat/cmd"
 	"github.com/elastic/beats/v7/libbeat/cmd"
-	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
 
 	// Register Auditbeat x-pack modules.
 	_ "github.com/elastic/beats/v7/x-pack/auditbeat/include"
+	_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
 )
 
 // Name of the beat
@@ -23,5 +23,4 @@ func init() {
 	settings := auditbeatcmd.AuditbeatSettings()
 	settings.ElasticLicensed = true
 	RootCmd = auditbeatcmd.Initialize(settings)
-	xpackcmd.AddXPack(RootCmd, auditbeatcmd.Name)
 }

x-pack/filebeat/cmd/root.go

@@ -7,11 +7,11 @@ package cmd
 import (
 	fbcmd "github.com/elastic/beats/v7/filebeat/cmd"
 	cmd "github.com/elastic/beats/v7/libbeat/cmd"
-	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
 
 	// Register the includes.
 	_ "github.com/elastic/beats/v7/x-pack/filebeat/include"
 	inputs "github.com/elastic/beats/v7/x-pack/filebeat/input/default-inputs"
+	_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
 )
 
 const Name = fbcmd.Name
@@ -21,6 +21,5 @@ func Filebeat() *cmd.BeatsRootCmd {
 	settings := fbcmd.FilebeatSettings()
 	settings.ElasticLicensed = true
 	command := fbcmd.Filebeat(inputs.Init, settings)
-	xpackcmd.AddXPack(command, Name)
 	return command
 }

x-pack/heartbeat/cmd/root.go

@@ -7,7 +7,8 @@ package cmd
 import (
 	heartbeatCmd "github.com/elastic/beats/v7/heartbeat/cmd"
 	"github.com/elastic/beats/v7/libbeat/cmd"
-	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
+
+	_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
 )
 
 // RootCmd to handle beats cli
@@ -17,5 +18,4 @@ func init() {
 	settings := heartbeatCmd.HeartbeatSettings()
 	settings.ElasticLicensed = true
 	RootCmd = heartbeatCmd.Initialize(settings)
-	xpackcmd.AddXPack(RootCmd, heartbeatCmd.Name)
 }

x-pack/journalbeat/cmd/root.go

@@ -7,7 +7,8 @@ package cmd
 import (
 	journalbeatCmd "github.com/elastic/beats/v7/journalbeat/cmd"
 	"github.com/elastic/beats/v7/libbeat/cmd"
-	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
+
+	_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
 )
 
 // RootCmd to handle beats cli
@@ -17,5 +18,4 @@ func init() {
 	settings := journalbeatCmd.JournalbeatSettings()
 	settings.ElasticLicensed = true
 	RootCmd = journalbeatCmd.Initialize(settings)
-	xpackcmd.AddXPack(RootCmd, journalbeatCmd.Name)
 }

x-pack/libbeat/cmd/inject.go → x-pack/libbeat/include/include.go

@@ -2,16 +2,12 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package cmd
+package include
 
 import (
-	"github.com/elastic/beats/v7/libbeat/cmd"
-
-	// register central management
+	// Register Fleet
 	_ "github.com/elastic/beats/v7/x-pack/libbeat/management"
 
-	// Register fleet
-	_ "github.com/elastic/beats/v7/x-pack/libbeat/management/fleet"
 	// register processors
 	_ "github.com/elastic/beats/v7/x-pack/libbeat/processors/add_cloudfoundry_metadata"
 	_ "github.com/elastic/beats/v7/x-pack/libbeat/processors/add_nomad_metadata"
@@ -21,8 +17,3 @@ import (
 	_ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/elb"
 	_ "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/nomad"
 )
-
-// AddXPack extends the given root folder with XPack features
-func AddXPack(root *cmd.BeatsRootCmd, name string) {
-	root.AddCommand(genEnrollCmd(name, ""))
-}

x-pack/libbeat/libbeat.go

@@ -9,14 +9,13 @@ import (
 
 	"github.com/elastic/beats/v7/libbeat/cmd"
 	"github.com/elastic/beats/v7/libbeat/mock"
-	xpackcmd "github.com/elastic/beats/v7/x-pack/libbeat/cmd"
+	_ "github.com/elastic/beats/v7/x-pack/libbeat/include"
 )
 
 // RootCmd to test libbeat
 var RootCmd = cmd.GenRootCmdWithSettings(mock.New, mock.Settings)
 
 func main() {
-	xpackcmd.AddXPack(RootCmd, mock.Name)
 	if err := RootCmd.Execute(); err != nil {
 		os.Exit(1)
 	}