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.

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

update go mod elatic/beats reference with newer commit #970

Merged
merged 4 commits into from
Dec 10, 2021

Conversation

michel-laterman
Copy link
Contributor

What is the problem this PR solves?

Update the version of elastic/beats to from v7.11.1 to a more recent one. Specifically elastic/beats@4641f75 off the 8.0 branch.

How does this PR solve the problem?

Updated module includes libbeat support ssl.ca_trusted_fingerprint (elastic/beats#29229). This option is used by libbeat to trust a self-signed CA when bootstrapping a secure by default cluster in 8.0.
The fleet-server will use this option when connecting to ES.

How to test this PR locally

The elastic-agent modifications to support/pass this option to fleet-server can be found with: elastic/beats#29128.

Create a snapshot build of the agent, and fleet-server.

start an 8.0+ ES node and Kibana
go to Kibana and setup fleet (ensure that the elasticsearch scheme is https.
enroll the fleet server with the command and the --fleet-server-es-ca-trusted-fingerprint flag, using the sha256 fingerprint that elasticsearch outputs on startup. i.e.:

./elastic-agent enroll  \
  --fleet-server-es=https://localhost:9200 \
  --fleet-server-service-token=AAEAAWVsYXN0aWMvZmxlZXQtc2VydmVyL3Rva2VuLTE2Mzg5MDYzMTgyNTA6TG1NZjJlMXNUQWVYS3FEbW95bHFBZw \
  --fleet-server-policy=0dd498f0-578b-11ec-89c7-8f0ea2875250 \
  --fleet-server-es-ca-trusted-fingerprint=ab12381f29e755c657ba451df9505d27317cf295062ae949ae2eb10059f31875

Related issues

@michel-laterman michel-laterman added enhancement New feature or request backport-v8.0.0 Automated backport with mergify Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team labels Dec 7, 2021
@elasticmachine
Copy link
Contributor

elasticmachine commented Dec 7, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-09T20:00:18.846+0000

  • Duration: 10 min 54 sec

  • Commit: a67141a

Test stats 🧪

Test Results
Failed 0
Passed 229
Skipped 0
Total 229

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

@michel-laterman
Copy link
Contributor Author

I've created #971 to track updating the module properly once v8.0.0 has bee released.

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.

LGTM

@michel-laterman
Copy link
Contributor Author

was able to do an end to end test on my machine with 8.0.

I had to add the ssl.ca_trusted_fingerprint attribute the the elasticsearch output settings in Kibana to ensure that they are passed to other processes that the agent runs.

@michel-laterman michel-laterman merged commit 7706e2b into elastic:master Dec 10, 2021
@michel-laterman michel-laterman deleted the update-beats-mod branch December 10, 2021 00:28
mergify bot pushed a commit that referenced this pull request Dec 10, 2021
* update go mod elatic/beats reference with newer commit

* Add license overrides

* Fix broken integration test

* Use libbeat BuildServerConfig

(cherry picked from commit 7706e2b)
mergify bot added a commit that referenced this pull request Dec 10, 2021
* update go mod elatic/beats reference with newer commit

* Add license overrides

* Fix broken integration test

* Use libbeat BuildServerConfig

(cherry picked from commit 7706e2b)

Co-authored-by: Michel Laterman <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.0.0 Automated backport with mergify enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants