Skip to content

Cherry-pick #16494 to 7.x: Merge agent to master#16885

Merged
ph merged 1 commit intoelastic:7.xfrom
ph:backport_16494_7.x
Apr 7, 2020
Merged

Cherry-pick #16494 to 7.x: Merge agent to master#16885
ph merged 1 commit intoelastic:7.xfrom
ph:backport_16494_7.x

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Mar 6, 2020

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

What does this PR do?

This PR move the development of the Elastic Agent inside the master branch, the Agent can be configured locally or using the ingest manager in Kibana. The Agent will take care of starting or stopping the processes depending on the configuration needs.

Why is it important?

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

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/ingest-management (Project:fleet)

Copy link
Copy Markdown
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

LGTM. Didn't review all the code but I assume it is a 1:1 backport from master and the go.mod diff looks ok. Please check CI.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 10, 2020

@ruflin Everything is OK on our side, I will rekick the jenkins jobs, because windows worker went offline / failed to connect.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 10, 2020

jenkins test this please

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 12, 2020

jenkins test this please

@ph ph requested review from a team as code owners April 6, 2020 18:47
This PR move the development of the Elastic Agent inside the master branch, the Agent can be configured locally or using the ingest manager in Kibana. The Agent will take care of starting or stopping the processes depending on the configuration needs.

Co-authored-by: Pier-Hugues Pellerin <phpellerin@gmail.com>
Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
(cherry picked from commit a9a2779)
@ph ph requested a review from ruflin April 6, 2020 19:02
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.

went through it and i think it looks ok

@ph ph merged commit dbe6400 into elastic:7.x Apr 7, 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