[Filebeat] move create-[module,fileset,fields] to mage

CHANGELOG.next.asciidoc

@@ -79,6 +79,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Filebeat*
 - Set event.outcome field based on googlecloud audit log output. {pull}15731[15731]
+- move create-[module,fileset,fields] to mage and enable in x-pack/filebeat {pull}XXXX[XXXX]
 
 *Heartbeat*
 

filebeat/Makefile

@@ -15,14 +15,14 @@ update: mage
 # Creates a new module. Requires the params MODULE.
 .PHONY: create-module
 create-module:
-	@go run ${ES_BEATS}/filebeat/scripts/generator/module/main.go --path=$(PWD) --beats_path=$(BEAT_GOPATH)/src/$(BEAT_PATH) --module=$(MODULE)
+	mage createModule
 
 # Creates a new fileset. Requires the params MODULE and FILESET.
 .PHONY: create-fileset
 create-fileset:
-	@go run ${ES_BEATS}/filebeat/scripts/generator/fileset/main.go --path=$(PWD) --beats_path=$(BEAT_GOPATH)/src/$(BEAT_PATH) --module=$(MODULE) --fileset=$(FILESET)
+	mage createFileset
 
 # Creates a fields.yml based on a pipeline.json file. Requires the params MODULE and FILESET.
 .PHONY: create-fields
 create-fields:
-	@go run ${ES_BEATS}/filebeat/scripts/generator/fields/main.go --beats_path=$(BEAT_GOPATH)/src/$(BEAT_PATH) --module=$(MODULE) --fileset=$(FILESET)
+	mage createFields

filebeat/magefile.go

@@ -22,11 +22,15 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
 	"time"
 
 	"github.com/magefile/mage/mg"
 
 	devtools "github.com/elastic/beats/dev-tools/mage"
+	"github.com/elastic/beats/filebeat/generator/fields"
+	"github.com/elastic/beats/filebeat/generator/fileset"
+	"github.com/elastic/beats/filebeat/generator/module"
 	filebeat "github.com/elastic/beats/filebeat/scripts/mage"
 
 	// mage:import
@@ -220,3 +224,57 @@ func PythonIntegTest(ctx context.Context) error {
 		return devtools.PythonNoseTest(args)
 	}, "GENERATE", "TESTING_FILEBEAT_MODULES", "TESTING_FILEBEAT_FILESETS")
 }
+
+// CreateModule creates a new Filebeat module.
+// Use MODULE=module to specify the name of the new module
+func CreateModule() error {
+	targetModule := os.Getenv("MODULE")
+	if targetModule == "" {
+		return fmt.Errorf("You must specify the module: MODULE=name mage createModule")
+	}
+
+	filebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	return module.Generate(targetModule, filebeatDir, filebeatDir)
+}
+
+// CreateFileset creates a new fileset for an existing Filebeat module.
+// Use MODULE=module to specify the name of the existing module
+// Use FILESET=fileset to specify the name of the new fileset
+func CreateFileset() error {
+	targetModule := os.Getenv("MODULE")
+	targetFileset := os.Getenv("FILESET")
+
+	if targetModule == "" || targetFileset == "" {
+		return fmt.Errorf("You must specify module and fileset: MODULE=module FILESET=fileset mage createFileset")
+	}
+
+	filebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	return fileset.Generate(targetModule, targetFileset, filebeatDir, filebeatDir)
+}
+
+// CreateFields creates a new fields.yml for an existing Filebeat fileset.
+// Use MODULE=module to specify the name of the existing module
+// Use FILESET=fileset to specify the name of the existing fileset
+func CreateFields() error {
+	targetModule := os.Getenv("MODULE")
+	targetFileset := os.Getenv("FILESET")
+
+	if targetModule == "" || targetFileset == "" {
+		return fmt.Errorf("You must specify module and fileset: MODULE=module FILESET=fileset mage createFields")
+	}
+
+	filebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	return fields.Generate(filebeatDir, targetModule, targetFileset, false)
+}

x-pack/filebeat/magefile.go

@@ -9,11 +9,16 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
+	"path"
 	"time"
 
 	"github.com/magefile/mage/mg"
 
 	devtools "github.com/elastic/beats/dev-tools/mage"
+	"github.com/elastic/beats/filebeat/generator/fields"
+	"github.com/elastic/beats/filebeat/generator/fileset"
+	"github.com/elastic/beats/filebeat/generator/module"
 	filebeat "github.com/elastic/beats/filebeat/scripts/mage"
 
 	// mage:import
@@ -188,3 +193,58 @@ func PythonIntegTest(ctx context.Context) error {
 		return devtools.PythonNoseTest(args)
 	}, "GENERATE", "TESTING_FILEBEAT_MODULES", "TESTING_FILEBEAT_FILESETS")
 }
+
+// CreateModule creates a new Filebeat module.
+// Use MODULE=module to specify the name of the new module
+func CreateModule() error {
+	targetModule := os.Getenv("MODULE")
+	if targetModule == "" {
+		return fmt.Errorf("You must specify the module: MODULE=name mage createModule")
+	}
+	xFilebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	filebeatDir := path.Join(path.Dir(path.Dir(xFilebeatDir)), "filebeat")
+
+	return module.Generate(targetModule, xFilebeatDir, filebeatDir)
+}
+
+// CreateFileset creates a new fileset for an existing Filebeat module.
+// Use MODULE=module to specify the name of the existing module
+// Use FILESET=fileset to specify the name of the new fileset
+func CreateFileset() error {
+	targetModule := os.Getenv("MODULE")
+	targetFileset := os.Getenv("FILESET")
+
+	if targetModule == "" || targetFileset == "" {
+		return fmt.Errorf("You must specify the module and fileset: MODULE=module FILESET=fileset createFileset")
+	}
+
+	xFilebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	filebeatDir := path.Join(path.Dir(path.Dir(xFilebeatDir)), "filebeat")
+
+	return fileset.Generate(targetModule, targetFileset, xFilebeatDir, filebeatDir)
+}
+
+// CreateFields creates a new fields.yml for an existing Filebeat fileset.
+// Use MODULE=module to specify the name of the existing module
+// Use FILESET=fileset to specify the name of the existing fileset
+func CreateFields() error {
+	targetModule := os.Getenv("MODULE")
+	targetFileset := os.Getenv("FILESET")
+
+	if targetModule == "" || targetFileset == "" {
+		return fmt.Errorf("You must specify the module and fileset: MODULE=module FILESET=fileset mage createFields")
+	}
+
+	filebeatDir, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+
+	return fields.Generate(filebeatDir, targetModule, targetFileset, false)
+}