Agent required changes for building the agent artifacts by ph · Pull Request #16624 · elastic/beats

ph · 2020-02-26T18:04:56Z

The Agent has special requirements:

Only Elastic licensed
Bundle Metricbeat
Bundle Filebeat

This PR isolate all the required changes for the devtools to correctly
build the agent. This can be merged as is because it doesn't impact
building any other beats.

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

The Agent has special requirements: - Only Elastic licensed - Bundle Metricbeat - Bundle Filebeat This PR isolate all the required changes for the devtools to correctly build the agent. This can be merged as is because it doesn't impact building any other beats.

elasticmachine · 2020-02-26T18:04:58Z

Pinging @elastic/ingest (Project:fleet)

ph · 2020-02-26T18:06:41Z

This can be safely backported to 7.x

urso · 2020-02-26T18:58:36Z

+    extra_vars:
+      # OS X 10.8 Mountain Lion is the oldest supported by Go 1.10.
+      # https://golang.org/doc/go1.10#ports
+      min_supported_osx_version: 10.8


our current build system is based on go1.13. Min macOS version is 1.11

@urso its a copy-paste of the existing packages task defined in

beats/dev-tools/packaging/packages.yml

Lines 222 to 225 in 6034c9a

# OS X 10.8 Mountain Lion is the oldest supported by Go 1.10.

# https://golang.org/doc/go1.10#ports

min_supported_osx_version: 10.8

identifier: 'co.{{.BeatVendor | tolower}}.beats.{{.BeatName}}'

I will update mine to 1.11 and make a PR for the other part in master.

urso · 2020-02-26T19:00:41Z

LGTM

@andrewkroh cam you also have a look?

Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>

ph · 2020-02-27T13:14:27Z

@ruflin all yours changes are in.

ph · 2020-02-27T13:56:05Z

Weird, I had to kick Travis manually it was stuck.

michalpristas

lgtm, looks like a cherry pick of what we have in feature ingest branch right?

michalpristas · 2020-02-27T15:05:27Z

i've see travis being slow lately. noemi also complained

ph · 2020-02-27T15:28:30Z

@michalpristas Yes Its a cherry-pick, there is webhook issues or slowdown on github side.

andrewkroh

Code changes look good. My questions are mostly about what's in the packages.

andrewkroh · 2020-02-27T15:33:19Z

+        source: '{{ repo.RootDir }}/LICENSE.txt'
+        mode: 0644
+      /usr/share/{{.BeatName}}/README.md:
+        template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/common/README.md.tmpl'


This readme template is specific to a Beat. I think the agent will want to have its own.

andrewkroh · 2020-02-27T15:49:11Z

+    extra_vars:
+      from: 'centos:7'
+      user: '{{ .BeatName }}'
+      linux_capabilities: ''


So that agent can run in a container as a non-root user without any special Linux capabilities added to the binary? 🤔

this is a copy paste from some beat, we in fact need to update user to a full root probably

root is used here in this PR: https://github.com/elastic/beats/pull/16898/files

andrewkroh · 2020-02-27T15:50:41Z

+    files:
+      <<: *agent_binary_files
+      install-service-{{.BeatName}}.ps1:
+        template: '{{ elastic_beats_dir }}/dev-tools/packaging/templates/windows/install-service.ps1.tmpl'


Does the agent use the same CLI arguments as the beats? Maybe you need a customized install script?

we tried to mimic beat behavior here and we support args like -c or path.* i'm not sure about -E

ph · 2020-03-02T15:35:32Z

I am going to merge this and addresses the changes the mention of @andrewkroh in a followup PR.

) * Agent required changes for building the agent artifacts The Agent has special requirements: - Only Elastic licensed - Bundle Metricbeat - Bundle Filebeat This PR isolate all the required changes for the devtools to correctly build the agent. This can be merged as is because it doesn't impact building any other beats. * Update dev-tools/mage/pkgspecs.go Co-Authored-By: Nicolas Ruflin <spam@ruflin.com> * Update dev-tools/mage/pkgspecs.go Co-Authored-By: Nicolas Ruflin <spam@ruflin.com> * Update dev-tools/mage/pkgspecs.go Co-Authored-By: Nicolas Ruflin <spam@ruflin.com> * update min version for macos to 1.11 Co-authored-by: Nicolas Ruflin <spam@ruflin.com> (cherry picked from commit ab84afc)

ph added review [zube]: In Review Project:fleet labels Feb 26, 2020

ph requested review from michalpristas, ruflin and urso February 26, 2020 18:04

ph self-assigned this Feb 26, 2020

ph mentioned this pull request Feb 26, 2020

Merge agent to master #16494

Merged

5 tasks

ph added the needs_backport PR is waiting to be backported to other branches. label Feb 26, 2020

urso reviewed Feb 26, 2020

View reviewed changes

urso requested a review from andrewkroh February 26, 2020 19:00

ruflin reviewed Feb 27, 2020

View reviewed changes

Comment thread dev-tools/mage/pkgspecs.go Outdated

Comment thread dev-tools/mage/pkgspecs.go Outdated

Comment thread dev-tools/mage/pkgspecs.go Outdated

ph and others added 3 commits February 27, 2020 08:14

Update dev-tools/mage/pkgspecs.go

bb66882

Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>

Update dev-tools/mage/pkgspecs.go

e3a175d

Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>

Update dev-tools/mage/pkgspecs.go

6034c9a

Co-Authored-By: Nicolas Ruflin <spam@ruflin.com>

update min version for macos to 1.11

f146e39

michalpristas approved these changes Feb 27, 2020

View reviewed changes

andrewkroh reviewed Feb 27, 2020

View reviewed changes

ph merged commit ab84afc into elastic:master Mar 2, 2020

ph mentioned this pull request Mar 2, 2020

Cherry-pick #16624 to 7.x: Agent required changes for building the agent artifacts #16729

Merged

5 tasks

ph removed the needs_backport PR is waiting to be backported to other branches. label Mar 2, 2020

ph added the v7.7.0 label Mar 2, 2020

	# OS X 10.8 Mountain Lion is the oldest supported by Go 1.10.
	# https://golang.org/doc/go1.10#ports
	min_supported_osx_version: 10.8
	identifier: 'co.{{.BeatVendor \| tolower}}.beats.{{.BeatName}}'

Conversation

ph commented Feb 26, 2020

What does this PR do?

Why is it important?

Checklist

Author's Checklist

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

Uh oh!

elasticmachine commented Feb 26, 2020

Uh oh!

ph commented Feb 26, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

urso commented Feb 26, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ph commented Feb 27, 2020

Uh oh!

ph commented Feb 27, 2020

Uh oh!

michalpristas left a comment

Choose a reason for hiding this comment

Uh oh!

michalpristas commented Feb 27, 2020

Uh oh!

ph commented Feb 27, 2020

Uh oh!

andrewkroh left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ph commented Mar 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants