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

Jump to bottom

Cherry-pick #16927 to 7.x: Fix issue when building Agent snapshot and enable building the agent. #17574

Merged
merged 5 commits into from
Apr 7, 2020
Merged

Cherry-pick #16927 to 7.x: Fix issue when building Agent snapshot and enable building the agent. #17574

merged 5 commits into from
Apr 7, 2020

Conversation

ph
Copy link
Contributor

@ph ph commented Apr 7, 2020 •
edited by andresrc
Loading

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

An extension in the generated files ("SNAPSHOT") was preventing us to
correctly generate the agent artifact with the packaged
metricbeat/filebeat.

Fixes: #16908

What does this PR do?

Why is it important?

To have agent artifacts from the nigthly build.

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

@ph
Fix issue when building Agent snapshot and enable building the agent. (…
f779da9 
…#16927)

An extension in the generated files ("SNAPSHOT") was preventing us to
correctly generate the agent artifact with the packaged
metricbeat/filebeat.

Fixes: #16908
(cherry picked from commit 62d3683)
@ph ph requested a review from michalpristas April 7, 2020 12:41
@ph ph self-assigned this Apr 7, 2020
@elasticmachine
Copy link
Collaborator

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

michalpristas
michalpristas reviewed Apr 7, 2020
View reviewed changes
dev-tools/packaging/packages.yml Outdated
@@ -98,10 +98,10 @@ shared:
mode: 0600
config: true
/etc/{{.BeatName}}/beats/filebeat-{{ beat_version }}-{{.GOOS}}-{{.AgentArchName}}.tar.gz:
Copy link
Contributor

Choose a reason for hiding this comment

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

can you cherry pick also a commit where snapshot is used also here on this line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://github.com/elastic/beats/pull/17077/files

This one right?

Copy link
Contributor

Choose a reason for hiding this comment

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

yes please

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have included #17077 #17368 #17016 #16898 in this PR can you take another look?

@michalpristas @ph
[Agent] Fix installers (#17077)
9baf176 
[Agent] Fix installers for snapshots (#17077)
@michalpristas @ph
[Agent] fixed mage package for agent (#17368)
398e16b 
[Agent] fixed mage package for agent (#17368)
@michalpristas @ph
[Agent] Make default config OS agnostic (#17016)
c66cfbf 
[Agent] Make default config OS agnostic (#17016)
@michalpristas @ph
[Agent] Docker image for integration tests (#16898)
dc22e9f 
[Agent] Docker image for integration tests (#16898)
michalpristas
michalpristas approved these changes Apr 7, 2020
View reviewed changes
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 good

This was referenced Apr 7, 2020
Merged
Merged
Merged
Merged
@ph
Copy link
Contributor Author

ph commented Apr 7, 2020

I am going to merge this as soon as lint passes there are currently no tests for agent executed on the 7.x branch.

@ph ph merged commit 284b202 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
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