Merge pull request #102 from weaveworks/update-prometheus

Update vendored prometheus/prometheus

Author: tomwilkie

cmd/cortex/main.go

@@ -220,17 +220,20 @@ func setupQuerier(
 	prefix string,
 	logSuccess bool,
 ) {
-	querier := querier.MergeQuerier{
-		Queriers: []querier.Querier{
-			distributor,
-			&querier.ChunkQuerier{
-				Store: chunkStore,
+	queryable := querier.Queryable{
+		Q: querier.MergeQuerier{
+			Queriers: []querier.Querier{
+				distributor,
+				&querier.ChunkQuerier{
+					Store: chunkStore,
+				},
 			},
 		},
 	}
-	engine := promql.NewEngine(querier, nil)
 
-	api := v1.NewAPI(engine, querier)
+	engine := promql.NewEngine(queryable, nil)
+
+	api := v1.NewAPI(engine, querier.DummyStorage{queryable})
 	router := route.New(func(r *http.Request) (context.Context, error) {
 		userID := r.Header.Get(userIDHeaderName)
 		if r.Method != "OPTIONS" && userID == "" {

querier/querier.go

@@ -43,6 +43,16 @@ func (q *ChunkQuerier) LabelValuesForLabelName(ctx context.Context, ln model.Lab
 	return nil, nil
 }
 
+// Queryable is an adapter between Prometheus' Queryable and Querier.
+type Queryable struct {
+	Q local.Querier
+}
+
+// Querier implements Queryable
+func (q Queryable) Querier() (local.Querier, error) {
+	return q.Q, nil
+}
+
 // A MergeQuerier is a promql.Querier that merges the results of multiple
 // cortex.Queriers for the same query.
 type MergeQuerier struct {
@@ -123,43 +133,53 @@ func (qm MergeQuerier) LabelValuesForLabelName(ctx context.Context, name model.L
 	return values, nil
 }
 
+// Close is a noop
+func (qm MergeQuerier) Close() error {
+	return nil
+}
+
+// DummyStorage creates a local.Storage compatible struct from a
+// Querable, such that it can be used with web.NewAPI.
 // TODO(juliusv): Remove all the dummy local.Storage methods below
 // once the upstream web API expects a leaner interface.
+type DummyStorage struct {
+	Queryable
+}
 
 // Append implements local.Storage. Needed to satisfy interface
 // requirements for usage with the Prometheus web API.
-func (qm MergeQuerier) Append(*model.Sample) error {
+func (DummyStorage) Append(*model.Sample) error {
 	panic("MergeQuerier.Append() should never be called")
 }
 
 // NeedsThrottling implements local.Storage. Needed to satisfy
 // interface requirements for usage with the Prometheus web API.
-func (qm MergeQuerier) NeedsThrottling() bool {
+func (DummyStorage) NeedsThrottling() bool {
 	panic("MergeQuerier.NeedsThrottling() should never be called")
 }
 
 // DropMetricsForLabelMatchers implements local.Storage. Needed
 // to satisfy interface requirements for usage with the Prometheus
 // web API.
-func (qm MergeQuerier) DropMetricsForLabelMatchers(context.Context, ...*metric.LabelMatcher) (int, error) {
+func (DummyStorage) DropMetricsForLabelMatchers(context.Context, ...*metric.LabelMatcher) (int, error) {
 	return 0, fmt.Errorf("dropping metrics is not supported")
 }
 
 // Start implements local.Storage. Needed to satisfy interface
 // requirements for usage with the Prometheus web API.
-func (qm MergeQuerier) Start() error {
+func (DummyStorage) Start() error {
 	panic("MergeQuerier.Start() should never be called")
 }
 
 // Stop implements local.Storage. Needed to satisfy interface
 // requirements for usage with the Prometheus web API.
-func (qm MergeQuerier) Stop() error {
+func (DummyStorage) Stop() error {
 	panic("MergeQuerier.Stop() should never be called")
 }
 
 // WaitForIndexing implements local.Storage. Needed to satisfy
 // interface requirements for usage with the Prometheus
 // web API.
-func (qm MergeQuerier) WaitForIndexing() {
+func (DummyStorage) WaitForIndexing() {
 	panic("MergeQuerier.WaitForIndexing() should never be called")
 }