Skip to content

Cherry-pick #24319 to 7.x: [Elastic Agent] Fix issues with enrollment key fetching#24365

Merged
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_24319_7.x
Mar 5, 2021
Merged

Cherry-pick #24319 to 7.x: [Elastic Agent] Fix issues with enrollment key fetching#24365
blakerouse merged 1 commit intoelastic:7.xfrom
blakerouse:backport_24319_7.x

Conversation

@blakerouse
Copy link
Copy Markdown
Contributor

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

What does this PR do?

Fixes an issue with the new container sub-command. It was not handling the naming of the enrollment tokens correctly and when not running without Fleet Server the api_key is not returned in the listing, requiring a detailed fetch to retrieve it.

Why is it important?

So usage of the Elastic Agent container on 7.13 works.

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
  • [ ] I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

* Fix issues with enrollment key fetching for Kibana 7.13.

* Fix issue with regex.

* Add comment, add strings.TrimSpace

(cherry picked from commit 3f00537)
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Copy Markdown
Contributor

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

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 4, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/fleet (Team:Fleet)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Mar 4, 2021
@blakerouse blakerouse self-assigned this Mar 4, 2021
@mtojek mtojek self-requested a review March 4, 2021 22:50
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 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

Expand to view the summary

Build stats

  • Build Cause: Pull request #24365 opened

  • Start Time: 2021-03-04T22:20:46.498+0000

  • Duration: 87 min 52 sec

  • Commit: 52d12e8

Test stats 🧪

Test Results
Failed 0
Passed 6500
Skipped 24
Total 6524

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6500
Skipped 24
Total 6524

@blakerouse blakerouse merged commit 4d0964d into elastic:7.x Mar 5, 2021
@blakerouse blakerouse deleted the backport_24319_7.x branch March 5, 2021 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Team:Elastic-Agent Label for the Agent team Team:Fleet Label for the Fleet team [zube]: In Review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants