-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Filebeat] move create-[module,fileset,fields] to mage #15836
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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") | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Try putting this into There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You could put them under |
||
// 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() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Use |
||
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) | ||
} |
This file was deleted.
This file was deleted.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you want https://godoc.org/github.com/elastic/beats/dev-tools/mage#OSSBeatDir. |
||
|
||
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) | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add a dependency on the mage target so that make will go install it.