From 4684428daa4b52f4e586ebebb26a70d280012963 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Wed, 20 May 2020 11:12:12 +0200 Subject: [PATCH 1/2] clear actions after new enroll --- x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go index 8a8624b16754..4c9b06651fc6 100644 --- a/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go +++ b/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go @@ -10,6 +10,7 @@ import ( "io" "net/http" "net/url" + "os" "gopkg.in/yaml.v2" @@ -179,6 +180,12 @@ func (c *EnrollCmd) Execute() error { return err } + // clear action store + // fail only if file exists and there was a failure + if err := os.Remove(info.AgentActionStoreFile()); !os.IsNotExist(err) { + return err + } + return nil } From 96d45c54b87385b496426852e6bc9932e8d831f9 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Wed, 20 May 2020 11:40:30 +0200 Subject: [PATCH 2/2] ch --- x-pack/elastic-agent/CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc index 2f0172be3f2b..8e6b9dc32118 100644 --- a/x-pack/elastic-agent/CHANGELOG.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.asciidoc @@ -36,6 +36,7 @@ - Fix jq: command not found {pull}18408[18408] - Avoid Chown on windows {pull}18512[18512] - Remove fleet admin from setup script {pull}18611[18611] +- Clean action store after enrolling to new configuration {pull}18656[18656] ==== New features