Skip to content
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

Customize x-pack/metricbeat config for Windows #10439

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
78 changes: 76 additions & 2 deletions x-pack/metricbeat/magefile.go
Expand Up @@ -16,6 +16,7 @@ import (
"time"

"github.com/magefile/mage/mg"
"github.com/pkg/errors"

"github.com/elastic/beats/dev-tools/mage"
)
Expand Down Expand Up @@ -64,7 +65,9 @@ func Package() {
start := time.Now()
defer func() { fmt.Println("package ran for", time.Since(start)) }()

mage.LoadLocalNamedSpec("xpack")
mage.UseElasticBeatXPackPackaging()
customizePackaging()
mage.PackageKibanaDashboardsFromBuildDir()

mg.Deps(Update, prepareModulePackaging)
mg.Deps(CrossBuild, CrossBuildGoDaemon)
Expand Down Expand Up @@ -97,7 +100,7 @@ func Dashboards() error {

// Config generates both the short and reference configs.
func Config() {
mg.Deps(shortConfig, referenceConfig, createDirModulesD)
mg.Deps(shortConfig, referenceConfig, dockerConfig, createDirModulesD)
}

// Update is an alias for running fields, dashboards, config.
Expand Down Expand Up @@ -244,6 +247,15 @@ func referenceConfig() error {
return nil
}

func dockerConfig() error {
var configParts = []string{
mage.OSSBeatDir("_meta/beat.docker.yml"),
mage.LibbeatDir("_meta/config.docker.yml"),
}

return mage.FileConcat(mage.BeatName+".docker.yml", 0600, configParts...)
}

func createDirModulesD() error {
if err := os.RemoveAll("modules.d"); err != nil {
return err
Expand Down Expand Up @@ -272,3 +284,65 @@ func createDirModulesD() error {
}
return nil
}

func customizePackaging() {
var (
archiveModulesDir = "modules.d"
unixModulesDir = "/etc/{{.BeatName}}/modules.d"

modulesDir = mage.PackageFile{
Mode: 0644,
Source: dirModulesDGenerated,
Config: true,
Modules: true,
}
windowsModulesDir = mage.PackageFile{
Mode: 0644,
Source: "{{.PackageDir}}/modules.d",
Config: true,
Modules: true,
Dep: func(spec mage.PackageSpec) error {
if err := mage.Copy(dirModulesDGenerated, spec.MustExpand("{{.PackageDir}}/modules.d")); err != nil {
return errors.Wrap(err, "failed to copy modules.d dir")
}

return mage.FindReplace(
spec.MustExpand("{{.PackageDir}}/modules.d/system.yml"),
regexp.MustCompile(`- load`), `#- load`)
},
}
windowsReferenceConfig = mage.PackageFile{
Mode: 0644,
Source: "{{.PackageDir}}/metricbeat.reference.yml",
Dep: func(spec mage.PackageSpec) error {
err := mage.Copy("metricbeat.reference.yml",
spec.MustExpand("{{.PackageDir}}/metricbeat.reference.yml"))
if err != nil {
return errors.Wrap(err, "failed to copy reference config")
}

return mage.FindReplace(
spec.MustExpand("{{.PackageDir}}/metricbeat.reference.yml"),
regexp.MustCompile(`- load`), `#- load`)
},
}
)

for _, args := range mage.Packages {
switch args.OS {
case "windows":
args.Spec.Files[archiveModulesDir] = windowsModulesDir
args.Spec.ReplaceFile("{{.BeatName}}.reference.yml", windowsReferenceConfig)
default:
pkgType := args.Types[0]
switch pkgType {
case mage.TarGz, mage.Zip, mage.Docker:
args.Spec.Files[archiveModulesDir] = modulesDir
case mage.Deb, mage.RPM, mage.DMG:
args.Spec.Files[unixModulesDir] = modulesDir
default:
panic(errors.Errorf("unhandled package type: %v", pkgType))
}
}
}
}
11 changes: 11 additions & 0 deletions x-pack/metricbeat/metricbeat.docker.yml
@@ -0,0 +1,11 @@
metricbeat.config.modules:
path: ${path.config}/modules.d/*.yml
reload.enabled: false

processors:
- add_cloud_metadata: ~

output.elasticsearch:
hosts: '${ELASTICSEARCH_HOSTS:elasticsearch:9200}'
username: '${ELASTICSEARCH_USERNAME:}'
password: '${ELASTICSEARCH_PASSWORD:}'
90 changes: 0 additions & 90 deletions x-pack/metricbeat/packages.yml

This file was deleted.