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

Jump to bottom

[Elastic Agent] Fix docker entrypoint for elastic-agent. #24155

Merged
merged 2 commits into from
Feb 22, 2021
Merged

[Elastic Agent] Fix docker entrypoint for elastic-agent. #24155

merged 2 commits into from
Feb 22, 2021

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Feb 22, 2021 •
edited
Loading

What does this PR do?

Fixes issue caused by #23865 where the enrollment command doesn't get parameterized url and enrollment token.

Why is it important?

So enrollment through Docker 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

@blakerouse blakerouse added bug needs_backport PR is waiting to be backported to other branches. Team:Elastic-Agent Label for the Agent team labels Feb 22, 2021
@blakerouse blakerouse self-assigned this Feb 22, 2021
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Feb 22, 2021
@blakerouse blakerouse marked this pull request as ready for review February 22, 2021 13:28
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Feb 22, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 #24155 updated

  • Start Time: 2021-02-22T13:29:00.901+0000

  • Duration: 111 min 51 sec

  • Commit: 3e61398

Test stats 🧪

Test Results
Failed 0
Passed 46704
Skipped 4944
Total 51648

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 46704
Skipped 4944
Total 51648

michalpristas
michalpristas approved these changes Feb 22, 2021
View reviewed changes
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.

change looks good , let's make sure Docs is up to date as well.

@elasticmachine
Copy link
Collaborator

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

@blakerouse blakerouse merged commit 239f243 into elastic:master Feb 22, 2021
@blakerouse blakerouse mentioned this pull request Feb 22, 2021
Merged
3 tasks
@blakerouse blakerouse added v7.13.0 and removed needs_backport PR is waiting to be backported to other branches. labels Feb 22, 2021
@blakerouse blakerouse deleted the agent-fix-docker-enroll branch February 22, 2021 16:16
blakerouse added a commit to blakerouse/beats that referenced this pull request Feb 22, 2021
@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
8c95220 
* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
blakerouse added a commit to blakerouse/beats that referenced this pull request Feb 22, 2021
@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
42e91b8 
* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
blakerouse added a commit to blakerouse/beats that referenced this pull request Feb 22, 2021
@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
d6e28b9 
* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
@blakerouse blakerouse mentioned this pull request Feb 22, 2021
Merged
3 tasks
v1v added a commit to v1v/beats that referenced this pull request Feb 22, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/e2e-fleet
2747498 
* upstream/master:
  [Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
  [PACKAGING] Push docker images with the architecture in the version (elastic#24121)
  [Agent] Add agent standalone manifests for system module & Pod's log collection (elastic#23938)
  indicator type url is in upper case (elastic#24152)
  [Filebeat] Document netflow internal_networks and set default (elastic#24110)
  [Filebeat] Adding fixes to the TI module (elastic#24133)
  [Enhancement] Add RotateOnStartup feature flag for file output (elastic#19347)
  [Ingest Manager] Fix: Successfully installed and enrolled agent running standalone (elastic#24128)
  Set Elastic licence type for APM server Beats update job (elastic#24122)
  Add logrotation section on Running Filebeat on k8s (elastic#24120)
  [CI] Run if manual UI (elastic#24116)
  [CI] enable x-pack/heartbeat in the CI (elastic#23873)
v1v added a commit to v1v/beats that referenced this pull request Feb 23, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/retry-win…
3ea53ee 
…dows-7

* upstream/master:
  Remove OSS reference for kibana and elasticsearch (elastic#24164)
  Skip flaky TestActions on MacOSx (elastic#23966)
  [Filebeat][AWS] Fix vpcflow pipeline exception: Cannot invoke "Object.getClass()" because "receiver" is null (elastic#24167)
  [Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
  [PACKAGING] Push docker images with the architecture in the version (elastic#24121)
  [Agent] Add agent standalone manifests for system module & Pod's log collection (elastic#23938)
  indicator type url is in upper case (elastic#24152)
  [Filebeat] Document netflow internal_networks and set default (elastic#24110)
  [Filebeat] Adding fixes to the TI module (elastic#24133)
  [Enhancement] Add RotateOnStartup feature flag for file output (elastic#19347)
  [Ingest Manager] Fix: Successfully installed and enrolled agent running standalone (elastic#24128)
  Set Elastic licence type for APM server Beats update job (elastic#24122)
  Add logrotation section on Running Filebeat on k8s (elastic#24120)
  [CI] Run if manual UI (elastic#24116)
  [CI] enable x-pack/heartbeat in the CI (elastic#23873)
  chore: comment out the E2E (elastic#24109)
  chore: add-backport-next (elastic#24098)
  Adjust the position of the architecture name in Dockerlogbeat tarball (elastic#24095)
  Update dependencies for M1 support in System (elastic#24019)
@mdelapenya mdelapenya mentioned this pull request Feb 23, 2021
Closed
blakerouse added a commit that referenced this pull request Feb 23, 2021
@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (#24155) (#2…
950b1c4 
…4163)

* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
blakerouse added a commit that referenced this pull request Feb 23, 2021
@blakerouse
[Elastic Agent] Fix docker entrypoint for elastic-agent. (#24155) (#2…
bd0f675 
…4161)

* Fix docker entrypoint for elastic-agent.

* Add changelog entry.

(cherry picked from commit 239f243)
@mdelapenya mdelapenya mentioned this pull request Feb 23, 2021
Merged
10 tasks
v1v added a commit to v1v/beats that referenced this pull request Feb 23, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/packaging…
2e57ac2 
…-arm

* upstream/master: (24 commits)
  Add example input autodsicover config (elastic#24157)
  Empty configuration options generate `<no value>` string for azure-eventhub input (elastic#24156)
  Remove OSS reference for kibana and elasticsearch (elastic#24164)
  Skip flaky TestActions on MacOSx (elastic#23966)
  [Filebeat][AWS] Fix vpcflow pipeline exception: Cannot invoke "Object.getClass()" because "receiver" is null (elastic#24167)
  [Elastic Agent] Fix docker entrypoint for elastic-agent. (elastic#24155)
  [PACKAGING] Push docker images with the architecture in the version (elastic#24121)
  [Agent] Add agent standalone manifests for system module & Pod's log collection (elastic#23938)
  indicator type url is in upper case (elastic#24152)
  [Filebeat] Document netflow internal_networks and set default (elastic#24110)
  [Filebeat] Adding fixes to the TI module (elastic#24133)
  [Enhancement] Add RotateOnStartup feature flag for file output (elastic#19347)
  [Ingest Manager] Fix: Successfully installed and enrolled agent running standalone (elastic#24128)
  Set Elastic licence type for APM server Beats update job (elastic#24122)
  Add logrotation section on Running Filebeat on k8s (elastic#24120)
  [CI] Run if manual UI (elastic#24116)
  [CI] enable x-pack/heartbeat in the CI (elastic#23873)
  chore: comment out the E2E (elastic#24109)
  chore: add-backport-next (elastic#24098)
  Adjust the position of the architecture name in Dockerlogbeat tarball (elastic#24095)
  ...
@EricDavisX EricDavisX mentioned this pull request Feb 25, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@michalpristas michalpristas michalpristas approved these changes

Assignees

@blakerouse blakerouse

Labels
bug Team:Elastic-Agent Label for the Agent team v7.12.0 v7.13.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Agent/Docker] FLEET_ENROLL in Docker agent enrollment is broken
3 participants
@blakerouse @elasticmachine @michalpristas