Get rid of the old ingester http interface

cmd/cortex/main.go

@@ -310,12 +310,6 @@ func setupIngester(
 		log.Fatal(err)
 	}
 	prometheus.MustRegister(ingester)
-
-	router.Path("/push").Handler(http.HandlerFunc(ingester.PushHandler))
-	router.Path("/query").Handler(http.HandlerFunc(ingester.QueryHandler))
-	router.Path("/label_values").Handler(http.HandlerFunc(ingester.LabelValuesHandler))
-	router.Path("/user_stats").Handler(http.HandlerFunc(ingester.UserStatsHandler))
-	router.Path("/ready").Handler(http.HandlerFunc(ingester.ReadinessHandler))
 	return ingester
 }
 

distributor/distributor.go

@@ -136,26 +136,18 @@ func (d *Distributor) getClientFor(ingester ring.IngesterDesc) (cortex.IngesterC
 		return client, nil
 	}
 
-	if ingester.GRPCHostname != "" {
-		conn, err := grpc.Dial(
-			ingester.GRPCHostname,
-			grpc.WithInsecure(),
-			grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
-				otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()),
-				middleware.ClientUserHeaderInterceptor,
-			)),
-		)
-		if err != nil {
-			return nil, err
-		}
-		client = cortex.NewIngesterClient(conn)
-	} else {
-		var err error
-		client, err = NewHTTPIngesterClient(ingester.Hostname, d.cfg.RemoteTimeout)
-		if err != nil {
-			return nil, err
-		}
+	conn, err := grpc.Dial(
+		ingester.GRPCHostname,
+		grpc.WithInsecure(),
+		grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(
+			otgrpc.OpenTracingClientInterceptor(opentracing.GlobalTracer()),
+			middleware.ClientUserHeaderInterceptor,
+		)),
+	)
+	if err != nil {
+		return nil, err
 	}
+	client = cortex.NewIngesterClient(conn)
 
 	d.clients[ingester.Hostname] = client
 	return client, nil

distributor/http_server.go

@@ -1,6 +1,7 @@
 package distributor
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/prometheus/common/log"
@@ -9,6 +10,23 @@ import (
 	"github.com/weaveworks/cortex/util"
 )
 
+// IngesterError is an error we got from an ingester.
+type IngesterError struct {
+	StatusCode int
+	err        error
+}
+
+func errStatusCode(code int, status string) IngesterError {
+	return IngesterError{
+		StatusCode: code,
+		err:        fmt.Errorf("server returned HTTP status %s", status),
+	}
+}
+
+func (i IngesterError) Error() string {
+	return i.err.Error()
+}
+
 // PushHandler is a http.Handler which accepts WriteRequests.
 func (d *Distributor) PushHandler(w http.ResponseWriter, r *http.Request) {
 	var req remote.WriteRequest