Don't exclude some ingesters from metrics and http admin page

Author: bboreham

pkg/ring/http.go

@@ -102,7 +102,7 @@ func (r *Ring) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		ing := r.ringDesc.Ingesters[id]
 		timestamp := time.Unix(ing.Timestamp, 0)
 		state := ing.State.String()
-		if !r.IsHealthy(ing, Write) {
+		if !r.IsHealthy(ing, Reporting) {
 			state = unhealthy
 		}
 

pkg/ring/ring.go

@@ -48,6 +48,7 @@ type Operation int
 const (
 	Read Operation = iota
 	Write
+	Reporting // Special value for inquiring about health
 )
 
 type uint32s []uint32
@@ -325,7 +326,7 @@ func (r *Ring) Collect(ch chan<- prometheus.Metric) {
 		JOINING.String(): 0,
 	}
 	for _, ingester := range r.ringDesc.Ingesters {
-		if !r.IsHealthy(ingester, Write) {
+		if !r.IsHealthy(ingester, Reporting) {
 			byState[unhealthy]++
 		} else {
 			byState[ingester.State.String()]++