From cb084f66f4acee3beba7a08be7f37f2d3cb261f5 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Mon, 17 Feb 2020 13:32:18 -0500
Subject: [PATCH] [Fleet] AgentEvent change agent_id and remove data

---
 x-pack/plugins/ingest_manager/common/types/models/agent.ts    | 2 +-
 x-pack/plugins/ingest_manager/dev_docs/api/agents_checkin.md  | 4 ++--
 .../plugins/ingest_manager/server/services/agents/checkin.ts  | 1 -
 x-pack/test/api_integration/apis/fleet/agents/checkin.ts      | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent.ts b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
index b5d274bb7157c..36c84e4c04a37 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent.ts
@@ -61,7 +61,7 @@ const AgentEventBase = {
   timestamp: schema.string(),
   message: schema.string(),
   payload: schema.maybe(schema.any()),
-  data: schema.maybe(schema.string()),
+  agent_id: schema.string(),
   action_id: schema.maybe(schema.string()),
   policy_id: schema.maybe(schema.string()),
   stream_id: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/ingest_manager/dev_docs/api/agents_checkin.md b/x-pack/plugins/ingest_manager/dev_docs/api/agents_checkin.md
index f5949de8bc536..7d7cdeaecaccb 100644
--- a/x-pack/plugins/ingest_manager/dev_docs/api/agents_checkin.md
+++ b/x-pack/plugins/ingest_manager/dev_docs/api/agents_checkin.md
@@ -13,7 +13,7 @@ Report current state of a Fleet agent.
 
 ## Request body
 
-- `events` (Required, array) An array of events with the properties `type`, `subtype`, `message`, `timestamp`, `payload`, and `data`.
+- `events` (Required, array) An array of events with the properties `type`, `subtype`, `message`, `timestamp`, `payload`, and `agent_id`.
 
 - `local_metadata` (Optional, object) An object that contains the local metadata for an agent. The metadata is a dictionary of strings (example: `{ "os": "macos" }`).
 
@@ -33,7 +33,7 @@ Authorization: ApiKey VALID_ACCESS_API_KEY
     "message": "state changed from STOPPED to STARTING",
     "timestamp": "2019-10-01T13:42:54.323Z",
     "payload": {},
-    "data": "{}"
+    "agent_id": "a4937110-e53e-11e9-934f-47a8e38a522c"
   }]
 }
 ```
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin.ts
index 23a8e44c2b19e..e159efd3e1bd7 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin.ts
@@ -123,7 +123,6 @@ async function createEventsForAgent(
     eventData => {
       return {
         attributes: {
-          agent_id: agentId,
           ...eventData,
           payload: eventData.payload ? JSON.stringify(eventData.payload) : undefined,
         },
diff --git a/x-pack/test/api_integration/apis/fleet/agents/checkin.ts b/x-pack/test/api_integration/apis/fleet/agents/checkin.ts
index bc6496e8b9436..ca51676126e73 100644
--- a/x-pack/test/api_integration/apis/fleet/agents/checkin.ts
+++ b/x-pack/test/api_integration/apis/fleet/agents/checkin.ts
@@ -89,6 +89,7 @@ export default function(providerContext: FtrProviderContext) {
               timestamp: '2019-01-04T14:32:03.36764-05:00',
               subtype: 'STARTING',
               message: 'State change: STARTING',
+              agent_id: 'agent1',
             },
           ],
           local_metadata: {