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

[bug][Elastic Agent] Fix endpoint constraint to enable arm64 #28677

Merged
merged 4 commits into from
Oct 28, 2021
Merged

[bug][Elastic Agent] Fix endpoint constraint to enable arm64 #28677

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60bf726
version and spec
michalpristas Oct 27, 2021
77c901b
version back
michalpristas Oct 27, 2021
58aef5a
updated test
michalpristas Oct 27, 2021
87dada6
Merge branch 'master' of github.com:elastic/beats into bug/endpoint-c…
michalpristas Oct 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/program/supported.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions x-pack/elastic-agent/pkg/agent/program/testdata/endpoint_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,5 @@ inputs:
network: true
runtime:
arch: arm64
family: redhat
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not familiar with this spec, what does this section do?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is a test file for testing endpoint will not be installed with certain runtime fields. this is used in TestConfiguration test in x-pack/elastic-agent/pkg/agent/program/program_test.go

see this change: https://github.com/elastic/beats/pull/27256/files#diff-baae09041516b8dab23e04ea74951edf4683919de0e2e35500158fe99fde088b

we populate these runtime fields based on env agent is running on so we can work with it within contraints or elsewhere in a program spec file

major: "7"
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/spec/endpoint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ rules:
- revision

when: length(${fleet}) > 0 and length(${inputs}) > 0 and hasKey(${output}, 'elasticsearch')
constraints: ${runtime.arch} != 'arm64' and ${runtime.family} != 'redhat' and ${runtime.major} != '7'
constraints: not (${runtime.arch} == 'arm64' and ${runtime.family} == 'redhat' and ${runtime.major} == '7')