Merge pull request #164 from weaveworks/ready-handler

Add ready handler back in

Author: tomwilkie

cmd/cortex/main.go

@@ -316,6 +316,8 @@ func setupIngester(
 		log.Fatal(err)
 	}
 	prometheus.MustRegister(ingester)
+
+	router.Path("/ready").Handler(http.HandlerFunc(ingester.ReadinessHandler))
 	return ingester
 }
 

ingester/http_server.go

@@ -0,0 +1,16 @@
+package ingester
+
+import (
+	"net/http"
+)
+
+// ReadinessHandler returns 204 when the ingester is ready,
+// 500 otherwise.  It's used by kubernetes to indicate if the ingester
+// pool is ready to have ingesters added / removed.
+func (i *Ingester) ReadinessHandler(w http.ResponseWriter, r *http.Request) {
+	if i.Ready() {
+		w.WriteHeader(http.StatusNoContent)
+	} else {
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+}