From 239f2438348c5550980ca2c50b164d18d9bba64b Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Mon, 22 Feb 2021 11:15:44 -0500 Subject: [PATCH] [Elastic Agent] Fix docker entrypoint for elastic-agent. (#24155) * Fix docker entrypoint for elastic-agent. * Add changelog entry. --- .../templates/docker/docker-entrypoint.elastic-agent.tmpl | 2 +- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl index 348a99dea4c..f1e6febfe8a 100644 --- a/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/docker-entrypoint.elastic-agent.tmpl @@ -63,7 +63,7 @@ function enroll(){ insecure_flag="--insecure" fi - ./{{ .BeatName }} enroll ${insecure_flag} ${KIBANA_HOST:-http://localhost:5601} $apikey -f + ./{{ .BeatName }} enroll ${insecure_flag} -f --url=${KIBANA_HOST:-http://localhost:5601} --enrollment-token=$apikey } if [[ -n "${FLEET_SETUP}" ]] && [[ ${FLEET_SETUP} == 1 ]]; then setup; fi diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index 3f0419ca38d..cb53ef11824 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -40,6 +40,7 @@ - Fix libbeat from reporting back degraded on config update {pull}23537[23537] - Fix issues with dynamic inputs and conditions {pull}23886[23886] - Fix bad substitution of API key. {pull}24036[24036] +- Fix docker enrollment issue related to Fleet Server change. {pull}24155[24155] ==== New features