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

elastic · Apr 2, 2020 · 66609a3 · 66609a3
1 parent b80066c
commit 66609a3
Show file tree

Hide file tree

Showing 286 changed files with 504 additions and 500 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -188,13 +188,13 @@ jobs:
 
     # Agent
     - os: linux
-      before_install: .ci/scripts/travis_has_changes.sh x-pack/agent libbeat || travis_terminate 0
-      env: TARGETS="-C x-pack/agent testsuite"
+      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/agent libbeat || travis_terminate 0
-      env: TARGETS="TEST_ENVIRONMENT=0 -C x-pack/agent testsuite"
+      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
 

diff --git a/Makefile b/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

diff --git a/dev-tools/packaging/packages.yml b/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 }}{{if .Snapshot}}-SNAPSHOT{{end}}-{{.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
 

diff --git a/...ng/templates/docker/Dockerfile.agent.tmpl → ...ates/docker/Dockerfile.elastic-agent.tmpl b/...ng/templates/docker/Dockerfile.agent.tmpl → ...ates/docker/Dockerfile.elastic-agent.tmpl
diff --git a/...lates/docker/docker-entrypoint.agent.tmpl → ...cker/docker-entrypoint.elastic-agent.tmpl b/...lates/docker/docker-entrypoint.agent.tmpl → ...cker/docker-entrypoint.elastic-agent.tmpl
diff --git a/x-pack/agent/pkg/agent/application/configuration_embed.go b/x-pack/agent/pkg/agent/application/configuration_embed.go
diff --git a/x-pack/agent/.gitignore → x-pack/elastic-agent/.gitignore b/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

diff --git a/x-pack/agent/CHANGELOG.asciidoc → x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/agent/CHANGELOG.asciidoc → x-pack/elastic-agent/CHANGELOG.asciidoc
@@ -9,6 +9,7 @@
 
 
 ==== Breaking changes
+- Rename agent to elastic-agent {pull}17391[17391]
 
 ==== Bugfixes
 

diff --git a/x-pack/agent/Dockerfile → x-pack/elastic-agent/Dockerfile b/x-pack/agent/Dockerfile → x-pack/elastic-agent/Dockerfile
diff --git a/x-pack/agent/Makefile → x-pack/elastic-agent/Makefile b/x-pack/agent/Makefile → x-pack/elastic-agent/Makefile
diff --git a/x-pack/agent/_meta/common.p1.yml → x-pack/elastic-agent/_meta/common.p1.yml b/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.
diff --git a/x-pack/agent/_meta/common.p2.yml → x-pack/elastic-agent/_meta/common.p2.yml b/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

diff --git a/x-pack/agent/_meta/common.reference.p1.yml → ...astic-agent/_meta/common.reference.p1.yml b/x-pack/agent/_meta/common.reference.p1.yml → ...astic-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.
diff --git a/x-pack/agent/_meta/common.reference.p2.yml → ...astic-agent/_meta/common.reference.p2.yml b/x-pack/agent/_meta/common.reference.p2.yml → ...astic-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

diff --git a/x-pack/agent/_meta/agent.docker.yml → ...stic-agent/_meta/elastic-agent.docker.yml b/x-pack/agent/_meta/agent.docker.yml → ...stic-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.

diff --git a/x-pack/agent/_meta/agent.fleet.yml → ...astic-agent/_meta/elastic-agent.fleet.yml b/x-pack/agent/_meta/agent.fleet.yml → ...astic-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.

diff --git a/x-pack/agent/_meta/agent.yml → x-pack/elastic-agent/_meta/elastic-agent.yml b/x-pack/agent/_meta/agent.yml → x-pack/elastic-agent/_meta/elastic-agent.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"
@@ -37,10 +37,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
@@ -57,7 +57,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.

diff --git a/x-pack/agent/cmd/agent/agent.go → ...-agent/cmd/elastic-agent/elastic-agent.go b/x-pack/agent/cmd/agent/agent.go → ...-agent/cmd/elastic-agent/elastic-agent.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/elastic/beats/v7/x-pack/agent/pkg/agent/cmd"
+	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/cmd"
 )
 
 // main just a wrapper, all commands are defined in 'pkg/agent/cmd'.

diff --git a/...-tools/cmd/buildfleetcfg/buildfleetcfg.go → ...-tools/cmd/buildfleetcfg/buildfleetcfg.go b/...-tools/cmd/buildfleetcfg/buildfleetcfg.go → ...-tools/cmd/buildfleetcfg/buildfleetcfg.go
diff --git a/...gent/dev-tools/cmd/buildspec/buildspec.go → ...gent/dev-tools/cmd/buildspec/buildspec.go b/...gent/dev-tools/cmd/buildspec/buildspec.go → ...gent/dev-tools/cmd/buildspec/buildspec.go
diff --git a/.../agent/dev-tools/cmd/fakewebapi/README.md → ...-agent/dev-tools/cmd/fakewebapi/README.md b/.../agent/dev-tools/cmd/fakewebapi/README.md → ...-agent/dev-tools/cmd/fakewebapi/README.md
@@ -1,6 +1,6 @@
 Fakewebapi is a simple test only Webserver
 
-The server implements the minimal calls and response to do high level testing of the agent:
+The server implements the minimal calls and response to do high level testing of the elastic-agent:
 
 - Enroll successfully an Agent.
 - Allow an Agent to periodically check in.

diff --git a/...-tools/cmd/fakewebapi/action_example.json → ...-tools/cmd/fakewebapi/action_example.json b/...-tools/cmd/fakewebapi/action_example.json → ...-tools/cmd/fakewebapi/action_example.json
diff --git a/...ent/dev-tools/cmd/fakewebapi/checkin.json → ...ent/dev-tools/cmd/fakewebapi/checkin.json b/...ent/dev-tools/cmd/fakewebapi/checkin.json → ...ent/dev-tools/cmd/fakewebapi/checkin.json
diff --git a/...k/agent/dev-tools/cmd/fakewebapi/fetch.sh → ...c-agent/dev-tools/cmd/fakewebapi/fetch.sh b/...k/agent/dev-tools/cmd/fakewebapi/fetch.sh → ...c-agent/dev-tools/cmd/fakewebapi/fetch.sh
diff --git a/...ck/agent/dev-tools/cmd/fakewebapi/main.go → ...ic-agent/dev-tools/cmd/fakewebapi/main.go b/...ck/agent/dev-tools/cmd/fakewebapi/main.go → ...ic-agent/dev-tools/cmd/fakewebapi/main.go
@@ -18,7 +18,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/elastic/beats/v7/x-pack/agent/pkg/fleetapi"
+	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/fleetapi"
 )
 
 var (

diff --git a/...ck/agent/dev-tools/cmd/fakewebapi/push.sh → ...ic-agent/dev-tools/cmd/fakewebapi/push.sh b/...ck/agent/dev-tools/cmd/fakewebapi/push.sh → ...ic-agent/dev-tools/cmd/fakewebapi/push.sh
diff --git a/x-pack/agent/docker-compose.yml → x-pack/elastic-agent/docker-compose.yml b/x-pack/agent/docker-compose.yml → x-pack/elastic-agent/docker-compose.yml
diff --git a/x-pack/agent/docs/agent.asciidoc → ...elastic-agent/docs/elastic-agent.asciidoc b/x-pack/agent/docs/agent.asciidoc → ...elastic-agent/docs/elastic-agent.asciidoc
diff --git a/...gent/docs/agent_configuration_example.yml → ...s/elastic-agent_configuration_example.yml b/...gent/docs/agent_configuration_example.yml → ...s/elastic-agent_configuration_example.yml
diff --git a/x-pack/agent/agent.docker.yml → ...ck/elastic-agent/elastic-agent.docker.yml b/x-pack/agent/agent.docker.yml → ...ck/elastic-agent/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.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@


		==== Breaking changes
		- Rename agent to elastic-agent {pull}17391[17391]

		==== Bugfixes

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ import ( @@
     	"os"
     	"time"
-    	"github.com/elastic/beats/v7/x-pack/agent/pkg/agent/cmd"
+    	"github.com/elastic/beats/v7/x-pack/elastic-agent/pkg/agent/cmd"
     )
     // main just a wrapper, all commands are defined in 'pkg/agent/cmd'.
@@ Expand Down @@