Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Agent] Rename agent to elastic-agent #17391

Merged
merged 9 commits into from
Apr 2, 2020
Merged

[Agent] Rename agent to elastic-agent #17391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4e0f837
renmaed
michalpristas Apr 1, 2020
7259127
linux packaging fixed
michalpristas Apr 1, 2020
37fb574
Merge branch 'master' into agent-rename
michalpristas Apr 1, 2020
4ea66ce
rename to capital agent in docs
michalpristas Apr 2, 2020
8b939de
Merge branch 'master' into agent-rename
michalpristas Apr 2, 2020
05a0687
Merge branch 'master' into agent-rename
michalpristas Apr 2, 2020
93bb2e3
merge master
michalpristas Apr 2, 2020
ab94db4
mage vendor
michalpristas Apr 2, 2020
f0398b3
changelog
michalpristas Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
0 ...ng/templates/docker/Dockerfile.agent.tmpl → ...ates/docker/Dockerfile.elastic-agent.tmpl
View file
Open in desktop
File renamed without changes.
0 ...lates/docker/docker-entrypoint.agent.tmpl → ...cker/docker-entrypoint.elastic-agent.tmpl
View file
Open in desktop
File renamed without changes.
25 changes: 0 additions & 25 deletions x-pack/agent/pkg/agent/application/configuration_embed.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion x-pack/agent/.gitignore → x-pack/elastic-agent/.gitignore
View file
Open in desktop
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
1 change: 1 addition & 0 deletions x-pack/agent/CHANGELOG.asciidoc → x-pack/elastic-agent/CHANGELOG.asciidoc
View file
Open in desktop
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
0 x-pack/agent/Dockerfile → x-pack/elastic-agent/Dockerfile
View file
Open in desktop
File renamed without changes.
0 x-pack/agent/Makefile → x-pack/elastic-agent/Makefile
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion x-pack/agent/_meta/common.p1.yml → x-pack/elastic-agent/_meta/common.p1.yml
View file
Open in desktop
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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the YAML of documentation we should use the right capitalization to represent the product: "Elastic Agent"

6 changes: 3 additions & 3 deletions x-pack/agent/_meta/common.p2.yml → x-pack/elastic-agent/_meta/common.p2.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion x-pack/agent/_meta/common.reference.p1.yml → ...astic-agent/_meta/common.reference.p1.yml
View file
Open in desktop
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.
6 changes: 3 additions & 3 deletions x-pack/agent/_meta/common.reference.p2.yml → ...astic-agent/_meta/common.reference.p2.yml
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions x-pack/agent/_meta/agent.docker.yml → ...stic-agent/_meta/elastic-agent.docker.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion x-pack/agent/_meta/agent.fleet.yml → ...astic-agent/_meta/elastic-agent.fleet.yml
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions x-pack/agent/_meta/agent.yml → x-pack/elastic-agent/_meta/elastic-agent.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion x-pack/agent/cmd/agent/agent.go → ...-agent/cmd/elastic-agent/elastic-agent.go
View file
Open in desktop
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
10 changes: 5 additions & 5 deletions ...-tools/cmd/buildfleetcfg/buildfleetcfg.go → ...-tools/cmd/buildfleetcfg/buildfleetcfg.go
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ...gent/dev-tools/cmd/buildspec/buildspec.go → ...gent/dev-tools/cmd/buildspec/buildspec.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .../agent/dev-tools/cmd/fakewebapi/README.md → ...-agent/dev-tools/cmd/fakewebapi/README.md
View file
Open in desktop
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
0 ...-tools/cmd/fakewebapi/action_example.json → ...-tools/cmd/fakewebapi/action_example.json
View file
Open in desktop
File renamed without changes.
0 ...ent/dev-tools/cmd/fakewebapi/checkin.json → ...ent/dev-tools/cmd/fakewebapi/checkin.json
View file
Open in desktop
File renamed without changes.
0 ...k/agent/dev-tools/cmd/fakewebapi/fetch.sh → ...c-agent/dev-tools/cmd/fakewebapi/fetch.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ck/agent/dev-tools/cmd/fakewebapi/main.go → ...ic-agent/dev-tools/cmd/fakewebapi/main.go
View file
Open in desktop
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
0 ...ck/agent/dev-tools/cmd/fakewebapi/push.sh → ...ic-agent/dev-tools/cmd/fakewebapi/push.sh
View file
Open in desktop
File renamed without changes.
0 x-pack/agent/docker-compose.yml → x-pack/elastic-agent/docker-compose.yml
View file
Open in desktop
File renamed without changes.
0 x-pack/agent/docs/agent.asciidoc → ...elastic-agent/docs/elastic-agent.asciidoc
View file
Open in desktop
File renamed without changes.
0 ...gent/docs/agent_configuration_example.yml → ...s/elastic-agent_configuration_example.yml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions x-pack/agent/agent.docker.yml → ...ck/elastic-agent/elastic-agent.docker.yml
View file
Open in desktop
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