Add action timeout (#575) (#579)

(cherry picked from commit 070638c) Co-authored-by: Aleksandr Maus <[email protected]>
elastic · Jul 21, 2021 · 74db288 · 74db288
1 parent 20f6377
commit 74db288
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git a/cmd/fleet/handleCheckin.go b/cmd/fleet/handleCheckin.go
@@ -388,6 +388,7 @@ func convertActions(agentId string, actions []model.Action) ([]ActionResp, strin
 			Id:        action.ActionId,
 			Type:      action.Type,
 			InputType: action.InputType,
+			Timeout:   action.Timeout,
 		})
 	}
 

diff --git a/cmd/fleet/schema.go b/cmd/fleet/schema.go
@@ -98,6 +98,7 @@ type ActionResp struct {
 	Id        string      `json:"id"`
 	Type      string      `json:"type"`
 	InputType string      `json:"input_type"`
+	Timeout   int64       `json:"timeout,omitempty"`
 }
 
 type Event struct {

diff --git a/internal/pkg/es/mapping.go b/internal/pkg/es/mapping.go
diff --git a/internal/pkg/model/schema.go b/internal/pkg/model/schema.go
diff --git a/model/schema.json b/model/schema.json
@@ -38,6 +38,10 @@
           "description": "The input type the actions should be routed to.",
           "type": "string"
         },
+        "timeout": {
+          "description": "The optional action timeout in seconds",
+          "type": "integer"
+        },
         "user_id": {
           "description": "The ID of the user who created the action.",
           "type": "string"