From 0fe130a6ff5308c58315a40be6e47168d9d868ae Mon Sep 17 00:00:00 2001 From: Michel Laterman <82832767+michel-laterman@users.noreply.github.com> Date: Fri, 9 Sep 2022 06:28:54 -0700 Subject: [PATCH 1/2] Remove events from agent checkin body. (#1842) Remove the events attribute from the agent checkin body. Note that removal of the attribute will not stop the server from issuing a 400 if the response body is too long. The removal is so that the checkin code on the fleet-server and agent remain comparable. Co-authored-by: Blake Rouse (cherry picked from commit 8a22669ebe8a2ef0af9e05c4ea53992131217e2e) # Conflicts: # CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 5 +++++ internal/pkg/api/schema.go | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index d3346516a..0be6173d4 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -3,6 +3,7 @@ - Return a better error on enrolling and the Elasticsearch version is incompatible. {pull}1211[1211] - Give a grace period when starting the unenroll monitor. {issue}1500[1500] - Fixes a race condition between the unenroller goroutine and the main goroutine for the coordinator monitor. {issues}1738[1738] +- Remove events from agent checkin body. {issue}1774[1774] ==== New Features @@ -12,3 +13,7 @@ - Add start_time and minimum_execution_duration to actions to allow fleet-server to schedule agent actions. {pull}1381[1381] - Fleet Server now allows setting global labels on APM instrumentation. {pull}1649[1649] - Fleet Server now allows setting transaction sample rate on APM instrumentation {pull}1681[1681] +<<<<<<< HEAD +======= +- Log redacted config when config updates. {issue}1626[1626] {pull}1668[1668] +>>>>>>> 8a22669 (Remove events from agent checkin body. (#1842)) diff --git a/internal/pkg/api/schema.go b/internal/pkg/api/schema.go index 7a7e3a0f3..481632b71 100644 --- a/internal/pkg/api/schema.go +++ b/internal/pkg/api/schema.go @@ -80,7 +80,6 @@ type EnrollResponse struct { type CheckinRequest struct { Status string `json:"status"` AckToken string `json:"ack_token,omitempty"` - Events []Event `json:"events"` LocalMeta json.RawMessage `json:"local_metadata"` } From bdb6bac8bcb79355a5ee3b295c841db45f227e18 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Fri, 9 Sep 2022 09:40:56 -0400 Subject: [PATCH 2/2] Update CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 0be6173d4..83da25b21 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -13,7 +13,3 @@ - Add start_time and minimum_execution_duration to actions to allow fleet-server to schedule agent actions. {pull}1381[1381] - Fleet Server now allows setting global labels on APM instrumentation. {pull}1649[1649] - Fleet Server now allows setting transaction sample rate on APM instrumentation {pull}1681[1681] -<<<<<<< HEAD -======= -- Log redacted config when config updates. {issue}1626[1626] {pull}1668[1668] ->>>>>>> 8a22669 (Remove events from agent checkin body. (#1842))