Skip to content

Commit

Permalink
[Agent] Rename agent to elastic-agent (#17391)
Browse files Browse the repository at this point in the history
[Agent] Rename agent to elastic-agent (#17391)
  • Loading branch information
michalpristas authored Apr 2, 2020
1 parent b80066c commit 66609a3
Show file tree
Hide file tree
Showing 286 changed files with 504 additions and 500 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 14 additions & 14 deletions dev-tools/packaging/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down
25 changes: 0 additions & 25 deletions x-pack/agent/pkg/agent/application/configuration_embed.go

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand Down
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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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.
Expand Down
Original file line number Diff 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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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.
Expand Down
Loading

0 comments on commit 66609a3

Please sign in to comment.