Cherry-pick #24155 to 7.12: [Elastic Agent] Fix docker entrypoint for elastic-agent. #24163

blakerouse · 2021-02-22T16:18:35Z

Cherry-pick of PR #24155 to 7.12 branch. Original message:

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

Closes [Agent/Docker] FLEET_ENROLL in Docker agent enrollment is broken #24146

* Fix docker entrypoint for elastic-agent. * Add changelog entry. (cherry picked from commit 239f243)

elasticmachine · 2021-02-22T16:18:37Z

Pinging @elastic/agent (Team:Agent)

elasticmachine · 2021-02-22T16:18:37Z

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

elasticmachine · 2021-02-22T18:13:49Z

💔 Build Failed

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: blakerouse commented: /test
Start Time: 2021-02-22T19:09:13.031+0000
Duration: 56 min 8 sec
Commit: d6e28b9

Test stats 🧪

Test	Results
Failed	0
Passed	46577
Skipped	4981
Total	51558

Trends 🧪

Steps errors

Expand to view the steps failures

`x-pack/packetbeat-packaging-linux - mage package`

Took 6 min 0 sec . View more details on here
Description: mage package

`Error signal`

Took 0 min 0 sec . View more details on here
Description: Error 'hudson.AbortException: script returned exit code 1'

Log output

Expand to view the last 100 lines of log output

[2021-02-22T20:03:34.449Z] 3.4: Pulling from library/alpine
[2021-02-22T20:03:34.449Z] c1e54eec4b57: Pulling fs layer
[2021-02-22T20:03:34.708Z] c1e54eec4b57: Verifying Checksum
[2021-02-22T20:03:34.708Z] c1e54eec4b57: Download complete
[2021-02-22T20:03:34.967Z] c1e54eec4b57: Pull complete
[2021-02-22T20:03:34.967Z] Digest: sha256:b733d4a32c4da6a00a84df2ca32791bb03df95400243648d8c539e7b4cce329c
[2021-02-22T20:03:34.967Z] Status: Downloaded newer image for alpine:3.4
[2021-02-22T20:03:35.085Z] + python .ci/scripts/pre_archive_test.py
[2021-02-22T20:03:37.167Z] + python .ci/scripts/pre_archive_test.py
[2021-02-22T20:03:39.078Z] Copy ./x-pack/filebeat/build into build/x-pack/filebeat/build
[2021-02-22T20:03:39.093Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-24163/src/github.com/elastic/beats/build
[2021-02-22T20:03:39.397Z] + rm -rf ve
[2021-02-22T20:03:39.397Z] + find . -type d -name vendor -exec rm -r {} ;
[2021-02-22T20:03:39.411Z] Recording test results
[2021-02-22T20:03:41.027Z] [Checks API] No suitable checks publisher found.
[2021-02-22T20:03:41.378Z] Client: Docker Engine - Community
[2021-02-22T20:03:41.378Z]  Version:           20.10.3
[2021-02-22T20:03:41.378Z]  API version:       1.41
[2021-02-22T20:03:41.378Z]  Go version:        go1.13.15
[2021-02-22T20:03:41.378Z]  Git commit:        48d30b5
[2021-02-22T20:03:41.378Z]  Built:             Fri Jan 29 14:33:13 2021
[2021-02-22T20:03:41.378Z]  OS/Arch:           linux/amd64
[2021-02-22T20:03:41.378Z]  Context:           default
[2021-02-22T20:03:41.378Z]  Experimental:      true
[2021-02-22T20:03:41.378Z] 
[2021-02-22T20:03:41.378Z] Server: Docker Engine - Community
[2021-02-22T20:03:41.378Z]  Engine:
[2021-02-22T20:03:41.378Z]   Version:          20.10.3
[2021-02-22T20:03:41.378Z]   API version:      1.41 (minimum version 1.12)
[2021-02-22T20:03:41.378Z]   Go version:       go1.13.15
[2021-02-22T20:03:41.378Z]   Git commit:       46229ca
[2021-02-22T20:03:41.378Z]   Built:            Fri Jan 29 14:31:25 2021
[2021-02-22T20:03:41.378Z]   OS/Arch:          linux/amd64
[2021-02-22T20:03:41.378Z]   Experimental:     false
[2021-02-22T20:03:41.378Z]  containerd:
[2021-02-22T20:03:41.378Z]   Version:          1.4.3
[2021-02-22T20:03:41.378Z]   GitCommit:        269548fa27e0089a8b8278fc4fc781d7f65a939b
[2021-02-22T20:03:41.378Z]  runc:
[2021-02-22T20:03:41.378Z]   Version:          1.0.0-rc92
[2021-02-22T20:03:41.378Z]   GitCommit:        ff819c7e9184c13b7c2607fe6c30ae19403a7aff
[2021-02-22T20:03:41.378Z]  docker-init:
[2021-02-22T20:03:41.378Z]   Version:          0.19.0
[2021-02-22T20:03:41.378Z]   GitCommit:        de40ad0
[2021-02-22T20:03:50.001Z] Copy ./x-pack/metricbeat/build into build/x-pack/metricbeat/build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/metricbeat/build/golang-crossbuild into build/x-pack/metricbeat/build/golang-crossbuild
[2021-02-22T20:03:50.001Z] Copy ./x-pack/metricbeat/build/package/metricbeat/metricbeat-linux-amd64.docker/docker-build into build/x-pack/metricbeat/build/package/metricbeat/metricbeat-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/metricbeat/build/package/metricbeat-ubi8/metricbeat-linux-amd64.docker/docker-build into build/x-pack/metricbeat/build/package/metricbeat-ubi8/metricbeat-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/elastic-agent/build into build/x-pack/elastic-agent/build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/elastic-agent/build/golang-crossbuild into build/x-pack/elastic-agent/build/golang-crossbuild
[2021-02-22T20:03:50.001Z] Copy ./x-pack/elastic-agent/build/package/elastic-agent/elastic-agent-linux-amd64.docker/docker-build into build/x-pack/elastic-agent/build/package/elastic-agent/elastic-agent-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/elastic-agent/build/package/elastic-agent-ubi8/elastic-agent-linux-amd64.docker/docker-build into build/x-pack/elastic-agent/build/package/elastic-agent-ubi8/elastic-agent-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/filebeat/build into build/x-pack/filebeat/build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/filebeat/build/golang-crossbuild into build/x-pack/filebeat/build/golang-crossbuild
[2021-02-22T20:03:50.001Z] Copy ./x-pack/filebeat/build/package/filebeat/filebeat-linux-amd64.docker/docker-build into build/x-pack/filebeat/build/package/filebeat/filebeat-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/filebeat/build/package/filebeat-ubi8/filebeat-linux-amd64.docker/docker-build into build/x-pack/filebeat/build/package/filebeat-ubi8/filebeat-linux-amd64.docker/docker-build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/heartbeat/build into build/x-pack/heartbeat/build
[2021-02-22T20:03:50.001Z] Copy ./x-pack/heartbeat/build/golang-crossbuild into build/x-pack/heartbeat/build/golang-crossbuild
[2021-02-22T20:03:50.018Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-24163/src/github.com/elastic/beats/build
[2021-02-22T20:03:50.338Z] + rm -rf ve
[2021-02-22T20:03:50.338Z] + find . -type d -name vendor -exec rm -r {} ;
[2021-02-22T20:03:50.618Z] Recording test results
[2021-02-22T20:03:52.529Z] None of the test reports contained any result
[2021-02-22T20:03:52.537Z] [Checks API] No suitable checks publisher found.
[2021-02-22T20:03:52.925Z] Client: Docker Engine - Community
[2021-02-22T20:03:52.925Z]  Version:           20.10.3
[2021-02-22T20:03:52.925Z]  API version:       1.41
[2021-02-22T20:03:52.925Z]  Go version:        go1.13.15
[2021-02-22T20:03:52.925Z]  Git commit:        48d30b5
[2021-02-22T20:03:52.925Z]  Built:             Fri Jan 29 14:33:13 2021
[2021-02-22T20:03:52.925Z]  OS/Arch:           linux/amd64
[2021-02-22T20:03:52.925Z]  Context:           default
[2021-02-22T20:03:52.925Z]  Experimental:      true
[2021-02-22T20:03:52.925Z] 
[2021-02-22T20:03:52.925Z] Server: Docker Engine - Community
[2021-02-22T20:03:52.925Z]  Engine:
[2021-02-22T20:03:52.925Z]   Version:          20.10.3
[2021-02-22T20:03:52.925Z]   API version:      1.41 (minimum version 1.12)
[2021-02-22T20:03:52.925Z]   Go version:       go1.13.15
[2021-02-22T20:03:52.925Z]   Git commit:       46229ca
[2021-02-22T20:03:52.925Z]   Built:            Fri Jan 29 14:31:25 2021
[2021-02-22T20:03:52.925Z]   OS/Arch:          linux/amd64
[2021-02-22T20:03:52.925Z]   Experimental:     false
[2021-02-22T20:03:52.925Z]  containerd:
[2021-02-22T20:03:52.925Z]   Version:          1.4.3
[2021-02-22T20:03:52.925Z]   GitCommit:        269548fa27e0089a8b8278fc4fc781d7f65a939b
[2021-02-22T20:03:52.925Z]  runc:
[2021-02-22T20:03:52.925Z]   Version:          1.0.0-rc92
[2021-02-22T20:03:52.925Z]   GitCommit:        ff819c7e9184c13b7c2607fe6c30ae19403a7aff
[2021-02-22T20:03:52.925Z]  docker-init:
[2021-02-22T20:03:52.925Z]   Version:          0.19.0
[2021-02-22T20:03:52.925Z]   GitCommit:        de40ad0
[2021-02-22T20:05:19.964Z] Stage "Packaging" skipped due to earlier failure(s)
[2021-02-22T20:05:20.023Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-24163/src/github.com/elastic/beats
[2021-02-22T20:05:20.941Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-24163
[2021-02-22T20:05:20.988Z] [INFO] getVaultSecret: Getting secrets
[2021-02-22T20:05:21.068Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-02-22T20:05:21.785Z] + chmod 755 generate-build-data.sh
[2021-02-22T20:05:21.786Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24163/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24163/runs/2 FAILURE 3368495
[2021-02-22T20:05:22.036Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24163/runs/2/steps/?limit=10000 -o steps-info.json
[2021-02-22T20:05:27.231Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-24163/runs/2/tests/?status=FAILED -o tests-errors.json

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	46577
Skipped	4981
Total	51558

blakerouse · 2021-02-22T19:08:53Z

/test

michalpristas

backport looks good, let's get this in

[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 added [zube]: In Review backport Team:Elastic-Agent Label for the Agent team Team:Ingest Management labels Feb 22, 2021

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 self-assigned this Feb 22, 2021

michalpristas approved these changes Feb 23, 2021

View reviewed changes

This was referenced Feb 23, 2021

Updating package-spec dependency elastic/elastic-package#260

Merged

Use correct types for source.port and source.ip elastic/integrations#737

Merged

Bump up stack version to 7.13.0-SNAPSHOT elastic/elastic-package#261

Merged

blakerouse merged commit 950b1c4 into elastic:7.12 Feb 23, 2021

blakerouse deleted the backport_24155_7.12 branch February 23, 2021 12:03

zube bot added [zube]: Done and removed [zube]: In Review labels Feb 23, 2021

This was referenced Feb 23, 2021

Enable package compatibility checks with older Elastic stacks elastic/integrations#740

Merged

Elastic Agent docker: new revisions are not getting released #24198

Closed

zube bot removed the [zube]: Done label May 25, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cherry-pick #24155 to 7.12: [Elastic Agent] Fix docker entrypoint for elastic-agent. #24163

Cherry-pick #24155 to 7.12: [Elastic Agent] Fix docker entrypoint for elastic-agent. #24163

blakerouse commented Feb 22, 2021 •

edited by zube bot

Loading

elasticmachine commented Feb 22, 2021

elasticmachine commented Feb 22, 2021

elasticmachine commented Feb 22, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Trends 🧪

`x-pack/packetbeat-packaging-linux - mage package`

`Error signal`

Test stats 🧪

blakerouse commented Feb 22, 2021

michalpristas left a comment

Cherry-pick #24155 to 7.12: [Elastic Agent] Fix docker entrypoint for elastic-agent. #24163

Cherry-pick #24155 to 7.12: [Elastic Agent] Fix docker entrypoint for elastic-agent. #24163

Conversation

blakerouse commented Feb 22, 2021 • edited by zube bot Loading

What does this PR do?

Why is it important?

Checklist

Related issues

elasticmachine commented Feb 22, 2021

elasticmachine commented Feb 22, 2021

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

💔 Build Failed

Build stats

Test stats 🧪

Trends 🧪

Steps errors

x-pack/packetbeat-packaging-linux - mage package

Error signal

Log output

💚 Flaky test report

Test stats 🧪

blakerouse commented Feb 22, 2021

michalpristas left a comment

Choose a reason for hiding this comment

blakerouse commented Feb 22, 2021 •

edited by zube bot

Loading

elasticmachine commented Feb 22, 2021 •

edited by jenkins-beats-ci bot

Loading

`x-pack/packetbeat-packaging-linux - mage package`

`Error signal`