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.

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

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

Merged
merged 6 commits into from
Apr 14, 2020

Conversation

ph
Copy link
Contributor

@ph ph commented Apr 8, 2020

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

@elasticmachine
Copy link
Collaborator

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

@ph
Copy link
Contributor Author

ph commented Apr 8, 2020

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

@michalpristas
Copy link
Contributor

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

@ph
Copy link
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
Contributor Author

ph commented Apr 8, 2020

libbeat failures is related checking it out.

@@ -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)
Copy link
Contributor

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
Contributor

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
Contributor

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
Contributor Author

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
[Agent] Rename agent to elastic-agent (elastic#17391)

(cherry picked from commit 66609a3)
* 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

With the recent moves to Jenkins pipeline the Elastic Agent project was
not currently tested.
@ph ph force-pushed the backport_17391_7.x branch from 0b0fc4d to a179399 Compare April 10, 2020 15:37
@ph
Copy link
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.

Copy link
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants