[Heartbeat] Move import to cmd for agentbeat (#39818)

emilioalvap · web-flow · commit 727777eab4c2 · 2024-06-06T17:24:04.000+02:00
* [Heartbeat] Move import to cmd for agentbeat

Fix browser plugin import to be bundled inside agentbeat, which is now being skipped and it prevents browser monitors from working.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -161,6 +161,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
 - Adjust State loader to only retry when response code status is 5xx {pull}37981[37981]
 - Reset prctl dumpable flag after cap drop. {pull}38269[38269]
 - Redact synthexec cmd output. {pull}39535[39535]
+- Fix import of browser plugin for agentbeat. {pull}39818[39818]
 
 *Heartbeat*
 
diff --git a/x-pack/heartbeat/cmd/import.go b/x-pack/heartbeat/cmd/import.go
@@ -4,8 +4,10 @@
 
 //go:build linux || darwin
 
-package main
+package cmd
 
+// Agentbeat imports cmd directly and skips main, import all required plugins
+// here to have them bundled together
 import (
 	_ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser"
 )

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,10 @@`
`4`	`4`
`5`	`5`	`//go:build linux \|\| darwin`
`6`	`6`
`7`		`-package main`
	`7`	`+package cmd`
`8`	`8`
	`9`	`+// Agentbeat imports cmd directly and skips main, import all required plugins`
	`10`	`+// here to have them bundled together`
`9`	`11`	`import (`
`10`	`12`	`_ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser"`
`11`	`13`	`)`