Skip to content

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

Merged
ph merged 6 commits intoelastic:7.xfrom
ph:backport_17391_7.x
Apr 14, 2020
Merged

Cherry-pick #17391 to 7.x: [Agent] Rename agent to elastic-agent#17599
ph merged 6 commits intoelastic:7.xfrom
ph:backport_17391_7.x

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Apr 8, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #17391 to 7.x branch. Original message:

What does this PR do?

This PR renames agent to elastic-agent.
packaging tested.
configuration variables such as agent.id are kept the same without a name change.

Why is it important?

To provide less generic name for executable

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Fixes #17239

@ph ph self-assigned this Apr 8, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 8, 2020

Pinging @elastic/ingest-management (Team:Ingest Management)

@ph ph requested a review from michalpristas April 8, 2020 00:14
This was referenced Apr 8, 2020
Merged
Merged
Merged
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Apr 8, 2020

@michalpristas don't merge it yet, I have another fix to go in.

@michalpristas
Copy link
Copy Markdown
Contributor

michalpristas commented Apr 8, 2020

Fails here: vet: management/fleet/manager.go:36:13: undeclared name: Config

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Apr 8, 2020

@michalpristas I've fixed all the bugs and diverging code from master to 7.x, I've run make check locally mage package and the tests. I think we are OK with this. Can you take another look?

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Apr 8, 2020

libbeat failures is related checking it out.

michalpristas
michalpristas reviewed Apr 9, 2020
View reviewed changes
libbeat/cmd/instance/beat.go Outdated
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas Apr 9, 2020

Choose a reason for hiding this comment

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

it's weird that this is missing

Copy link
Copy Markdown
Contributor

@michalpristas michalpristas Apr 9, 2020

Choose a reason for hiding this comment

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

x-pack/libbeat/management/fleet is missing entirely in branch

Copy link
Copy Markdown
Contributor

@michalpristas michalpristas Apr 9, 2020

Choose a reason for hiding this comment

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

check this PR and especially this test update to make libbeat pass
https://github.com/elastic/beats/pull/14835/files#diff-cf1cbef8b594350a8858a0682701458eR76

Copy link
Copy Markdown
Contributor Author

@ph ph Apr 9, 2020

Choose a reason for hiding this comment

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

weird le met check that. I have it locally I might not have pushed it but I still have issues with the libbeat system test.

michalpristas and others added 6 commits April 10, 2020 11:20
@michalpristas @ph
[Agent] Rename agent to elastic-agent (#17391)
5a09d60 
[Agent] Rename agent to elastic-agent (#17391)

(cherry picked from commit 66609a3)
@ph
Add Elastic Agent in the Jenkinsfile (#17445)
7e98ffb 
* Add Elastic Agent in the Jenkinsfile

With the recent moves to Jenkins pipeline the Elastic Agent project was
not currently tested.
@ph
Add Elastic Agent in the Jenkinsfile (#17445)
87b7f1a 
* Add Elastic Agent in the Jenkinsfile

With the recent moves to Jenkins pipeline the Elastic Agent project was
not currently tested.
@michalpristas @ph
[Agent] Handle abs paths on windows correctly (#17461)
ec7f333 
* handle windows correctly
@michalpristas @ph
[Agent] Fix merge of config (#17399)
ca65a54 
[Agent] Fix merge of config #17399
@ph
Missing commits from the initial merges of the agent -> master
a179399
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Apr 10, 2020

@michalpristas I've went back to all the PRs I've backported and I did missed some files, so I tried to understand what happened and I just failed at the big merges. So I've think I've go everything now in this PR. Please take a look all tests were running locally will take a look at the CI this weekend.

michalpristas
michalpristas approved these changes Apr 14, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

looks ok, thanks @ph

@ph ph merged commit 52a4e2b into elastic:7.x Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@michalpristas michalpristas michalpristas approved these changes

Assignees

@ph ph

Labels

backport review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ph @elasticmachine @michalpristas @andresrc