Add a 'body' field to the check stanza

Consul allows specifying the HTTP body to send in a health check. Nomad
uses Consul for health checking so this just plumbs the value through to
where the Consul API is called.

There is no validation that `body` is not used with an incompatible
check method like GET.

api/services.go

@@ -95,6 +95,7 @@ type ServiceCheck struct {
 	TaskName               string              `mapstructure:"task" hcl:"task,optional"`
 	SuccessBeforePassing   int                 `mapstructure:"success_before_passing" hcl:"success_before_passing,optional"`
 	FailuresBeforeCritical int                 `mapstructure:"failures_before_critical" hcl:"failures_before_critical,optional"`
+	Body                   string              `hcl:"body,optional"`
 	OnUpdate               string              `mapstructure:"on_update" hcl:"on_update,optional"`
 }
 

command/agent/consul/service_client.go

@@ -1408,6 +1408,7 @@ func createCheckReg(serviceID, checkID string, check *structs.ServiceCheck, host
 		chkReg.HTTP = checkURL.String()
 		chkReg.Method = check.Method
 		chkReg.Header = check.Header
+		chkReg.Body = check.Body
 
 	case structs.ServiceCheckTCP:
 		chkReg.TCP = net.JoinHostPort(host, strconv.Itoa(port))

jobspec/parse_service.go

@@ -852,6 +852,7 @@ func parseChecks(service *api.Service, checkObjs *ast.ObjectList) error {
 			"tls_skip_verify",
 			"header",
 			"method",
+			"body",
 			"check_restart",
 			"address_mode",
 			"grpc_service",

jobspec/parse_test.go

@@ -1349,6 +1349,47 @@ func TestParse(t *testing.T) {
 			},
 			false,
 		},
+		{
+			"tg-service-check-body.hcl",
+			&api.Job{
+				ID:   stringToPtr("group_service_check_script"),
+				Name: stringToPtr("group_service_check_script"),
+				TaskGroups: []*api.TaskGroup{
+					{
+						Name:  stringToPtr("group"),
+						Count: intToPtr(1),
+						Networks: []*api.NetworkResource{
+							{
+								Mode: "bridge",
+								ReservedPorts: []api.Port{
+									{
+										Label: "http",
+										Value: 80,
+										To:    8080,
+									},
+								},
+							},
+						},
+						Services: []*api.Service{
+							{
+								Name:      "foo-service",
+								PortLabel: "http",
+								Checks: []api.ServiceCheck{
+									{
+										Name:   "check-name",
+										Type:   "http",
+										Method: "POST",
+										Body:   "{\"check\":\"mem\"}",
+									},
+								},
+							},
+						},
+						Tasks: []*api.Task{{Name: "foo"}},
+					},
+				},
+			},
+			false,
+		},
 		{
 			"tg-service-connect-native.hcl",
 			&api.Job{

jobspec/test-fixtures/tg-service-check-body.hcl

@@ -0,0 +1,28 @@
+job "group_service_check_script" {
+  group "group" {
+    count = 1
+
+    network {
+      mode = "bridge"
+
+      port "http" {
+        static = 80
+        to     = 8080
+      }
+    }
+
+    service {
+      name = "foo-service"
+      port = "http"
+
+      check {
+        name   = "check-name"
+        type   = "http"
+        method = "POST"
+        body   = "{\"check\":\"mem\"}"
+      }
+    }
+
+    task "foo" {}
+  }
+}

nomad/structs/diff_test.go

@@ -2805,6 +2805,12 @@ func TestTaskGroupDiff(t *testing.T) {
 										Old:  "",
 										New:  "",
 									},
+									{
+										Type: DiffTypeNone,
+										Name: "Body",
+										Old:  "",
+										New:  "",
+									},
 									{
 										Type: DiffTypeEdited,
 										Name: "Command",
@@ -5996,6 +6002,12 @@ func TestTaskDiff(t *testing.T) {
 										Old:  "",
 										New:  "",
 									},
+									{
+										Type: DiffTypeNone,
+										Name: "Body",
+										Old:  "",
+										New:  "",
+									},
 									{
 										Type: DiffTypeNone,
 										Name: "Command",

nomad/structs/services.go

@@ -61,6 +61,7 @@ type ServiceCheck struct {
 	TaskName               string              // What task to execute this check in
 	SuccessBeforePassing   int                 // Number of consecutive successes required before considered healthy
 	FailuresBeforeCritical int                 // Number of consecutive failures required before considered unhealthy
+	Body                   string              // Body to use in HTTP check
 	OnUpdate               string
 }
 
@@ -168,6 +169,10 @@ func (sc *ServiceCheck) Equals(o *ServiceCheck) bool {
 		return false
 	}
 
+	if sc.Body != o.Body {
+		return false
+	}
+
 	if sc.OnUpdate != o.OnUpdate {
 		return false
 	}