From c5af83af661c7b2bb971b271c1a76ea9f20c5371 Mon Sep 17 00:00:00 2001
From: Adam Chalmers <achalmers@cloudflare.com>
Date: Tue, 12 Nov 2019 16:55:40 -0600
Subject: [PATCH] TUN-2053: Add a /healthcheck endpoint to the metrics server

---
 go.mod             | 1 +
 metrics/metrics.go | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/go.mod b/go.mod
index c55ae1b9..bce9d655 100644
--- a/go.mod
+++ b/go.mod
@@ -57,6 +57,7 @@ require (
 	golang.org/x/sync v0.0.0-20190423024810-112230192c58
 	golang.org/x/sys v0.0.0-20191008105621-543471e840be
 	golang.org/x/text v0.3.2 // indirect
+	google.golang.org/appengine v1.4.0 // indirect
 	google.golang.org/genproto v0.0.0-20191007204434-a023cd5227bd // indirect
 	google.golang.org/grpc v1.24.0 // indirect
 	gopkg.in/coreos/go-oidc.v2 v2.1.0
diff --git a/metrics/metrics.go b/metrics/metrics.go
index 7c4170c0..f2dfd7f0 100644
--- a/metrics/metrics.go
+++ b/metrics/metrics.go
@@ -2,6 +2,7 @@ package metrics
 
 import (
 	"context"
+	"fmt"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -33,6 +34,9 @@ func ServeMetrics(l net.Listener, shutdownC <-chan struct{}, logger *logrus.Logg
 	}
 
 	http.Handle("/metrics", promhttp.Handler())
+	http.Handle("/healthcheck", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintf(w, "OK\n")
+	}))
 
 	wg.Add(1)
 	go func() {