Add new agentbeat with all beats shipped with Elastic Agent as a single beat

filebeat/fileset/factory.go

@@ -34,10 +34,6 @@ import (
 
 var moduleList = monitoring.NewUniqueList()
 
-func init() {
-	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "module", moduleList.Report, monitoring.Report)
-}
-
 // Factory for modules
 type Factory struct {
 	beatInfo              beat.Info

filebeat/fileset/factory_init.go

@@ -0,0 +1,28 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build !agentbeat
+
+package fileset
+
+import (
+	"github.com/elastic/elastic-agent-libs/monitoring"
+)
+
+func init() {
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "module", moduleList.Report, monitoring.Report)
+}

filebeat/fileset/factory_init_agent.go

@@ -0,0 +1,28 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build agentbeat
+
+package fileset
+
+import (
+	"github.com/elastic/elastic-agent-libs/monitoring"
+)
+
+func init() {
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "filebeat_module", moduleList.Report, monitoring.Report)
+}

filebeat/input/input.go

@@ -31,10 +31,6 @@ import (
 
 var inputList = monitoring.NewUniqueList()
 
-func init() {
-	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "input", inputList.Report, monitoring.Report)
-}
-
 // Input is the interface common to all input
 type Input interface {
 	Run()

filebeat/input/input_init.go

@@ -0,0 +1,26 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build !agentbeat
+
+package input
+
+import "github.com/elastic/elastic-agent-libs/monitoring"
+
+func init() {
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "input", inputList.Report, monitoring.Report)
+}

filebeat/input/input_init_agent.go

@@ -0,0 +1,26 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build agentbeat
+
+package input
+
+import "github.com/elastic/elastic-agent-libs/monitoring"
+
+func init() {
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "filebeat_input", inputList.Report, monitoring.Report)
+}

metricbeat/mb/module/runner.go

@@ -32,11 +32,6 @@ var (
 	moduleList *monitoring.UniqueList
 )
 
-func init() {
-	moduleList = monitoring.NewUniqueList()
-	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "module", moduleList.Report, monitoring.Report)
-}
-
 // Runner is a facade for a Wrapper that provides a simple interface
 // for starting and stopping a Module.
 type Runner interface {

metricbeat/mb/module/runner_init.go

@@ -0,0 +1,29 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build !agentbeat
+
+package module
+
+import (
+	"github.com/elastic/elastic-agent-libs/monitoring"
+)
+
+func init() {
+	moduleList = monitoring.NewUniqueList()
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "module", moduleList.Report, monitoring.Report)
+}

metricbeat/mb/module/runner_init_agent.go

@@ -0,0 +1,29 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+//go:build agentbeat
+
+package module
+
+import (
+	"github.com/elastic/elastic-agent-libs/monitoring"
+)
+
+func init() {
+	moduleList = monitoring.NewUniqueList()
+	monitoring.NewFunc(monitoring.GetNamespace("state").GetRegistry(), "metricbeat_module", moduleList.Report, monitoring.Report)
+}

packetbeat/scripts/mage/pcap.go

@@ -26,6 +26,14 @@ import (
 // GolangCrossBuild build the Beat binary inside of the golang-builder.
 // Do not use directly, use crossBuild instead.
 func GolangCrossBuild() error {
+	return multierr.Combine(
+		devtools.GolangCrossBuild(GolangCrossBuildArgs()),
+		devtools.TestLinuxForCentosGLIBC(),
+	)
+}
+
+// GolangCrossBuildArgs returns the correct build arguments for golang-crossbuild.
+func GolangCrossBuildArgs() devtools.BuildArgs {
 	params := devtools.DefaultGolangCrossBuildArgs()
 	if flags, found := libpcapLDFLAGS[devtools.Platform.Name]; found {
 		params.Env = map[string]string{
@@ -35,11 +43,7 @@ func GolangCrossBuild() error {
 	if flags, found := libpcapCFLAGS[devtools.Platform.Name]; found {
 		params.Env["CGO_CFLAGS"] = flags
 	}
-
-	return multierr.Combine(
-		devtools.GolangCrossBuild(params),
-		devtools.TestLinuxForCentosGLIBC(),
-	)
+	return params
 }
 
 // -----------------------------------------------------------------------------

x-pack/agentbeat/Makefile

@@ -0,0 +1,3 @@
+ES_BEATS ?= ../..
+
+include $(ES_BEATS)/dev-tools/make/mage.mk