Skip to content

[Agent] Include beats in agent package#15046

Merged
ph merged 12 commits intoelastic:fleetfrom
michalpristas:fleet-packaging
Dec 18, 2019
Merged

[Agent] Include beats in agent package#15046
ph merged 12 commits intoelastic:fleetfrom
michalpristas:fleet-packaging

Conversation

@michalpristas
Copy link
Copy Markdown
Contributor

@michalpristas michalpristas commented Dec 11, 2019

When packaging an agent supported beats are packed into resulting package
New subfolder is created with artifacts of supported beats for specific os-arch combination (windows agent does not contain linux artifacts, 32 bit arch does not mix with 64...)

Fixes: #14915

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/ingest (Project:fleet)

@ph
Copy link
Copy Markdown
Contributor

ph commented Dec 17, 2019

While testing this, I run the mage package task in the x-pack/agent directory but I do not get the Metricbeat / Binaries binaries included in the agent linux zip. Are you expecting us to run make snapshot at the root?

Comment thread dev-tools/packaging/packages.yml Outdated
<<: *common
files:
<<: *agent_binary_files
'beats/filebeat-{{.GOOS}}-{{.Platform.Arch}}.zip':
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

zip

Comment thread dev-tools/packaging/packages.yml Outdated
uninstall-service-{{.BeatName}}.ps1:
template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/windows/uninstall-service.ps1.tmpl'
mode: 0755
'beats/filebeat-{{.GOOS}}-{{.Platform.Arch}}.zip':
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

version?

@ph
Copy link
Copy Markdown
Contributor

ph commented Dec 17, 2019

@michalpristas it is ready for another round of review? I did a quick mage package and the required files appear to be present in the artifact?

@michalpristas
Copy link
Copy Markdown
Contributor Author

@ph yeah it should be all working now, you need to check build/distributions inside x-pack/agent to verify content

@ph
Copy link
Copy Markdown
Contributor

ph commented Dec 18, 2019

LGTM

@ph ph merged commit f307368 into elastic:fleet Dec 18, 2019
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
Include metricbeat and Filebeat inside the agent.
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.

3 participants