From 8a2fa34bca1d33c61fbb9e066601749eaddbd668 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Tue, 6 Oct 2020 16:54:49 -0500 Subject: [PATCH] Remove heartbeat from bundled beats in agent. This keeps most of the changes in https://github.com/elastic/beats/pull/20488 but unbundles heartbeat since it's not ready for prime time yet. We may as well keep the work that has been done already IMHO. --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 - x-pack/elastic-agent/magefile.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index a0cd6f6291e..43e97d4e971 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -21,7 +21,6 @@ - Improved version CLI {pull}20359[20359] - Enroll CLI now restarts running daemon {pull}20359[20359] - Add restart CLI cmd {pull}20359[20359] -- Add new `synthetics/*` inputs to run Heartbeat {pull}20387[20387] - Users of the Docker image can now pass `FLEET_ENROLL_INSECURE=1` to include the `--insecure` flag with the `elastic-agent enroll` command {issue}20312[20312] {pull}20713[20713] - Add `docker` composable dynamic provider. {pull}20842[20842] - Add support for dynamic inputs with providers and `{{variable|"default"}}` substitution. {pull}20839[20839] diff --git a/x-pack/elastic-agent/magefile.go b/x-pack/elastic-agent/magefile.go index 4fa067f8f8b..a1aaba840fb 100644 --- a/x-pack/elastic-agent/magefile.go +++ b/x-pack/elastic-agent/magefile.go @@ -572,7 +572,7 @@ func packageAgent(requiredPackages []string, packagingFn func()) { defer os.RemoveAll(dropPath) defer os.Unsetenv(agentDropPath) - packedBeats := []string{"filebeat", "heartbeat", "metricbeat"} + packedBeats := []string{"filebeat", "metricbeat"} for _, b := range packedBeats { pwd, err := filepath.Abs(filepath.Join("..", b))