From 2c6fd6b796c0e3576d6efefcaf85eea1a6d923b0 Mon Sep 17 00:00:00 2001
From: Aliaksandr Mianzhynski <amenzhinsky@gmail.com>
Date: Tue, 22 Sep 2020 21:15:05 +0300
Subject: [PATCH 1/2] Return grpc serving status in health check errors

---
 agent/checks/grpc.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/agent/checks/grpc.go b/agent/checks/grpc.go
index dea6a84cff0a..d1bf6b900a2a 100644
--- a/agent/checks/grpc.go
+++ b/agent/checks/grpc.go
@@ -13,8 +13,6 @@ import (
 	"google.golang.org/grpc/resolver"
 )
 
-var ErrGRPCUnhealthy = fmt.Errorf("gRPC application didn't report service healthy")
-
 // GrpcHealthProbe connects to gRPC application and queries health service for application/service status.
 type GrpcHealthProbe struct {
 	server      string
@@ -69,8 +67,8 @@ func (probe *GrpcHealthProbe) Check(target string) error {
 	if err != nil {
 		return err
 	}
-	if response == nil || response.Status != hv1.HealthCheckResponse_SERVING {
-		return ErrGRPCUnhealthy
+	if response.Status != hv1.HealthCheckResponse_SERVING {
+		return fmt.Errorf("gRPC %s serving status: %s", target, response.Status)
 	}
 
 	return nil

From edac9f943fd69dd7c3e14ccb5ab5195440de8f66 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@hashicorp.com>
Date: Fri, 25 Sep 2020 12:03:49 -0400
Subject: [PATCH 2/2] Add changelog file

---
 .changelog/8726.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/8726.txt

diff --git a/.changelog/8726.txt b/.changelog/8726.txt
new file mode 100644
index 000000000000..d96d8aaedcf6
--- /dev/null
+++ b/.changelog/8726.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+checks: add health status to the failure message when gRPC healthchecks fail.
+```