diff --git a/agent/structs/structs.go b/agent/structs/structs.go index 830168888..90f3f84be 100644 --- a/agent/structs/structs.go +++ b/agent/structs/structs.go @@ -1792,6 +1792,7 @@ type HealthCheckDefinition struct { TCP string `json:",omitempty"` UDP string `json:",omitempty"` H2PING string `json:",omitempty"` + OSService string `json:",omitempty"` H2PingUseTLS bool `json:",omitempty"` Interval time.Duration `json:",omitempty"` OutputMaxSize uint `json:",omitempty"` @@ -1943,6 +1944,7 @@ func (c *HealthCheck) CheckType() *CheckType { TCP: c.Definition.TCP, UDP: c.Definition.UDP, H2PING: c.Definition.H2PING, + OSService: c.Definition.OSService, H2PingUseTLS: c.Definition.H2PingUseTLS, Interval: c.Definition.Interval, DockerContainerID: c.Definition.DockerContainerID, diff --git a/agent/txn_endpoint.go b/agent/txn_endpoint.go index 4e898bfce..b54993550 100644 --- a/agent/txn_endpoint.go +++ b/agent/txn_endpoint.go @@ -275,6 +275,7 @@ func (s *HTTPHandlers) convertOps(resp http.ResponseWriter, req *http.Request) ( TCP: check.Definition.TCP, GRPC: check.Definition.GRPC, GRPCUseTLS: check.Definition.GRPCUseTLS, + OSService: check.Definition.OSService, Interval: interval, Timeout: timeout, DeregisterCriticalServiceAfter: deregisterCriticalServiceAfter, diff --git a/api/health.go b/api/health.go index 2bcb3cb52..0368f8376 100644 --- a/api/health.go +++ b/api/health.go @@ -64,6 +64,7 @@ type HealthCheckDefinition struct { TCP string UDP string GRPC string + OSService string GRPCUseTLS bool IntervalDuration time.Duration `json:"-"` TimeoutDuration time.Duration `json:"-"` diff --git a/proto/pbservice/healthcheck.gen.go b/proto/pbservice/healthcheck.gen.go index 2dccc25a7..092a4ded9 100644 --- a/proto/pbservice/healthcheck.gen.go +++ b/proto/pbservice/healthcheck.gen.go @@ -144,6 +144,7 @@ func HealthCheckDefinitionToStructs(s *HealthCheckDefinition, t *structs.HealthC t.TCP = s.TCP t.UDP = s.UDP t.H2PING = s.H2PING + t.OSService = s.OSService t.H2PingUseTLS = s.H2PingUseTLS t.Interval = structs.DurationFromProto(s.Interval) t.OutputMaxSize = uint(s.OutputMaxSize) @@ -172,6 +173,7 @@ func HealthCheckDefinitionFromStructs(t *structs.HealthCheckDefinition, s *Healt s.TCP = t.TCP s.UDP = t.UDP s.H2PING = t.H2PING + s.OSService = t.OSService s.H2PingUseTLS = t.H2PingUseTLS s.Interval = structs.DurationToProto(t.Interval) s.OutputMaxSize = uint32(t.OutputMaxSize)