Cherry-pick #17391 to 7.x: [Agent] Rename agent to elastic-agent (#17599

)

* [Agent] Rename agent to elastic-agent (#17391)

[Agent] Rename agent to elastic-agent (#17391)

(cherry picked from commit 66609a3)

* Add Elastic Agent in the Jenkinsfile (#17445)

* Add Elastic Agent in the Jenkinsfile

With the recent moves to Jenkins pipeline the Elastic Agent project was
not currently tested.

* Add Elastic Agent in the Jenkinsfile (#17445)

* Add Elastic Agent in the Jenkinsfile

With the recent moves to Jenkins pipeline the Elastic Agent project was
not currently tested.

* [Agent] Fix merge of config (#17399)

[Agent] Fix merge of config #17399

* [Agent] Handle abs paths on windows correctly (#17461)

* handle windows correctly

* Missing commits from the initial merges of the agent -> master

Co-authored-by: Michal Pristas <[email protected]>
Co-authored-by: Pier-Hugues Pellerin <[email protected]>

.travis.yml

@@ -161,6 +161,18 @@ jobs:
       go: $TRAVIS_GO_VERSION
       stage: test
 
+    # Agent
+    - os: linux
+      before_install: .ci/scripts/travis_has_changes.sh x-pack/elastic-agent libbeat || travis_terminate 0
+      env: TARGETS="-C x-pack/elastic-agent testsuite"
+      go: $TRAVIS_GO_VERSION
+      stage: test
+    - os: osx
+      before_install: .ci/scripts/travis_has_changes.sh x-pack/elastic-agent libbeat || travis_terminate 0
+      env: TARGETS="TEST_ENVIRONMENT=0 -C x-pack/elastic-agent testsuite"
+      go: $TRAVIS_GO_VERSION
+      stage: test
+
     # Generators
     - os: linux
       env: TARGETS="-C generator/_templates/metricbeat test test-package"

Jenkinsfile

@@ -55,6 +55,48 @@ pipeline {
     stage('Build and Test'){
       failFast false
       parallel {
+        stage('Elastic Agent x-pack'){
+          agent { label 'ubuntu && immutable' }
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            expression {
+              return env.BUILD_ELASTIC_AGENT_XPACK != "false"
+            }
+          }
+          steps {
+            makeTarget("Elastic Agent x-pack Linux", "-C x-pack/elastic-agent testsuite")
+          }
+        }
+
+        stage('Elastic Agent x-pack Windows'){
+          agent { label 'windows-immutable && windows-2019' }
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            expression {
+              return env.BUILD_ELASTIC_AGENT_XPACK != "false" && params.windowsTest
+            }
+          }
+          steps {
+            mageTargetWin("Elastic Agent x-pack Windows Unit test", "x-pack/elastic-agent", "unitTest")
+          }
+        }
+
+        stage('Elastic Agent Mac OS X'){
+          agent { label 'macosx' }
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            expression {
+              return env.BUILD_ELASTIC_AGENT_XPACK != "false" && params.macosTest
+            }
+          }
+          steps {
+            makeTarget("Elastic Agent x-pack Mac OS X", "TEST_ENVIRONMENT=0 -C x-pack/elastic-agent testsuite")
+          }
+        }
+
         stage('Filebeat oss'){
           agent { label 'ubuntu && immutable' }
           options { skipDefaultCheckout() }
@@ -892,5 +934,9 @@ def loadConfigEnvVars(){
 
   env.BUILD_GENERATOR = isChangedOSSCode(["^generator/.*"])
 
+  env.BUILD_ELASTIC_AGENT_XPACK = isChangedXPackCode([
+    "^x-pack/elastic-agent/.*",
+  ])
+
   env.GO_VERSION = readFile(".go-version").trim()
 }

Makefile

@@ -1,6 +1,6 @@
 BUILD_DIR=$(CURDIR)/build
 COVERAGE_DIR=$(BUILD_DIR)/coverage
-BEATS?=auditbeat filebeat heartbeat journalbeat metricbeat packetbeat winlogbeat x-pack/functionbeat x-pack/agent
+BEATS?=auditbeat filebeat heartbeat journalbeat metricbeat packetbeat winlogbeat x-pack/functionbeat x-pack/elastic-agent
 PROJECTS=libbeat $(BEATS)
 PROJECTS_ENV=libbeat filebeat metricbeat
 PYTHON_ENV?=$(BUILD_DIR)/python-env

dev-tools/packaging/packages.yml

@@ -35,11 +35,11 @@ shared:
         content: >
           {{ commit }}
         mode: 0644
-      /etc/{{.BeatName}}/agent.reference.yml:
-        source: 'agent.reference.yml'
+      /etc/{{.BeatName}}/elastic-agent.reference.yml:
+        source: 'elastic-agent.reference.yml'
         mode: 0644
-      /etc/{{.BeatName}}/agent.yml:
-        source: 'agent.yml'
+      /etc/{{.BeatName}}/elastic-agent.yml:
+        source: 'elastic-agent.yml'
         mode: 0600
         config: true
       /usr/share/{{.BeatName}}/bin/{{.BeatName}}-god:
@@ -90,11 +90,11 @@ shared:
       /Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/{{.identifier}}.plist:
         template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/darwin/launchd-daemon.plist.tmpl'
         mode: 0644
-      /etc/{{.BeatName}}/agent.reference.yml:
-        source: 'agent.reference.yml'
+      /etc/{{.BeatName}}/elastic-agent.reference.yml:
+        source: 'elastic-agent.reference.yml'
         mode: 0644
-      /etc/{{.BeatName}}/agent.yml:
-        source: 'agent.yml'
+      /etc/{{.BeatName}}/elastic-agent.yml:
+        source: 'elastic-agent.yml'
         mode: 0600
         config: true
       /etc/{{.BeatName}}/data/downloads/filebeat-{{ beat_version }}-{{.GOOS}}-{{.AgentArchName}}.tar.gz:
@@ -118,11 +118,11 @@ shared:
       content: >
         {{ commit }}
       mode: 0644
-    'agent.reference.yml':
-      source: 'agent.reference.yml'
+    'elastic-agent.reference.yml':
+      source: 'elastic-agent.reference.yml'
       mode: 0644
-    'agent.yml':
-      source: 'agent.yml'
+    'elastic-agent.yml':
+      source: 'elastic-agent.yml'
       mode: 0600
       config: true
 
@@ -163,8 +163,8 @@ shared:
       user: 'root'
       linux_capabilities: ''
     files:
-      'agent.yml':
-        source: 'agent.docker.yml'
+      'elastic-agent.yml':
+        source: 'elastic-agent.docker.yml'
         mode: 0600
         config: true
 

libbeat/cmd/instance/beat.go

@@ -629,7 +629,7 @@ func (b *Beat) configure(settings Settings) error {
 	logp.Info("Beat ID: %v", b.Info.ID)
 
 	// initialize config manager
-	b.ConfigManager, err = management.Factory()(b.Config.Management, reload.Register, b.Beat.Info.ID)
+	b.ConfigManager, err = management.Factory(b.Config.Management)(b.Config.Management, reload.Register, b.Beat.Info.ID)
 	if err != nil {
 		return err
 	}

libbeat/management/management.go

@@ -31,6 +31,8 @@ var Namespace = "libbeat.management"
 // DebugK used as key for all things central management
 var DebugK = "centralmgmt"
 
+var centralMgmtKey = "x-pack-cm"
+
 // ConfigManager interacts with the beat to update configurations
 // from an external source
 type ConfigManager interface {
@@ -47,32 +49,47 @@ type ConfigManager interface {
 	CheckRawConfig(cfg *common.Config) error
 }
 
+// PluginFunc for creating FactoryFunc if it matches a config
+type PluginFunc func(*common.Config) FactoryFunc
+
 // FactoryFunc for creating a config manager
 type FactoryFunc func(*common.Config, *reload.Registry, uuid.UUID) (ConfigManager, error)
 
 // Register a config manager
-func Register(name string, fn FactoryFunc, stability feature.Stability) {
+func Register(name string, fn PluginFunc, stability feature.Stability) {
 	f := feature.New(Namespace, name, fn, feature.MakeDetails(name, "", stability))
 	feature.MustRegister(f)
 }
 
 // Factory retrieves config manager constructor. If no one is registered
 // it will create a nil manager
-func Factory() FactoryFunc {
+func Factory(cfg *common.Config) FactoryFunc {
 	factories, err := feature.GlobalRegistry().LookupAll(Namespace)
 	if err != nil {
 		return nilFactory
 	}
 
 	for _, f := range factories {
-		if factory, ok := f.Factory().(FactoryFunc); ok {
-			return factory
+		if plugin, ok := f.Factory().(PluginFunc); ok {
+			if factory := plugin(cfg); factory != nil {
+				return factory
+			}
 		}
 	}
 
 	return nilFactory
 }
 
+type modeConfig struct {
+	Mode string `config:"mode" yaml:"mode"`
+}
+
+func defaultModeConfig() *modeConfig {
+	return &modeConfig{
+		Mode: centralMgmtKey,
+	}
+}
+
 // nilManager, fallback when no manager is present
 type nilManager struct{}
 

x-pack/agent/.gitignore → x-pack/elastic-agent/.gitignore

@@ -1,6 +1,6 @@
 # agent
 build/
-agent.dev.yml
+elastic-agent.dev.yml
 pkg/agent/operation/tests/scripts/short--1.0.yml
 pkg/agent/operation/tests/scripts/configurable-1.0-darwin-x86/configurable
 pkg/agent/operation/tests/scripts/configurablebyfile-1.0-darwin-x86/configurablebyfile

x-pack/agent/CHANGELOG.asciidoc → x-pack/elastic-agent/CHANGELOG.asciidoc

@@ -9,11 +9,14 @@
 
 
 ==== Breaking changes
+- Rename agent to elastic-agent {pull}17391[17391]
 
 ==== Bugfixes
 
 - Fixed tests on windows {pull}16922[16922]
 - Fixed installers for SNAPSHOTs and windows {pull}17077[17077]
+- Fixed merge of config {pull}17399[17399]
+- Handle abs paths on windows correctly {pull}17461[17461]
 
 ==== New features
 

x-pack/agent/_meta/common.p1.yml → x-pack/elastic-agent/_meta/common.p1.yml

@@ -1,5 +1,5 @@
 ###################### Agent Configuration Example #########################
 
 # This file is an example configuration file highlighting only the most common
-# options. The agent.reference.yml file from the same directory contains all the
+# options. The elastic-agent.reference.yml file from the same directory contains all the
 # supported options with more comments. You can use it as a reference.

x-pack/agent/_meta/common.p2.yml → x-pack/elastic-agent/_meta/common.p2.yml

@@ -24,9 +24,9 @@ datasources:
             dataset: system.filesystem
 
 management:
-  # Mode of magement, the agent support two modes of operation:
+  # Mode of management, the Elastic Agent support two modes of operation:
   #
-  # local: The agent will expect to find the inputs configuration in the local file.
+  # local: The Elastic Agent will expect to find the inputs configuration in the local file.
   #
   # Default is local.
   mode: "local"
@@ -65,7 +65,7 @@ management:
   # Allow fleet to reload his configuration locally on disk.
   # Notes: Only specific process configuration will be reloaded.
   reload:
-    # enabled configure the agent to reload or not the local configuration.
+    # enabled configure the Elastic Agent to reload or not the local configuration.
     #
     # Default is true
     enabled: true

x-pack/agent/_meta/common.reference.p1.yml → x-pack/elastic-agent/_meta/common.reference.p1.yml

@@ -1,5 +1,5 @@
 ###################### Agent Configuration Example #########################
 
 # This file is an example configuration file highlighting only the most common
-# options. The agent.reference.yml file from the same directory contains all the
+# options. The elastic-agent.reference.yml file from the same directory contains all the
 # supported options with more comments. You can use it as a reference.

x-pack/agent/_meta/common.reference.p2.yml → x-pack/elastic-agent/_meta/common.reference.p2.yml

@@ -24,9 +24,9 @@ datasources:
             dataset: system.filesystem
 
 management:
-  # Mode of management, the agent currently only support the following mode:
+  # Mode of management, the Elastic Agent currently only support the following mode:
   #
-  # local: The agent will expect to find the inputs configuration in the local file.
+  # local: The Elastic Agent will expect to find the inputs configuration in the local file.
   #
   # Default is local.
   mode: local
@@ -65,7 +65,7 @@ management:
   # Allow fleet to reload his configuration locally on disk.
   # Notes: Only specific process configuration will be reloaded.
   reload:
-    # enabled configure the agent to reload or not the local configuration.
+    # enabled configure the Elastic Agent to reload or not the local configuration.
     #
     # Default is true
     enabled: true

x-pack/agent/_meta/agent.docker.yml → x-pack/elastic-agent/_meta/elastic-agent.docker.yml

@@ -24,9 +24,9 @@ datasources:
             dataset: system.filesystem
 
 management:
-  # Mode of management, the agent support two modes of operation:
+  # Mode of management, the Elastic Agent support two modes of operation:
   #
-  # local: The agent will expect to find the inputs configuration in the local file.
+  # local: The Elastic Agent will expect to find the inputs configuration in the local file.
   #
   # Default is local.
   mode: "local"
@@ -36,10 +36,10 @@ management:
       # format in which logs will be written, options are json or default.
       format: "default"
 
-  # Allow the agent to reload his configuration locally on disk.
+  # Allow the Elastic Agent to reload his configuration locally on disk.
   # Notes: Only specific process configuration will be reloaded.
   reload:
-    # enabled configure the agent to reload or not the local configuration.
+    # enabled configure the Elastic Agent to reload or not the local configuration.
     #
     # Default is true
     enabled: true
@@ -56,7 +56,7 @@ download:
   # timeout for downloading package
   timeout: 30s
   # file path to a public key used for verifying downloaded artifacts
-  # if not file is present agent will try to load public key from elastic.co website.
+  # if not file is present Elastic Agent will try to load public key from elastic.co website.
   pgpfile: "${path.data}/elastic.pgp"
   # install_path describes the location of installed packages/programs. It is also used
   # for reading program specifications.

x-pack/agent/_meta/agent.fleet.yml → x-pack/elastic-agent/_meta/elastic-agent.fleet.yml

@@ -14,7 +14,7 @@ download:
   # timeout for downloading package
   timeout: 30s
   # file path to a public key used for verifying downloaded artifacts
-  # if not file is present agent will try to load public key from elastic.co website.
+  # if not file is present Elastic Agent will try to load public key from elastic.co website.
   pgpfile: "${path.data}/elastic.pgp"
   # install_path describes the location of installed packages/programs. It is also used
   # for reading program specifications.