Skip to content

Cherry-pick #16616 to 7.x: Vendor Agent dependencies#16730

Closed
ph wants to merge 1 commit intoelastic:7.xfrom
ph:backport_16616_7.x
Closed

Cherry-pick #16616 to 7.x: Vendor Agent dependencies#16730
ph wants to merge 1 commit intoelastic:7.xfrom
ph:backport_16616_7.x

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Mar 2, 2020

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

This PR is only the dependencies required by the Agent. We do this to simplify the Agent PR itself and to facilitate future backport to 7.x

What does this PR do?

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 (Project:fleet)

@ph ph requested review from michalpristas, ruflin and urso March 2, 2020 17:28
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, besides the merge conflict.

Comment thread vendor/vendor.json Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@urso Should we bring this into a elastic repo long term?

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Long term and if there is still interest in ecslog, yes.

@urso
Copy link
Copy Markdown

urso commented Mar 3, 2020

@ph looks like switch to go modules to add a conflict.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 3, 2020

yeah, didn't have conflict yesterday rebasing it.

* Vendor Agent dependencies

This PR is only the dependencies required by the Agent.

* Fix missing/bad ecslog dependencies

(cherry picked from commit a25903b)
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 3, 2020

rebased waiting for ci green to merge

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 3, 2020

going to close this, with the introduction of go module it will break this PR.

@ph ph closed this Mar 3, 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.

5 participants