From 770aa82ed931918b901fcf76479627ee2f553360 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Tue, 6 Jul 2021 11:46:46 -0400 Subject: [PATCH 1/4] Improve log to include URL. --- x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go index 8a1a1563bfc..1f67ef96a39 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go @@ -402,6 +402,7 @@ func (c *enrollCmd) daemonReload(ctx context.Context) error { func (c *enrollCmd) enrollWithBackoff(ctx context.Context, persistentConfig map[string]interface{}) error { delay(ctx, enrollDelay) + c.log.Infof("Starting enrollment to URL: %s", c.client.URI()) err := c.enroll(ctx, persistentConfig) signal := make(chan struct{}) backExp := backoff.NewExpBackoff(signal, 60*time.Second, 10*time.Minute) @@ -419,7 +420,7 @@ func (c *enrollCmd) enrollWithBackoff(ctx context.Context, persistentConfig map[ break } backExp.Wait() - c.log.Info("Retrying to enroll...") + c.log.Infof("Retrying to enrollment to URL: %s", c.client.URI()) err = c.enroll(ctx, persistentConfig) } From ef73dfd88380dfe44e47c325563bef5b0d2fb20a Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Tue, 6 Jul 2021 15:45:34 -0400 Subject: [PATCH 2/4] Fix issue with enroll command. --- .../elastic-agent/pkg/agent/cmd/enroll_cmd.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go index 1f67ef96a39..1f0f9bbdfe5 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go @@ -200,6 +200,15 @@ func (c *enrollCmd) Execute(ctx context.Context) error { // will communicate to the internal fleet server on localhost only. // Connection setup should disable proxies in that case. localFleetServer := c.options.FleetServer.ConnStr != "" + if localFleetServer { + token, err := c.fleetServerBootstrap(ctx) + if err != nil { + return err + } + if c.options.EnrollAPIKey == "" && token != "" { + c.options.EnrollAPIKey = token + } + } c.remoteConfig, err = c.options.remoteConfig() if err != nil { @@ -208,19 +217,10 @@ func (c *enrollCmd) Execute(ctx context.Context) error { errors.TypeConfig, errors.M(errors.MetaKeyURI, c.options.URL)) } - if localFleetServer { // Ensure that the agent does not use a proxy configuration // when connecting to the local fleet server. c.remoteConfig.Transport.Proxy.Disable = true - - token, err := c.fleetServerBootstrap(ctx) - if err != nil { - return err - } - if c.options.EnrollAPIKey == "" && token != "" { - c.options.EnrollAPIKey = token - } } c.client, err = fleetclient.NewWithConfig(c.log, c.remoteConfig) From 3743b6bce00790c17e7d200f6bbfb017e4719ac8 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Tue, 6 Jul 2021 15:50:26 -0400 Subject: [PATCH 3/4] Add changelog entry. --- x-pack/elastic-agent/CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/elastic-agent/CHANGELOG.next.asciidoc b/x-pack/elastic-agent/CHANGELOG.next.asciidoc index 590fa82c3ae..01c7e2737df 100644 --- a/x-pack/elastic-agent/CHANGELOG.next.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.next.asciidoc @@ -73,6 +73,7 @@ - Change timestamp in elatic-agent-json.log to use UTC {issue}25391[25391] - Fix add support for Logstash output. {pull}24305[24305] - Do not log Elasticsearch configuration for monitoring output when running with debug. {pull}26583[26583] +- Fix issue where proxy enrollment options broke enrollment command. {pull}26749[26749] ==== New features From 208b8bc7af27e07f6a45b4439814688f0c8f0b95 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Wed, 7 Jul 2021 08:39:04 -0400 Subject: [PATCH 4/4] Fix retry log message. --- x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go index 1f0f9bbdfe5..e86fe07dab2 100644 --- a/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/cmd/enroll_cmd.go @@ -420,7 +420,7 @@ func (c *enrollCmd) enrollWithBackoff(ctx context.Context, persistentConfig map[ break } backExp.Wait() - c.log.Infof("Retrying to enrollment to URL: %s", c.client.URI()) + c.log.Infof("Retrying enrollment to URL: %s", c.client.URI()) err = c.enroll(ctx, persistentConfig) }