Revert "[Heartbeat] Add Magefile to X-Pack (elastic#20549)"

This reverts commit d036955.

heartbeat/magefile.go

@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"github.com/magefile/mage/mg"
+	"github.com/magefile/mage/sh"
 
 	devtools "github.com/elastic/beats/v7/dev-tools/mage"
 	"github.com/elastic/beats/v7/generator/common/beatgen"
@@ -94,7 +95,7 @@ func Package() {
 	defer func() { fmt.Println("package ran for", time.Since(start)) }()
 
 	devtools.UseElasticBeatPackaging()
-	heartbeat.CustomizePackaging()
+	customizePackaging()
 
 	mg.Deps(Update)
 	mg.Deps(CrossBuild, CrossBuildXPack, CrossBuildGoDaemon)
@@ -106,13 +107,14 @@ func TestPackages() error {
 	return devtools.TestPackages(devtools.WithMonitorsD())
 }
 
-func Fields() error {
-	return heartbeat.Fields()
+// Update updates the generated files (aka make update).
+func Update() error {
+	return sh.Run("make", "update")
 }
 
-// Update updates the generated files (aka make update).
-func Update() {
-	mg.SerialDeps(Fields, Config)
+// Fields generates a fields.yml for the Beat.
+func Fields() error {
+	return devtools.GenerateFieldsYAML("monitors/active")
 }
 
 // Imports generates an include/list.go file containing
@@ -125,6 +127,28 @@ func Imports() error {
 	return devtools.GenerateIncludeListGo(options)
 }
 
+func customizePackaging() {
+	monitorsDTarget := "monitors.d"
+	unixMonitorsDir := "/etc/{{.BeatName}}/monitors.d"
+	monitorsD := devtools.PackageFile{
+		Mode:   0644,
+		Source: "monitors.d",
+	}
+
+	for _, args := range devtools.Packages {
+		pkgType := args.Types[0]
+		switch pkgType {
+		case devtools.Docker:
+			args.Spec.ExtraVar("linux_capabilities", "cap_net_raw=eip")
+			args.Spec.Files[monitorsDTarget] = monitorsD
+		case devtools.TarGz, devtools.Zip:
+			args.Spec.Files[monitorsDTarget] = monitorsD
+		case devtools.Deb, devtools.RPM, devtools.DMG:
+			args.Spec.Files[unixMonitorsDir] = monitorsD
+		}
+	}
+}
+
 // Config generates both the short/reference/docker configs.
 func Config() error {
 	return devtools.Config(devtools.AllConfigTypes, heartbeat.ConfigFileParams(), ".")

x-pack/heartbeat/main_test.go

@@ -1,7 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-
 package main
 
 // This file is mandatory as otherwise the heartbeat.test binary is not generated correctly.