[Agent] Fix ACK to fleet #16994

elastic · Mar 13, 2020 · 261eb43 · 261eb43
1 parent 9325ec4
commit 261eb43
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/x-pack/agent/pkg/agent/application/action_store.go b/x-pack/agent/pkg/agent/application/action_store.go
@@ -134,7 +134,7 @@ func (a *actionStoreAcker) Ack(ctx context.Context, action fleetapi.Action) erro
 }
 
 func (a *actionStoreAcker) Commit(ctx context.Context) error {
-	return nil
+	return a.acker.Commit(ctx)
 }
 
 func newActionStoreAcker(acker fleetAcker, store *actionStore) *actionStoreAcker {

diff --git a/x-pack/agent/pkg/agent/application/fleet_acker.go b/x-pack/agent/pkg/agent/application/fleet_acker.go
@@ -40,7 +40,6 @@ func (f *actionAcker) Ack(ctx context.Context, action fleetapi.Action) error {
 	// checkin
 	cmd := fleetapi.NewAckCmd(f.agentInfo, f.client)
 	req := &fleetapi.AckRequest{
-		AgentID: f.agentInfo.AgentID(),
 		Actions: []string{
 			action.ID(),
 		},

diff --git a/x-pack/agent/pkg/fleetapi/ack_cmd.go b/x-pack/agent/pkg/fleetapi/ack_cmd.go
@@ -23,7 +23,6 @@ const ackPath = "/api/ingest_manager/fleet/agents/%s/acks"
 //   "action_ids": ["id1"]
 // }
 type AckRequest struct {
-	AgentID string   `json:"agent_id"`
 	Actions []string `json:"action_ids"`
 }